mcp-proxy-adapter 6.9.0__py3-none-any.whl → 6.9.2__py3-none-any.whl

mcp_proxy_adapter/core/config_validator.py

@@ -69,7 +69,7 @@ class ConfigValidator:
                 "log_file": str,
                 "error_log_file": str,
                 "access_log_file": str,
-                "max_file_size": str,
+                "max_file_size": (str, int),
                 "backup_count": int,
                 "format": str,
                 "date_format": str,
@@ -250,9 +250,29 @@ class ConfigValidator:
         
         return self.validation_results
     
+    def validate_all(self, config_data: Optional[Dict[str, Any]] = None) -> List[ValidationResult]:
+        """
+        Alias for validate_config method for backward compatibility.
+
+        Args:
+            config_data: Configuration data to validate. If None, uses loaded config.
+            
+        Returns:
+            List of validation results
+        """
+        return self.validate_config(config_data)
+    
     def _validate_required_sections(self) -> None:
-        """Validate that all required sections and keys are present."""
-        for section_name, required_keys in self.required_sections.items():
+        """Validate that all required sections and keys are present for enabled features only."""
+        # Always required sections (core functionality)
+        always_required = {
+            "server": self.required_sections["server"],
+            "logging": self.required_sections["logging"],
+            "commands": self.required_sections["commands"]
+        }
+        
+        # Check always required sections
+        for section_name, required_keys in always_required.items():
             if section_name not in self.config_data:
                 self.validation_results.append(ValidationResult(
                     level="error",
@@ -273,13 +293,70 @@ class ConfigValidator:
                 else:
                     # Validate type
                     value = section_data[key]
-                    if not isinstance(value, expected_type):
+                    if isinstance(expected_type, tuple):
+                        if not isinstance(value, expected_type):
+                            expected_names = [t.__name__ for t in expected_type]
+                            self.validation_results.append(ValidationResult(
+                                level="error",
+                                message=f"Key '{key}' in section '{section_name}' has wrong type. Expected {' or '.join(expected_names)}, got {type(value).__name__}",
+                                section=section_name,
+                                key=key
+                            ))
+                    else:
+                        if not isinstance(value, expected_type):
+                            self.validation_results.append(ValidationResult(
+                                level="error",
+                                message=f"Key '{key}' in section '{section_name}' has wrong type. Expected {expected_type.__name__}, got {type(value).__name__}",
+                                section=section_name,
+                                key=key
+                            ))
+        
+        # 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)
+            
+            if is_enabled and feature_name in self.required_sections:
+                section_name = feature_name
+                required_keys = self.required_sections[section_name]
+                
+                if section_name not in self.config_data:
+                    self.validation_results.append(ValidationResult(
+                        level="error",
+                        message=f"Required section '{section_name}' is missing for enabled feature",
+                        section=section_name
+                    ))
+                    continue
+                    
+                section_data = self.config_data[section_name]
+                for key, expected_type in required_keys.items():
+                    if key not in section_data:
                         self.validation_results.append(ValidationResult(
                             level="error",
-                            message=f"Key '{key}' in section '{section_name}' has wrong type. Expected {expected_type.__name__}, got {type(value).__name__}",
+                            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]
+                        if isinstance(expected_type, tuple):
+                            if not isinstance(value, expected_type):
+                                expected_names = [t.__name__ for t in expected_type]
+                                self.validation_results.append(ValidationResult(
+                                    level="error",
+                                    message=f"Key '{key}' in section '{section_name}' has wrong type. Expected {' or '.join(expected_names)}, got {type(value).__name__}",
+                                    section=section_name,
+                                    key=key
+                                ))
+                        else:
+                            if not isinstance(value, expected_type):
+                                self.validation_results.append(ValidationResult(
+                                    level="error",
+                                    message=f"Key '{key}' in section '{section_name}' has wrong type. Expected {expected_type.__name__}, got {type(value).__name__}",
+                                    section=section_name,
+                                    key=key
+                                ))
     
     def _validate_feature_flags(self) -> None:
         """Validate feature flags and their dependencies."""
@@ -333,7 +410,7 @@ class ConfigValidator:
                 key="protocol"
             ))
             return
-            
+
         requirements = self.protocol_requirements[protocol]
         
         # Check SSL requirements
@@ -461,7 +538,7 @@ class ConfigValidator:
                 if auth_method == "certificate":
                     cert_file = self._get_nested_value("proxy_registration.certificate.cert_file")
                     key_file = self._get_nested_value("proxy_registration.certificate.key_file")
-                    if not cert_file or not key_file:
+            if not cert_file or not key_file:
                         self.validation_results.append(ValidationResult(
                             level="error",
                             message="Certificate authentication is enabled but certificate files are not specified",
@@ -772,8 +849,8 @@ class ConfigValidator:
                         section=section,
                         key=key
                     ))
-                    return
-            
+            return
+
             # Check CA certificate expiration
             now = datetime.now(timezone.utc)
             not_after = ca_cert.not_valid_after.replace(tzinfo=timezone.utc)
@@ -870,8 +947,8 @@ class ConfigValidator:
                         key="cert_file",
                         suggestion="Ensure the certificate and private key are from the same key pair"
                     ))
-                    return
-            
+            return
+
             # If CA certificate is provided, validate certificate chain
             if ca_cert_file and os.path.exists(ca_cert_file):
                 self._validate_certificate_chain(cert_file, ca_cert_file, section)

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.9.0.dist-info → mcp_proxy_adapter-6.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.0
+Version: 6.9.2
 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.0.dist-info → mcp_proxy_adapter-6.9.2.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=yX54-cNu3WDv2Y6PxrAvGEH5Ju4EUsUaVQ0KC0Y_zqk,74
+mcp_proxy_adapter/version.py,sha256=vuzTrRHSwgcLMySpJ4TEb05VMX9YheQ9F8Ky7MCpH4g,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,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=jsTZJA8oxWtmbDAoTfrQX38e6pZ9RIVepwWlk8gP91c,43873
+mcp_proxy_adapter/core/config_validator.py,sha256=HdSsXNfieqhBkaQdpRU1Dx2-I7NmBtaoozvR46yTUWg,47937
 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/logging.py,sha256=VIpiC6QTGLukRjiJoVpq3VEoLKhUeLNl8IdfljpW6ZU,9654
@@ -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.0.dist-info/METADATA,sha256=uEnRinAvORlAl_2fXmaDEt8Hy8UuwNniFTw-sijCn1s,8510
-mcp_proxy_adapter-6.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.0.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.0.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.0.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.2.dist-info/METADATA,sha256=VcF7hcY89nQtaROg25aeYmkPC_PAAd98ZhYFevRUBtk,8510
+mcp_proxy_adapter-6.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.2.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.2.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.2.dist-info/RECORD,,