PraisonAI 2.2.18__cp313-cp313-manylinux_2_39_x86_64.whl → 2.2.19__cp313-cp313-manylinux_2_39_x86_64.whl

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.18 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/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/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/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/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.18.dist-info → praisonai-2.2.19.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: PraisonAI
-Version: 2.2.18
+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

{praisonai-2.2.18.dist-info → praisonai-2.2.19.dist-info}/RECORD

@@ -6,12 +6,12 @@ praisonai/api/call.py,sha256=krOfTCZM_bdbsNuWQ1PijzCHECkDvEi9jIvvZaDQUUU,11035
 praisonai/auto.py,sha256=n4rhiNckKv0Vtn2OnhDVVuOBxmm3CpimM9Y-ZVN9H9E,9240
 praisonai/chainlit_ui.py,sha256=VKf_--cONLIBMymMY8j-oj6Pq_rw3pHtXOqF2wZ9gYI,12220
 praisonai/cli.py,sha256=Tw2HT4Orgx4WW6RDB-f9ssvFPdlyJlHTc_3G7Uve060,27893
-praisonai/deploy.py,sha256=9_n1GdjdP8cFoaUISRwN9wiwDtAhYHkZ3W6Dxt1O87g,6028
+praisonai/deploy.py,sha256=5hJ0ZmNzCqmv9KKSm-PKi8VixM5x-B_2A-ywQgggMvw,6028
 praisonai/inbuilt_tools/__init__.py,sha256=mZOEximj3zCyJHq9Lz0bGXhQpBsa_QR-R-yA9UKC3zI,565
 praisonai/inbuilt_tools/autogen_tools.py,sha256=kJdEv61BTYvdHOaURNEpBcWq8Rs-oC03loNFTIjT-ak,4687
 praisonai/inc/__init__.py,sha256=sPDlYBBwdk0VlWzaaM_lG0_LD07lS2HRGvPdxXJFiYg,62
 praisonai/inc/config.py,sha256=up2-841ruK7MCUUT3xkWBA5S6WsY0sFODNfcT6Q4Wms,3333
-praisonai/inc/models.py,sha256=lWzKBiGXpvv2L6SD3jJo5kTaH1Senm1HvRMCKlYkmjk,5718
+praisonai/inc/models.py,sha256=hKcyzMxAFWBTnIjk_ngfZUGmb1ubkgqx8I8cJ0Kr_Xc,6556
 praisonai/public/android-chrome-192x192.png,sha256=ENJEqhDE3XEQViRhKNDezQKRiOiuHOUj5nzRN43fz50,6535
 praisonai/public/android-chrome-512x512.png,sha256=4txEwB0cJkxFVarRdvFGJZR1DtWJ2h-L_2cUEjBXHAc,15244
 praisonai/public/apple-touch-icon.png,sha256=YLlEhlenm24QY_yv-5wb_mxDxJ8H22H_S8Khlvz-zVA,6001
@@ -57,7 +57,8 @@ praisonai/ui/config/translations/ta.json,sha256=8JPW6BwLN2dl9wuq5wSkMvazcY8lM5v1
 praisonai/ui/config/translations/te.json,sha256=JzW2YXWg1qqvWgIvEgMelQz5s6EzTb_uD_3TEHAHiQw,23526
 praisonai/ui/config/translations/zh-CN.json,sha256=aLBSSSQ0yojlYGuMMlOYvkD_ruG9-d2AgnjJWhPODVw,11737
 praisonai/ui/context.py,sha256=oWO2I_WBZb7kZnuXItf18EJX0ZQv-1nAd8rxhwhuuDU,11871
-praisonai/ui/db.py,sha256=2ljFHRisGnu4h-vKQdKYiBVc4sWa-BORhMmOC9Xt6xk,11426
+praisonai/ui/database_config.py,sha256=rW0YRUWom5yC4_5MfHP0fnMG7jHKdDYXvnUZc0JOGPA,1838
+praisonai/ui/db.py,sha256=CLY_fWmy2uwIZNby2Ya7FBvh2o2tKje8fkXAmtRwky4,11450
 praisonai/ui/public/fantasy.svg,sha256=4Gs3kIOux-pjGtw6ogI_rv5_viVJxnE5gRwGilsSg0o,1553
 praisonai/ui/public/game.svg,sha256=y2QMaA01m8XzuDjTOBWzupOC3-TpnUl9ah89mIhviUw,2406
 praisonai/ui/public/logo_dark.png,sha256=frHz1zkrnivGssJgk9iy1cabojkVgm8B4MllFwL_CnI,17050
@@ -69,11 +70,11 @@ praisonai/ui/realtime.py,sha256=aVK-lbA57J9KHo3Lrknk4aaO1V1tRkiKXr_01zWrl30,1784
 praisonai/ui/realtimeclient/__init__.py,sha256=zA2xa7rBUSw77wFkndJMQNNPqdH6ywQ3uf4WSYHjNfs,27513
 praisonai/ui/realtimeclient/realtimedocs.txt,sha256=hmgd8Uwy2SkjSndyyF_-ZOaNxiyHwGaQLGc67DvV-sI,26395
 praisonai/ui/realtimeclient/tools.py,sha256=IJOYwVOBW5Ocn5_iV9pFkmSKR3WU3YpX3kwF0I3jikQ,7855
-praisonai/ui/sql_alchemy.py,sha256=fPLPBJlrgV1_sRugirbNDCunqxqFB-CjV9TvCThU4nU,29686
+praisonai/ui/sql_alchemy.py,sha256=ilWAWicUGja7ADbXW9_OgIYeyKNuAQ1ZI_RMqjmMI9k,29667
 praisonai/ui/tools.md,sha256=Ad3YH_ZCLMWlz3mDXllQnQ_S5l55LWqLdcZSh-EXrHI,3956
 praisonai/upload_vision.py,sha256=lMpFn993UiYVJxRNZQTmcbPbEajQ5TFKCNGK1Icn_hg,5253
 praisonai/version.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
-praisonai-2.2.18.dist-info/METADATA,sha256=wblnChfolLTcsCb5ig3U6_RPiwGb3N9IsdJs_xBkntk,4745
-praisonai-2.2.18.dist-info/WHEEL,sha256=dCzwOzx-VmbmLA5u8QpkARaxx3rsePBxa1nmZphhNQk,110
-praisonai-2.2.18.dist-info/entry_points.txt,sha256=I_xc6a6MNTTfLxYmAxe0rgey0G-_hbY07oFW-ZDnkw4,135
-praisonai-2.2.18.dist-info/RECORD,,
+praisonai-2.2.19.dist-info/METADATA,sha256=p_2qcwKD0mDb0caJqqlyhHF-EChB2oRYI1fih81IOMM,4739
+praisonai-2.2.19.dist-info/WHEEL,sha256=dCzwOzx-VmbmLA5u8QpkARaxx3rsePBxa1nmZphhNQk,110
+praisonai-2.2.19.dist-info/entry_points.txt,sha256=I_xc6a6MNTTfLxYmAxe0rgey0G-_hbY07oFW-ZDnkw4,135
+praisonai-2.2.19.dist-info/RECORD,,