sunholo 0.115.3__py3-none-any.whl → 0.116.1__py3-none-any.whl

sunholo/cli/cli.py

@@ -14,6 +14,8 @@ from ..llamaindex import setup_llamaindex_subparser
 from ..excel import setup_excel_subparser
 from ..terraform import setup_tfvarseditor_subparser
 from ..senses.stream_voice import setup_tts_subparser
+from ..mcp.cli import setup_mcp_subparser
+
 
 from ..utils import ConfigManager
 from ..utils.version import sunholo_version
@@ -62,7 +64,7 @@ def main(args=None):
     """
     default_project, default_region = load_default_gcp_config()
 
-    parser = argparse.ArgumentParser(description="sunholo CLI tool for deploying GenAI VACs", add_help=False)
+    parser = argparse.ArgumentParser(description="sunholo CLI tool for deploying GenAI VACs 3", add_help=False)
     parser.add_argument('-h', '--help', action=CustomHelpAction, help='Show this help message and exit')
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
     parser.add_argument('--project', default=default_project, help='GCP project to list Cloud Run services from.')
@@ -101,6 +103,8 @@ def main(args=None):
     setup_tfvarseditor_subparser(subparsers)
     # tts
     setup_tts_subparser(subparsers)
+    # anthropic MCP
+    setup_mcp_subparser(subparsers)
 
     #TODO: add database setup commands: alloydb and supabase
 

sunholo/mcp/cli.py

@@ -0,0 +1,297 @@
+import os
+import asyncio
+from typing import Any, Sequence
+from functools import lru_cache
+import subprocess
+
+try:
+    from mcp.server import Server
+    from mcp.server.stdio import stdio_server
+    from mcp.types import (
+        Resource,
+        Tool,
+        TextContent,
+        ImageContent,
+        EmbeddedResource,
+    )
+
+    from rich import print
+    from ..cli.sun_rich import console
+except ImportError:
+    Server = None
+    console = None
+
+from pydantic import AnyUrl
+
+# Configure logging
+import logging
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger("sunholo-mcp")
+
+
+class SunholoMCPServer2:
+    def __init__(self):
+        logger.info("Initializing Sunholo MCP Server")
+
+        if Server is None:
+            raise ImportError("SunholoMCPServer requires `sunholo[anthropic]` to be installed")
+        
+        self.server = Server("sunholo-mcp-server")
+        self.server.onerror = self.handle_error
+
+        self.setup_handlers()
+
+    def handle_error(self, error: Exception):
+        """Handle server errors"""
+        logger.error(f"MCP Server error: {error}", exc_info=True)
+
+    def setup_handlers(self):
+        """Set up all the MCP protocol handlers"""
+        self.setup_resource_handlers()
+        self.setup_tool_handlers()
+
+    def setup_resource_handlers(self):
+        """Configure resource-related handlers"""
+        
+        @self.server.list_resources()
+        async def list_resources() -> list[Resource]:
+            """List available Sunholo resources"""
+            return [
+                Resource(
+                    uri="sunholo://vacs/list2",
+                    name="Available Sunholo VACs 2",
+                    mimeType="application/json",
+                    description="List of available Virtual Agent Computers"
+                )
+            ]
+
+        @self.server.read_resource()
+        async def read_resource(uri: AnyUrl) -> str:
+            """Read Sunholo resources based on URI"""
+            logger.info(f"{uri} available")
+            console.print(f"{uri} available")
+            if str(uri) == "sunholo://vacs/list2":
+                try:
+                    # Execute sunholo vac list command
+                    result = subprocess.run(
+                        ["sunholo", "vac", "list"],
+                        capture_output=True,
+                        text=True
+                    )
+                    console.print(f"{result=}")
+                    return result.stdout
+                except subprocess.CalledProcessError as e:
+                    raise RuntimeError(f"Failed to list VACs: {str(e)}")
+                except Exception as e:
+                    raise RuntimeError(f"Error accessing Sunholo: {str(e)}")
+
+            raise ValueError(f"Unknown resource: {uri}")
+
+    def setup_tool_handlers(self):
+        """Configure tool-related handlers"""
+
+        @self.server.list_tools()
+        async def list_tools() -> list[Tool]:
+            """List available Sunholo tools"""
+            return [
+                Tool(
+                    name="chat_with_vac",
+                    description="Chat with a specific Sunholo VAC2",
+                    inputSchema={
+                        "type": "object",
+                        "properties": {
+                            "vac_name": {
+                                "type": "string",
+                                "description": "Name of the VAC to chat with"
+                            },
+                            "message": {
+                                "type": "string",
+                                "description": "Message to send to the VAC"
+                            },
+                        },
+                        "required": ["vac_name", "message"]
+                    }
+                ),
+                Tool(
+                    name="list_configs",
+                    description="List Sunholo configurations2",
+                    inputSchema={
+                        "type": "object",
+                        "properties": {
+                            "kind": {
+                                "type": "string",
+                                "description": "Filter configurations by kind e.g. vacConfig"
+                            },
+                            "vac": {
+                                "type": "string", 
+                                "description": "Filter configurations by VAC name"
+                            },
+                            "validate": {
+                                "type": "boolean",
+                                "description": "Validate the configuration files"
+                            }
+                        }
+                    }
+                ),
+                Tool(
+                    name="embed_content",
+                    description="Embed content in a VAC's vector store2",
+                    inputSchema={
+                        "type": "object",
+                        "properties": {
+                            "vac_name": {
+                                "type": "string",
+                                "description": "Name of the VAC to embed content for"
+                            },
+                            "content": {
+                                "type": "string",
+                                "description": "Content to embed"
+                            },
+                            "local_chunks": {
+                                "type": "boolean",
+                                "description": "Whether to process chunks locally",
+                                "default": False
+                            }
+                        },
+                        "required": ["vac_name", "content"]
+                    }
+                )
+            ]
+
+        @self.server.call_tool()
+        async def call_tool(
+            name: str,
+            arguments: Any
+        ) -> Sequence[TextContent | ImageContent | EmbeddedResource]:
+            """Handle tool calls for Sunholo interactions"""
+            
+            if name == "chat_with_vac":
+                if not isinstance(arguments, dict):
+                    raise ValueError("Invalid arguments format")
+
+                vac_name = arguments.get("vac_name")
+                message = arguments.get("message")
+
+                if not vac_name or not message:
+                    raise ValueError("Missing required arguments")
+
+                try:
+                    cmd = ["sunholo", "vac", "chat", vac_name, message]
+                    cmd.append("--headless")
+
+                    result = subprocess.run(
+                        cmd,
+                        capture_output=True,
+                        text=True
+                    )
+
+                    return [
+                        TextContent(
+                            type="text",
+                            text=result.stdout
+                        )
+                    ]
+                except subprocess.CalledProcessError as e:
+                    return [
+                        TextContent(
+                            type="text",
+                            text=f"Error chatting with VAC: {e.stderr}"
+                        )
+                    ]
+
+            elif name == "embed_content":
+                if not isinstance(arguments, dict):
+                    raise ValueError("Invalid arguments format")
+
+                vac_name = arguments.get("vac_name")
+                content = arguments.get("content")
+                local_chunks = arguments.get("local_chunks", False)
+
+                if not vac_name or not content:
+                    raise ValueError("Missing required arguments")
+
+                try:
+                    cmd = ["sunholo", "embed", vac_name, content]
+                    if local_chunks:
+                        cmd.append("--local-chunks")
+
+                    result = subprocess.run(
+                        cmd,
+                        capture_output=True,
+                        text=True
+                    )
+
+                    return [
+                        TextContent(
+                            type="text",
+                            text=result.stdout
+                        )
+                    ]
+                except subprocess.CalledProcessError as e:
+                    return [
+                        TextContent(
+                            type="text",
+                            text=f"Error embedding content: {e.stderr}"
+                        )
+                    ]
+            elif name == "list_configs":
+
+                # Build command
+                cmd = ["sunholo", "list-configs"]
+                
+                if arguments.get("kind"):
+                    cmd.extend(["--kind", arguments["kind"]])
+                if arguments.get("vac"):
+                    cmd.extend(["--vac", arguments["vac"]])
+                if arguments.get("validate"):
+                    cmd.append("--validate")
+
+                # Execute sunholo command
+                try:
+                    result = subprocess.run(cmd, capture_output=True, text=True)
+                    return [TextContent(type="text", text=result.stdout)]
+                except subprocess.CalledProcessError as e:
+                    return [TextContent(type="text", text=f"Error: {e.stderr}")]
+
+
+            raise ValueError(f"Unknown tool: {name}")
+
+    async def run(self):
+        """Run the MCP server"""
+        async with stdio_server() as (read_stream, write_stream):
+            await self.server.run(
+                read_stream,
+                write_stream,
+                self.server.create_initialization_options()
+            )
+
+def cli_mcp(args):
+    """CLI handler for the MCP server command"""
+    try:
+
+        # Create and run the MCP server
+        server = SunholoMCPServer2()
+            
+        logger.info("Starting Sunholo MCP server3...")
+        console.print("Starting Sunholo MCP server3...")
+        asyncio.run(server.run())
+
+    except Exception as e:
+        logger.error(f"Error running MCP server: {str(e)}")
+        raise
+
+def setup_mcp_subparser(subparsers):
+    """
+    Sets up an argparse subparser for the 'mcp' command 3.
+
+    By default will use configurations within the folder specified by 'VAC_CONFIG_FOLDER'
+
+    Example command:
+    ```bash
+    sunholo mcp
+    ```
+    """
+    mcp_parser = subparsers.add_parser('mcp', 
+                                      help='Start an Anthropic MCP server that wraps `sunholo` functionality3')
+    
+    mcp_parser.set_defaults(func=cli_mcp)

{sunholo-0.115.3.dist-info → sunholo-0.116.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.115.3
+Version: 0.116.1
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.115.3.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.116.1.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -62,6 +62,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: numpy; extra == "all"
 Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
@@ -138,7 +139,8 @@ Provides-Extra: openai
 Requires-Dist: langchain-openai==0.1.25; extra == "openai"
 Requires-Dist: tiktoken; extra == "openai"
 Provides-Extra: anthropic
-Requires-Dist: langchain-anthropic==0.1.23; extra == "anthropic"
+Requires-Dist: langchain-anthropic>=0.1.23; extra == "anthropic"
+Requires-Dist: mcp; extra == "anthropic"
 Provides-Extra: tools
 Requires-Dist: openapi-spec-validator; extra == "tools"
 Requires-Dist: playwright; extra == "tools"

{sunholo-0.115.3.dist-info → sunholo-0.116.1.dist-info}/RECORD

@@ -44,7 +44,7 @@ sunholo/chunker/pubsub.py,sha256=48bhuAcszN7LGe3-ksPSLHHhq0uKxiXOrizck5qpcP0,101
 sunholo/chunker/splitter.py,sha256=RfekLPkjhCcNd1PFXIj_FxusJMJ8_3cyWl7bsYvtQ0g,7068
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/cli/chat_vac.py,sha256=sYPzUDwwwebJvIobv3GRW_xbQQ4BTy9G-WHdarGCHB0,23705
-sunholo/cli/cli.py,sha256=Bhyrs8GEtJTbsvPYufEY184ra13eusATXAnJClJ_LGY,4474
+sunholo/cli/cli.py,sha256=K8c0Lw3d0fJ_RL5Fh6wnFAhNFH7WM8Lem042Q7ytk40,4575
 sunholo/cli/cli_init.py,sha256=u6BZFtUyFMOKrXZ46-DfET0IpH3Tl2PlOz386rADtrw,8549
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
 sunholo/cli/deploy.py,sha256=zxdwUsRTRMC8U5vyRv0JiKBLFn84Ug_Tc88-_h9hJSs,1609
@@ -107,6 +107,8 @@ 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/cli.py,sha256=Ff4sQFbAli3aDalEzQkWm8o5NjeC8Nwh9qzuaPLSP4Q,10526
 sunholo/pubsub/__init__.py,sha256=DfTEk4zmCfqn6gFxRrqDO0pOrvXTDqH-medpgYO4PGw,117
 sunholo/pubsub/process_pubsub.py,sha256=rN2N4WM6PZkMKDrdT8pnEfTvsXACRyJFqIHJQCbuxLs,3088
 sunholo/pubsub/pubsub_manager.py,sha256=19w_N0LiG-wgVWvgJ13b8BUeN8ZzgSPXAhPmL1HRRSI,6966
@@ -147,9 +149,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.115.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.115.3.dist-info/METADATA,sha256=0-6WiXCtxysjfaGOz4Xl51PLTRftAzJL1BKcvEZWyv8,9134
-sunholo-0.115.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-sunholo-0.115.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.115.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.115.3.dist-info/RECORD,,
+sunholo-0.116.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.116.1.dist-info/METADATA,sha256=FYrAQFonxUdw8AVH32lbQurwbVnIdCfclmPOVK6IdRk,9210
+sunholo-0.116.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+sunholo-0.116.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.116.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.116.1.dist-info/RECORD,,