praisonaiagents 0.0.78__py3-none-any.whl → 0.0.80__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -22,16 +22,16 @@ import inspect
 import uuid
 from dataclasses import dataclass
 
+# Global variables for API server
+_server_started = False
+_registered_agents = {}
+_shared_app = None
+
 # Don't import FastAPI dependencies here - use lazy loading instead
 
 if TYPE_CHECKING:
     from ..task.task import Task
 
-# Shared variables for API server
-_shared_app = None
-_server_started = False
-_registered_agents = {}
-
 @dataclass
 class ChatCompletionMessage:
     content: str
@@ -1408,7 +1408,7 @@ Your Goal: {self.goal}
             logging.error(f"Error in execute_tool_async: {str(e)}", exc_info=True)
             return {"error": f"Error in execute_tool_async: {str(e)}"}
 
-    def launch(self, path: str = '/', port: int = 8000, host: str = '0.0.0.0', autostart: bool = True, debug: bool = False, blocking: bool = True):
+    def launch(self, path: str = '/', port: int = 8000, host: str = '0.0.0.0', debug: bool = False):
         """
         Launch the agent as an HTTP API endpoint.
         
@@ -1416,9 +1416,7 @@ Your Goal: {self.goal}
             path: API endpoint path (default: '/')
             port: Server port (default: 8000)
             host: Server host (default: '0.0.0.0')
-            autostart: Whether to start the server automatically (default: True)
             debug: Enable debug mode for uvicorn (default: False)
-            blocking: If True, blocks the main thread to keep the server running (default: True)
             
         Returns:
             None
@@ -1431,6 +1429,8 @@ Your Goal: {self.goal}
             from fastapi import FastAPI, HTTPException, Request
             from fastapi.responses import JSONResponse
             from pydantic import BaseModel
+            import threading
+            import time
             
             # Define the request model here since we need pydantic
             class AgentQuery(BaseModel):
@@ -1458,6 +1458,11 @@ Your Goal: {self.goal}
             @_shared_app.get("/")
             async def root():
                 return {"message": "Welcome to PraisonAI Agents API. See /docs for usage."}
+            
+            # Add healthcheck endpoint
+            @_shared_app.get("/health")
+            async def healthcheck():
+                return {"status": "ok", "agents": list(_registered_agents.keys())}
         
         # Normalize path to ensure it starts with /
         if not path.startswith('/'):
@@ -1516,47 +1521,68 @@ Your Goal: {self.goal}
         
         print(f"🚀 Agent '{self.name}' available at http://{host}:{port}{path}")
         
-        # Start the server if this is the first launch call and autostart is True
-        if autostart and not _server_started:
+        # Start the server if it's not already running
+        if not _server_started:
             _server_started = True
             
-            # Add healthcheck endpoint
-            @_shared_app.get("/health")
-            async def healthcheck():
-                return {"status": "ok", "agents": list(_registered_agents.keys())}
-            
-            # Start the server in a separate thread to not block execution
-            import threading
+            # Start the server in a separate thread
             def run_server():
                 try:
+                    print(f"✅ FastAPI server started at http://{host}:{port}")
+                    print(f"📚 API documentation available at http://{host}:{port}/docs")
+                    print(f"🔌 Available endpoints: {', '.join(list(_registered_agents.keys()))}")
                     uvicorn.run(_shared_app, host=host, port=port, log_level="debug" if debug else "info")
                 except Exception as e:
                     logging.error(f"Error starting server: {str(e)}", exc_info=True)
                     print(f"❌ Error starting server: {str(e)}")
             
+            # Run server in a background thread
             server_thread = threading.Thread(target=run_server, daemon=True)
             server_thread.start()
             
-            # Give the server a moment to start up
-            import time
+            # Wait for a moment to allow the server to start and register endpoints
             time.sleep(0.5)
+        else:
+            # If server is already running, wait a moment to make sure the endpoint is registered
+            time.sleep(0.1)
+            print(f"🔌 Available endpoints: {', '.join(list(_registered_agents.keys()))}")
+        
+        # Get the stack frame to check if this is the last launch() call in the script
+        import inspect
+        stack = inspect.stack()
+        
+        # If this is called from a Python script (not interactive), try to detect if it's the last launch call
+        if len(stack) > 1 and stack[1].filename.endswith('.py'):
+            caller_frame = stack[1]
+            caller_line = caller_frame.lineno
             
-            print(f"✅ FastAPI server started at http://{host}:{port}")
-            print(f"📚 API documentation available at http://{host}:{port}/docs")
-            
-            # If blocking is True, keep the main thread alive
-            if blocking:
-                print("\nServer is running in blocking mode. Press Ctrl+C to stop...")
+            try:
+                # Read the file to check if there are more launch calls after this one
+                with open(caller_frame.filename, 'r') as f:
+                    lines = f.readlines()
+                
+                # Check if there are more launch() calls after the current line
+                has_more_launches = False
+                for line in lines[caller_line:]:
+                    if '.launch(' in line and not line.strip().startswith('#'):
+                        has_more_launches = True
+                        break
+                
+                # If this is the last launch call, block the main thread
+                if not has_more_launches:
+                    try:
+                        print("\nAll agents registered. Press Ctrl+C to stop the server.")
+                        while True:
+                            time.sleep(1)
+                    except KeyboardInterrupt:
+                        print("\nServer stopped")
+            except Exception as e:
+                # If something goes wrong with detection, block anyway to be safe
+                logging.error(f"Error in launch detection: {e}")
                 try:
                     while True:
                         time.sleep(1)
                 except KeyboardInterrupt:
                     print("\nServer stopped")
-            else:
-                # Note for non-blocking mode
-                print("\nNote: Server is running in a background thread. To keep it alive, either:")
-                print("1. Set blocking=True when calling launch()")
-                print("2. Keep your main application running")
-                print("3. Use a loop in your code to prevent the program from exiting")
-            
+        
         return None 

praisonaiagents/agents/agents.py

@@ -17,6 +17,11 @@ import uuid
 # Set up logger
 logger = logging.getLogger(__name__)
 
+# Global variables for managing the shared servers
+_agents_server_started = {}  # Dict of port -> started boolean
+_agents_registered_endpoints = {}  # Dict of port -> Dict of path -> endpoint_id
+_agents_shared_apps = {}  # Dict of port -> FastAPI app
+
 def encode_file_to_base64(file_path: str) -> str:
     """Base64-encode a file."""
     import base64
@@ -878,4 +883,230 @@ Context:
 
     def clear_state(self) -> None:
         """Clear all state values"""
-        self._state.clear() 
+        self._state.clear()
+        
+    def launch(self, path: str = '/agents', port: int = 8000, host: str = '0.0.0.0', debug: bool = False):
+        """
+        Launch all agents as a single API endpoint. The endpoint accepts a query and processes it through
+        all agents in sequence, with the output of each agent feeding into the next.
+        
+        Args:
+            path: API endpoint path (default: '/agents')
+            port: Server port (default: 8000)
+            host: Server host (default: '0.0.0.0')
+            debug: Enable debug mode for uvicorn (default: False)
+            
+        Returns:
+            None
+        """
+        global _agents_server_started, _agents_registered_endpoints, _agents_shared_apps
+        
+        if not self.agents:
+            logging.warning("No agents to launch. Add agents to the Agents instance first.")
+            return
+            
+        # Try to import FastAPI dependencies - lazy loading
+        try:
+            import uvicorn
+            from fastapi import FastAPI, HTTPException, Request
+            from fastapi.responses import JSONResponse
+            from pydantic import BaseModel
+            import threading
+            import time
+            
+            # Define the request model here since we need pydantic
+            class AgentQuery(BaseModel):
+                query: str
+                
+        except ImportError as e:
+            # Check which specific module is missing
+            missing_module = str(e).split("No module named '")[-1].rstrip("'")
+            display_error(f"Missing dependency: {missing_module}. Required for launch() method.")
+            logging.error(f"Missing dependency: {missing_module}. Required for launch() method.")
+            print(f"\nTo add API capabilities, install the required dependencies:")
+            print(f"pip install {missing_module}")
+            print("\nOr install all API dependencies with:")
+            print("pip install 'praisonaiagents[api]'")
+            return None
+        
+        # Initialize port-specific collections if needed
+        if port not in _agents_registered_endpoints:
+            _agents_registered_endpoints[port] = {}
+            
+        # Initialize shared FastAPI app if not already created for this port
+        if _agents_shared_apps.get(port) is None:
+            _agents_shared_apps[port] = FastAPI(
+                title=f"PraisonAI Agents API (Port {port})",
+                description="API for interacting with multiple PraisonAI Agents"
+            )
+            
+            # Add a root endpoint with a welcome message
+            @_agents_shared_apps[port].get("/")
+            async def root():
+                return {
+                    "message": f"Welcome to PraisonAI Agents API on port {port}. See /docs for usage.",
+                    "endpoints": list(_agents_registered_endpoints[port].keys())
+                }
+            
+            # Add healthcheck endpoint
+            @_agents_shared_apps[port].get("/health")
+            async def healthcheck():
+                return {
+                    "status": "ok", 
+                    "endpoints": list(_agents_registered_endpoints[port].keys())
+                }
+        
+        # Normalize path to ensure it starts with /
+        if not path.startswith('/'):
+            path = f'/{path}'
+            
+        # Check if path is already registered for this port
+        if path in _agents_registered_endpoints[port]:
+            logging.warning(f"Path '{path}' is already registered on port {port}. Please use a different path.")
+            print(f"⚠️ Warning: Path '{path}' is already registered on port {port}.")
+            # Use a modified path to avoid conflicts
+            original_path = path
+            instance_id = str(uuid.uuid4())[:6]
+            path = f"{path}_{instance_id}"
+            logging.warning(f"Using '{path}' instead of '{original_path}'")
+            print(f"🔄 Using '{path}' instead")
+        
+        # Generate a unique ID for this agent group's endpoint
+        endpoint_id = str(uuid.uuid4())
+        _agents_registered_endpoints[port][path] = endpoint_id
+        
+        # Define the endpoint handler
+        @_agents_shared_apps[port].post(path)
+        async def handle_query(request: Request, query_data: Optional[AgentQuery] = None):
+            # Handle both direct JSON with query field and form data
+            if query_data is None:
+                try:
+                    request_data = await request.json()
+                    if "query" not in request_data:
+                        raise HTTPException(status_code=400, detail="Missing 'query' field in request")
+                    query = request_data["query"]
+                except:
+                    # Fallback to form data or query params
+                    form_data = await request.form()
+                    if "query" in form_data:
+                        query = form_data["query"]
+                    else:
+                        raise HTTPException(status_code=400, detail="Missing 'query' field in request")
+            else:
+                query = query_data.query
+            
+            try:
+                # Process the query sequentially through all agents
+                current_input = query
+                results = []
+                
+                for agent in self.agents:
+                    try:
+                        # Use async version if available, otherwise use sync version
+                        if asyncio.iscoroutinefunction(agent.chat):
+                            response = await agent.achat(current_input)
+                        else:
+                            # Run sync function in a thread to avoid blocking
+                            loop = asyncio.get_event_loop()
+                            response = await loop.run_in_executor(None, lambda: agent.chat(current_input))
+                        
+                        # Store this agent's result
+                        results.append({
+                            "agent": agent.name,
+                            "response": response
+                        })
+                        
+                        # Use this response as input to the next agent
+                        current_input = response
+                    except Exception as e:
+                        logging.error(f"Error with agent {agent.name}: {str(e)}", exc_info=True)
+                        results.append({
+                            "agent": agent.name,
+                            "error": str(e)
+                        })
+                        # Continue with original input if there's an error
+                
+                # Return all results and the final output
+                return {
+                    "query": query,
+                    "results": results,
+                    "final_response": current_input
+                }
+            except Exception as e:
+                logging.error(f"Error processing query: {str(e)}", exc_info=True)
+                return JSONResponse(
+                    status_code=500,
+                    content={"error": f"Error processing query: {str(e)}"}
+                )
+        
+        print(f"🚀 Multi-Agent API available at http://{host}:{port}{path}")
+        agent_names = ", ".join([agent.name for agent in self.agents])
+        print(f"📊 Available agents ({len(self.agents)}): {agent_names}")
+        
+        # Start the server if it's not already running for this port
+        if not _agents_server_started.get(port, False):
+            # Mark the server as started first to prevent duplicate starts
+            _agents_server_started[port] = True
+            
+            # Start the server in a separate thread
+            def run_server():
+                try:
+                    print(f"✅ FastAPI server started at http://{host}:{port}")
+                    print(f"📚 API documentation available at http://{host}:{port}/docs")
+                    print(f"🔌 Available endpoints: {', '.join(list(_agents_registered_endpoints[port].keys()))}")
+                    uvicorn.run(_agents_shared_apps[port], host=host, port=port, log_level="debug" if debug else "info")
+                except Exception as e:
+                    logging.error(f"Error starting server: {str(e)}", exc_info=True)
+                    print(f"❌ Error starting server: {str(e)}")
+            
+            # Run server in a background thread
+            server_thread = threading.Thread(target=run_server, daemon=True)
+            server_thread.start()
+            
+            # Wait for a moment to allow the server to start and register endpoints
+            time.sleep(0.5)
+        else:
+            # If server is already running, wait a moment to make sure the endpoint is registered
+            time.sleep(0.1)
+            print(f"🔌 Available endpoints on port {port}: {', '.join(list(_agents_registered_endpoints[port].keys()))}")
+        
+        # Get the stack frame to check if this is the last launch() call in the script
+        import inspect
+        stack = inspect.stack()
+        
+        # If this is called from a Python script (not interactive), try to detect if it's the last launch call
+        if len(stack) > 1 and stack[1].filename.endswith('.py'):
+            caller_frame = stack[1]
+            caller_line = caller_frame.lineno
+            
+            try:
+                # Read the file to check if there are more launch calls after this one
+                with open(caller_frame.filename, 'r') as f:
+                    lines = f.readlines()
+                
+                # Check if there are more launch() calls after the current line
+                has_more_launches = False
+                for line in lines[caller_line:]:
+                    if '.launch(' in line and not line.strip().startswith('#'):
+                        has_more_launches = True
+                        break
+                
+                # If this is the last launch call, block the main thread
+                if not has_more_launches:
+                    try:
+                        print("\nAll agents registered. Press Ctrl+C to stop the servers.")
+                        while True:
+                            time.sleep(1)
+                    except KeyboardInterrupt:
+                        print("\nServers stopped")
+            except Exception as e:
+                # If something goes wrong with detection, block anyway to be safe
+                logging.error(f"Error in launch detection: {e}")
+                try:
+                    print("\nKeeping servers alive. Press Ctrl+C to stop.")
+                    while True:
+                        time.sleep(1)
+                except KeyboardInterrupt:
+                    print("\nServers stopped")
+        
+        return None 

{praisonaiagents-0.0.78.dist-info → praisonaiagents-0.0.80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praisonaiagents
-Version: 0.0.78
+Version: 0.0.80
 Summary: Praison AI agents for completing complex tasks with Self Reflection Agents
 Author: Mervin Praison
 Requires-Dist: pydantic

{praisonaiagents-0.0.78.dist-info → praisonaiagents-0.0.80.dist-info}/RECORD

@@ -1,10 +1,10 @@
 praisonaiagents/__init__.py,sha256=Z2_rSA6mYozz0r3ioUgKzl3QV8uWRDS_QaqPg2oGjqg,1324
 praisonaiagents/main.py,sha256=l29nGEbV2ReBi4szURbnH0Fk0w2F_QZTmECysyZjYcA,15066
 praisonaiagents/agent/__init__.py,sha256=j0T19TVNbfZcClvpbZDDinQxZ0oORgsMrMqx16jZ-bA,128
-praisonaiagents/agent/agent.py,sha256=mkZOHL_qgZaiX_DXTgiDlMIfjTmrqeMpi088VCC_YOo,73946
+praisonaiagents/agent/agent.py,sha256=OOP_05mOMoHNkeElQWqH9jKOFUivlIjZ_vZJWLhIkSc,75089
 praisonaiagents/agent/image_agent.py,sha256=-5MXG594HVwSpFMcidt16YBp7udtik-Cp7eXlzLE1fY,8696
 praisonaiagents/agents/__init__.py,sha256=_1d6Pqyk9EoBSo7E68sKyd1jDRlN1vxvVIRpoMc0Jcw,168
-praisonaiagents/agents/agents.py,sha256=uAOHyn77noFvg3sYVFRhQUuc1LDpCMpfLND8CKOXAd4,37971
+praisonaiagents/agents/agents.py,sha256=ABMQW07fH8HgY0adiwollDB5DQJZcf7uGhu4njiyIVM,49026
 praisonaiagents/agents/autoagents.py,sha256=olYDn--rlJp-SckxILqmREkkgNlzCgEEcAUzfMj-54E,13518
 praisonaiagents/knowledge/__init__.py,sha256=xL1Eh-a3xsHyIcU4foOWF-JdWYIYBALJH9bge0Ujuto,246
 praisonaiagents/knowledge/chunking.py,sha256=G6wyHa7_8V0_7VpnrrUXbEmUmptlT16ISJYaxmkSgmU,7678
@@ -40,7 +40,7 @@ praisonaiagents/tools/xml_tools.py,sha256=iYTMBEk5l3L3ryQ1fkUnNVYK-Nnua2Kx2S0dxN
 praisonaiagents/tools/yaml_tools.py,sha256=uogAZrhXV9O7xvspAtcTfpKSQYL2nlOTvCQXN94-G9A,14215
 praisonaiagents/tools/yfinance_tools.py,sha256=s2PBj_1v7oQnOobo2fDbQBACEHl61ftG4beG6Z979ZE,8529
 praisonaiagents/tools/train/data/generatecot.py,sha256=H6bNh-E2hqL5MW6kX3hqZ05g9ETKN2-kudSjiuU_SD8,19403
-praisonaiagents-0.0.78.dist-info/METADATA,sha256=VwX1r4Ib2OxhTYVqSHpEluxljiGzNy7eifYi6wBRbTk,1149
-praisonaiagents-0.0.78.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-praisonaiagents-0.0.78.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.78.dist-info/RECORD,,
+praisonaiagents-0.0.80.dist-info/METADATA,sha256=MAc45qEZryYHTSeN-iQ0Ia90WSHgKEDmu9ulXvfY8cw,1149
+praisonaiagents-0.0.80.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+praisonaiagents-0.0.80.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.80.dist-info/RECORD,,