claude-mpm 4.1.6__py3-none-any.whl → 4.24.0__py3-none-any.whl

claude_mpm/services/mcp_gateway/__init__.py

@@ -27,99 +27,103 @@ __version__ = "0.1.0"
 
 # Lazy imports to prevent circular dependencies and improve startup performance
 def __getattr__(name):
-    """Lazy import mechanism for MCP Gateway components."""
-
-    # Core interfaces and base classes
-    if name == "IMCPGateway":
-        from .core.interfaces import IMCPGateway
-
-        return IMCPGateway
-    if name == "IMCPToolRegistry":
-        from .core.interfaces import IMCPToolRegistry
-
-        return IMCPToolRegistry
-    if name == "IMCPConfiguration":
-        from .core.interfaces import IMCPConfiguration
-
-        return IMCPConfiguration
-    if name == "IMCPToolAdapter":
-        from .core.interfaces import IMCPToolAdapter
-
-        return IMCPToolAdapter
-    if name == "BaseMCPService":
-        from .core.base import BaseMCPService
-
-        return BaseMCPService
-
-    # Gateway implementations
-    if name == "MCPGateway":
-        from .server.mcp_gateway import MCPGateway
-
-        return MCPGateway
-    if name == "StdioHandler":
-        from .server.stdio_handler import StdioHandler
-
-        return StdioHandler
-    if name == "AlternativeStdioHandler":
-        from .server.stdio_handler import AlternativeStdioHandler
-
-        return AlternativeStdioHandler
-
-    # Tool registry and adapters
-    if name == "ToolRegistry":
-        from .registry.tool_registry import ToolRegistry
-
-        return ToolRegistry
-    if name == "BaseToolAdapter":
-        from .tools.base_adapter import BaseToolAdapter
-
-        return BaseToolAdapter
-    if name == "EchoToolAdapter":
-        from .tools.base_adapter import EchoToolAdapter
-
-        return EchoToolAdapter
-    if name == "CalculatorToolAdapter":
-        from .tools.base_adapter import CalculatorToolAdapter
-
-        return CalculatorToolAdapter
-    if name == "SystemInfoToolAdapter":
-        from .tools.base_adapter import SystemInfoToolAdapter
-
-        return SystemInfoToolAdapter
-
-    # Configuration management
-    if name == "MCPConfiguration":
-        from .config.configuration import MCPConfiguration
-
-        return MCPConfiguration
-    if name == "MCPConfigLoader":
-        from .config.config_loader import MCPConfigLoader
-
-        return MCPConfigLoader
-
-    # Service registry
-    if name == "MCPServiceRegistry":
-        from .registry.service_registry import MCPServiceRegistry
-
-        return MCPServiceRegistry
-
-    # Exceptions
-    if name == "MCPException":
-        from .core.exceptions import MCPException
-
-        return MCPException
-    if name == "MCPConfigurationError":
-        from .core.exceptions import MCPConfigurationError
-
-        return MCPConfigurationError
-    if name == "MCPToolNotFoundError":
-        from .core.exceptions import MCPToolNotFoundError
-
-        return MCPToolNotFoundError
-    if name == "MCPServerError":
-        from .core.exceptions import MCPServerError
-
-        return MCPServerError
+    """Lazy import mechanism for MCP Gateway components using dictionary-based mapping."""
+    from importlib import import_module
+
+    # Dictionary mapping: name -> (module_path, attribute_name)
+    _LAZY_IMPORTS = {
+        # Core interfaces and base classes
+        "IMCPGateway": (
+            "claude_mpm.services.mcp_gateway.core.interfaces",
+            "IMCPGateway",
+        ),
+        "IMCPToolRegistry": (
+            "claude_mpm.services.mcp_gateway.core.interfaces",
+            "IMCPToolRegistry",
+        ),
+        "IMCPConfiguration": (
+            "claude_mpm.services.mcp_gateway.core.interfaces",
+            "IMCPConfiguration",
+        ),
+        "IMCPToolAdapter": (
+            "claude_mpm.services.mcp_gateway.core.interfaces",
+            "IMCPToolAdapter",
+        ),
+        "BaseMCPService": (
+            "claude_mpm.services.mcp_gateway.core.base",
+            "BaseMCPService",
+        ),
+        # Gateway implementations
+        "MCPGateway": (
+            "claude_mpm.services.mcp_gateway.server.mcp_gateway",
+            "MCPGateway",
+        ),
+        "StdioHandler": (
+            "claude_mpm.services.mcp_gateway.server.stdio_handler",
+            "StdioHandler",
+        ),
+        "AlternativeStdioHandler": (
+            "claude_mpm.services.mcp_gateway.server.stdio_handler",
+            "AlternativeStdioHandler",
+        ),
+        # Tool registry and adapters
+        "ToolRegistry": (
+            "claude_mpm.services.mcp_gateway.registry.tool_registry",
+            "ToolRegistry",
+        ),
+        "BaseToolAdapter": (
+            "claude_mpm.services.mcp_gateway.tools.base_adapter",
+            "BaseToolAdapter",
+        ),
+        "EchoToolAdapter": (
+            "claude_mpm.services.mcp_gateway.tools.base_adapter",
+            "EchoToolAdapter",
+        ),
+        "CalculatorToolAdapter": (
+            "claude_mpm.services.mcp_gateway.tools.base_adapter",
+            "CalculatorToolAdapter",
+        ),
+        "SystemInfoToolAdapter": (
+            "claude_mpm.services.mcp_gateway.tools.base_adapter",
+            "SystemInfoToolAdapter",
+        ),
+        # Configuration management
+        "MCPConfiguration": (
+            "claude_mpm.services.mcp_gateway.config.configuration",
+            "MCPConfiguration",
+        ),
+        "MCPConfigLoader": (
+            "claude_mpm.services.mcp_gateway.config.config_loader",
+            "MCPConfigLoader",
+        ),
+        # Service registry
+        "MCPServiceRegistry": (
+            "claude_mpm.services.mcp_gateway.registry.service_registry",
+            "MCPServiceRegistry",
+        ),
+        # Exceptions
+        "MCPException": (
+            "claude_mpm.services.mcp_gateway.core.exceptions",
+            "MCPException",
+        ),
+        "MCPConfigurationError": (
+            "claude_mpm.services.mcp_gateway.core.exceptions",
+            "MCPConfigurationError",
+        ),
+        "MCPToolNotFoundError": (
+            "claude_mpm.services.mcp_gateway.core.exceptions",
+            "MCPToolNotFoundError",
+        ),
+        "MCPServerError": (
+            "claude_mpm.services.mcp_gateway.core.exceptions",
+            "MCPServerError",
+        ),
+    }
+
+    if name in _LAZY_IMPORTS:
+        module_path, attr_name = _LAZY_IMPORTS[name]
+        module = import_module(module_path)
+        return getattr(module, attr_name)
 
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
 

claude_mpm/services/mcp_gateway/auto_configure.py

@@ -20,7 +20,7 @@ DESIGN DECISIONS:
 import json
 import os
 import sys
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Dict, Optional
 
@@ -78,7 +78,7 @@ class MCPAutoConfigurator:
             return False
 
         try:
-            with open(self.claude_config_path) as f:
+            with self.claude_config_path.open() as f:
                 config = json.load(f)
 
             # Check if claude-mpm-gateway is configured
@@ -131,7 +131,7 @@ class MCPAutoConfigurator:
             return False
 
         try:
-            with open(self.preference_file) as f:
+            with self.preference_file.open() as f:
                 prefs = json.load(f)
             return prefs.get("asked", False)
         except (OSError, json.JSONDecodeError):
@@ -144,11 +144,11 @@ class MCPAutoConfigurator:
         prefs = {
             "asked": True,
             "choice": choice,
-            "timestamp": datetime.now().isoformat(),
+            "timestamp": datetime.now(timezone.utc).isoformat(),
         }
 
         try:
-            with open(self.preference_file, "w") as f:
+            with self.preference_file.open("w") as f:
                 json.dump(prefs, f, indent=2)
         except Exception as e:
             self.logger.debug(f"Could not save preference: {e}")
@@ -163,26 +163,29 @@ class MCPAutoConfigurator:
         Returns:
             True if user agrees, False if declines, None if timeout
         """
-        print("\n" + "=" * 60)
-        print("🔧 MCP Gateway Configuration")
-        print("=" * 60)
-        print("\nClaude MPM can automatically configure MCP Gateway for")
-        print("Claude Code integration. This enables advanced features:")
-        print("  • File analysis and summarization")
-        print("  • System diagnostics")
-        print("  • Ticket management")
-        print("  • And more...")
-        print("\nWould you like to configure it now? (y/n)")
-        print(f"(Auto-declining in {timeout} seconds)")
+        print("\n" + "=" * 60, file=sys.stderr)
+        print("🔧 MCP Gateway Configuration", file=sys.stderr)
+        print("=" * 60, file=sys.stderr)
+        print(
+            "\nClaude MPM can automatically configure MCP Gateway for", file=sys.stderr
+        )
+        print(
+            "Claude Code integration. This enables advanced features:", file=sys.stderr
+        )
+        print("  • File analysis and summarization", file=sys.stderr)
+        print("  • System diagnostics", file=sys.stderr)
+        print("  • Ticket management", file=sys.stderr)
+        print("  • And more...", file=sys.stderr)
+        print("\nWould you like to configure it now? (y/n)", file=sys.stderr)
+        print(f"(Auto-declining in {timeout} seconds)", file=sys.stderr)
 
         # Use threading for cross-platform timeout support
+        # Python 3.7+ has queue built-in - no need to check, we require 3.10+
+        import importlib.util
         import threading
 
-        try:
-            # Python 3.7+ has queue built-in
-            import queue
-        except ImportError:
-            # Python 2.x fallback
+        if importlib.util.find_spec("queue") is None:
+            # Extremely unlikely in Python 3.10+, but for completeness
             pass
 
         user_input = None
@@ -204,7 +207,7 @@ class MCPAutoConfigurator:
 
         if input_thread.is_alive():
             # Timed out
-            print("\n(Timed out - declining)")
+            print("\n(Timed out - declining)", file=sys.stderr)
             return None
         # Got input
         return user_input in ["y", "yes"]
@@ -221,7 +224,7 @@ class MCPAutoConfigurator:
             if self.claude_config_path.exists():
                 backup_path = self._create_backup()
                 if backup_path:
-                    print(f"✅ Backup created: {backup_path}")
+                    print(f"✅ Backup created: {backup_path}", file=sys.stderr)
 
             # Load or create configuration
             config = self._load_or_create_config()
@@ -233,7 +236,7 @@ class MCPAutoConfigurator:
             # Find claude-mpm executable
             executable = self._find_claude_mpm_executable()
             if not executable:
-                print("❌ Could not find claude-mpm executable")
+                print("❌ Could not find claude-mpm executable", file=sys.stderr)
                 return False
 
             # Configure MCP server
@@ -244,29 +247,31 @@ class MCPAutoConfigurator:
             }
 
             # Save configuration
-            with open(self.claude_config_path, "w") as f:
+            with self.claude_config_path.open("w") as f:
                 json.dump(config, f, indent=2)
 
-            print(f"✅ Configuration saved to: {self.claude_config_path}")
-            print("\n🎉 MCP Gateway configured successfully!")
-            print("\nNext steps:")
-            print("1. Restart Claude Code (if running)")
-            print("2. Look for the MCP icon in the interface")
-            print("3. Try @claude-mpm-gateway in a conversation")
+            print(
+                f"✅ Configuration saved to: {self.claude_config_path}", file=sys.stderr
+            )
+            print("\n🎉 MCP Gateway configured successfully!", file=sys.stderr)
+            print("\nNext steps:", file=sys.stderr)
+            print("1. Restart Claude Code (if running)", file=sys.stderr)
+            print("2. Look for the MCP icon in the interface", file=sys.stderr)
+            print("3. Try @claude-mpm-gateway in a conversation", file=sys.stderr)
 
             return True
 
         except Exception as e:
             self.logger.error(f"Auto-configuration failed: {e}")
-            print(f"❌ Configuration failed: {e}")
-            print("\nYou can configure manually with:")
-            print("  claude-mpm mcp install")
+            print(f"❌ Configuration failed: {e}", file=sys.stderr)
+            print("\nYou can configure manually with:", file=sys.stderr)
+            print("  claude-mpm mcp install", file=sys.stderr)
             return False
 
     def _create_backup(self) -> Optional[Path]:
         """Create backup of existing configuration."""
         try:
-            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            timestamp = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
             backup_path = self.claude_config_path.with_suffix(
                 f".backup.{timestamp}.json"
             )
@@ -284,7 +289,7 @@ class MCPAutoConfigurator:
         """Load existing config or create new one."""
         if self.claude_config_path.exists():
             try:
-                with open(self.claude_config_path) as f:
+                with self.claude_config_path.open() as f:
                     return json.load(f)
             except json.JSONDecodeError:
                 self.logger.warning("Existing config is invalid JSON, creating new")
@@ -345,8 +350,8 @@ class MCPAutoConfigurator:
         if user_choice:
             return self.auto_configure()
         if user_choice is False:  # User explicitly said no
-            print("\n📝 You can configure MCP later with:")
-            print("  claude-mpm mcp install")
+            print("\n📝 You can configure MCP later with:", file=sys.stderr)
+            print("  claude-mpm mcp install", file=sys.stderr)
         # If timeout (None), don't show additional message
         return False
 

claude_mpm/services/mcp_gateway/config/config_loader.py

@@ -97,7 +97,7 @@ class MCPConfigLoader:
                 self.logger.error(f"Configuration file not found: {expanded_path}")
                 return None
 
-            with open(expanded_path) as f:
+            with expanded_path.open() as f:
                 config = yaml.safe_load(f)
 
             self.logger.info(f"Configuration loaded from {expanded_path}")
@@ -143,7 +143,7 @@ class MCPConfigLoader:
                 import json
 
                 current[key] = json.loads(env_value)
-            except:
+            except Exception:
                 # Fall back to string value
                 current[key] = env_value
 
@@ -271,7 +271,7 @@ class MCPConfigLoader:
             expanded_path = path.expanduser()
             expanded_path.parent.mkdir(parents=True, exist_ok=True)
 
-            with open(expanded_path, "w") as f:
+            with expanded_path.open("w") as f:
                 yaml.dump(
                     MCPConfiguration.DEFAULT_CONFIG,
                     f,

claude_mpm/services/mcp_gateway/config/configuration.py

@@ -60,6 +60,23 @@ class MCPConfiguration(BaseMCPService, IMCPConfiguration):
                 "timeout_default": 30,  # seconds
                 "max_concurrent": 10,
             },
+            "external_services": {
+                "enabled": True,
+                "auto_install": True,
+                "services": [
+                    {
+                        "name": "mcp-vector-search",
+                        "package": "mcp-vector-search",
+                        "enabled": True,
+                        "auto_index": True,
+                    },
+                    {
+                        "name": "mcp-browser",
+                        "package": "mcp-browser",
+                        "enabled": True,
+                    },
+                ],
+            },
             "logging": {
                 "level": "INFO",
                 "file": "~/.claude/logs/mcp_gateway.log",
@@ -138,7 +155,7 @@ class MCPConfiguration(BaseMCPService, IMCPConfiguration):
                 self.log_warning(f"Configuration file not found: {config_path}")
                 return True  # Not an error, use defaults
 
-            with open(config_path) as f:
+            with config_path.open() as f:
                 if config_path.suffix in [".yaml", ".yml"]:
                     loaded_config = yaml.safe_load(f) or {}
                 else:
@@ -154,7 +171,9 @@ class MCPConfiguration(BaseMCPService, IMCPConfiguration):
             return True
 
         except yaml.YAMLError as e:
-            raise MCPConfigurationError(f"Failed to parse YAML configuration: {e}")
+            raise MCPConfigurationError(
+                f"Failed to parse YAML configuration: {e}"
+            ) from e
         except Exception as e:
             self.log_error(f"Failed to load configuration: {e}")
             return False
@@ -208,7 +227,7 @@ class MCPConfiguration(BaseMCPService, IMCPConfiguration):
                     import json
 
                     current[key] = json.loads(env_value)
-                except:
+                except Exception:
                     # Fall back to string value
                     current[key] = env_value
 
@@ -347,7 +366,7 @@ class MCPConfiguration(BaseMCPService, IMCPConfiguration):
             save_path = Path(save_path).expanduser()
             save_path.parent.mkdir(parents=True, exist_ok=True)
 
-            with open(save_path, "w") as f:
+            with save_path.open("w") as f:
                 yaml.dump(
                     self._config_data, f, default_flow_style=False, sort_keys=True
                 )

claude_mpm/services/mcp_gateway/core/__init__.py

@@ -5,7 +5,7 @@ MCP Gateway Core Module
 Core interfaces and base classes for the MCP Gateway service.
 """
 
-from .base import BaseMCPService, MCPServiceState
+from .base import BaseMCPService
 from .exceptions import (
     MCPCommunicationError,
     MCPConfigurationError,
@@ -38,7 +38,6 @@ __all__ = [
     # Exceptions
     "MCPException",
     "MCPServerError",
-    "MCPServiceState",
     "MCPToolNotFoundError",
     "MCPValidationError",
 ]

claude_mpm/services/mcp_gateway/core/base.py

@@ -8,25 +8,12 @@ Part of ISS-0034: Infrastructure Setup - MCP Gateway Project Foundation
 """
 
 import asyncio
-from enum import Enum
 from typing import Any, Dict, Optional
 
+from claude_mpm.core.enums import ServiceState
 from claude_mpm.services.core.base import BaseService
 
 
-class MCPServiceState(Enum):
-    """MCP service lifecycle states."""
-
-    UNINITIALIZED = "uninitialized"
-    INITIALIZING = "initializing"
-    INITIALIZED = "initialized"
-    STARTING = "starting"
-    RUNNING = "running"
-    STOPPING = "stopping"
-    STOPPED = "stopped"
-    ERROR = "error"
-
-
 class BaseMCPService(BaseService):
     """
     Base class for all MCP Gateway services.
@@ -53,7 +40,7 @@ class BaseMCPService(BaseService):
             config: Service-specific configuration
         """
         super().__init__(service_name or "MCPService", config)
-        self._state = MCPServiceState.UNINITIALIZED
+        self._state = ServiceState.UNINITIALIZED
         self._health_status = {
             "healthy": False,
             "state": self._state.value,
@@ -76,13 +63,13 @@ class BaseMCPService(BaseService):
         """
         async with self._state_lock:
             if self._state not in [
-                MCPServiceState.UNINITIALIZED,
-                MCPServiceState.STOPPED,
+                ServiceState.UNINITIALIZED,
+                ServiceState.STOPPED,
             ]:
                 self.log_warning(f"Cannot initialize from state {self._state.value}")
                 return False
 
-            self._state = MCPServiceState.INITIALIZING
+            self._state = ServiceState.INITIALIZING
             self.log_info("Initializing MCP service")
 
         try:
@@ -91,13 +78,13 @@ class BaseMCPService(BaseService):
 
             async with self._state_lock:
                 if success:
-                    self._state = MCPServiceState.INITIALIZED
+                    self._state = ServiceState.INITIALIZED
                     self._initialized = True
                     self._health_status["healthy"] = True
                     self._health_status["state"] = self._state.value
                     self.log_info("MCP service initialized successfully")
                 else:
-                    self._state = MCPServiceState.ERROR
+                    self._state = ServiceState.ERROR
                     self._health_status["healthy"] = False
                     self._health_status["state"] = self._state.value
                     self.log_error("MCP service initialization failed")
@@ -106,7 +93,7 @@ class BaseMCPService(BaseService):
 
         except Exception as e:
             async with self._state_lock:
-                self._state = MCPServiceState.ERROR
+                self._state = ServiceState.ERROR
                 self._health_status["healthy"] = False
                 self._health_status["state"] = self._state.value
                 self._health_status["details"]["error"] = str(e)
@@ -134,11 +121,11 @@ class BaseMCPService(BaseService):
             True if startup successful
         """
         async with self._state_lock:
-            if self._state != MCPServiceState.INITIALIZED:
+            if self._state != ServiceState.INITIALIZED:
                 self.log_warning(f"Cannot start from state {self._state.value}")
                 return False
 
-            self._state = MCPServiceState.STARTING
+            self._state = ServiceState.STARTING
             self.log_info("Starting MCP service")
 
         try:
@@ -146,12 +133,12 @@ class BaseMCPService(BaseService):
 
             async with self._state_lock:
                 if success:
-                    self._state = MCPServiceState.RUNNING
+                    self._state = ServiceState.RUNNING
                     self._health_status["healthy"] = True
                     self._health_status["state"] = self._state.value
                     self.log_info("MCP service started successfully")
                 else:
-                    self._state = MCPServiceState.ERROR
+                    self._state = ServiceState.ERROR
                     self._health_status["healthy"] = False
                     self._health_status["state"] = self._state.value
                     self.log_error("MCP service startup failed")
@@ -160,7 +147,7 @@ class BaseMCPService(BaseService):
 
         except Exception as e:
             async with self._state_lock:
-                self._state = MCPServiceState.ERROR
+                self._state = ServiceState.ERROR
                 self._health_status["healthy"] = False
                 self._health_status["state"] = self._state.value
                 self._health_status["details"]["error"] = str(e)
@@ -188,18 +175,18 @@ class BaseMCPService(BaseService):
         Subclasses should override _do_shutdown() for custom shutdown logic.
         """
         async with self._state_lock:
-            if self._state in [MCPServiceState.STOPPED, MCPServiceState.STOPPING]:
+            if self._state in [ServiceState.STOPPED, ServiceState.STOPPING]:
                 self.log_warning(f"Already in state {self._state.value}")
                 return
 
-            self._state = MCPServiceState.STOPPING
+            self._state = ServiceState.STOPPING
             self.log_info("Shutting down MCP service")
 
         try:
             await self._do_shutdown()
 
             async with self._state_lock:
-                self._state = MCPServiceState.STOPPED
+                self._state = ServiceState.STOPPED
                 self._shutdown = True
                 self._health_status["healthy"] = False
                 self._health_status["state"] = self._state.value
@@ -207,7 +194,7 @@ class BaseMCPService(BaseService):
 
         except Exception as e:
             async with self._state_lock:
-                self._state = MCPServiceState.ERROR
+                self._state = ServiceState.ERROR
                 self._health_status["healthy"] = False
                 self._health_status["state"] = self._state.value
                 self._health_status["details"]["error"] = str(e)
@@ -232,7 +219,7 @@ class BaseMCPService(BaseService):
         self.log_info("Restarting MCP service")
 
         # Shutdown if running
-        if self._state == MCPServiceState.RUNNING:
+        if self._state == ServiceState.RUNNING:
             await self.shutdown()
 
         # Re-initialize
@@ -279,10 +266,10 @@ class BaseMCPService(BaseService):
             healthy: Whether service is healthy
             details: Additional health details
         """
-        from datetime import datetime
+        from datetime import datetime, timezone
 
         self._health_status["healthy"] = healthy
-        self._health_status["last_check"] = datetime.now().isoformat()
+        self._health_status["last_check"] = datetime.now(timezone.utc).isoformat()
 
         if details:
             self._health_status["details"].update(details)