praisonaiagents 0.0.81__tar.gz → 0.0.82__tar.gz

{praisonaiagents-0.0.81 → praisonaiagents-0.0.82}/PKG-INFO

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

{praisonaiagents-0.0.81 → praisonaiagents-0.0.82}/praisonaiagents/agent/agent.py

@@ -1095,6 +1095,10 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
         start_time = time.time()
         reasoning_steps = reasoning_steps or self.reasoning_steps
         try:
+            # Default to self.tools if tools argument is None
+            if tools is None:
+                tools = self.tools
+
             # Search for existing knowledge if any knowledge is provided
             if self.knowledge:
                 search_results = self.knowledge.search(prompt, agent_id=self.agent_id)
@@ -1408,192 +1412,329 @@ 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', debug: bool = False):
+    def launch(self, path: str = '/', port: int = 8000, host: str = '0.0.0.0', debug: bool = False, protocol: str = "http"):
         """
-        Launch the agent as an HTTP API endpoint.
+        Launch the agent as an HTTP API endpoint or an MCP server.
         
         Args:
-            path: API endpoint path (default: '/')
+            path: API endpoint path (default: '/') for HTTP, or base path for MCP.
             port: Server port (default: 8000)
             host: Server host (default: '0.0.0.0')
             debug: Enable debug mode for uvicorn (default: False)
+            protocol: "http" to launch as FastAPI, "mcp" to launch as MCP server.
             
         Returns:
             None
         """
-        global _server_started, _registered_agents, _shared_apps
-        
-        # 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
+        if protocol == "http":
+            global _server_started, _registered_agents, _shared_apps
             
-            # Define the request model here since we need pydantic
-            class AgentQuery(BaseModel):
-                query: str
+            # 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
                 
-        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 _registered_agents:
-            _registered_agents[port] = {}
-            
-        # Initialize shared FastAPI app if not already created for this port
-        if _shared_apps.get(port) is None:
-            _shared_apps[port] = FastAPI(
-                title=f"PraisonAI Agents API (Port {port})",
-                description="API for interacting with PraisonAI Agents"
-            )
+                # 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 with HTTP mode.")
+                logging.error(f"Missing dependency: {missing_module}. Required for launch() method with HTTP mode.")
+                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 _registered_agents:
+                _registered_agents[port] = {}
+                
+            # Initialize shared FastAPI app if not already created for this port
+            if _shared_apps.get(port) is None:
+                _shared_apps[port] = FastAPI(
+                    title=f"PraisonAI Agents API (Port {port})",
+                    description="API for interacting with PraisonAI Agents"
+                )
+                
+                # Add a root endpoint with a welcome message
+                @_shared_apps[port].get("/")
+                async def root():
+                    return {
+                        "message": f"Welcome to PraisonAI Agents API on port {port}. See /docs for usage.",
+                        "endpoints": list(_registered_agents[port].keys())
+                    }
+                
+                # Add healthcheck endpoint
+                @_shared_apps[port].get("/health")
+                async def healthcheck():
+                    return {
+                        "status": "ok", 
+                        "endpoints": list(_registered_agents[port].keys())
+                    }
             
-            # Add a root endpoint with a welcome message
-            @_shared_apps[port].get("/")
-            async def root():
-                return {
-                    "message": f"Welcome to PraisonAI Agents API on port {port}. See /docs for usage.",
-                    "endpoints": list(_registered_agents[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 _registered_agents[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
+                path = f"{path}_{self.agent_id[:6]}"
+                logging.warning(f"Using '{path}' instead of '{original_path}'")
+                print(f"🔄 Using '{path}' instead")
             
-            # Add healthcheck endpoint
-            @_shared_apps[port].get("/health")
-            async def healthcheck():
-                return {
-                    "status": "ok", 
-                    "endpoints": list(_registered_agents[port].keys())
-                }
-        
-        # Normalize path to ensure it starts with /
-        if not path.startswith('/'):
-            path = f'/{path}'
+            # Register the agent to this path
+            _registered_agents[port][path] = self.agent_id
             
-        # Check if path is already registered for this port
-        if path in _registered_agents[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
-            path = f"{path}_{self.agent_id[:6]}"
-            logging.warning(f"Using '{path}' instead of '{original_path}'")
-            print(f"🔄 Using '{path}' instead")
-        
-        # Register the agent to this path
-        _registered_agents[port][path] = self.agent_id
-        
-        # Define the endpoint handler
-        @_shared_apps[port].post(path)
-        async def handle_agent_query(request: Request, query_data: Optional[AgentQuery] = None):
-            # Handle both direct JSON with query field and form data
-            if query_data is None:
+            # Define the endpoint handler
+            @_shared_apps[port].post(path)
+            async def handle_agent_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:
-                    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"]
+                    # Use async version if available, otherwise use sync version
+                    if asyncio.iscoroutinefunction(self.chat):
+                        response = await self.achat(query)
                     else:
-                        raise HTTPException(status_code=400, detail="Missing 'query' field in request")
-            else:
-                query = query_data.query
+                        # Run sync function in a thread to avoid blocking
+                        loop = asyncio.get_event_loop()
+                        response = await loop.run_in_executor(None, lambda p=query: self.chat(p))
+                    
+                    return {"response": response}
+                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"🚀 Agent '{self.name}' available at http://{host}:{port}")
+            
+            # Start the server if it's not already running for this port
+            if not _server_started.get(port, False):
+                # Mark the server as started first to prevent duplicate starts
+                _server_started[port] = True
                 
-            try:
-                # Use async version if available, otherwise use sync version
-                if asyncio.iscoroutinefunction(self.chat):
-                    response = await self.achat(query)
-                else:
-                    # Run sync function in a thread to avoid blocking
-                    loop = asyncio.get_event_loop()
-                    response = await loop.run_in_executor(None, lambda: self.chat(query))
+                # 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[port].keys()))}")
+                        uvicorn.run(_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)}")
                 
-                return {"response": response}
-            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"🚀 Agent '{self.name}' available at http://{host}:{port}{path}")
-        
-        # Start the server if it's not already running for this port
-        if not _server_started.get(port, False):
-            # Mark the server as started first to prevent duplicate starts
-            _server_started[port] = True
+                # 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(_registered_agents[port].keys()))}")
+            
+            # Get the stack frame to check if this is the last launch() call in the script
+            import inspect
+            stack = inspect.stack()
             
-            # Start the server in a separate thread
-            def run_server():
+            # 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:
-                    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[port].keys()))}")
-                    uvicorn.run(_shared_apps[port], host=host, port=port, log_level="debug" if debug else "info")
+                    # 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_content in lines[caller_line:]: # renamed line to line_content
+                        if '.launch(' in line_content and not line_content.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 for HTTP mode. Press Ctrl+C to stop the servers.")
+                            while True:
+                                time.sleep(1)
+                        except KeyboardInterrupt:
+                            print("\nServers stopped")
                 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(_registered_agents[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
+                    # If something goes wrong with detection, block anyway to be safe
+                    logging.error(f"Error in launch detection: {e}")
+                    try:
+                        print("\nKeeping HTTP servers alive. Press Ctrl+C to stop.")
+                        while True:
+                            time.sleep(1)
+                    except KeyboardInterrupt:
+                        print("\nServers stopped")
+            return None
             
+        elif protocol == "mcp":
             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()
+                import uvicorn
+                from mcp.server.fastmcp import FastMCP
+                from mcp.server.sse import SseServerTransport
+                from starlette.applications import Starlette
+                from starlette.requests import Request
+                from starlette.routing import Mount, Route
+                from mcp.server import Server as MCPServer # Alias to avoid conflict
+                import threading
+                import time
+                import inspect
+                import asyncio # Ensure asyncio is imported
+                # logging is already imported at the module level
                 
-                # 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:
+            except ImportError as e:
+                missing_module = str(e).split("No module named '")[-1].rstrip("'")
+                display_error(f"Missing dependency: {missing_module}. Required for launch() method with MCP mode.")
+                logging.error(f"Missing dependency: {missing_module}. Required for launch() method with MCP mode.")
+                print(f"\nTo add MCP capabilities, install the required dependencies:")
+                print(f"pip install {missing_module} mcp praison-mcp starlette uvicorn") # Added mcp, praison-mcp, starlette, uvicorn
+                print("\nOr install all MCP dependencies with relevant packages.")
+                return None
+
+            mcp_server_instance_name = f"{self.name}_mcp_server" if self.name else "agent_mcp_server"
+            mcp = FastMCP(mcp_server_instance_name)
+
+            # Determine the MCP tool name based on self.name
+            actual_mcp_tool_name = f"execute_{self.name.lower().replace(' ', '_').replace('-', '_')}_task" if self.name \
+                else "execute_task"
+
+            @mcp.tool(name=actual_mcp_tool_name)
+            async def execute_agent_task(prompt: str) -> str:
+                """Executes the agent's primary task with the given prompt."""
+                logging.info(f"MCP tool '{actual_mcp_tool_name}' called with prompt: {prompt}")
+                try:
+                    # Ensure self.achat is used as it's the async version and pass its tools
+                    if hasattr(self, 'achat') and asyncio.iscoroutinefunction(self.achat):
+                        response = await self.achat(prompt, tools=self.tools)
+                    elif hasattr(self, 'chat'): # Fallback for synchronous chat
+                        loop = asyncio.get_event_loop()
+                        response = await loop.run_in_executor(None, lambda p=prompt: self.chat(p, tools=self.tools))
+                    else:
+                        logging.error(f"Agent {self.name} has no suitable chat or achat method for MCP tool.")
+                        return f"Error: Agent {self.name} misconfigured for MCP."
+                    return response if response is not None else "Agent returned no response."
+                except Exception as e:
+                    logging.error(f"Error in MCP tool '{actual_mcp_tool_name}': {e}", exc_info=True)
+                    return f"Error executing task: {str(e)}"
+
+            # Normalize base_path for MCP routes
+            base_path = path.rstrip('/')
+            sse_path = f"{base_path}/sse"
+            messages_path_prefix = f"{base_path}/messages" # Prefix for message posting
+            
+            # Ensure messages_path ends with a slash for Mount
+            if not messages_path_prefix.endswith('/'):
+                messages_path_prefix += '/'
+
+
+            sse_transport = SseServerTransport(messages_path_prefix) # Pass the full prefix
+
+            async def handle_sse_connection(request: Request) -> None:
+                logging.debug(f"SSE connection request received from {request.client} for path {request.url.path}")
+                async with sse_transport.connect_sse(
+                        request.scope,
+                        request.receive,
+                        request._send,  # noqa: SLF001
+                ) as (read_stream, write_stream):
+                    await mcp._mcp_server.run( # Use the underlying server from FastMCP
+                        read_stream,
+                        write_stream,
+                        mcp._mcp_server.create_initialization_options(),
+                    )
+            
+            starlette_app = Starlette(
+                debug=debug,
+                routes=[
+                    Route(sse_path, endpoint=handle_sse_connection),
+                    Mount(messages_path_prefix, app=sse_transport.handle_post_message),
+                ],
+            )
+
+            print(f"🚀 Agent '{self.name}' MCP server starting on http://{host}:{port}")
+            print(f"📡 MCP SSE endpoint available at {sse_path}")
+            print(f"📢 MCP messages post to {messages_path_prefix}")
+            # Instead of trying to extract tool names, hardcode the known tool name
+            tool_names = [actual_mcp_tool_name]  # Use the determined dynamic tool name
+            print(f"🛠️ Available MCP tools: {', '.join(tool_names)}")
+
+            # Uvicorn server running logic (similar to HTTP mode but standalone for MCP)
+            def run_mcp_server():
+                try:
+                    uvicorn.run(starlette_app, host=host, port=port, log_level="debug" if debug else "info")
+                except Exception as e:
+                    logging.error(f"Error starting MCP server: {str(e)}", exc_info=True)
+                    print(f"❌ Error starting MCP server: {str(e)}")
+
+            server_thread = threading.Thread(target=run_mcp_server, daemon=True)
+            server_thread.start()
+            time.sleep(0.5) # Allow server to start
+
+            # Blocking logic for MCP mode
+            import inspect # Already imported but good for clarity
+            stack = inspect.stack()
+            if len(stack) > 1 and stack[1].filename.endswith('.py'):
+                caller_frame = stack[1]
+                caller_line = caller_frame.lineno
+                try:
+                    with open(caller_frame.filename, 'r') as f:
+                        lines = f.readlines()
+                    has_more_launches = False
+                    for line_content in lines[caller_line:]: # renamed line to line_content
+                        if '.launch(' in line_content and not line_content.strip().startswith('#'):
+                            has_more_launches = True
+                            break
+                    if not has_more_launches:
+                        try:
+                            print("\nAgent MCP server running. Press Ctrl+C to stop.")
+                            while True:
+                                time.sleep(1)
+                        except KeyboardInterrupt:
+                            print("\nMCP Server stopped")
+                except Exception as e:
+                    logging.error(f"Error in MCP launch detection: {e}")
                     try:
-                        print("\nAll agents registered. Press Ctrl+C to stop the servers.")
+                        print("\nKeeping MCP server alive. Press Ctrl+C to stop.")
                         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 
+                        print("\nMCP Server stopped")
+            return None
+        else:
+            display_error(f"Invalid protocol: {protocol}. Choose 'http' or 'mcp'.")
+            return None