sunholo 0.144.2__py3-none-any.whl → 0.144.3__py3-none-any.whl

sunholo/agents/fastapi/vac_routes.py

@@ -113,31 +113,92 @@ class VACRoutesFastAPI:
     
     ## Basic Usage
     
+    ### Simplified Setup (Recommended)
+    
+    Use the helper method for automatic lifespan management:
+    
     ```python
-    from fastapi import FastAPI
     from sunholo.agents.fastapi import VACRoutesFastAPI
     
-    app = FastAPI()
-    
     async def my_stream_interpreter(question, vector_name, chat_history, callback, **kwargs):
         # Your streaming VAC logic here
         # Use callback.async_on_llm_new_token(token) for streaming
-        # Return final result with sources
         return {"answer": "Response", "sources": []}
     
-    # Create VAC routes with MCP server enabled
+    # Single call sets up everything with MCP server and proper lifespan management
+    app, vac_routes = VACRoutesFastAPI.create_app_with_mcp(
+        title="My VAC Application",
+        stream_interpreter=my_stream_interpreter
+        # MCP server is automatically enabled when using this method
+    )
+    
+    # Add custom endpoints if needed
+    @app.get("/custom")
+    async def custom_endpoint():
+        return {"message": "Hello"}
+    
+    # Run the app
+    if __name__ == "__main__":
+        import uvicorn
+        uvicorn.run(app, host="0.0.0.0", port=8000)
+    ```
+    
+    ### Manual Setup (Advanced)
+    
+    For more control over lifespan management:
+    
+    ```python
+    from contextlib import asynccontextmanager
+    from fastapi import FastAPI
+    from sunholo.agents.fastapi import VACRoutesFastAPI
+    
+    async def my_stream_interpreter(question, vector_name, chat_history, callback, **kwargs):
+        return {"answer": "Response", "sources": []}
+    
+    # Define your app's lifespan
+    @asynccontextmanager
+    async def app_lifespan(app: FastAPI):
+        print("Starting up...")
+        yield
+        print("Shutting down...")
+    
+    # Create temp app to get MCP lifespan
+    temp_app = FastAPI()
+    vac_routes_temp = VACRoutesFastAPI(
+        temp_app,
+        stream_interpreter=my_stream_interpreter,
+        enable_mcp_server=True
+    )
+    
+    # Get MCP lifespan
+    mcp_lifespan = vac_routes_temp.get_mcp_lifespan()
+    
+    # Combine lifespans
+    @asynccontextmanager
+    async def combined_lifespan(app: FastAPI):
+        async with app_lifespan(app):
+            if mcp_lifespan:
+                async with mcp_lifespan(app):
+                    yield
+            else:
+                yield
+    
+    # Create app with combined lifespan
+    app = FastAPI(title="My VAC Application", lifespan=combined_lifespan)
+    
+    # Initialize VAC routes
     vac_routes = VACRoutesFastAPI(
         app=app,
         stream_interpreter=my_stream_interpreter,
-        enable_mcp_server=True  # Enable MCP server for Claude Desktop/Code
+        enable_mcp_server=True
     )
-    
-    # Your FastAPI app now includes:
-    # - All VAC endpoints
-    # - MCP server at /mcp (for Claude Desktop/Code to connect)
-    # - Built-in VAC tools: vac_stream, vac_query, list_available_vacs, get_vac_info
     ```
     
+    Your FastAPI app now includes:
+    - All VAC endpoints  
+    - MCP server at /mcp (for Claude Desktop/Code to connect)
+    - Built-in VAC tools: vac_stream, vac_query, list_available_vacs, get_vac_info
+    
     ## Adding Custom MCP Tools
     
     ### Method 1: Using Decorators
@@ -416,6 +477,138 @@ class VACRoutesFastAPI:
         
         self.register_routes()
     
+    @staticmethod
+    def create_app_with_mcp(
+        title: str = "VAC Application",
+        stream_interpreter: Optional[callable] = None,
+        vac_interpreter: Optional[callable] = None,
+        app_lifespan: Optional[callable] = None,
+        **kwargs
+    ) -> tuple[FastAPI, 'VACRoutesFastAPI']:
+        """
+        Helper method to create a FastAPI app with proper MCP lifespan management.
+        
+        This method simplifies the setup process by handling the lifespan combination
+        automatically, avoiding the need for the double initialization pattern.
+        MCP server is automatically enabled when using this method.
+        
+        Args:
+            title: Title for the FastAPI app
+            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)
+            
+        Returns:
+            Tuple of (FastAPI app, VACRoutesFastAPI instance)
+            
+        Example:
+            ```python
+            from sunholo.agents.fastapi import VACRoutesFastAPI
+            
+            async def my_interpreter(question, vector_name, chat_history, callback, **kwargs):
+                # Your logic here
+                return {"answer": "response", "sources": []}
+            
+            # Single call to set up everything (MCP is automatically enabled)
+            app, vac_routes = VACRoutesFastAPI.create_app_with_mcp(
+                title="My VAC App",
+                stream_interpreter=my_interpreter
+            )
+            
+            # Add custom endpoints
+            @app.get("/custom")
+            async def custom_endpoint():
+                return {"message": "Custom endpoint"}
+            
+            if __name__ == "__main__":
+                import uvicorn
+                uvicorn.run(app, host="0.0.0.0", port=8000)
+            ```
+        """
+        from contextlib import asynccontextmanager
+        
+        # Default app lifespan if not provided
+        if app_lifespan is None:
+            @asynccontextmanager
+            async def app_lifespan(app: FastAPI):
+                yield
+        
+        # Create temporary app to get MCP app (always enabled for this method)
+        temp_app = FastAPI()
+        temp_routes = VACRoutesFastAPI(
+            temp_app,
+            stream_interpreter=stream_interpreter,
+            vac_interpreter=vac_interpreter,
+            enable_mcp_server=True,  # Always enabled for create_app_with_mcp
+            **kwargs
+        )
+        
+        mcp_app = None
+        if temp_routes.vac_mcp_server:
+            mcp_app = temp_routes.vac_mcp_server.get_http_app()
+        
+        # Create combined lifespan
+        @asynccontextmanager  
+        async def combined_lifespan(app: FastAPI):
+            async with app_lifespan(app):
+                if mcp_app:
+                    async with mcp_app.lifespan(app):
+                        yield
+                else:
+                    yield
+        
+        # Create the actual app with combined lifespan
+        app = FastAPI(
+            title=title,
+            lifespan=combined_lifespan if mcp_app else app_lifespan
+        )
+        
+        # Initialize VAC routes (MCP always enabled for this method)
+        vac_routes = VACRoutesFastAPI(
+            app,
+            stream_interpreter=stream_interpreter,
+            vac_interpreter=vac_interpreter,
+            enable_mcp_server=True,  # Always enabled for create_app_with_mcp
+            **kwargs
+        )
+        
+        return app, vac_routes
+    
+    def get_mcp_lifespan(self):
+        """
+        Get the MCP app's lifespan for manual lifespan management.
+        
+        Returns:
+            The MCP app's lifespan if MCP server is enabled, None otherwise.
+            
+        Example:
+            ```python
+            from contextlib import asynccontextmanager
+            
+            # Create temp app to get MCP lifespan
+            temp_app = FastAPI()
+            vac_routes = VACRoutesFastAPI(temp_app, ..., enable_mcp_server=True)
+            mcp_lifespan = vac_routes.get_mcp_lifespan()
+            
+            # Combine with your app's lifespan
+            @asynccontextmanager
+            async def combined_lifespan(app: FastAPI):
+                async with my_app_lifespan(app):
+                    if mcp_lifespan:
+                        async with mcp_lifespan(app):
+                            yield
+                    else:
+                        yield
+            
+            app = FastAPI(lifespan=combined_lifespan)
+            ```
+        """
+        if self.vac_mcp_server:
+            mcp_app = self.vac_mcp_server.get_http_app()
+            return mcp_app.lifespan
+        return None
+    
     async def vac_interpreter_default(self, question: str, vector_name: str, chat_history=None, **kwargs):
         """Default VAC interpreter that uses the stream interpreter without streaming."""
         class NoOpCallback:
@@ -484,11 +677,34 @@ class VACRoutesFastAPI:
         if self.enable_mcp_server and self.vac_mcp_server:
             try:
                 mcp_app = self.vac_mcp_server.get_http_app()
+                
+                # Note: FastAPI doesn't expose lifespan as a public attribute,
+                # so we can't easily check if it's configured. The error will be
+                # caught below if lifespan is missing.
+                
                 self.app.mount("/mcp", mcp_app)
-                log.info("MCP server mounted at /mcp endpoint")
+                log.info("✅ MCP server mounted at /mcp endpoint")
+                
+            except RuntimeError as e:
+                if "Task group is not initialized" in str(e):
+                    error_msg = (
+                        "MCP server initialization failed: Lifespan not configured properly.\n"
+                        "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"
+                        "  )\n\n"
+                        "Or manually configure the lifespan - see documentation for details."
+                    )
+                    log.error(error_msg)
+                    raise RuntimeError(error_msg) from e
+                else:
+                    log.error(f"Failed to mount MCP server: {e}")
+                    raise RuntimeError(f"MCP server initialization failed: {e}") from e
             except Exception as e:
                 log.error(f"Failed to mount MCP server: {e}")
-                raise RuntimeError(f"MCP server initialization failed: {e}")
+                raise RuntimeError(f"MCP server initialization failed: {e}") from e
         
         # A2A agent endpoints
         if self.enable_a2a_agent:

sunholo/mcp/vac_mcp_server_fastmcp.py

@@ -73,7 +73,7 @@ class VACMCPServer:
     
     def get_http_app(self):
         """Get the HTTP app for mounting in FastAPI."""
-        return self.server.get_app()
+        return self.server.http_app()
     
     def add_tool(self, func: Callable, name: str = None, description: str = None):
         """

sunholo/mcp/vac_tools.py

@@ -241,9 +241,10 @@ def register_vac_tools(server: 'FastMCP', registry: 'MCPToolRegistry' = None):
     
     # Register tools in registry if provided
     if registry:
-        registry.register_tool("vac_stream", vac_stream)
-        registry.register_tool("vac_query", vac_query) 
-        registry.register_tool("list_available_vacs", list_available_vacs)
-        registry.register_tool("get_vac_info", get_vac_info)
+        # Extract the underlying function from FunctionTool objects
+        registry.register_tool("vac_stream", vac_stream.fn if hasattr(vac_stream, 'fn') else vac_stream)
+        registry.register_tool("vac_query", vac_query.fn if hasattr(vac_query, 'fn') else vac_query) 
+        registry.register_tool("list_available_vacs", list_available_vacs.fn if hasattr(list_available_vacs, 'fn') else list_available_vacs)
+        registry.register_tool("get_vac_info", get_vac_info.fn if hasattr(get_vac_info, 'fn') else get_vac_info)
     
     log.info("Registered built-in VAC tools with MCP server")

{sunholo-0.144.2.dist-info → sunholo-0.144.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.144.2
+Version: 0.144.3
 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.2.dist-info → sunholo-0.144.3.dist-info}/RECORD

@@ -16,7 +16,7 @@ sunholo/agents/swagger.py,sha256=2tzGmpveUMmTREykZvVnDj3j295wyOMu7mUFDnXdY3c,106
 sunholo/agents/fastapi/__init__.py,sha256=f7x7kiEjaNyBiOwJHLJ4vdOiePqkXdI52sIAAHtS-ms,141
 sunholo/agents/fastapi/base.py,sha256=W-cyF8ZDUH40rc-c-Apw3-_8IIi2e4Y9qRtnoVnsc1Q,2521
 sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhBlV3to-s,3864
-sunholo/agents/fastapi/vac_routes.py,sha256=jV7Kb9CG4qdlntSHZuI_8UALjFuwYOh5ovrZpDkixzg,51909
+sunholo/agents/fastapi/vac_routes.py,sha256=s0wzGupaIsfQqJlDA1f8MXoVY8LGsHr0VP2xeRQOzM0,59860
 sunholo/agents/flask/__init__.py,sha256=dEoByI3gDNUOjpX1uVKP7uPjhfFHJubbiaAv3xLopnk,63
 sunholo/agents/flask/base.py,sha256=vnpxFEOnCmt9humqj-jYPLfJcdwzsop9NorgkJ-tSaU,1756
 sunholo/agents/flask/vac_routes.py,sha256=kaPUDyIH5KhCgeCEtag97qErGVZfqpY1ZEiX3y1_r-s,57505
@@ -122,8 +122,8 @@ sunholo/mcp/extensible_mcp_server.py,sha256=docJT800-wJLApU6kEa3lwu9FHyy1yvtJIk8
 sunholo/mcp/mcp_manager.py,sha256=g75vv6XvM24U7uz366slE-p76Qs4AvVcsarHSF9qIvE,5061
 sunholo/mcp/stdio_http_bridge.py,sha256=IunHOtnjKAkRWef3SJnqnAL2r2qBRpCH2k_Q_y0Tdf8,3237
 sunholo/mcp/vac_mcp_server.py,sha256=MotoCw5lDsxCeVtwh1499yGFku9w-78xXhGkIHTUo3w,838
-sunholo/mcp/vac_mcp_server_fastmcp.py,sha256=ZZ0Que7XErlUQlaiMiQ8pesTttq24l7mfG7BiKk4ohs,4450
-sunholo/mcp/vac_tools.py,sha256=26IW5iTSEI1orbHYAlcjbBkZ1yjqQhqGqerjYkTVhko,8464
+sunholo/mcp/vac_mcp_server_fastmcp.py,sha256=R95GDWRbVyAVqVhWVkJv9wd5gH1bWKiz69IU5rWPnIc,4451
+sunholo/mcp/vac_tools.py,sha256=pTtHxPHD5k80wRnmJw1-RJK8L8IOOCWpGyTL1W2M934,8744
 sunholo/ollama/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/ollama/ollama_images.py,sha256=H2cpcNu88R4TwyfL_nnqkQhdvBQ2FPCAy4Ok__0yQmo,2351
 sunholo/pubsub/__init__.py,sha256=DfTEk4zmCfqn6gFxRrqDO0pOrvXTDqH-medpgYO4PGw,117
@@ -181,9 +181,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.144.2.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.144.2.dist-info/METADATA,sha256=QrQ-DLWAPoqQU4Jb0QVWLc7qDOJTe58siJ3AsEdGq60,18700
-sunholo-0.144.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sunholo-0.144.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.144.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.144.2.dist-info/RECORD,,
+sunholo-0.144.3.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.144.3.dist-info/METADATA,sha256=RObZwvRVw98mi-1RzJMaNtiLKZ0mui7wnNsaqf-oYmI,18700
+sunholo-0.144.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sunholo-0.144.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.144.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.144.3.dist-info/RECORD,,