mcp-proxy-adapter 6.9.30__py3-none-any.whl → 6.9.32__py3-none-any.whl

mcp_proxy_adapter/core/app_factory.py

@@ -16,6 +16,7 @@ from fastapi import FastAPI
 from mcp_proxy_adapter.api.app import create_app
 from mcp_proxy_adapter.core.logging import setup_logging, get_global_logger
 from mcp_proxy_adapter.config import config
+
 # Built-in command registration is temporarily disabled in this startup path
 
 logger = get_global_logger()
@@ -72,9 +73,9 @@ async def create_and_run_server(
 
         try:
             from mcp_proxy_adapter.config import Config
-            config = Config()
-            config.load_from_file(str(config_file))
-            app_config = config.get_all()
+
+            config_instance = Config(config_path=str(config_file))
+            app_config = config_instance.config_data
             print(f"✅ Configuration loaded from: {config_path}")
 
             # Validate UUID configuration (mandatory)
@@ -92,14 +93,10 @@ async def create_and_run_server(
             print("✅ Configuration validation passed")
 
             # Debug: Check what config.get_all() actually returns
-            print(
-                f"🔍 Debug: config.get_all() keys: {list(app_config.keys())}"
-            )
+            print(f"🔍 Debug: config.get_all() keys: {list(app_config.keys())}")
             if "security" in app_config:
                 security_ssl = app_config["security"].get("ssl", {})
-                print(
-                    f"🔍 Debug: config.get_all() security.ssl: {security_ssl}"
-                )
+                print(f"🔍 Debug: config.get_all() security.ssl: {security_ssl}")
 
             # Debug: Check if root ssl section exists after loading
             if "ssl" in app_config:
@@ -113,7 +110,7 @@ async def create_and_run_server(
                     f"🔍 Debug: Root SSL section after loading: key_file={app_config['ssl'].get('key_file')}"
                 )
             else:
-                print(f"🔍 Debug: No root SSL section after loading")
+                print("🔍 Debug: No root SSL section after loading")
 
             # Debug: Check app_config immediately after get_all()
             if app_config and "ssl" in app_config:
@@ -131,11 +128,11 @@ async def create_and_run_server(
             # CRITICAL: Validate SSL configuration - NO FALLBACKS!
             if app_config and "ssl" in app_config:
                 ssl_config = app_config["ssl"]
-                ssl_enabled = ssl_config.get('enabled', False)
+                ssl_enabled = ssl_config.get("enabled", False)
                 protocol = app_config.get("server", {}).get("protocol", "http")
-                
+
                 print(f"🔍 Debug: SSL enabled={ssl_enabled}, protocol={protocol}")
-                
+
                 # CRITICAL CHECK: If SSL is enabled, protocol MUST be https or mtls
                 if ssl_enabled and protocol not in ["https", "mtls"]:
                     raise ValueError(
@@ -143,7 +140,7 @@ async def create_and_run_server(
                         f"Protocol MUST be 'https' or 'mtls' when SSL is enabled. "
                         f"Fix your configuration file."
                     )
-                
+
                 # CRITICAL CHECK: If protocol is https/mtls, SSL MUST be enabled
                 if protocol in ["https", "mtls"] and not ssl_enabled:
                     raise ValueError(
@@ -151,39 +148,39 @@ async def create_and_run_server(
                         f"SSL MUST be enabled when protocol is 'https' or 'mtls'. "
                         f"Fix your configuration file."
                     )
-                
+
                 # CRITICAL CHECK: If SSL is enabled, cert and key files MUST exist
                 if ssl_enabled:
-                    cert_file = ssl_config.get('cert_file')
-                    key_file = ssl_config.get('key_file')
-                    
+                    cert_file = ssl_config.get("cert_file")
+                    key_file = ssl_config.get("key_file")
+
                     if not cert_file or not key_file:
                         raise ValueError(
                             f"CRITICAL CONFIG ERROR: SSL is enabled but cert_file or key_file is missing. "
                             f"cert_file={cert_file}, key_file={key_file}. "
                             f"Fix your configuration file."
                         )
-                    
+
                     if not Path(cert_file).exists():
                         raise ValueError(
                             f"CRITICAL CONFIG ERROR: SSL certificate file does not exist: {cert_file}. "
                             f"Fix your configuration file or create the certificate."
                         )
-                    
+
                     if not Path(key_file).exists():
                         raise ValueError(
                             f"CRITICAL CONFIG ERROR: SSL key file does not exist: {key_file}. "
                             f"Fix your configuration file or create the key."
                         )
-                    
-                    print(f"✅ SSL configuration validated: cert={cert_file}, key={key_file}")
+
+                    print(
+                        f"✅ SSL configuration validated: cert={cert_file}, key={key_file}"
+                    )
 
             # Validate security framework configuration only if enabled
             security_config = app_config.get("security", {})
             if security_config.get("enabled", False):
-                framework = security_config.get(
-                    "framework", "mcp_security_framework"
-                )
+                framework = security_config.get("framework", "mcp_security_framework")
                 print(f"🔒 Security framework: {framework}")
 
                 # Debug: Check SSL config before validation
@@ -226,16 +223,14 @@ async def create_and_run_server(
             sys.exit(1)
     else:
         print("⚠️  No configuration file provided, using defaults")
-        app_config = config.get_all()
+        app_config = config.config_data
 
     # 2. Setup logging
     try:
         if log_config_path:
             log_config_file = Path(log_config_path)
             if not log_config_file.exists():
-                print(
-                    f"❌ Log configuration file not found: {log_config_path}"
-                )
+                print(f"❌ Log configuration file not found: {log_config_path}")
                 sys.exit(1)
             setup_logging(log_config_path=str(log_config_file))
             print(f"✅ Logging configured from: {log_config_path}")
@@ -278,12 +273,9 @@ async def create_and_run_server(
 
     # 5. Create server configuration
     # Get port from config if available, otherwise use default
-    server_port = (
-        app_config.get("server", {}).get("port", 8000) if app_config else 8000
-    )
+    server_port = app_config.get("server", {}).get("port", 8000) if app_config else 8000
     print(f"🔌 Port: {server_port}")
 
-
     server_config = {
         "host": host,
         "port": server_port,
@@ -324,13 +316,9 @@ async def create_and_run_server(
     # Check for SSL config in security section (fallback)
     if app_config and "security" in app_config:
         security_config = app_config["security"]
-        print(
-            f"🔍 Debug: security_config keys: {list(security_config.keys())}"
-        )
+        print(f"🔍 Debug: security_config keys: {list(security_config.keys())}")
         if "ssl" in security_config:
-            print(
-                f"🔍 Debug: SSL config found in security: {security_config['ssl']}"
-            )
+            print(f"🔍 Debug: SSL config found in security: {security_config['ssl']}")
             print(
                 f"🔍 Debug: SSL enabled: {security_config['ssl'].get('enabled', False)}"
             )
@@ -397,11 +385,9 @@ async def create_and_run_server(
 
         # Configure hypercorn
         config_hypercorn = hypercorn.config.Config()
-        config_hypercorn.bind = [
-            f"{server_config['host']}:{server_config['port']}"
-        ]
+        config_hypercorn.bind = [f"{server_config['host']}:{server_config['port']}"]
         config_hypercorn.loglevel = server_config.get("log_level", "info")
-        
+
         # Add SSL shutdown timeout to prevent SSL shutdown timeout errors
         config_hypercorn.ssl_handshake_timeout = 10.0
         config_hypercorn.keep_alive_timeout = 5.0
@@ -417,15 +403,11 @@ async def create_and_run_server(
             import ssl
 
             # Use the verify_mode from configuration, default to CERT_NONE
-            verify_mode = getattr(
-                ssl, server_config["verify_mode"], ssl.CERT_NONE
-            )
+            verify_mode = getattr(ssl, server_config["verify_mode"], ssl.CERT_NONE)
             config_hypercorn.verify_mode = verify_mode
 
         # Determine if SSL is enabled
-        ssl_enabled = any(
-            key in server_config for key in ["certfile", "keyfile"]
-        )
+        ssl_enabled = any(key in server_config for key in ["certfile", "keyfile"])
 
         if ssl_enabled:
             if verify_client:
@@ -433,9 +415,9 @@ async def create_and_run_server(
                     f"🔐 Starting external mTLS proxy with hypercorn (internal server on port {mtls_server.port if mtls_server else 'N/A'})..."
                 )
             else:
-                print(f"🔐 Starting HTTPS server with hypercorn...")
+                print("🔐 Starting HTTPS server with hypercorn...")
         else:
-            print(f"🌐 Starting HTTP server with hypercorn...")
+            print("🌐 Starting HTTP server with hypercorn...")
 
         # Final port check disabled in this refactor; rely on OS errors
 
@@ -457,6 +439,7 @@ async def create_and_run_server(
             print("🛑 Stopping mTLS server...")
             mtls_server.stop()
         import traceback
+
         traceback.print_exc()
         sys.exit(1)
     except Exception as e:
@@ -489,8 +472,8 @@ def validate_config_file(config_path: str) -> bool:
 
         # Try to load configuration to validate JSON format
         from mcp_proxy_adapter.config import Config
-        config = Config()
-        config.load_from_file(str(config_file))
+
+        Config(config_path=str(config_file))
         return True
 
     except Exception as e:

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.9.30.dist-info → mcp_proxy_adapter-6.9.32.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ mcp_proxy_adapter/config.py,sha256=Nj5Cpyt2_BHRCWF_TsdL6W5Eb7_yNe7WVsCNZSx2LT0,5
 mcp_proxy_adapter/custom_openapi.py,sha256=WY9JTPoi5uofaopU4tm703qQ8ak2qezPmk98dUyWm2U,1482
 mcp_proxy_adapter/main.py,sha256=K_ulceLTzo6fqJsr5J3AvBO-63q7sm-xyR6XUaQH0d8,10952
 mcp_proxy_adapter/openapi.py,sha256=N3iJ4h6vJKz_pjoHiJxM_mFEodsbz8aN3v0NVV7YX7w,12885
-mcp_proxy_adapter/version.py,sha256=lTERyxydTdH-2Ybchzz6ai7J8Ziz2hn8jWOGWEEjKL0,75
+mcp_proxy_adapter/version.py,sha256=ZOknzBzX6vOn3T1ee-kkR4_uOa-AYfSqrloJGp0FQZw,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=zvqMxMVx0YJ32Q6zFKhpyDdaF8BKVGokBxpwbqBTWmU,1921
 mcp_proxy_adapter/api/handlers.py,sha256=jNzWrks7throenjQ6salj4C8tBxIvx-QBhK9IkfixxM,6370
@@ -94,7 +94,7 @@ mcp_proxy_adapter/commands/registry/command_loader.py,sha256=OBRkKCtDHRxQGFgZKdu
 mcp_proxy_adapter/commands/registry/command_manager.py,sha256=dMQWKNwACiknHdECya2DIE8beZaeJDV4dpHid--Sk6Q,3979
 mcp_proxy_adapter/commands/registry/command_registry.py,sha256=XURwiKUoUNbzp32p1awtS7nedqO3RW8scy7qqzdBk3o,6410
 mcp_proxy_adapter/core/__init__.py,sha256=aKs8nj8jamwV8xwZgtwxmzPKUgCZincqGZHuMj7qki0,196
-mcp_proxy_adapter/core/app_factory.py,sha256=qydxVnkrwDkScph1xfteBJhtJaxpLKj1x5DcwG4ku6U,22624
+mcp_proxy_adapter/core/app_factory.py,sha256=rvNp2hXgUq6tI2U55R5ddVWxxD0FCxF5YY-sDFVsFP8,22201
 mcp_proxy_adapter/core/app_runner.py,sha256=7FF9MVdMiVpXpJcu-a8DhI-VstS0y_Ee5TF5HmrOry0,10670
 mcp_proxy_adapter/core/auth_validator.py,sha256=BuvGEHLvNU8Rv5wmdB8qd-TPlCDJF0cSwnWMHe9h18w,16565
 mcp_proxy_adapter/core/certificate_utils.py,sha256=Jeftf420a_tsBjOqUwZrK5azqrqkK10YFD0ll-lgWHo,7499
@@ -228,8 +228,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.30.dist-info/METADATA,sha256=Ajq0oP9spGq-C1BXZwJKPMBMsvz-89AioHOTrlwC7gk,8570
-mcp_proxy_adapter-6.9.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.30.dist-info/entry_points.txt,sha256=9nRLPijE8MJY-OmY0VnSvOH8VzGCUzVwOZT6ZJKMQYA,563
-mcp_proxy_adapter-6.9.30.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.30.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.32.dist-info/METADATA,sha256=dT9BHnVAHHuOyphK3Bz4G2P1lFW7j2tolEVHSJakP_E,8570
+mcp_proxy_adapter-6.9.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.32.dist-info/entry_points.txt,sha256=9nRLPijE8MJY-OmY0VnSvOH8VzGCUzVwOZT6ZJKMQYA,563
+mcp_proxy_adapter-6.9.32.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.32.dist-info/RECORD,,