mcp-proxy-adapter 6.9.15__py3-none-any.whl → 6.9.16__py3-none-any.whl

mcp_proxy_adapter/api/app.py

@@ -116,12 +116,13 @@ def _determine_registration_url(config: Dict[str, Any]) -> str:
     return server_url
 
 
-def create_lifespan(config_path: Optional[str] = None):
+def create_lifespan(config_path: Optional[str] = None, current_config: Optional[Dict[str, Any]] = None):
     """
     Create lifespan manager for the FastAPI application.
 
     Args:
         config_path: Path to configuration file (optional)
+        current_config: Current configuration data (optional)
 
     Returns:
         Lifespan context manager
@@ -146,7 +147,17 @@ def create_lifespan(config_path: Optional[str] = None):
         # Compute server_url EARLY and inject into registration manager so
         # that reload_system (which may perform registration) uses the correct
         # externally reachable address.
-        server_config = current_config.get("server")
+        # Use current_config from closure or fallback to global config
+        config_to_use = current_config
+        if config_to_use is None:
+            # Fallback: try to get config from global instance
+            try:
+                from mcp_proxy_adapter.config import get_config
+                config_to_use = get_config().get_all()
+            except Exception:
+                config_to_use = {}
+        
+        server_config = config_to_use.get("server")
         if not server_config:
             raise ValueError("server configuration is required")
         server_host = server_config.get("host")
@@ -159,10 +170,6 @@ def create_lifespan(config_path: Optional[str] = None):
         # Check port availability BEFORE starting registration manager
         from mcp_proxy_adapter.core.utils import check_port_availability, handle_port_conflict
         
-        server_config = config.get("server", {})
-        server_host = server_config.get("host", "0.0.0.0")
-        server_port = server_config.get("port", 8000)
-        
         print(f"🔍 Checking external server port availability: {server_host}:{server_port}")
         if not check_port_availability(server_host, server_port):
             print(f"❌ CRITICAL: External server port {server_port} is occupied")
@@ -171,7 +178,7 @@ def create_lifespan(config_path: Optional[str] = None):
         print(f"✅ External server port {server_port} is available")
 
         # Determine registration URL using unified logic
-        early_server_url = _determine_registration_url(config)
+        early_server_url = _determine_registration_url(config_to_use)
         try:
             from mcp_proxy_adapter.core.proxy_registration import (
                 register_with_proxy,
@@ -190,10 +197,20 @@ def create_lifespan(config_path: Optional[str] = None):
             logger.error(f"Failed to initialize async registration: {e}")
 
         # Initialize system using unified logic (may perform registration)
+        # Set global config for reload_system
+        from mcp_proxy_adapter.config import Config
+        config_obj = Config()
+        config_obj.config_data = config_to_use
+        
+        # Set global config for command registry
+        from mcp_proxy_adapter.config import get_config
+        global_config = get_config()
+        global_config.config_data = config_to_use
+        
         if config_path:
-            init_result = await registry.reload_system(config_path=config_path)
+            init_result = await registry.reload_system(config_path=config_path, config_obj=config_obj)
         else:
-            init_result = await registry.reload_system()
+            init_result = await registry.reload_system(config_obj=config_obj)
 
         logger.info(
             f"Application started with {init_result['total_commands']} commands registered"
@@ -566,7 +583,7 @@ def create_app(
         version=app_version,
         docs_url="/docs",
         redoc_url="/redoc",
-        lifespan=create_lifespan(config_path),
+        lifespan=create_lifespan(config_path, current_config),
     )
     
     # CRITICAL FIX: Register commands immediately during app creation

mcp_proxy_adapter/commands/command_registry.py

@@ -659,7 +659,7 @@ class CommandRegistry:
         self._loaded_commands.clear()
         self._instances.clear()
 
-    async def reload_system(self, config_path: Optional[str] = None) -> Dict[str, Any]:
+    async def reload_system(self, config_path: Optional[str] = None, config_obj: Optional[Any] = None) -> Dict[str, Any]:
         """
         Universal method for system initialization and reload.
         This method should be used both at startup and during reload.
@@ -675,13 +675,16 @@ class CommandRegistry:
         )
 
         # Step 1: Load configuration (preserve previous config for soft-fail)
-        previous_config = config.get_all()
+        if config_obj is None:
+            config_obj = config
+            
+        previous_config = config_obj.get_all()
         try:
             if config_path:
-                config.load_from_file(config_path)
+                config_obj.load_from_file(config_path)
                 logger.info(f"✅ Configuration loaded from: {config_path}")
             else:
-                config.load_config()
+                config_obj.load_config()
                 logger.info("✅ Configuration loaded from default path")
 
             config_reloaded = True
@@ -694,14 +697,14 @@ class CommandRegistry:
             from mcp_proxy_adapter.core.config_validator import ConfigValidator
 
             validator = ConfigValidator()
-            validation = validator.validate(config.get_all())
+            validation = validator.validate(config_obj.get_all())
             if not validation.is_valid:
                 logger.error("⚠️ Configuration validation failed during reload:")
                 for err in validation.errors:
                     logger.error(f"  - {err}")
                 # Do NOT exit on reload; restore previous configuration
                 try:
-                    config.config_data = previous_config
+                    config_obj.config_data = previous_config
                     config_reloaded = False
                     logger.error("ℹ️ Restored previous configuration due to validation errors")
                 except Exception as restore_ex:

mcp_proxy_adapter/core/config_validator.py

@@ -341,13 +341,18 @@ class ConfigValidator:
                     
                 section_data = self.config_data[section_name]
                 for key, expected_type in required_keys.items():
+                    # Check if key allows None (optional)
+                    is_optional = isinstance(expected_type, tuple) and type(None) in expected_type
+                    
                     if key not in section_data:
-                        self.validation_results.append(ValidationResult(
-                            level="error",
-                            message=f"Required key '{key}' is missing in section '{section_name}' for enabled feature",
-                            section=section_name,
-                            key=key
-                        ))
+                        # Only report error if key is not optional
+                        if not is_optional:
+                            self.validation_results.append(ValidationResult(
+                                level="error",
+                                message=f"Required key '{key}' is missing in section '{section_name}' for enabled feature",
+                                section=section_name,
+                                key=key
+                            ))
                     else:
                         # Validate type
                         value = section_data[key]
@@ -535,7 +540,11 @@ class ConfigValidator:
                 ])
         
         for file_key in file_keys:
-            file_path = self._get_nested_value(file_key)
+            # Skip if the key doesn't exist in the configuration
+            if not self._has_nested_key(file_key):
+                continue
+                
+            file_path = self._get_nested_value_safe(file_key)
             if file_path and not os.path.exists(file_path):
                 # Check if this is a required file based on enabled features
                 is_required = self._is_file_required_for_enabled_features(file_key)
@@ -685,15 +694,10 @@ class ConfigValidator:
             else:
                 key_file = self._get_nested_value("ssl.key_file")
             
-            if not self._has_nested_key("ssl.ca_cert"):
-                self.validation_results.append(ValidationResult(
-                    level="error",
-                    message="SSL is enabled but ca_cert is not specified",
-                    section="ssl",
-                    key="ca_cert"
-                ))
-            else:
-                ca_cert = self._get_nested_value("ssl.ca_cert")
+            # CA cert is optional for HTTPS but may be required for mTLS with client verification
+            ca_cert = None
+            if self._has_nested_key("ssl.ca_cert"):
+                ca_cert = self._get_nested_value_safe("ssl.ca_cert")
             
             # Check certificate file
             if not cert_file:

mcp_proxy_adapter/version.py

@@ -2,4 +2,4 @@
 Version information for MCP Proxy Adapter.
 """
 
-__version__ = "6.9.15"
+__version__ = "6.9.16"

{mcp_proxy_adapter-6.9.15.dist-info → mcp_proxy_adapter-6.9.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.15
+Version: 6.9.16
 Summary: Powerful JSON-RPC microservices framework with built-in security, authentication, and proxy registration
 Home-page: https://github.com/maverikod/mcp-proxy-adapter
 Author: Vasiliy Zdanovskiy

{mcp_proxy_adapter-6.9.15.dist-info → mcp_proxy_adapter-6.9.16.dist-info}/RECORD

@@ -4,9 +4,9 @@ mcp_proxy_adapter/config.py,sha256=ow9zL4fRK6vr0ZYukUIGcHo2VKup9NCJqflrDDeGFQU,2
 mcp_proxy_adapter/custom_openapi.py,sha256=XRviX-C-ZkSKdBhORhDTdeN_1FWyEfXZADiASft3t9I,28149
 mcp_proxy_adapter/main.py,sha256=NFcSW7WaEnimRWe5zj28D0CH9otHlRZ92d2Um6XiGjE,10399
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=wNd8p-JNrRUaPPjPgiZdeLFjvBYBXlFIAoT2Vcww0L4,75
+mcp_proxy_adapter/version.py,sha256=5LFX-sQkllGH3WMs3H7fc5U7YusbuSm8_dE4BGqPip8,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_proxy_adapter/api/app.py,sha256=FoZ6YU_ZbvWmg_1nz9TQoyu7urd-tDybdLAGrM-moY4,37556
+mcp_proxy_adapter/api/app.py,sha256=5XGhli2MClGfDetSaAhK8oXe7erzUoC4ISytVWIjDbI,38364
 mcp_proxy_adapter/api/handlers.py,sha256=X-hcMNVeTAu4yVkKJEChEsj2bFptUS6sLNN-Wysjkow,10011
 mcp_proxy_adapter/api/schemas.py,sha256=mevUvQnYgWQfkJAs3-vq3HalBzh6-Saa-Au1VVf0peE,12377
 mcp_proxy_adapter/api/tool_integration.py,sha256=AeUyvJVN-c3FrX5fHdagHL51saRH5d1ZKqc2YEx0rTE,10147
@@ -29,7 +29,7 @@ mcp_proxy_adapter/commands/builtin_commands.py,sha256=8kYLWIr4JvhZtqaVM9Jhqr_-yS
 mcp_proxy_adapter/commands/catalog_manager.py,sha256=1DLvjt9RVMmeNZyynd-frk8gYkdgGJYyBXg6uWTJ16k,34873
 mcp_proxy_adapter/commands/cert_monitor_command.py,sha256=phSms8EYOn1RqSp7na6jw0S1bLRrilmYZIFXVepVFyU,23687
 mcp_proxy_adapter/commands/certificate_management_command.py,sha256=TDoGV2mnEz1HaJiHsxAO_IvtSinVwp0s_av5oIgmRqk,23225
-mcp_proxy_adapter/commands/command_registry.py,sha256=jsvGu50nwQdBCBAZ4i2Kn88RO0eETYT4WY1wwQlJGNw,37517
+mcp_proxy_adapter/commands/command_registry.py,sha256=NpVUCj78M_9BlxlJSAn0v_Mq7sRgmXDqWxAS32hOO7E,37647
 mcp_proxy_adapter/commands/config_command.py,sha256=PWX1OhKAmjlc8CSy4-sImdvGeSNgDNyv30Y-P5iZp9g,3767
 mcp_proxy_adapter/commands/dependency_container.py,sha256=mvPob62lQ-mKRbAA9aL3L5gOT9_4V2Vy2cGoup2S840,3239
 mcp_proxy_adapter/commands/dependency_manager.py,sha256=lXgtrhCiQhy9Y-QpU_RWRg2d0VYy5msoNQPUjPOcOc8,8245
@@ -62,7 +62,7 @@ mcp_proxy_adapter/core/client.py,sha256=qIbPl8prEwK2U65kl-vGJW2_imo1E4i6HxG_VpPe
 mcp_proxy_adapter/core/client_manager.py,sha256=yD8HZJlOwmDbVU49YfzSbh1XZ-Vib8qfcLVAaH03Jdg,8832
 mcp_proxy_adapter/core/client_security.py,sha256=siUaYorcDbpZsEIKgLfg-jBKkp7z_Er8wsO63mDD3Is,13127
 mcp_proxy_adapter/core/config_converter.py,sha256=Wnnsrbw7DxtgDfLG-IyyzK-hkKu0_1yp7-7dW87tu_4,17422
-mcp_proxy_adapter/core/config_validator.py,sha256=B5Tu8nE_iSvB1jFJ6qseOZrUpd0QoK7phU9Sznv1HDI,54858
+mcp_proxy_adapter/core/config_validator.py,sha256=-pvOeh_7srlpxzTQ7TzsPcEbBzSaltFoPJPgJjcX-zA,55179
 mcp_proxy_adapter/core/crl_utils.py,sha256=Jnwq2UN52IoCDZCwByRP3XNMOJexftb-mVaH6zes6Fc,11706
 mcp_proxy_adapter/core/errors.py,sha256=CyhQgvMt0ooQjONa65XRBJ44y-l-E5_ES4KOuRvIpBk,8557
 mcp_proxy_adapter/core/logging.py,sha256=dplInPvL4Ff4P0cRDszOiCcFzwu7NXAw2qkBB2OW7_E,8452
@@ -137,8 +137,8 @@ mcp_proxy_adapter/schemas/base_schema.json,sha256=v9G9cGMd4dRhCZsOQ_FMqOi5VFyVbI
 mcp_proxy_adapter/schemas/openapi_schema.json,sha256=C3yLkwmDsvnLW9B5gnKKdBGl4zxkeU-rEmjTrNVsQU0,8405
 mcp_proxy_adapter/schemas/roles.json,sha256=pgf_ZyqKyXbfGUxvobpiLiSJz9zzxrMuoVWEkEpz3N8,764
 mcp_proxy_adapter/schemas/roles_schema.json,sha256=deHgI7L6GwfBXacOlNtDgDJelDThppClC3Ti4Eh8rJY,5659
-mcp_proxy_adapter-6.9.15.dist-info/METADATA,sha256=6tBPggVIw3Pa8iQmsEPd0kW7mFhW1uAv1HHD5adIop4,8511
-mcp_proxy_adapter-6.9.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.15.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.15.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.15.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.16.dist-info/METADATA,sha256=7B2rZRfRiPEOw4DmLfr-KfrLaLXbfYI6VecB1ocsoSs,8511
+mcp_proxy_adapter-6.9.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.16.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.16.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.16.dist-info/RECORD,,