PraisonAI 2.2.17__tar.gz → 2.2.19__tar.gz

{praisonai-2.2.17 → praisonai-2.2.19}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: PraisonAI
-Version: 2.2.17
+Version: 2.2.19
 Summary: PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration.
 Author: Mervin Praison
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.10
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -63,7 +63,7 @@ Requires-Dist: playwright (>=1.47.0) ; extra == "code"
 Requires-Dist: plotly (>=5.24.0) ; extra == "realtime"
 Requires-Dist: praisonai-tools (>=0.0.15) ; extra == "autogen"
 Requires-Dist: praisonai-tools (>=0.0.15) ; extra == "crewai"
-Requires-Dist: praisonaiagents (>=0.0.90)
+Requires-Dist: praisonaiagents (>=0.0.91)
 Requires-Dist: pyautogen (>=0.2.19) ; extra == "autogen"
 Requires-Dist: pydantic (<=2.10.1) ; extra == "chat"
 Requires-Dist: pydantic (<=2.10.1) ; extra == "code"

{praisonai-2.2.17 → praisonai-2.2.19}/praisonai/deploy.py

@@ -56,7 +56,7 @@ class CloudDeployer:
             file.write("FROM python:3.11-slim\n")
             file.write("WORKDIR /app\n")
             file.write("COPY . .\n")
-            file.write("RUN pip install flask praisonai==2.2.17 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==2.2.19 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

{praisonai-2.2.17 → praisonai-2.2.19}/praisonai/inc/models.py

@@ -1,9 +1,13 @@
 # praisonai/inc/models.py
 import os
 import logging
+from urllib.parse import urlparse
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO').upper(), format='%(asctime)s - %(levelname)s - %(message)s')
 
+# Constants
+LOCAL_SERVER_API_KEY_PLACEHOLDER = "not-needed"
+
 # Conditionally import modules based on availability
 try:
     from langchain_openai import ChatOpenAI  # pip install langchain-openai
@@ -71,11 +75,27 @@ class PraisonAIModel:
             self.model_name = self.model.replace("openrouter/", "")
         else: 
             self.api_key_var = api_key_var or "OPENAI_API_KEY" 
-            self.base_url = base_url or os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1")
+            self.base_url = base_url or os.environ.get("OPENAI_API_BASE") or os.environ.get("OPENAI_BASE_URL") or "https://api.openai.com/v1"
             self.model_name = self.model
         logger.debug(f"Initialized PraisonAIModel with model {self.model_name}, api_key_var {self.api_key_var}, and base_url {self.base_url}")
-        # Use explicit API key if provided, otherwise fall back to environment variable
-        self.api_key = api_key or os.environ.get(self.api_key_var, "nokey")
+
+        # Get API key from environment
+        self.api_key = api_key or os.environ.get(self.api_key_var)
+        
+        # For local servers, allow placeholder API key if base_url is set to non-OpenAI endpoint
+        if not self.api_key and self.base_url:
+            parsed_url = urlparse(self.base_url)
+            is_local = (parsed_url.hostname in ["localhost", "127.0.0.1"] or 
+                       "api.openai.com" not in self.base_url)
+            if is_local:
+                self.api_key = LOCAL_SERVER_API_KEY_PLACEHOLDER
+        
+        if not self.api_key:
+            raise ValueError(
+                f"{self.api_key_var} environment variable is required for the default OpenAI service. "
+                f"For local servers, set {self.api_key_var}='{LOCAL_SERVER_API_KEY_PLACEHOLDER}' and OPENAI_API_BASE to your local endpoint."
+            )
+
 
     def get_model(self):
         """
@@ -127,4 +147,4 @@ class PraisonAIModel:
             raise ImportError(
                 "Required Langchain Integration 'langchain-openai' not found. "
                 "Please install with 'pip install langchain-openai'"
-            )
+            )

praisonai-2.2.19/praisonai/ui/database_config.py

@@ -0,0 +1,56 @@
+"""
+Database configuration utilities for PraisonAI UI components.
+
+This module provides centralized database configuration functionality,
+particularly for handling the FORCE_SQLITE environment variable.
+"""
+
+import os
+from typing import Optional, Tuple
+
+
+def should_force_sqlite() -> bool:
+    """
+    Check if FORCE_SQLITE environment variable is set to true.
+    
+    Returns:
+        bool: True if FORCE_SQLITE is set to "true" (case-insensitive), False otherwise.
+    """
+    return os.getenv("FORCE_SQLITE", "false").lower() == "true"
+
+
+def get_database_url_with_sqlite_override() -> Optional[str]:
+    """
+    Get database URL respecting FORCE_SQLITE flag.
+    
+    When FORCE_SQLITE=true, this function returns None to force SQLite usage.
+    Otherwise, it returns the appropriate database URL from environment variables.
+    
+    Returns:
+        Optional[str]: Database URL if external database should be used, None for SQLite.
+    """
+    if should_force_sqlite():
+        return None
+    
+    database_url = os.getenv("DATABASE_URL")
+    supabase_url = os.getenv("SUPABASE_DATABASE_URL")
+    return supabase_url if supabase_url else database_url
+
+
+def get_database_config_for_sqlalchemy() -> Tuple[Optional[str], Optional[str]]:
+    """
+    Get database configuration for SQLAlchemy module respecting FORCE_SQLITE flag.
+    
+    Returns:
+        Tuple[Optional[str], Optional[str]]: (DATABASE_URL, SUPABASE_DATABASE_URL)
+            Both will be None if FORCE_SQLITE=true, otherwise original values.
+    """
+    if should_force_sqlite():
+        return None, None
+    else:
+        database_url = os.getenv("DATABASE_URL")
+        supabase_url = os.getenv("SUPABASE_DATABASE_URL")
+        # Apply Supabase override logic
+        if supabase_url:
+            database_url = supabase_url
+        return database_url, supabase_url

{praisonai-2.2.17 → praisonai-2.2.19}/praisonai/ui/db.py

@@ -9,6 +9,7 @@ from sqlalchemy.orm import sessionmaker
 from sql_alchemy import SQLAlchemyDataLayer
 import chainlit.data as cl_data
 from chainlit.types import ThreadDict
+from database_config import get_database_url_with_sqlite_override
 
 def ensure_directories():
     """Ensure required directories exist"""
@@ -57,10 +58,8 @@ ensure_directories()
 
 class DatabaseManager(SQLAlchemyDataLayer):
     def __init__(self):
-        self.database_url = os.getenv("DATABASE_URL")
-        supabase_url = os.getenv("SUPABASE_DATABASE_URL")
-        if supabase_url:
-            self.database_url = supabase_url
+        # Check FORCE_SQLITE flag to bypass external database detection
+        self.database_url = get_database_url_with_sqlite_override()
         
         if self.database_url:
             self.conninfo = self.database_url

{praisonai-2.2.17 → praisonai-2.2.19}/praisonai/ui/sql_alchemy.py

@@ -29,16 +29,14 @@ from sqlalchemy import text
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
 from sqlalchemy.orm import sessionmaker
+from database_config import get_database_config_for_sqlalchemy
 
 if TYPE_CHECKING:
     from chainlit.element import Element
     from chainlit.step import StepDict
 
-DATABASE_URL = os.getenv("DATABASE_URL")
-SUPABASE_DATABASE_URL = os.getenv("SUPABASE_DATABASE_URL")
-if SUPABASE_DATABASE_URL:
-    # If a Supabase database URL is provided, use it.
-    DATABASE_URL = SUPABASE_DATABASE_URL
+# Check FORCE_SQLITE flag to bypass external database detection
+DATABASE_URL, SUPABASE_DATABASE_URL = get_database_config_for_sqlalchemy()
 
 class SQLAlchemyDataLayer(BaseDataLayer):
     def __init__(

{praisonai-2.2.17 → praisonai-2.2.19}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "PraisonAI"
-version = "2.2.17"
+version = "2.2.19"
 description = "PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration."
 readme = "README.md"
 license = ""
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10"
 authors = [
     { name = "Mervin Praison" }
 ]
@@ -12,7 +12,7 @@ dependencies = [
     "rich>=13.7",
     "markdown>=3.5",
     "pyparsing>=3.0.0",
-    "praisonaiagents>=0.0.90",
+    "praisonaiagents>=0.0.91",
     "python-dotenv>=0.19.0",
     "instructor>=1.3.3",
     "PyYAML>=6.0",
@@ -89,7 +89,7 @@ autogen = ["pyautogen>=0.2.19", "praisonai-tools>=0.0.15", "crewai"]
 
 [tool.poetry]
 name = "PraisonAI"
-version = "2.2.17"
+version = "2.2.19"
 description = "PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration."
 authors = ["Mervin Praison"]
 license = ""
@@ -107,7 +107,7 @@ python = ">=3.10,<3.13"
 rich = ">=13.7"
 markdown = ">=3.5"
 pyparsing = ">=3.0.0"
-praisonaiagents = ">=0.0.90"
+praisonaiagents = ">=0.0.91"
 python-dotenv = ">=0.19.0"
 instructor = ">=1.3.3"
 PyYAML = ">=6.0"