sunholo 0.144.3__tar.gz → 0.144.5__tar.gz

{sunholo-0.144.3/src/sunholo.egg-info → sunholo-0.144.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.144.3
+Version: 0.144.5
 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.3 → sunholo-0.144.5}/pyproject.toml

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

{sunholo-0.144.3 → sunholo-0.144.5}/src/sunholo/agents/fastapi/vac_routes.py

@@ -534,44 +534,64 @@ class VACRoutesFastAPI:
             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:
+        # Import here to avoid circular imports
+        if VACMCPServer:
+            from fastmcp import FastMCP
+            
+            # Create MCP server directly to get its lifespan
+            mcp_server = FastMCP("sunholo-vac-fastapi-server")
+            
+            # Register built-in VAC tools directly with the stream interpreter
+            from sunholo.mcp.vac_tools import register_vac_tools
+            register_vac_tools(mcp_server, None, stream_interpreter)
+            
+            # Get the MCP app with path="" so when mounted at /mcp it's accessible at /mcp
+            mcp_app = mcp_server.http_app(path="", stateless_http=True)
+            
+            # Create combined lifespan
+            @asynccontextmanager  
+            async def combined_lifespan(app: FastAPI):
+                async with app_lifespan(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
-        )
+            
+            # Create the actual app with combined lifespan
+            app = FastAPI(
+                title=title,
+                lifespan=combined_lifespan
+            )
+            
+            # Mount the MCP app at /mcp
+            app.mount("/mcp", mcp_app)
+            
+            # Now create VAC routes WITHOUT MCP (since we already mounted it)
+            vac_routes = VACRoutesFastAPI(
+                app,
+                stream_interpreter=stream_interpreter,
+                vac_interpreter=vac_interpreter,
+                enable_mcp_server=False,  # Don't enable again since we manually mounted
+                **kwargs
+            )
+            
+            # Store reference to MCP server for tool registration
+            vac_routes.vac_mcp_server = type('MockMCPServer', (), {
+                'add_tool': lambda self, func, name=None, desc=None: mcp_server.tool(func) if name is None else mcp_server.tool(name=name)(func),
+                'server': mcp_server
+            })()
+        else:
+            # No MCP support available
+            app = FastAPI(
+                title=title,
+                lifespan=app_lifespan
+            )
+            
+            vac_routes = VACRoutesFastAPI(
+                app,
+                stream_interpreter=stream_interpreter,
+                vac_interpreter=vac_interpreter,
+                enable_mcp_server=False,
+                **kwargs
+            )
         
         return app, vac_routes
     
@@ -682,7 +702,8 @@ class VACRoutesFastAPI:
                 # 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)
+                # Mount at root - the MCP app already has /mcp path configured
+                self.app.mount("", mcp_app)
                 log.info("✅ MCP server mounted at /mcp endpoint")
                 
             except RuntimeError as e:

{sunholo-0.144.3 → sunholo-0.144.5}/src/sunholo/mcp/__init__.py

@@ -26,4 +26,13 @@ except ImportError as e:
     print(f"Warning: VACMCPServer not available - {e}")
     VACMCPServer = None
 
-__all__ = ['MCPClientManager', 'VACMCPServer']
+# SSE utilities are always available
+from .sse_utils import parse_sse_response, is_sse_response, extract_sse_data
+
+__all__ = [
+    'MCPClientManager', 
+    'VACMCPServer',
+    'parse_sse_response',
+    'is_sse_response', 
+    'extract_sse_data'
+]

sunholo-0.144.5/src/sunholo/mcp/sse_utils.py

@@ -0,0 +1,105 @@
+#   Copyright [2024] [Holosun ApS]
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+"""
+Utilities for parsing Server-Sent Events (SSE) responses from MCP servers.
+"""
+
+import json
+from typing import Any, Dict, Optional
+
+
+def parse_sse_response(text: str) -> Dict[str, Any]:
+    """
+    Parse SSE-formatted response from MCP server.
+    
+    FastMCP returns responses in SSE format when using HTTP transport,
+    even with stateless_http=True. This function extracts the JSON data
+    from the SSE format.
+    
+    Args:
+        text: Raw response text from MCP server
+        
+    Returns:
+        Parsed JSON data from the SSE response
+        
+    Raises:
+        ValueError: If the response cannot be parsed
+        
+    Example:
+        >>> response_text = 'event: message\\ndata: {"jsonrpc": "2.0", "id": 1, "result": {...}}'
+        >>> data = parse_sse_response(response_text)
+        >>> print(data['result'])
+    """
+    # Check if it's SSE format
+    if text.startswith('event:') or text.startswith('data:'):
+        # Parse SSE format - extract JSON from data: line
+        lines = text.split('\n')
+        
+        # Find the data line
+        data_line = None
+        for line in lines:
+            if line.startswith('data:'):
+                data_line = line
+                break
+        
+        if data_line:
+            # Remove 'data:' prefix and parse JSON
+            json_str = data_line[5:].strip()
+            try:
+                return json.loads(json_str)
+            except json.JSONDecodeError as e:
+                raise ValueError(f"Failed to parse JSON from SSE data: {e}")
+        else:
+            raise ValueError("No data line found in SSE response")
+    else:
+        # Try parsing as regular JSON
+        try:
+            return json.loads(text)
+        except json.JSONDecodeError as e:
+            raise ValueError(f"Response is not valid JSON or SSE format: {e}")
+
+
+def is_sse_response(text: str) -> bool:
+    """
+    Check if a response is in SSE format.
+    
+    Args:
+        text: Response text to check
+        
+    Returns:
+        True if the response appears to be SSE format
+    """
+    return text.startswith('event:') or text.startswith('data:')
+
+
+def extract_sse_data(text: str) -> Optional[str]:
+    """
+    Extract the data portion from an SSE response.
+    
+    Args:
+        text: SSE-formatted response text
+        
+    Returns:
+        The extracted data string, or None if not found
+    """
+    if not is_sse_response(text):
+        return None
+    
+    lines = text.split('\n')
+    for line in lines:
+        if line.startswith('data:'):
+            return line[5:].strip()
+    
+    return None

{sunholo-0.144.3 → sunholo-0.144.5}/src/sunholo/mcp/vac_mcp_server_fastmcp.py

@@ -73,7 +73,8 @@ class VACMCPServer:
     
     def get_http_app(self):
         """Get the HTTP app for mounting in FastAPI."""
-        return self.server.http_app()
+        # Following FastMCP docs: when mounted at root "", path="/mcp" gives us /mcp endpoint
+        return self.server.http_app(path="/mcp")
     
     def add_tool(self, func: Callable, name: str = None, description: str = None):
         """

{sunholo-0.144.3 → sunholo-0.144.5}/src/sunholo/mcp/vac_tools.py

@@ -20,6 +20,7 @@ Provides core Sunholo VAC functionality as MCP tools.
 import asyncio
 import os
 import sys
+import traceback
 from typing import Dict, List, Optional, Any
 
 try:
@@ -39,14 +40,6 @@ except ImportError:
     ConfigManager = None
     CONFIG_AVAILABLE = False
 
-try:
-    from ..streaming import start_streaming_chat_async
-    STREAMING_AVAILABLE = True
-except ImportError:
-    start_streaming_chat_async = None
-    STREAMING_AVAILABLE = False
-
-
 def get_vac_config(vector_name: str = None) -> 'ConfigManager':
     """Get VAC configuration for the specified vector name."""
     if not CONFIG_AVAILABLE:
@@ -54,115 +47,21 @@ def get_vac_config(vector_name: str = None) -> 'ConfigManager':
         
     default_vac = os.getenv("DEFAULT_VAC_NAME", "demo")
     vac_name = vector_name or default_vac
-    vac_config_folder = os.getenv("VAC_CONFIG_FOLDER")
-    
-    if vac_config_folder:
-        return ConfigManager(vac_name, config_folder=vac_config_folder)
-    else:
-        return ConfigManager(vac_name)
-
-
-async def call_vac_async(question: str, vector_name: str, chat_history: List[Dict[str, str]] = None) -> str:
-    """
-    Call VAC asynchronously using the streaming interface.
-    
-    Args:
-        question: The user's question
-        vector_name: Name of the VAC to query
-        chat_history: Previous conversation history
-        
-    Returns:
-        The VAC's response
-    """
-    if not STREAMING_AVAILABLE:
-        raise ImportError("Streaming functionality not available. Install sunholo with streaming support.")
-        
-    if chat_history is None:
-        chat_history = []
     
-    try:
-        config = get_vac_config(vector_name)
-        
-        # Import the appropriate QNA function based on configuration
-        llm_str = config.vacConfig('llm')
-        
-        if llm_str and 'anthropic' in llm_str.lower():
-            try:
-                from ..agents.langchain.vertex_genai2 import qna_async
-            except ImportError:
-                log.warning("Anthropic integration not available, falling back to default")
-                from ..agents.langchain.vertex_genai2 import qna_async
-        elif llm_str and 'openai' in llm_str.lower():
-            try:
-                from ..agents.langchain.vertex_genai2 import qna_async
-            except ImportError:
-                log.warning("OpenAI integration not available, falling back to default")
-                from ..agents.langchain.vertex_genai2 import qna_async
-        else:
-            # Default to vertex AI
-            from ..agents.langchain.vertex_genai2 import qna_async
-        
-        # Use streaming interface to get response
-        full_response = ""
-        async for chunk in start_streaming_chat_async(
-            question=question,
-            vector_name=vector_name,
-            qna_func_async=qna_async,
-            chat_history=chat_history
-        ):
-            if isinstance(chunk, dict) and 'answer' in chunk:
-                full_response = chunk['answer']
-            elif isinstance(chunk, str):
-                full_response += chunk
-        
-        return full_response or "No response generated"
-        
-    except Exception as e:
-        log.error(f"Error calling VAC {vector_name}: {str(e)}")
-        return f"Error: {str(e)}"
+    # ConfigManager uses VAC_CONFIG_FOLDER env var automatically
+    return ConfigManager(vac_name)
 
 
-def register_vac_tools(server: 'FastMCP', registry: 'MCPToolRegistry' = None):
+def register_vac_tools(server: 'FastMCP', registry: Optional[Any] = None, stream_interpreter: Optional[Any] = None):
     """
     Register built-in VAC tools with a FastMCP server.
     
     Args:
         server: FastMCP server instance
         registry: Optional registry to track tools
+        stream_interpreter: The stream interpreter function from VACRoutesFastAPI
     """
     
-    @server.tool
-    async def vac_stream(
-        vector_name: str,
-        user_input: str,
-        chat_history: Optional[List[Dict[str, str]]] = None,
-        stream_wait_time: float = 7,
-        stream_timeout: float = 120
-    ) -> str:
-        """
-        Stream responses from a Sunholo VAC (Virtual Agent Computer).
-        
-        Args:
-            vector_name: Name of the VAC to interact with
-            user_input: The user's question or input  
-            chat_history: Previous conversation history
-            stream_wait_time: Time to wait between stream chunks (default: 7) 
-            stream_timeout: Maximum time to wait for response (default: 120)
-        
-        Returns:
-            The streamed response from the VAC
-        """
-        if chat_history is None:
-            chat_history = []
-        
-        log.info(f"MCP streaming request for VAC '{vector_name}': {user_input}")
-        
-        try:
-            return await call_vac_async(user_input, vector_name, chat_history)
-        except Exception as e:
-            log.error(f"Error in MCP VAC stream: {str(e)}")
-            return f"Error: {str(e)}"
-
     @server.tool  
     async def vac_query(
         vector_name: str,
@@ -186,9 +85,51 @@ def register_vac_tools(server: 'FastMCP', registry: 'MCPToolRegistry' = None):
         log.info(f"MCP query request for VAC '{vector_name}': {user_input}")
         
         try:
-            return await call_vac_async(user_input, vector_name, chat_history)
+            # If we have a stream_interpreter, use it directly
+            if stream_interpreter:
+                # Create a no-op callback for non-streaming
+                class NoOpCallback:
+                    async def async_on_llm_new_token(self, token): pass
+                    async def async_on_llm_end(self, response): pass
+                    def on_llm_new_token(self, token): pass
+                    def on_llm_end(self, response): pass
+                
+                callback = NoOpCallback()
+                
+                # Call the stream interpreter
+                import inspect
+                if inspect.iscoroutinefunction(stream_interpreter):
+                    result = await stream_interpreter(
+                        question=user_input,
+                        vector_name=vector_name,
+                        chat_history=chat_history,
+                        callback=callback
+                    )
+                else:
+                    # Run sync function in executor
+                    import asyncio
+                    loop = asyncio.get_event_loop()
+                    result = await loop.run_in_executor(
+                        None,
+                        stream_interpreter,
+                        user_input,
+                        vector_name,
+                        chat_history,
+                        callback
+                    )
+                
+                # Extract answer from result
+                if isinstance(result, dict):
+                    return result.get('answer', str(result))
+                else:
+                    return str(result)
+            else:
+                # Fallback to simple response if no interpreter provided
+                return f"VAC '{vector_name}' received: {user_input}"
+                
         except Exception as e:
             log.error(f"Error in MCP VAC query: {str(e)}")
+            log.error(f"Traceback: {traceback.format_exc()}")
             return f"Error: {str(e)}"
 
     @server.tool
@@ -242,7 +183,6 @@ def register_vac_tools(server: 'FastMCP', registry: 'MCPToolRegistry' = None):
     # Register tools in registry if provided
     if registry:
         # 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)

{sunholo-0.144.3 → sunholo-0.144.5/src/sunholo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.144.3
+Version: 0.144.5
 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.3 → sunholo-0.144.5}/src/sunholo.egg-info/SOURCES.txt

@@ -130,6 +130,7 @@ src/sunholo/mcp/cli.py
 src/sunholo/mcp/cli_fastmcp.py
 src/sunholo/mcp/extensible_mcp_server.py
 src/sunholo/mcp/mcp_manager.py
+src/sunholo/mcp/sse_utils.py
 src/sunholo/mcp/stdio_http_bridge.py
 src/sunholo/mcp/vac_mcp_server.py
 src/sunholo/mcp/vac_mcp_server_fastmcp.py