sunholo 0.116.0__py3-none-any.whl → 0.116.2__py3-none-any.whl

sunholo/cli/cli.py

@@ -16,7 +16,6 @@ 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
 
@@ -24,7 +23,7 @@ from ..custom_logging import log
 
 from .sun_rich import console
 import sys
-from rich.panel import Panel
+
 
 def load_default_gcp_config():
     try:
@@ -43,6 +42,7 @@ class CustomHelpAction(argparse.Action):
         super().__init__(option_strings, dest, nargs=nargs, **kwargs)
 
     def __call__(self, parser, namespace, values, option_string=None):
+        from rich.panel import Panel
         console.print(
             Panel("Welcome to Sunholo Command Line Interface, your assistant to deploy GenAI Virtual Agent Computers (VACs) to Multivac or your own Cloud.", 
                     title="Sunholo GenAIOps Assistant CLI",
@@ -64,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=f"sunholo CLI tool for deploying GenAI VACs - [{sunholo_version()}]", 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.')

sunholo/mcp/cli.py

@@ -3,16 +3,8 @@ import asyncio
 from typing import Any, Sequence
 from functools import lru_cache
 import subprocess
-from mcp.server import Server
-from mcp.server.stdio import stdio_server
-from mcp.types import (
-    Resource,
-    Tool,
-    TextContent,
-    ImageContent,
-    EmbeddedResource,
-)
-"""
+from ..utils.version import sunholo_version
+
 try:
     from mcp.server import Server
     from mcp.server.stdio import stdio_server
@@ -23,24 +15,35 @@ try:
         ImageContent,
         EmbeddedResource,
     )
+
+    from rich import print
+    from ..cli.sun_rich import console
 except ImportError:
     Server = None
-"""
+    console = None
 
 from pydantic import AnyUrl
 
 # Configure logging
 from ..custom_logging import setup_logging
-logger = setup_logging("sunholo-mcp-server")
+logger = setup_logging("sunholo-mcp")
 
 class SunholoMCPServer:
     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()
@@ -64,11 +67,13 @@ class SunholoMCPServer:
         @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/list":
                 try:
                     # Execute sunholo vac list command
                     result = subprocess.run(
-                        ["sunholo", "vac", "list", "--debug"],
+                        ["sunholo", "vac", "list"],
                         capture_output=True,
                         text=True
                     )
@@ -101,15 +106,31 @@ class SunholoMCPServer:
                                 "type": "string",
                                 "description": "Message to send to the VAC"
                             },
-                            "headless": {
-                                "type": "boolean",
-                                "description": "Whether to run in headless mode",
-                                "default": True
-                            }
                         },
                         "required": ["vac_name", "message"]
                     }
                 ),
+                Tool(
+                    name="list_configs",
+                    description="List Sunholo configurations",
+                    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 store",
@@ -148,15 +169,13 @@ class SunholoMCPServer:
 
                 vac_name = arguments.get("vac_name")
                 message = arguments.get("message")
-                headless = arguments.get("headless", True)
 
                 if not vac_name or not message:
                     raise ValueError("Missing required arguments")
 
                 try:
                     cmd = ["sunholo", "vac", "chat", vac_name, message]
-                    if headless:
-                        cmd.append("--headless")
+                    cmd.append("--headless")
 
                     result = subprocess.run(
                         cmd,
@@ -213,6 +232,25 @@ class SunholoMCPServer:
                             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}")
 
@@ -229,10 +267,16 @@ def cli_mcp(args):
     """CLI handler for the MCP server command"""
     try:
 
+        if not os.getenv("VAC_CONFIG_FOLDER"):
+            raise ValueError("sunholo configuration folder must be present in config/ or via VAC_CONFIG_FOLDER")
+        
         # Create and run the MCP server
         server = SunholoMCPServer()
-            
-        logger.info("Starting Sunholo MCP server...")
+        msg = {"message": "Starting Sunholo MCP server..."}
+
+        logger.info(msg)
+        console.print(msg)
+        
         asyncio.run(server.run())
 
     except Exception as e:
@@ -241,9 +285,9 @@ def cli_mcp(args):
 
 def setup_mcp_subparser(subparsers):
     """
-    Sets up an argparse subparser for the 'mcp' command.
+    Sets up an argparse subparser for the 'mcp' command 3.
 
-    By default will use configurations within the folder specified by '_CONFIG_FOLDER'
+    By default will use configurations within the folder specified by 'VAC_CONFIG_FOLDER'
 
     Example command:
     ```bash

{sunholo-0.116.0.dist-info → sunholo-0.116.2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.116.0
+Version: 0.116.2
 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.116.0.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.116.2.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"
@@ -189,6 +190,12 @@ pip install . --use-feature=in-tree-build
 pytest tests
 ```
 
+## Local dev
+
+```sh
+uv tool install --from "sunholo[cli]" sunholo --with ".[all]"
+```
+
 ## Demos
 
 Using https://github.com/charmbracelet/vhs

{sunholo-0.116.0.dist-info → sunholo-0.116.2.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=5IrZ-POlxiSQRqt09mxQohtEVd1c66bWiizxAlj596s,4573
+sunholo/cli/cli.py,sha256=WiWyLywKwuKR46H7a-mBLO0c7jMW-PNl8th2Mj7ioMs,4606
 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
@@ -108,7 +108,7 @@ sunholo/llamaindex/user_history.py,sha256=ZtkecWuF9ORduyGB8kF8gP66bm9DdvCI-ZiK6K
 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=X_tZYoE3OWuQEX6r1p1Ux66gGe4BCLTtCRjZBC_TSt8,8785
+sunholo/mcp/cli.py,sha256=D9IFMSffCsRO6vFayzukiVX9s3CvoFFyJUcQ0S6db1s,10660
 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
@@ -149,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.116.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.116.0.dist-info/METADATA,sha256=ofz1Ra8Wu-Mm9ZLrOleCp20kG4JJuOz4S1vghYGj72U,9175
-sunholo-0.116.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-sunholo-0.116.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.116.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.116.0.dist-info/RECORD,,
+sunholo-0.116.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.116.2.dist-info/METADATA,sha256=YUoz-Kw42oDa68pBZ6Qd1gygiihKtR36SqJ0OnXl-6I,9297
+sunholo-0.116.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+sunholo-0.116.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.116.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.116.2.dist-info/RECORD,,