sunholo 0.144.7__tar.gz → 0.144.9__tar.gz

{sunholo-0.144.7/src/sunholo.egg-info → sunholo-0.144.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.144.7
+Version: 0.144.9
 Summary: AI DevOps - a package to help deploy GenAI to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0

{sunholo-0.144.7 → sunholo-0.144.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sunholo"
-version = "0.144.7"
+version = "0.144.9"
 description = "AI DevOps - a package to help deploy GenAI to the Cloud."
 readme = "README.md"
 requires-python = ">=3.11"

{sunholo-0.144.7 → sunholo-0.144.9}/src/sunholo/agents/fastapi/vac_routes.py

@@ -353,7 +353,6 @@ class VACRoutesFastAPI:
         additional_routes: Optional[List[Dict]] = None,
         mcp_servers: Optional[List[Dict[str, Any]]] = None,
         add_langfuse_eval: bool = True,
-        enable_mcp_server: bool = False,
         enable_a2a_agent: bool = False,
         a2a_vac_names: Optional[List[str]] = None
     ):
@@ -371,9 +370,6 @@ class VACRoutesFastAPI:
             mcp_servers: List of external MCP server configurations to connect to:
                        [{"name": "server-name", "command": "python", "args": ["server.py"]}]
             add_langfuse_eval: Whether to enable Langfuse evaluation and tracing
-            enable_mcp_server: Whether to enable the MCP server at /mcp endpoint for 
-                             Claude Desktop/Code integration. When True, automatically
-                             includes built-in VAC tools and supports custom tool registration.
             enable_a2a_agent: Whether to enable A2A (Agent-to-Agent) protocol endpoints
             a2a_vac_names: List of VAC names available for A2A agent interactions
         
@@ -398,7 +394,7 @@ class VACRoutesFastAPI:
         
         ## MCP Server Integration
         
-        When enable_mcp_server=True, the following happens:
+        When VACMCPServer is available, the following happens automatically:
         1. MCP server is mounted at /mcp endpoint
         2. Built-in VAC tools are automatically registered:
            - vac_stream, vac_query, list_available_vacs, get_vac_info
@@ -452,13 +448,13 @@ class VACRoutesFastAPI:
         self.mcp_client_manager = MCPClientManager() if MCPClientManager else None
         self._mcp_initialized = False
         
-        # MCP server initialization
-        self.enable_mcp_server = enable_mcp_server
+        # MCP server initialization - automatically enabled if VACMCPServer is available
         self.vac_mcp_server = None
         self._custom_mcp_tools = []
         self._custom_mcp_resources = []
         
-        if self.enable_mcp_server and VACMCPServer:
+        # Enable MCP server if VACMCPServer is available
+        if VACMCPServer:
             self.vac_mcp_server = VACMCPServer(
                 server_name="sunholo-vac-fastapi-server",
                 include_vac_tools=True
@@ -497,7 +493,7 @@ class VACRoutesFastAPI:
             stream_interpreter: Streaming interpreter function
             vac_interpreter: Non-streaming interpreter function  
             app_lifespan: Optional app lifespan context manager
-            **kwargs: Additional arguments passed to VACRoutesFastAPI (except enable_mcp_server)
+            **kwargs: Additional arguments passed to VACRoutesFastAPI
             
         Returns:
             Tuple of (FastAPI app, VACRoutesFastAPI instance)
@@ -569,7 +565,6 @@ class VACRoutesFastAPI:
                 app,
                 stream_interpreter=stream_interpreter,
                 vac_interpreter=vac_interpreter,
-                enable_mcp_server=False,  # Don't enable again since we manually mounted
                 **kwargs
             )
             
@@ -589,7 +584,6 @@ class VACRoutesFastAPI:
                 app,
                 stream_interpreter=stream_interpreter,
                 vac_interpreter=vac_interpreter,
-                enable_mcp_server=False,
                 **kwargs
             )
         
@@ -694,7 +688,7 @@ class VACRoutesFastAPI:
             self.app.post("/mcp/resources/read")(self.handle_mcp_read_resource)
         
         # MCP server endpoint - mount the FastMCP app
-        if self.enable_mcp_server and self.vac_mcp_server:
+        if self.vac_mcp_server:
             try:
                 mcp_app = self.vac_mcp_server.get_http_app()
                 
@@ -713,8 +707,7 @@ class VACRoutesFastAPI:
                         "The FastAPI app must be created with the MCP lifespan.\n\n"
                         "Quick fix: Use the helper method:\n"
                         "  app, vac_routes = VACRoutesFastAPI.create_app_with_mcp(\n"
-                        "      stream_interpreter=your_interpreter,\n"
-                        "      enable_mcp_server=True\n"
+                        "      stream_interpreter=your_interpreter\n"
                         "  )\n\n"
                         "Or manually configure the lifespan - see documentation for details."
                     )
@@ -727,6 +720,10 @@ class VACRoutesFastAPI:
                 log.error(f"Failed to mount MCP server: {e}")
                 raise RuntimeError(f"MCP server initialization failed: {e}") from e
         
+        # MCP debug endpoint - add if we have a MCP server instance
+        if self.vac_mcp_server:
+            self.app.get("/debug/mcp")(self.handle_mcp_debug)
+        
         # A2A agent endpoints
         if self.enable_a2a_agent:
             self.app.get("/.well-known/agent.json")(self.handle_a2a_agent_card)
@@ -1516,4 +1513,116 @@ class VACRoutesFastAPI:
         """
         if self.vac_mcp_server:
             return self.vac_mcp_server.list_resources()
-        return []
+        return []
+    
+    async def handle_mcp_debug(self):
+        """
+        Debug endpoint to check MCP server status and list tools.
+        
+        Returns:
+            JSON with MCP server status, tools list, and diagnostic information
+        """
+        import json
+        
+        has_mcp = self.vac_mcp_server is not None
+        mcp_tools = []
+        mcp_response = None
+        
+        # Try to call the MCP endpoint the same way clients do
+        if has_mcp:
+            try:
+                # Make internal request to MCP server to get tools
+                import httpx
+                
+                # Get the base URL from the current request
+                from fastapi import Request
+                from starlette.requests import Request as StarletteRequest
+                
+                # Try common ports since we don't have request context
+                ports_to_try = [8000, 8001, 8080, 3000, 1956]
+                successful_response = None
+                
+                for port in ports_to_try:
+                    try:
+                        base_url = f"http://localhost:{port}"
+                        async with httpx.AsyncClient(timeout=2.0) as client:
+                                response = await client.post(
+                                    f"{base_url}/mcp/mcp",
+                                    json={
+                                        "jsonrpc": "2.0",
+                                        "id": 1,
+                                        "method": "tools/list"
+                                    },
+                                    headers={
+                                        "Content-Type": "application/json",
+                                        "Accept": "application/json, text/event-stream"
+                                    }
+                                )
+                                
+                                if response.status_code == 200:
+                                    successful_response = response
+                                    break  # Found working port
+                    except (httpx.ConnectError, httpx.TimeoutException):
+                        continue  # Try next port
+                    except Exception:
+                        continue  # Try next port
+                
+                if successful_response:
+                    # Parse SSE (Server-Sent Events) response
+                    text = successful_response.text
+                    for line in text.split('\n'):
+                        if line.startswith('data: '):
+                            # Extract JSON from the data line
+                            json_str = line[6:]  # Remove 'data: ' prefix
+                            try:
+                                mcp_response = json.loads(json_str)
+                                if "result" in mcp_response and "tools" in mcp_response["result"]:
+                                    for tool in mcp_response["result"]["tools"]:
+                                        mcp_tools.append({
+                                            "name": tool.get("name"),
+                                            "description": tool.get("description", "No description")[:100] + "..." if len(tool.get("description", "")) > 100 else tool.get("description", "No description")
+                                        })
+                                break  # We found the data we need
+                            except json.JSONDecodeError:
+                                continue
+                else:
+                    mcp_response = {
+                        "error": "Could not connect to MCP server on any common port",
+                        "ports_tried": ports_to_try
+                    }
+                        
+            except Exception as e:
+                log.error(f"Error calling MCP endpoint in debug: {e}")
+                mcp_response = {"error": str(e)}
+                
+                # Fallback: try to get tools from internal MCP server state
+                try:
+                    # Get tools from the FastMCP server directly
+                    if hasattr(self.vac_mcp_server, 'server'):
+                        mcp_server = self.vac_mcp_server.server
+                        if hasattr(mcp_server, '_tools'):
+                            for tool_name, tool_func in mcp_server._tools.items():
+                                mcp_tools.append({
+                                    "name": tool_name,
+                                    "description": getattr(tool_func, '__doc__', 'No description') or 'No description'
+                                })
+                except Exception as inner_e:
+                    log.error(f"Error getting MCP tools from internal state: {inner_e}")
+        
+        # Check for pending tools that haven't been registered yet
+        pending_tools = len(self._custom_mcp_tools) if hasattr(self, '_custom_mcp_tools') else 0
+        
+        return {
+            "mcp_enabled": has_mcp,
+            "has_mcp_server": has_mcp,
+            "mcp_tools_count": len(mcp_tools),
+            "mcp_tools": [tool["name"] for tool in mcp_tools] if mcp_tools else [],
+            "tool_details": mcp_tools,
+            "pending_tools": pending_tools,
+            "message": f"MCP server is available at /mcp endpoint with {len(mcp_tools)} tools" if has_mcp and mcp_tools else "MCP server is available at /mcp endpoint" if has_mcp else "MCP server not configured",
+            "debug_info": {
+                "mcp_server_type": type(self.vac_mcp_server).__name__ if self.vac_mcp_server else None,
+                "has_custom_tools": len(self._custom_mcp_tools) > 0 if hasattr(self, '_custom_mcp_tools') else False,
+                "has_custom_resources": len(self._custom_mcp_resources) > 0 if hasattr(self, '_custom_mcp_resources') else False
+            }
+        }

{sunholo-0.144.7 → sunholo-0.144.9/src/sunholo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.144.7
+Version: 0.144.9
 Summary: AI DevOps - a package to help deploy GenAI to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0

{sunholo-0.144.7 → sunholo-0.144.9}/tests/test_vac_routes_mcp.py

@@ -214,7 +214,6 @@ def mcp_server_app():
         app,
         stream_interpreter=mock_async_stream_interpreter,
         vac_interpreter=mock_async_vac_interpreter,
-        enable_mcp_server=False,  # Disable initially
         add_langfuse_eval=False
     )
     
@@ -253,7 +252,6 @@ def mcp_client_app():
         stream_interpreter=mock_async_stream_interpreter,
         vac_interpreter=mock_async_vac_interpreter,
         mcp_servers=mcp_servers,
-        enable_mcp_server=False,
         add_langfuse_eval=False
     )
     # Replace with mock MCP client manager
@@ -320,7 +318,6 @@ class TestMCPServer:
         vac_routes = VACRoutesFastAPI(
             app,
             stream_interpreter=mock_async_stream_interpreter,
-            enable_mcp_server=False,
             add_langfuse_eval=False
         )
         client = TestClient(app)
@@ -331,6 +328,64 @@ class TestMCPServer:
 
 
 
+class TestMCPDebugEndpoint:
+    """Test MCP debug endpoint functionality."""
+    
+    def test_debug_endpoint_with_mcp_server(self):
+        """Test /debug/mcp endpoint when MCP server is enabled."""
+        app, vac_routes = VACRoutesFastAPI.create_app_with_mcp(
+            title="Test App",
+            stream_interpreter=mock_async_stream_interpreter
+        )
+        
+        # Add a mock tool to test
+        @vac_routes.add_mcp_tool
+        async def test_tool(input: str) -> str:
+            """Test tool for MCP."""
+            return f"Test: {input}"
+        
+        client = TestClient(app)
+        response = client.get("/debug/mcp")
+        
+        assert response.status_code == 200
+        data = response.json()
+        
+        # Check basic structure
+        assert "mcp_enabled" in data
+        assert "has_mcp_server" in data
+        assert "mcp_tools_count" in data
+        assert "mcp_tools" in data
+        
+        # Check values
+        assert data["mcp_enabled"] is True
+        assert data["has_mcp_server"] is True
+        assert data["mcp_tools_count"] >= 5  # Built-in tools + test_tool
+        
+        # Check that test_tool is in the list
+        tool_names = [tool["name"] for tool in data["mcp_tools"]]
+        assert "test_tool" in tool_names
+        
+        # Check built-in tools are present
+        assert "vac_stream" in tool_names
+        assert "vac_query" in tool_names
+        assert "list_available_vacs" in tool_names
+        assert "get_vac_info" in tool_names
+    
+    def test_debug_endpoint_without_mcp_server(self):
+        """Test /debug/mcp endpoint when MCP server is not present."""
+        app = FastAPI()
+        vac_routes = VACRoutesFastAPI(
+            app,
+            stream_interpreter=mock_async_stream_interpreter,
+            add_langfuse_eval=False
+        )
+        
+        # Should not have debug endpoint if no MCP server
+        client = TestClient(app)
+        response = client.get("/debug/mcp")
+        assert response.status_code == 404
+
+
 class TestMCPErrorHandling:
     """Test MCP error handling."""