sunholo 0.142.0__py3-none-any.whl → 0.143.3__py3-none-any.whl

sunholo/mcp/mcp_manager.py

@@ -0,0 +1,98 @@
+"""
+Proper MCP integration for VACRoutes using the official MCP Python SDK.
+This shows how to integrate MCP servers with your Flask/VACRoutes application.
+"""
+
+from typing import Dict, Any, List, Optional
+
+# Official MCP imports
+from mcp import StdioServerParameters, ClientSession
+from mcp.client.stdio import stdio_client
+from mcp.types import Tool, Resource, TextContent, CallToolResult
+
+
+class MCPClientManager:
+    """Manages MCP client connections to various MCP servers."""
+    
+    def __init__(self):
+        self.sessions: Dict[str, ClientSession] = {}
+        self.server_configs: Dict[str, Dict[str, Any]] = {}
+        
+    async def connect_to_server(self, server_name: str, command: str, args: List[str] = None) -> ClientSession:
+        """Connect to an MCP server via stdio."""
+        if server_name in self.sessions:
+            return self.sessions[server_name]
+        
+        # Create server parameters
+        server_params = StdioServerParameters(
+            command=command,
+            args=args or []
+        )
+        
+        # Connect to the server
+        async with stdio_client(server_params) as (read, write):
+            # Create and initialize client session directly
+            session = ClientSession(read, write)
+            await session.initialize()
+            self.sessions[server_name] = session
+            self.server_configs[server_name] = {
+                "command": command,
+                "args": args
+            }
+            return session
+    
+    async def list_tools(self, server_name: Optional[str] = None) -> List[Tool]:
+        """List available tools from one or all connected servers."""
+        if server_name:
+            session = self.sessions.get(server_name)
+            if session:
+                return await session.list_tools()
+            return []
+        
+        # List from all servers
+        all_tools = []
+        for name, session in self.sessions.items():
+            tools = await session.list_tools()
+            # Add server name to tool metadata
+            for tool in tools:
+                tool.metadata = tool.metadata or {}
+                tool.metadata["server"] = name
+            all_tools.extend(tools)
+        return all_tools
+    
+    async def call_tool(self, server_name: str, tool_name: str, arguments: Dict[str, Any]) -> CallToolResult:
+        """Call a tool on a specific MCP server."""
+        session = self.sessions.get(server_name)
+        if not session:
+            raise ValueError(f"Not connected to server: {server_name}")
+        
+        # Call the tool
+        result = await session.call_tool(tool_name, arguments)
+        return result
+    
+    async def list_resources(self, server_name: Optional[str] = None) -> List[Resource]:
+        """List available resources from servers."""
+        if server_name:
+            session = self.sessions.get(server_name)
+            if session:
+                return await session.list_resources()
+            return []
+        
+        # List from all servers
+        all_resources = []
+        for name, session in self.sessions.items():
+            resources = await session.list_resources()
+            for resource in resources:
+                resource.metadata = resource.metadata or {}
+                resource.metadata["server"] = name
+            all_resources.extend(resources)
+        return all_resources
+    
+    async def read_resource(self, server_name: str, uri: str) -> List[TextContent]:
+        """Read a resource from an MCP server."""
+        session = self.sessions.get(server_name)
+        if not session:
+            raise ValueError(f"Not connected to server: {server_name}")
+        
+        result = await session.read_resource(uri)
+        return result.contents

sunholo/mcp/vac_mcp_server.py

@@ -0,0 +1,259 @@
+#   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.
+
+"""
+MCP Server wrapper for VAC functionality.
+This module exposes VAC streaming capabilities as MCP tools.
+"""
+
+from typing import Any, Sequence, Dict, List, Optional, Callable
+import json
+import asyncio
+from functools import partial
+
+try:
+    from mcp.server import Server
+    from mcp.types import Tool, TextContent, ImageContent, EmbeddedResource
+except ImportError:
+    Server = None
+    Tool = None
+    TextContent = None
+
+from ..custom_logging import log
+from ..streaming import start_streaming_chat_async
+
+
+class VACMCPServer:
+    """MCP Server that exposes VAC functionality as tools."""
+    
+    def __init__(self, stream_interpreter: Callable, vac_interpreter: Callable = None):
+        """
+        Initialize the VAC MCP Server.
+        
+        Args:
+            stream_interpreter: The streaming interpreter function
+            vac_interpreter: The static VAC interpreter function (optional)
+        """
+        if Server is None:
+            raise ImportError("MCP server requires `pip install sunholo[anthropic]`")
+        
+        self.stream_interpreter = stream_interpreter
+        self.vac_interpreter = vac_interpreter
+        self.server = Server("sunholo-vac-server")
+        
+        # Set up handlers
+        self._setup_handlers()
+    
+    def _setup_handlers(self):
+        """Set up MCP protocol handlers."""
+        
+        @self.server.list_tools()
+        async def list_tools() -> List[Tool]:
+            """List available VAC tools."""
+            tools = [
+                Tool(
+                    name="vac_stream",
+                    description="Stream responses from a Sunholo VAC (Virtual Agent Computer)",
+                    inputSchema={
+                        "type": "object",
+                        "properties": {
+                            "vector_name": {
+                                "type": "string",
+                                "description": "Name of the VAC to interact with"
+                            },
+                            "user_input": {
+                                "type": "string", 
+                                "description": "The user's question or input"
+                            },
+                            "chat_history": {
+                                "type": "array",
+                                "description": "Previous conversation history",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "human": {"type": "string"},
+                                        "ai": {"type": "string"}
+                                    }
+                                },
+                                "default": []
+                            },
+                            "stream_wait_time": {
+                                "type": "number",
+                                "description": "Time to wait between stream chunks",
+                                "default": 7
+                            },
+                            "stream_timeout": {
+                                "type": "number",
+                                "description": "Maximum time to wait for response",
+                                "default": 120
+                            }
+                        },
+                        "required": ["vector_name", "user_input"]
+                    }
+                )
+            ]
+            
+            # Add static VAC tool if interpreter is provided
+            if self.vac_interpreter:
+                tools.append(
+                    Tool(
+                        name="vac_query",
+                        description="Query a Sunholo VAC (non-streaming)",
+                        inputSchema={
+                            "type": "object",
+                            "properties": {
+                                "vector_name": {
+                                    "type": "string",
+                                    "description": "Name of the VAC to interact with"
+                                },
+                                "user_input": {
+                                    "type": "string",
+                                    "description": "The user's question or input"
+                                },
+                                "chat_history": {
+                                    "type": "array",
+                                    "description": "Previous conversation history",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "human": {"type": "string"},
+                                            "ai": {"type": "string"}
+                                        }
+                                    },
+                                    "default": []
+                                }
+                            },
+                            "required": ["vector_name", "user_input"]
+                        }
+                    )
+                )
+            
+            return tools
+        
+        @self.server.call_tool()
+        async def call_tool(
+            name: str,
+            arguments: Any
+        ) -> Sequence[TextContent | ImageContent | EmbeddedResource]:
+            """Handle tool calls for VAC interactions."""
+            
+            if name == "vac_stream":
+                return await self._handle_vac_stream(arguments)
+            elif name == "vac_query" and self.vac_interpreter:
+                return await self._handle_vac_query(arguments)
+            else:
+                raise ValueError(f"Unknown tool: {name}")
+    
+    async def _handle_vac_stream(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
+        """Handle streaming VAC requests."""
+        vector_name = arguments.get("vector_name")
+        user_input = arguments.get("user_input")
+        chat_history = arguments.get("chat_history", [])
+        stream_wait_time = arguments.get("stream_wait_time", 7)
+        stream_timeout = arguments.get("stream_timeout", 120)
+        
+        if not vector_name or not user_input:
+            raise ValueError("Missing required arguments: vector_name and user_input")
+        
+        log.info(f"MCP streaming request for VAC '{vector_name}': {user_input}")
+        
+        try:
+            # Collect streaming responses
+            full_response = ""
+            
+            async for chunk in start_streaming_chat_async(
+                question=user_input,
+                vector_name=vector_name,
+                qna_func_async=self.stream_interpreter,
+                chat_history=chat_history,
+                wait_time=stream_wait_time,
+                timeout=stream_timeout
+            ):
+                if isinstance(chunk, dict) and 'answer' in chunk:
+                    full_response = chunk['answer']
+                elif isinstance(chunk, str):
+                    full_response += chunk
+            
+            return [
+                TextContent(
+                    type="text",
+                    text=full_response or "No response generated"
+                )
+            ]
+            
+        except Exception as e:
+            log.error(f"Error in MCP VAC stream: {str(e)}")
+            return [
+                TextContent(
+                    type="text",
+                    text=f"Error: {str(e)}"
+                )
+            ]
+    
+    async def _handle_vac_query(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
+        """Handle non-streaming VAC requests."""
+        vector_name = arguments.get("vector_name")
+        user_input = arguments.get("user_input")
+        chat_history = arguments.get("chat_history", [])
+        
+        if not vector_name or not user_input:
+            raise ValueError("Missing required arguments: vector_name and user_input")
+        
+        log.info(f"MCP query request for VAC '{vector_name}': {user_input}")
+        
+        try:
+            # Run in executor if not async
+            if asyncio.iscoroutinefunction(self.vac_interpreter):
+                result = await self.vac_interpreter(
+                    question=user_input,
+                    vector_name=vector_name,
+                    chat_history=chat_history
+                )
+            else:
+                loop = asyncio.get_event_loop()
+                result = await loop.run_in_executor(
+                    None,
+                    partial(
+                        self.vac_interpreter,
+                        question=user_input,
+                        vector_name=vector_name,
+                        chat_history=chat_history
+                    )
+                )
+            
+            # Extract answer from result
+            if isinstance(result, dict):
+                answer = result.get("answer", str(result))
+            else:
+                answer = str(result)
+            
+            return [
+                TextContent(
+                    type="text",
+                    text=answer
+                )
+            ]
+            
+        except Exception as e:
+            log.error(f"Error in MCP VAC query: {str(e)}")
+            return [
+                TextContent(
+                    type="text",
+                    text=f"Error: {str(e)}"
+                )
+            ]
+    
+    def get_server(self) -> Server:
+        """Get the underlying MCP server instance."""
+        return self.server

{sunholo-0.142.0.dist-info → sunholo-0.143.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.142.0
+Version: 0.143.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
@@ -15,14 +15,16 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: a2a-python>=0.0.1
 Requires-Dist: aiohttp
+Requires-Dist: flask>=3.1.0
 Requires-Dist: google-auth
-Requires-Dist: ollama>=0.4.7
-Requires-Dist: pillow>=11.0.0
+Requires-Dist: mcp>=1.1.1
 Requires-Dist: pydantic
+Requires-Dist: pytest-asyncio>=1.0.0
 Requires-Dist: requests
 Requires-Dist: ruamel.yaml
 Requires-Dist: tenacity
@@ -69,7 +71,7 @@ Requires-Dist: langchain-anthropic>=0.1.23; extra == "all"
 Requires-Dist: langchain-google-vertexai; extra == "all"
 Requires-Dist: langchain-unstructured; extra == "all"
 Requires-Dist: langfuse; extra == "all"
-Requires-Dist: mcp; extra == "all"
+Requires-Dist: mcp>=1.1.1; extra == "all"
 Requires-Dist: numpy; extra == "all"
 Requires-Dist: opencv-python; extra == "all"
 Requires-Dist: pg8000; extra == "all"
@@ -125,6 +127,7 @@ Requires-Dist: pytesseract; extra == "pipeline"
 Requires-Dist: tabulate; extra == "pipeline"
 Requires-Dist: unstructured[all-docs,local-inference]; extra == "pipeline"
 Provides-Extra: gcp
+Requires-Dist: a2a-python; extra == "gcp"
 Requires-Dist: aiofiles; extra == "gcp"
 Requires-Dist: anthropic[vertex]; extra == "gcp"
 Requires-Dist: google-api-python-client; extra == "gcp"
@@ -155,7 +158,7 @@ Requires-Dist: langchain-openai>=0.3.2; extra == "openai"
 Requires-Dist: tiktoken; extra == "openai"
 Provides-Extra: anthropic
 Requires-Dist: langchain-anthropic>=0.1.23; extra == "anthropic"
-Requires-Dist: mcp; extra == "anthropic"
+Requires-Dist: mcp>=1.1.1; extra == "anthropic"
 Provides-Extra: tools
 Requires-Dist: openapi-spec-validator; extra == "tools"
 Requires-Dist: playwright; extra == "tools"

{sunholo-0.142.0.dist-info → sunholo-0.143.3.dist-info}/RECORD

@@ -1,6 +1,10 @@
 sunholo/__init__.py,sha256=InRbX4V0-qdNHo9zYH3GEye7ASLR6LX8-SMvPV4Jsaw,1212
 sunholo/custom_logging.py,sha256=JXZTnXp_DixP3jwYfKw4LYRDS9IuTq7ctCgfZbI2rxA,22023
 sunholo/langchain_types.py,sha256=uZ4zvgej_f7pLqjtu4YP7qMC_eZD5ym_5x4pyvA1Ih4,1834
+sunholo/a2a/__init__.py,sha256=ohwR-3_toRUdyj3ACNCVPrd_V2lzR5tmL5Hwn1ChSSU,1049
+sunholo/a2a/agent_card.py,sha256=TJOgZ5FZJGgapyFXzBIRnnocUWcfSLah7fjvl0fLYJ4,13387
+sunholo/a2a/task_manager.py,sha256=Ox1oAHarqYdcWku_JFcYDt2pQG3gwfuBTO7WCakE-U0,17670
+sunholo/a2a/vac_a2a_agent.py,sha256=vL-sQceVRBE9d3kjx9m8zGWK1S9J1sHUybAH3tSbVFg,13344
 sunholo/agents/__init__.py,sha256=AauG3l0y4r5Fzx1zJfZ634M4o-0o7B7J5T8k_gPvNqE,370
 sunholo/agents/chat_history.py,sha256=gRuIUyU-53A72Q17SmSgf6Ok3YO8hKAZhsc64976018,17782
 sunholo/agents/dispatch_to_qa.py,sha256=NHihwAoCJ5_Lk11e_jZnucVUGQyZHCB-YpkfMHBCpQk,8882
@@ -14,7 +18,7 @@ sunholo/agents/fastapi/base.py,sha256=W-cyF8ZDUH40rc-c-Apw3-_8IIi2e4Y9qRtnoVnsc1
 sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhBlV3to-s,3864
 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=TEM0u2vkZC0BSKJABxQVPm4QiUsEFoPOwJZIOxzi1Sk,32621
+sunholo/agents/flask/vac_routes.py,sha256=4Wenjq1Mg9gnmVt_5nHH3Uzhvio269lo2N9v38VxT48,53850
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
@@ -110,8 +114,10 @@ sunholo/llamaindex/llamaindex_class.py,sha256=PnpPoc7LpP7xvKIXYu-UvI4ehj67pGhE1E
 sunholo/llamaindex/user_history.py,sha256=ZtkecWuF9ORduyGB8kF8gP66bm9DdvCI-ZiK6Kt-cSE,2265
 sunholo/lookup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/lookup/model_lookup.yaml,sha256=O7o-jP53MLA06C8pI-ILwERShO-xf6z_258wtpZBv6A,739
-sunholo/mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sunholo/mcp/__init__.py,sha256=GmKB8Z0ecXUzpuzYEOXSI0aaZP7LZJc7yTCMEFdAmi4,791
 sunholo/mcp/cli.py,sha256=d24nnVzhZYz4AWgTqmN-qjKG4rPbf8RhdmEOHZkBHy8,10570
+sunholo/mcp/mcp_manager.py,sha256=ooa_2JSNaKIuK9azEV0OaPVf5Mp_tL_DHaYEyFCmgKY,3752
+sunholo/mcp/vac_mcp_server.py,sha256=fRcerTqp_pTK8AVITpGPhrez_IaDuUDr4WnVUHPv8GM,10114
 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
@@ -169,9 +175,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.142.0.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.142.0.dist-info/METADATA,sha256=9v1AM0UCFJv_qx8vYOFO8gprTDulHCAxnMck7Jcmszs,18292
-sunholo-0.142.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sunholo-0.142.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.142.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.142.0.dist-info/RECORD,,
+sunholo-0.143.3.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.143.3.dist-info/METADATA,sha256=d36VCf5W1j1lyZ7HIe_vBHxOPyQ_f_UNhTD1X6_FjiQ,18413
+sunholo-0.143.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sunholo-0.143.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.143.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.143.3.dist-info/RECORD,,