PraisonAI 2.2.33__cp313-cp313-manylinux_2_39_x86_64.whl → 2.2.35__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.33 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==2.2.35 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

praisonai/ui/agents.py

@@ -467,10 +467,12 @@ async def ui_run_praisonai(config, topic, tools_dict):
                     role_tools.append(callable_func)
                     # Add API tool definition to task's tools
                     task_tools.append(tool_def)
-                    # Also set the agent's tools to include both
-                    agent.tools = role_tools
                 else:
                     logger.warning(f"Tool '{tool_name}' not found. Skipping.")
+            
+            # Set the agent's tools after collecting all tools
+            if role_tools:
+                agent.tools = role_tools
 
             for tname, tdetails in details.get('tasks', {}).items():
                 description_filled = tdetails['description'].format(topic=topic)

praisonai/ui/chat.py

@@ -7,6 +7,8 @@ import json
 import asyncio
 import io
 import base64
+import importlib.util
+import inspect
 
 # Third-party imports
 from dotenv import load_dotenv
@@ -59,6 +61,76 @@ def load_setting(key: str) -> str:
 
 cl_data._data_layer = db_manager
 
+def load_custom_tools():
+    """Load custom tools from tools.py if it exists"""
+    custom_tools = {}
+    try:
+        spec = importlib.util.spec_from_file_location("tools", "tools.py")
+        if spec is None:
+            logger.debug("tools.py not found in current directory")
+            return custom_tools
+        
+        module = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(module)
+        
+        # Load all functions from tools.py
+        for name, obj in inspect.getmembers(module):
+            if not name.startswith('_') and callable(obj) and not inspect.isclass(obj):
+                # Store function in globals for access
+                globals()[name] = obj
+                
+                # Get function signature to build parameters
+                sig = inspect.signature(obj)
+                params_properties = {}
+                required_params = []
+                
+                for param_name, param in sig.parameters.items():
+                    if param_name != 'self':  # Skip self parameter
+                        # Get type annotation if available
+                        param_type = "string"  # Default type
+                        if param.annotation != inspect.Parameter.empty:
+                            if param.annotation == int:
+                                param_type = "integer"
+                            elif param.annotation == float:
+                                param_type = "number"
+                            elif param.annotation == bool:
+                                param_type = "boolean"
+                        
+                        params_properties[param_name] = {
+                            "type": param_type,
+                            "description": f"Parameter {param_name}"
+                        }
+                        
+                        # Add to required if no default value
+                        if param.default == inspect.Parameter.empty:
+                            required_params.append(param_name)
+                
+                # Build tool definition
+                tool_def = {
+                    "type": "function",
+                    "function": {
+                        "name": name,
+                        "description": obj.__doc__ or f"Function {name.replace('_', ' ')}",
+                        "parameters": {
+                            "type": "object",
+                            "properties": params_properties,
+                            "required": required_params
+                        }
+                    }
+                }
+                
+                custom_tools[name] = tool_def
+                logger.info(f"Loaded custom tool: {name}")
+        
+        logger.info(f"Loaded {len(custom_tools)} custom tools from tools.py")
+    except Exception as e:
+        logger.warning(f"Error loading custom tools: {e}")
+    
+    return custom_tools
+
+# Load custom tools
+custom_tools_dict = load_custom_tools()
+
 tavily_api_key = os.getenv("TAVILY_API_KEY")
 tavily_client = TavilyClient(api_key=tavily_api_key) if tavily_api_key else None
 
@@ -72,7 +144,7 @@ async def tavily_web_search(query):
     response = tavily_client.search(query)
     logger.debug(f"Tavily search response: {response}")
 
-    async with AsyncAsyncWebCrawler() as crawler:
+    async with AsyncWebCrawler() as crawler:
         results = []
         for result in response.get('results', []):
             url = result.get('url')
@@ -97,20 +169,28 @@ async def tavily_web_search(query):
         "results": results
     })
 
-tools = [{
-    "type": "function",
-    "function": {
-        "name": "tavily_web_search",
-        "description": "Search the web using Tavily API and crawl the resulting URLs",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "query": {"type": "string", "description": "Search query"}
-            },
-            "required": ["query"]
+# Build tools list with Tavily and custom tools
+tools = []
+
+# Add Tavily tool if API key is available
+if tavily_api_key:
+    tools.append({
+        "type": "function",
+        "function": {
+            "name": "tavily_web_search",
+            "description": "Search the web using Tavily API and crawl the resulting URLs",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "query": {"type": "string", "description": "Search query"}
+                },
+                "required": ["query"]
+            }
         }
-    }
-}] if tavily_api_key else []
+    })
+
+# Add custom tools from tools.py
+tools.extend(list(custom_tools_dict.values()))
 
 # Authentication configuration
 AUTH_PASSWORD_ENABLED = os.getenv("AUTH_PASSWORD_ENABLED", "true").lower() == "true"  # Password authentication enabled by default
@@ -235,7 +315,8 @@ User Question: {message.content}
             ]
         }
 
-    if tavily_api_key:
+    # Pass tools if we have any (Tavily or custom)
+    if tools:
         completion_params["tools"] = tools
         completion_params["tool_choice"] = "auto"
 
@@ -254,7 +335,7 @@ User Question: {message.content}
                 await msg.stream_token(token)
                 full_response += token
 
-            if tavily_api_key and 'tool_calls' in delta and delta['tool_calls'] is not None:
+            if tools and 'tool_calls' in delta and delta['tool_calls'] is not None:
                 for tool_call in delta['tool_calls']:
                     if current_tool_call is None or tool_call.index != current_tool_call['index']:
                         if current_tool_call:
@@ -284,10 +365,17 @@ User Question: {message.content}
     cl.user_session.set("message_history", message_history)
     await msg.update()
 
-    if tavily_api_key and tool_calls:
-        available_functions = {
-            "tavily_web_search": tavily_web_search,
-        }
+    if tool_calls and tools:  # Check if we have any tools and tool calls
+        available_functions = {}
+        
+        # Add Tavily function if available
+        if tavily_api_key:
+            available_functions["tavily_web_search"] = tavily_web_search
+        
+        # Add all custom tool functions from globals
+        for tool_name in custom_tools_dict:
+            if tool_name in globals():
+                available_functions[tool_name] = globals()[tool_name]
         messages = message_history + [{"role": "assistant", "content": None, "function_call": {
             "name": tool_calls[0]['function']['name'],
             "arguments": tool_calls[0]['function']['arguments']
@@ -301,9 +389,25 @@ User Question: {message.content}
                 if function_args:
                     try:
                         function_args = json.loads(function_args)
-                        function_response = await function_to_call(
-                            query=function_args.get("query"),
-                        )
+                        
+                        # Call function based on whether it's async or sync
+                        if asyncio.iscoroutinefunction(function_to_call):
+                            # For async functions like tavily_web_search
+                            if function_name == "tavily_web_search":
+                                function_response = await function_to_call(
+                                    query=function_args.get("query"),
+                                )
+                            else:
+                                # For custom async functions, pass all arguments
+                                function_response = await function_to_call(**function_args)
+                        else:
+                            # For sync functions (most custom tools)
+                            function_response = function_to_call(**function_args)
+                        
+                        # Convert response to string if needed
+                        if not isinstance(function_response, str):
+                            function_response = json.dumps(function_response)
+                        
                         messages.append(
                             {
                                 "role": "function",
@@ -313,6 +417,15 @@ User Question: {message.content}
                         )
                     except json.JSONDecodeError:
                         logger.error(f"Failed to parse function arguments: {function_args}")
+                    except Exception as e:
+                        logger.error(f"Error calling function {function_name}: {str(e)}")
+                        messages.append(
+                            {
+                                "role": "function",
+                                "name": function_name,
+                                "content": f"Error: {str(e)}",
+                            }
+                        )
 
         second_response = await acompletion(
             model=model_name,

{praisonai-2.2.33.dist-info → praisonai-2.2.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PraisonAI
-Version: 2.2.33
+Version: 2.2.35
 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
@@ -64,7 +64,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.106)
+Requires-Dist: praisonaiagents (>=0.0.108)
 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.33.dist-info → praisonai-2.2.35.dist-info}/RECORD

@@ -6,7 +6,7 @@ praisonai/api/call.py,sha256=-dV9DKNDi4w9vN6K63TUh15_PC0M5KzYOmBqHbuJqq0,11079
 praisonai/auto.py,sha256=0omuyIIuu-zBAXpsGo3JwuhX6zpjQg3ZtqbPtF5LZbg,12331
 praisonai/chainlit_ui.py,sha256=1lmqZ7_W9Pp1ueFYLvOq1YoH5NnKy3blssDrVvn95pc,12236
 praisonai/cli.py,sha256=4mG3TVE4DJxOC2KFfJcOiOhd814q9WEK2W2XNp7fIY8,36627
-praisonai/deploy.py,sha256=GJYcyXkp7CuOb2Hy6U_6bYmd6vrxZGVOetptn9n_PNY,6028
+praisonai/deploy.py,sha256=MUguy-5jcKyxRolVXdOyHf2hRpqWRavodNKOGElYjPw,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
@@ -38,9 +38,9 @@ praisonai/test.py,sha256=OL-wesjA5JTohr8rtr6kWoaS4ImkJg2l0GXJ-dUUfRU,4090
 praisonai/train.py,sha256=Cjb0TKU3esNrCk2OX24Qm1S1crRC00FdiGUYJLw3iPQ,24094
 praisonai/train_vision.py,sha256=OLDtr5u9rszWQ80LC5iFy37yPuYguES6AQybm_2RtM4,12514
 praisonai/ui/README.md,sha256=QG9yucvBieVjCjWFzu6hL9xNtYllkoqyJ_q1b0YYAco,1124
-praisonai/ui/agents.py,sha256=-QfO3wK5-_bzPkwAslfGBNQuiXAtrHBqT5Ty_E5vnr0,32831
+praisonai/ui/agents.py,sha256=bnyHozpfhnX-LAipjG_X618yqXL_6BveW8ZsuAUQ7Zk,32865
 praisonai/ui/callbacks.py,sha256=V4_-GjxmjDFmugUZGfQHKtNSysx7rT6i1UblbM_8lIM,1968
-praisonai/ui/chat.py,sha256=mfNU-fmJt4-x3sKe10DuiieOTZYsP5046yGlZq3yVI0,13570
+praisonai/ui/chat.py,sha256=c2nZfWBiprjs_X_B86M4ObhyVM1RZB0ZdZudDeHTN3g,18602
 praisonai/ui/code.py,sha256=pBD7v35qCRSq2Q5YXKmGWUf3J7gAnBJDQoJSe90r9qQ,26449
 praisonai/ui/colab.py,sha256=A2NceDVazMy53mIpp-NIn5w3y8aQKwQu5LmHTepVwlo,19584
 praisonai/ui/colab_chainlit.py,sha256=wrB1O0ttRlmOH8aMxU8QdGpse-X54U87ZcEEA3R1aFg,2432
@@ -74,7 +74,7 @@ praisonai/ui/sql_alchemy.py,sha256=ilWAWicUGja7ADbXW9_OgIYeyKNuAQ1ZI_RMqjmMI9k,2
 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.33.dist-info/METADATA,sha256=jz3maSJ-2WTTVul2ej5DcjCeP3aSX6EDomDmnKmsvSc,4762
-praisonai-2.2.33.dist-info/WHEEL,sha256=dCzwOzx-VmbmLA5u8QpkARaxx3rsePBxa1nmZphhNQk,110
-praisonai-2.2.33.dist-info/entry_points.txt,sha256=QSSfuXjZMhf16FZ201I_oSoX_s1nWYbi_4_UXPE3S-o,145
-praisonai-2.2.33.dist-info/RECORD,,
+praisonai-2.2.35.dist-info/METADATA,sha256=PAQy4iS7n5QgOsAZzkhA6p9-VXGeZMs6PuIkxDFPrtA,4762
+praisonai-2.2.35.dist-info/WHEEL,sha256=dCzwOzx-VmbmLA5u8QpkARaxx3rsePBxa1nmZphhNQk,110
+praisonai-2.2.35.dist-info/entry_points.txt,sha256=QSSfuXjZMhf16FZ201I_oSoX_s1nWYbi_4_UXPE3S-o,145
+praisonai-2.2.35.dist-info/RECORD,,