mcp-mesh 0.7.16__tar.gz → 0.7.18__tar.gz

{mcp_mesh-0.7.16 → mcp_mesh-0.7.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-mesh
-Version: 0.7.16
+Version: 0.7.18
 Summary: Kubernetes-native platform for distributed MCP applications
 Project-URL: Homepage, https://github.com/dhyansraj/mcp-mesh
 Project-URL: Documentation, https://github.com/dhyansraj/mcp-mesh/tree/main/docs
@@ -40,6 +40,7 @@ Requires-Dist: rich<14.0.0,>=13.0.0
 Requires-Dist: typer<1.0.0,>=0.9.0
 Requires-Dist: urllib3<3.0.0,>=2.1.0
 Requires-Dist: uvicorn<1.0.0,>=0.24.0
+Requires-Dist: watchfiles>=1.0.0
 Provides-Extra: dev
 Requires-Dist: bandit[toml]>=1.7.0; extra == 'dev'
 Requires-Dist: black>=25.0.0; extra == 'dev'

{mcp_mesh-0.7.16 → mcp_mesh-0.7.18}/_mcp_mesh/__init__.py

@@ -31,7 +31,7 @@ from .engine.decorator_registry import (
     get_decorator_stats,
 )
 
-__version__ = "0.7.16"
+__version__ = "0.7.18"
 
 # Store reference to runtime processor if initialized
 _runtime_processor = None

{mcp_mesh-0.7.16 → mcp_mesh-0.7.18}/_mcp_mesh/pipeline/mcp_startup/fastapiserver_setup.py

@@ -553,6 +553,7 @@ mcp_mesh_up{{agent="{agent_name}"}} 1
                 port=bind_port,
                 log_level="info",
                 access_log=False,  # Reduce noise
+                ws="websockets-sansio",  # Use modern websockets API (avoids deprecation warnings)
             )
 
             # Create and start server

{mcp_mesh-0.7.16 → mcp_mesh-0.7.18}/_mcp_mesh/pipeline/mcp_startup/startup_orchestrator.py

@@ -319,6 +319,7 @@ class DebounceCoordinator:
                 port=bind_port,
                 log_level="info",
                 access_log=False,  # Reduce noise
+                ws="websockets-sansio",  # Use modern websockets API (avoids deprecation warnings)
             )
 
         except KeyboardInterrupt:

mcp_mesh-0.7.18/_mcp_mesh/reload.py

@@ -0,0 +1,206 @@
+"""
+File watch and reload functionality for MCP Mesh agents.
+
+Provides automatic restart of agent processes when source files change.
+Used by `meshctl start --watch` for development workflows.
+"""
+
+import logging
+import os
+import signal
+import subprocess
+import sys
+import threading
+import time
+from pathlib import Path
+
+logger = logging.getLogger(__name__)
+
+# Debounce delay to batch rapid file changes (seconds)
+DEBOUNCE_DELAY = float(os.getenv("MCP_MESH_RELOAD_DEBOUNCE", "0.5"))
+
+# Delay after stopping process to allow port release (seconds)
+PORT_RELEASE_DELAY = float(os.getenv("MCP_MESH_RELOAD_PORT_DELAY", "0.5"))
+
+
+def get_watch_paths(script_path: str) -> list[Path]:
+    """
+    Determine which paths to watch for changes.
+
+    Watches the directory containing the agent script and all subdirectories.
+    """
+    script_dir = Path(script_path).parent.absolute()
+    return [script_dir]
+
+
+def should_watch_file(path: str) -> bool:
+    """
+    Filter function to determine which files to watch.
+
+    Only watches:
+    - Python files (.py)
+    - Jinja2 templates (.jinja2, .j2)
+    - YAML config files (.yaml, .yml)
+
+    Excludes common non-source directories like __pycache__, .git, .venv, etc.
+    Also excludes hidden files and editor temporary files.
+    """
+    path_obj = Path(path)
+    filename = path_obj.name
+
+    # Skip hidden files and editor temp files (e.g., .!12345!main.py from sed -i)
+    if filename.startswith("."):
+        return False
+
+    # Skip common editor backup/temp files
+    if filename.endswith("~") or filename.endswith(".swp") or filename.endswith(".tmp"):
+        return False
+
+    path_parts = {p.lower() for p in path_obj.parts}
+
+    # Skip common non-source directories (case-insensitive, exact component match)
+    skip_patterns = [
+        "__pycache__",
+        ".git",
+        ".venv",
+        "venv",
+        ".pytest_cache",
+        ".mypy_cache",
+        "node_modules",
+        ".eggs",
+        ".egg-info",
+    ]
+
+    for pattern in skip_patterns:
+        if pattern.lower() in path_parts:
+            return False
+
+    # Only watch specific file types
+    watch_extensions = [".py", ".jinja2", ".j2", ".yaml", ".yml"]
+    return path_obj.suffix.lower() in watch_extensions
+
+
+def terminate_process(process: subprocess.Popen, timeout: int = 3) -> None:
+    """
+    Gracefully terminate a process and all its children, force kill if needed.
+
+    Args:
+        process: The subprocess to terminate
+        timeout: Seconds to wait before force killing
+    """
+    if process is None or process.poll() is not None:
+        return
+
+    pid = process.pid
+
+    # Try graceful termination first - send to process group to include children
+    try:
+        os.killpg(pid, signal.SIGTERM)
+    except (ProcessLookupError, PermissionError):
+        # Process group doesn't exist or we can't signal it, try direct
+        process.terminate()
+
+    try:
+        process.wait(timeout=timeout)
+    except subprocess.TimeoutExpired:
+        logger.warning(
+            f"Process {pid} didn't terminate gracefully, force killing..."
+        )
+        # Force kill the entire process group
+        try:
+            os.killpg(pid, signal.SIGKILL)
+        except (ProcessLookupError, PermissionError):
+            process.kill()
+        process.wait()
+
+
+def run_with_reload(script_path: str) -> None:
+    """
+    Run the agent script with file watching and auto-reload.
+
+    Uses watchfiles to monitor the agent directory for changes.
+    When files change, the agent process is terminated and restarted.
+
+    Args:
+        script_path: Path to the agent's main.py script
+    """
+    try:
+        import watchfiles
+    except ImportError:
+        logger.error(
+            "watchfiles is required for reload mode. "
+            "Install with: pip install watchfiles"
+        )
+        sys.exit(1)
+
+    script_path = os.path.abspath(script_path)
+    watch_paths = get_watch_paths(script_path)
+    python_exec = sys.executable
+
+    logger.info("🔄 Starting agent with file watching enabled")
+    logger.info(f"📁 Watching: {watch_paths[0]}")
+    logger.info("📝 File types: .py, .jinja2, .j2, .yaml, .yml")
+    logger.info("🔃 Agent will restart automatically when files change")
+
+    process = None
+    stop_event = threading.Event()
+
+    def signal_handler(signum, frame):
+        stop_event.set()
+        logger.info("🛑 Stopping agent...")
+        terminate_process(process)
+
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+
+    def start_agent() -> subprocess.Popen:
+        """Start the agent subprocess in a new process group."""
+        return subprocess.Popen(
+            [python_exec, script_path],
+            stdout=sys.stdout,
+            stderr=sys.stderr,
+            stdin=sys.stdin,
+            start_new_session=True,  # Create new process group for clean shutdown
+        )
+
+    # Start initial process
+    process = start_agent()
+    logger.info(f"✅ Agent started (PID: {process.pid})")
+
+    # Watch for file changes
+    try:
+        for changes in watchfiles.watch(
+            *watch_paths,
+            watch_filter=lambda ct, p: should_watch_file(p),
+            debounce=int(DEBOUNCE_DELAY * 1000),  # Convert to milliseconds
+            stop_event=stop_event,
+        ):
+            if stop_event.is_set():
+                break
+
+            # Check if process crashed
+            if process.poll() is not None:
+                logger.warning(f"⚠️ Agent process exited with code {process.returncode}")
+
+            # Log changes
+            for change_type, path in changes:
+                rel_path = os.path.relpath(path, watch_paths[0])
+                logger.info(f"🔄 Detected {change_type.name}: {rel_path}")
+
+            logger.info("🔃 Restarting agent...")
+
+            # Stop current process
+            terminate_process(process)
+
+            # Delay to allow ports to be released
+            time.sleep(PORT_RELEASE_DELAY)
+
+            # Start new process
+            process = start_agent()
+            logger.info(f"✅ Agent restarted (PID: {process.pid})")
+
+    except KeyboardInterrupt:
+        pass
+    finally:
+        terminate_process(process)
+        logger.info("👋 File watcher stopped")

mcp_mesh-0.7.18/_mcp_mesh/reload_runner.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+"""
+MCP Mesh Reload Runner - Entry point for file watching mode.
+
+Usage:
+    python -m _mcp_mesh.reload_runner <agent_script.py>
+
+This module is invoked by `meshctl start --watch` to wrap agent execution
+with file watching. When source files change, the agent process is
+automatically restarted.
+
+Environment variables:
+    MCP_MESH_RELOAD_DEBOUNCE: Debounce delay in seconds (default: 0.5)
+    MCP_MESH_RELOAD_PORT_DELAY: Port release delay in seconds (default: 0.5)
+"""
+
+import logging
+import os
+import sys
+
+# Configure logging before imports
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(levelname)-8s %(message)s",
+)
+logger = logging.getLogger(__name__)
+
+
+def main():
+    """Main entry point for reload runner."""
+    if len(sys.argv) < 2:
+        print("Usage: python -m _mcp_mesh.reload_runner <agent_script.py>")
+        sys.exit(1)
+
+    script_path = sys.argv[1]
+
+    if not os.path.exists(script_path):
+        print(f"Error: Script not found: {script_path}")
+        sys.exit(1)
+
+    if not script_path.endswith(".py"):
+        print(f"Error: Expected a Python script (.py), got: {script_path}")
+        sys.exit(1)
+
+    # Import and run with reload
+    from .reload import run_with_reload
+
+    run_with_reload(script_path)
+
+
+if __name__ == "__main__":
+    main()

{mcp_mesh-0.7.16 → mcp_mesh-0.7.18}/mesh/decorators.py

@@ -242,6 +242,7 @@ def _start_uvicorn_immediately(http_host: str, http_port: int):
                     log_level="info",
                     timeout_graceful_shutdown=30,  # Allow time for registry cleanup
                     access_log=False,  # Reduce noise
+                    ws="websockets-sansio",  # Use modern websockets API (avoids deprecation warnings)
                 )
             except Exception as e:
                 logger.error(f"❌ IMMEDIATE UVICORN: Server failed: {e}")

{mcp_mesh-0.7.16 → mcp_mesh-0.7.18}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mcp-mesh"
-version = "0.7.16"
+version = "0.7.18"
 description = "Kubernetes-native platform for distributed MCP applications"
 readme = "README.md"
 license = { text = "MIT" }
@@ -53,7 +53,8 @@ dependencies = [
     "pyyaml>=6.0,<7.0",
     "jinja2>=3.1.0",
     "redis>=4.0.0,<7.0.0",
-    "cachetools>=5.3.0"
+    "cachetools>=5.3.0",
+    "watchfiles>=1.0.0"
 ]
 
 [project.optional-dependencies]
@@ -120,7 +121,7 @@ extend-exclude = '''
 '''
 
 [tool.ruff]
-target-version = "0.7.16"
+target-version = "0.7.18"
 line-length = 88
 
 [tool.ruff.lint]
@@ -157,7 +158,7 @@ ignore = [
 "tests/**" = ["E712", "F841", "B007", "C401", "F401"]  # Relax style requirements for test files
 
 [tool.mypy]
-python_version = "0.7.16"
+python_version = "0.7.18"
 check_untyped_defs = false  # Temporarily relaxed
 disallow_any_generics = false  # Temporarily relaxed
 disallow_incomplete_defs = false  # Temporarily relaxed
@@ -169,7 +170,7 @@ warn_return_any = false  # Temporarily relaxed
 exclude = ["tests/", ".*agent_server_generated.*", ".*registry_client_generated.*"]  # Skip type checking for test and generated files
 
 [tool.pytest.ini_options]
-minversion = "0.7.16"
+minversion = "0.7.18"
 addopts = "-ra -q --strict-markers --strict-config"
 testpaths = [
     "tests",