mcp-proxy-adapter 6.9.3__py3-none-any.whl → 6.9.5__py3-none-any.whl

mcp_proxy_adapter/core/config_validator.py

@@ -27,8 +27,8 @@ class ValidationLevel(Enum):
     INFO = "info"
 
 
-# Import ValidationResult from errors to avoid circular imports
-from .errors import ValidationResult
+# Import ValidationResult and exceptions from errors to avoid circular imports
+from .errors import ValidationResult, MissingConfigKeyError
 
 
 class ConfigValidator:
@@ -314,7 +314,7 @@ class ConfigValidator:
         # Check conditional sections based on feature flags
         for feature_name, feature_config in self.feature_flags.items():
             enabled_key = feature_config["enabled_key"]
-            is_enabled = self._get_nested_value(enabled_key, False)
+            is_enabled = self._get_nested_value_safe(enabled_key, False)
             
             if is_enabled and feature_name in self.required_sections:
                 section_name = feature_name
@@ -362,7 +362,7 @@ class ConfigValidator:
         """Validate feature flags and their dependencies."""
         for feature_name, feature_config in self.feature_flags.items():
             enabled_key = feature_config["enabled_key"]
-            is_enabled = self._get_nested_value(enabled_key, False)
+            is_enabled = self._get_nested_value_safe(enabled_key, False)
             
             if is_enabled:
                 # Check dependencies
@@ -400,7 +400,7 @@ class ConfigValidator:
     
     def _validate_protocol_requirements(self) -> None:
         """Validate protocol-specific requirements."""
-        protocol = self._get_nested_value("server.protocol", "http")
+        protocol = self._get_nested_value_safe("server.protocol", "http")
         
         if protocol not in self.protocol_requirements:
             self.validation_results.append(ValidationResult(
@@ -415,7 +415,7 @@ class ConfigValidator:
         
         # Check SSL requirements
         if requirements["ssl_enabled"]:
-            ssl_enabled = self._get_nested_value("ssl.enabled", False)
+            ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
             if not ssl_enabled:
                 self.validation_results.append(ValidationResult(
                     level="error",
@@ -444,7 +444,7 @@ class ConfigValidator:
         
         # Check client verification requirements
         if requirements["client_verification"]:
-            verify_client = self._get_nested_value("transport.ssl.verify_client", False)
+            verify_client = self._get_nested_value_safe("transport.ssl.verify_client", False)
             if not verify_client:
                 self.validation_results.append(ValidationResult(
                     level="error",
@@ -489,13 +489,13 @@ class ConfigValidator:
     
     def _validate_security_consistency(self) -> None:
         """Validate security configuration consistency."""
-        security_enabled = self._get_nested_value("security.enabled", False)
+        security_enabled = self._get_nested_value_safe("security.enabled", False)
         
         if security_enabled:
             # Check if authentication is properly configured
-            tokens = self._get_nested_value("security.tokens", {})
-            roles = self._get_nested_value("security.roles", {})
-            roles_file = self._get_nested_value("security.roles_file")
+            tokens = self._get_nested_value_safe("security.tokens", {})
+            roles = self._get_nested_value_safe("security.roles", {})
+            roles_file = self._get_nested_value_safe("security.roles_file")
             
             has_tokens = bool(tokens and any(tokens.values()))
             has_roles = bool(roles and any(roles.values()))
@@ -520,7 +520,7 @@ class ConfigValidator:
     
     def _validate_proxy_registration(self) -> None:
         """Validate proxy registration configuration."""
-        registration_enabled = self._get_nested_value("proxy_registration.enabled", False)
+        registration_enabled = self._get_nested_value_safe("proxy_registration.enabled", False)
         
         if registration_enabled:
             proxy_url = self._get_nested_value("proxy_registration.proxy_url")
@@ -533,7 +533,7 @@ class ConfigValidator:
                 ))
             
             # Check authentication method consistency
-            auth_method = self._get_nested_value("proxy_registration.auth_method", "none")
+            auth_method = self._get_nested_value_safe("proxy_registration.auth_method", "none")
             if auth_method != "none":
                 if auth_method == "certificate":
                     cert_file = self._get_nested_value("proxy_registration.certificate.cert_file")
@@ -557,7 +557,7 @@ class ConfigValidator:
     
     def _validate_ssl_configuration(self) -> None:
         """Validate SSL configuration with detailed certificate validation."""
-        ssl_enabled = self._get_nested_value("ssl.enabled", False)
+        ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
         
         if ssl_enabled:
             cert_file = self._get_nested_value("ssl.cert_file")
@@ -621,7 +621,7 @@ class ConfigValidator:
     
     def _validate_roles_configuration(self) -> None:
         """Validate roles configuration."""
-        roles_enabled = self._get_nested_value("roles.enabled", False)
+        roles_enabled = self._get_nested_value_safe("roles.enabled", False)
         
         if roles_enabled:
             config_file = self._get_nested_value("roles.config_file")
@@ -640,8 +640,8 @@ class ConfigValidator:
                     key="config_file"
                 ))
     
-    def _get_nested_value(self, key: str, default: Any = None) -> Any:
-        """Get value from nested dictionary using dot notation."""
+    def _get_nested_value(self, key: str) -> Any:
+        """Get value from nested dictionary using dot notation. Raises exception if key not found."""
         keys = key.split(".")
         value = self.config_data
         
@@ -649,7 +649,7 @@ class ConfigValidator:
             if isinstance(value, dict) and k in value:
                 value = value[k]
             else:
-                return default
+                raise MissingConfigKeyError(k, ".".join(keys[:keys.index(k)]))
                 
         return value
     
@@ -666,11 +666,18 @@ class ConfigValidator:
                 
         return True
     
+    def _get_nested_value_safe(self, key: str, default: Any = None) -> Any:
+        """Get value from nested dictionary using dot notation with fallback."""
+        try:
+            return self._get_nested_value(key)
+        except MissingConfigKeyError:
+            return default
+    
     def _is_file_required_for_enabled_features(self, file_key: str) -> bool:
         """Check if file is required based on enabled features."""
         for feature_name, feature_config in self.feature_flags.items():
             enabled_key = feature_config["enabled_key"]
-            is_enabled = self._get_nested_value(enabled_key, False)
+            is_enabled = self._get_nested_value_safe(enabled_key, False)
             
             if is_enabled and file_key in feature_config["required_files"]:
                 return True

mcp_proxy_adapter/core/errors.py

@@ -257,3 +257,55 @@ class ConfigError(MicroserviceError):
                 error_messages.append(error_msg)
         
         return "\n".join(error_messages)
+
+
+class MissingConfigKeyError(ConfigError):
+    """Missing required configuration key."""
+    
+    def __init__(self, key: str, section: str = None):
+        location = f"{section}.{key}" if section else key
+        message = f"Required configuration key '{location}' is missing"
+        super().__init__(message)
+        self.key = key
+        self.section = section
+
+
+class InvalidConfigValueError(ConfigError):
+    """Invalid configuration value."""
+    
+    def __init__(self, key: str, value: Any, expected_type: str, section: str = None):
+        location = f"{section}.{key}" if section else key
+        message = f"Invalid value for '{location}': got {type(value).__name__}, expected {expected_type}"
+        super().__init__(message)
+        self.key = key
+        self.section = section
+        self.value = value
+        self.expected_type = expected_type
+
+
+class MissingConfigSectionError(ConfigError):
+    """Missing required configuration section."""
+    
+    def __init__(self, section: str):
+        message = f"Required configuration section '{section}' is missing"
+        super().__init__(message)
+        self.section = section
+
+
+class MissingConfigFileError(ConfigError):
+    """Missing configuration file."""
+    
+    def __init__(self, file_path: str):
+        message = f"Configuration file '{file_path}' does not exist"
+        super().__init__(message)
+        self.file_path = file_path
+
+
+class InvalidConfigFileError(ConfigError):
+    """Invalid configuration file format."""
+    
+    def __init__(self, file_path: str, reason: str):
+        message = f"Invalid configuration file '{file_path}': {reason}"
+        super().__init__(message)
+        self.file_path = file_path
+        self.reason = reason

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.9.3.dist-info → mcp_proxy_adapter-6.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.3
+Version: 6.9.5
 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.3.dist-info → mcp_proxy_adapter-6.9.5.dist-info}/RECORD

@@ -4,7 +4,7 @@ mcp_proxy_adapter/config.py,sha256=1Ngxri2IPGoytYdCF5pXzbLUXsWcf6qYENkaDkAppg0,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=tV-lq3hMWpVSeNSP5O7fD51zBeh0HmU_VQ0eSm_1AWw,74
+mcp_proxy_adapter/version.py,sha256=H4y12LYc2zqn1jp-HbYjiwhKAaPPybDzCaf9Sl6SshU,74
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=PQ1Ch5ydJIHp3Z6gcMCzKkTsXPQAuZ9weHtQ-EXnNGY,37134
 mcp_proxy_adapter/api/handlers.py,sha256=X-hcMNVeTAu4yVkKJEChEsj2bFptUS6sLNN-Wysjkow,10011
@@ -62,9 +62,9 @@ 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=aYUznU9DYCFf71WEgp2dcxtSLdQ9XmrbZgZPyeFLyXY,47913
+mcp_proxy_adapter/core/config_validator.py,sha256=hEl1w2Ab_GZeGWNdGOVjzFVFgbzDhz3EvAsrENDXwd4,48370
 mcp_proxy_adapter/core/crl_utils.py,sha256=Jnwq2UN52IoCDZCwByRP3XNMOJexftb-mVaH6zes6Fc,11706
-mcp_proxy_adapter/core/errors.py,sha256=uXm0zslc1iyvuu-aEfX5euEHPWaQn8LZUwgQGKVWe8U,6825
+mcp_proxy_adapter/core/errors.py,sha256=CyhQgvMt0ooQjONa65XRBJ44y-l-E5_ES4KOuRvIpBk,8557
 mcp_proxy_adapter/core/logging.py,sha256=VIpiC6QTGLukRjiJoVpq3VEoLKhUeLNl8IdfljpW6ZU,9654
 mcp_proxy_adapter/core/mtls_asgi.py,sha256=tvk0P9024s18dcCHY9AaQIecT4ojOTv21EuQWXwooU0,5200
 mcp_proxy_adapter/core/mtls_asgi_app.py,sha256=DT_fTUH1RkvBa3ThbyCyNb-XUHyCb4DqaKA1gcZC6z4,6538
@@ -135,8 +135,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.3.dist-info/METADATA,sha256=OYA3fcomK5vH3jssummdjrsIQuTS2DI0tJCJksIzpqg,8510
-mcp_proxy_adapter-6.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.3.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.3.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.3.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.5.dist-info/METADATA,sha256=z40vgZzi2X2_tKG77uK2up95EKM9hKFfnDp9eT8vMAM,8510
+mcp_proxy_adapter-6.9.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.5.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.5.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.5.dist-info/RECORD,,