mcp-proxy-adapter 6.9.18__py3-none-any.whl → 6.9.20__py3-none-any.whl

mcp_proxy_adapter/examples/generate_config.py

@@ -20,7 +20,7 @@ from config_builder import generate_complete_config
 
 # Import validation modules
 try:
-    from mcp_proxy_adapter.core.config_validator import ConfigValidator, ValidationLevel
+    from mcp_proxy_adapter.core.config_validator import ConfigValidator
     VALIDATION_AVAILABLE = True
 except ImportError:
     VALIDATION_AVAILABLE = False
@@ -57,8 +57,49 @@ def create_config_from_flags(
     Returns:
         Configuration dictionary
     """
-    # Use the simple config builder
-    return generate_complete_config(host, port)
+    # Start with basic configuration
+    config = generate_complete_config(host, port)
+    
+    # Set protocol
+    config["server"]["protocol"] = protocol
+    
+    # Configure SSL based on protocol
+    if protocol == "https":
+        config["ssl"]["enabled"] = True
+        config["ssl"]["cert_file"] = f"{cert_dir}/server.crt"
+        config["ssl"]["key_file"] = f"{key_dir}/server.key"
+    elif protocol == "mtls":
+        config["ssl"]["enabled"] = True
+        config["ssl"]["cert_file"] = f"{cert_dir}/server.crt"
+        config["ssl"]["key_file"] = f"{key_dir}/server.key"
+        config["ssl"]["ca_cert"] = f"{cert_dir}/ca.crt"
+    
+    # Configure security if token authentication is enabled
+    if token:
+        config["security"]["enabled"] = True
+        config["security"]["tokens"] = {
+            "admin": "admin-secret-key",
+            "user": "user-secret-key",
+            "readonly": "readonly-secret-key"
+        }
+        
+        if roles:
+            config["security"]["roles"] = {
+                "admin": ["read", "write", "delete", "admin"],
+                "user": ["read", "write"],
+                "readonly": ["read"]
+            }
+            config["security"]["roles_file"] = f"{output_dir}/roles.json"
+            config["roles"]["enabled"] = True
+            config["roles"]["config_file"] = f"{output_dir}/roles.json"
+    
+    # Configure proxy registration if enabled
+    if proxy_registration or auto_registration:
+        config["proxy_registration"]["enabled"] = True
+        config["proxy_registration"]["proxy_url"] = proxy_url
+        config["proxy_registration"]["server_id"] = server_id
+    
+    return config
 
 
 def save_config(config: Dict[str, Any], filename: str, output_dir: str, validate: bool = True) -> Path:
@@ -80,13 +121,9 @@ def save_config(config: Dict[str, Any], filename: str, output_dir: str, validate
         if results:
             print("⚠️  Validation issues found:")
             for result in results:
-                level_symbol = {
-                    ValidationLevel.ERROR: "❌",
-                    ValidationLevel.WARNING: "⚠️",
-                    ValidationLevel.INFO: "ℹ️"
-                }[result.level]
+                level_symbol = "❌" if result.level == "error" else "⚠️" if result.level == "warning" else "ℹ️"
                 print(f"  {level_symbol} {result.message}")
-                if result.suggestion:
+                if hasattr(result, 'suggestion') and result.suggestion:
                     print(f"     Suggestion: {result.suggestion}")
         else:
             print("✅ Configuration validation passed!")
@@ -106,15 +143,17 @@ def create_full_config_with_all_options(host: str = "127.0.0.1", port: int = 200
     Returns:
         Full configuration dictionary with all options
     """
-    builder = ConfigBuilder()
+    # Start with basic configuration
+    config = generate_complete_config(host, port)
     
-    # Set server configuration
-    builder.set_server(host=host, port=port)
-    
-    # Set to HTTP base (no SSL by default)
-    builder.set_protocol(Protocol.HTTP)
+    # Add protocol variants for easy switching
+    config["protocol_variants"] = {
+        "http": {"server": {"protocol": "http"}},
+        "https": {"server": {"protocol": "https"}},
+        "mtls": {"server": {"protocol": "mtls"}}
+    }
     
-    # Enable all authentication options but keep them disabled by default
+    # Add authentication configurations for easy switching
     api_keys = {
         "admin": "admin-secret-key",
         "user": "user-secret-key", 
@@ -126,21 +165,6 @@ def create_full_config_with_all_options(host: str = "127.0.0.1", port: int = 200
         "readonly": ["read"]
     }
     
-    # Set up all authentication methods but keep security disabled
-    builder.set_auth(AuthMethod.TOKEN_ROLES, api_keys=api_keys, roles=roles)
-    
-    # Disable security by default (will be enabled in tests)
-    config = builder.build()
-    config["security"]["enabled"] = False
-    
-    # Add protocol variants for easy switching
-    config["protocol_variants"] = {
-        "http": {"server": {"protocol": "http"}},
-        "https": {"server": {"protocol": "https"}},
-        "mtls": {"server": {"protocol": "mtls"}}
-    }
-    
-    # Add authentication configurations for easy switching
     config["auth_variants"] = {
         "none": {"security": {"enabled": False}},
         "token": {
@@ -164,7 +188,7 @@ def create_full_config_with_all_options(host: str = "127.0.0.1", port: int = 200
     return config
 
 
-def generate_all_configs(output_dir: str = "./configs", host: str = "127.0.0.1") -> None:
+def generate_all_configs(output_dir: str = "./configs", host: str = "127.0.0.1", validate: bool = True) -> None:
     """Generate all standard configurations."""
     configs = [
         # HTTP configurations
@@ -209,7 +233,7 @@ def generate_all_configs(output_dir: str = "./configs", host: str = "127.0.0.1")
         )
         
         # Save configuration with validation
-        config_file = save_config(config, config_name, output_dir, validate=not args.no_validate)
+        config_file = save_config(config, config_name, output_dir, validate=validate)
         generated_files.append(config_file)
         
         print(f"✅ Created {config_name}.json (port {port})")
@@ -338,18 +362,30 @@ Examples:
                 return 1
             
             print(f"🔍 Validating configuration file: {config_file}")
-            validator = ConfigValidator(config_file)
-            validator.load_config()
-            validator.validate_config()
-            validator.print_validation_report()
+            validator = ConfigValidator()
+            validator.load_config(config_file)
+            results = validator.validate_config()
             
-            return 0 if validator.get_validation_summary()["is_valid"] else 1
+            if results:
+                print("⚠️  Validation issues found:")
+                for result in results:
+                    level_symbol = "❌" if result.level == "error" else "⚠️" if result.level == "warning" else "ℹ️"
+                    print(f"  {level_symbol} {result.message}")
+                    if hasattr(result, 'suggestion') and result.suggestion:
+                        print(f"     Suggestion: {result.suggestion}")
+            else:
+                print("✅ Configuration validation passed!")
+            
+            # Check if there are any errors
+            errors = [r for r in results if r.level == "error"] if results else []
+            return 0 if not errors else 1
         
         elif args.all:
             # Generate all configurations
             generate_all_configs(
                 output_dir=args.output_dir,
-                host=args.host
+                host=args.host,
+                validate=not args.no_validate
             )
         elif args.full_config:
             # Generate full config with all options

mcp_proxy_adapter/main.py

@@ -49,6 +49,9 @@ def main():
     else:
         config = Config()
 
+    # Load configuration from file
+    config.load_config()
+
     # Validate UUID configuration (mandatory)
     validator = ConfigValidator(config.get_all())
     if not validator.validate_all():

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.9.18.dist-info → mcp_proxy_adapter-6.9.20.dist-info}/METADATA

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

@@ -2,9 +2,9 @@ mcp_proxy_adapter/__init__.py,sha256=iH0EBBsRj_cfZJpAIsgN_8tTdfefhnl6uUKHjLHhWDQ
 mcp_proxy_adapter/__main__.py,sha256=sq3tANRuTd18euamt0Bmn1sJeAyzXENZ5VvsMwbrDFA,579
 mcp_proxy_adapter/config.py,sha256=CSt0wiKz0GnN5sFKE2Sh8qspBb05bLl3ONMn79x_IF0,25410
 mcp_proxy_adapter/custom_openapi.py,sha256=AgUQM0OwP5DZkOr7eDjro-Kpjn1y1kPF60Jzmp4Ovuc,28238
-mcp_proxy_adapter/main.py,sha256=NFcSW7WaEnimRWe5zj28D0CH9otHlRZ92d2Um6XiGjE,10399
+mcp_proxy_adapter/main.py,sha256=FV1p-w_TTgdyfaVII5_VA8EAWnKCMmoR4nezcg2iSZg,10460
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=a7HlSk4laAuPAtigY2L_BRhTjgJMjM4d4beyVwYeu7A,75
+mcp_proxy_adapter/version.py,sha256=cU-yX-PaA0egHOSIRsMZ-BeRuLtW9wgyP4HPVao8arE,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=oyEK7GE-t8Dzt3_ZQDgxNAz48D3RscNLrY8syd2SjcA,39242
 mcp_proxy_adapter/api/handlers.py,sha256=NTZk34hP1US3bvAl0Z0DDrOEQBNk5T7jkt9AatI-5rc,10074
@@ -95,7 +95,7 @@ mcp_proxy_adapter/examples/create_test_configs.py,sha256=9TrvLa4-bWLPu0SB1JXwWuC
 mcp_proxy_adapter/examples/debug_request_state.py,sha256=Z3Gy2-fWtu7KIV9OkzGDLVz7TpL_h9V_99ica40uQBU,4489
 mcp_proxy_adapter/examples/debug_role_chain.py,sha256=GLVXC2fJUwP8UJnXHchd1t-H53cjWLJI3RqTPrKmaak,8750
 mcp_proxy_adapter/examples/demo_client.py,sha256=en2Rtb70B1sQmhL-vdQ4PDpKNNl_mfll2YCFT_jFCAg,10191
-mcp_proxy_adapter/examples/generate_config.py,sha256=h0_T9gi8ux6xf2nIF56VX1s2YBxLxQVIk3SbhmKsxEg,14977
+mcp_proxy_adapter/examples/generate_config.py,sha256=XCJamcGQByoYBeqpR54uo4Z0wbXECH37dxLWqofpV5c,16656
 mcp_proxy_adapter/examples/proxy_registration_example.py,sha256=Dz7ZQTmdgCgGxMqhKaJj-EJWmHb4BLav9nDTZHPSKmY,12995
 mcp_proxy_adapter/examples/required_certificates.py,sha256=YW9-V78oFiZ-FmHlGP-8FQFS569VdDVyq9hfvCv31pk,7133
 mcp_proxy_adapter/examples/run_example.py,sha256=yp-a6HIrSk3ddQmbn0KkuKwErId0aNfj028TE6U-zmY,2626
@@ -142,8 +142,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.18.dist-info/METADATA,sha256=5ulV-u6aXik73grFBKVFoFHsa7mOoLE1wP2D-nY0AoY,8511
-mcp_proxy_adapter-6.9.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.18.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.18.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.18.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.20.dist-info/METADATA,sha256=h_tPYHvipNnt2KjAkZmiloCRaeGPhzBBqu3sPLlt8eY,8511
+mcp_proxy_adapter-6.9.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.20.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.20.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.20.dist-info/RECORD,,