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

mcp_proxy_adapter/api/app.py

@@ -146,7 +146,7 @@ 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 = config.get("server")
+        server_config = current_config.get("server")
         if not server_config:
             raise ValueError("server configuration is required")
         server_host = server_config.get("host")
@@ -362,9 +362,16 @@ def create_app(
         elif hasattr(app_config, "keys"):
             current_config = app_config
         else:
-            current_config = config.get_all()
+            # If app_config is not a dict-like object, use it as is
+            current_config = app_config
     else:
-        current_config = config.get_all()
+        # If no app_config provided, try to get global config
+        try:
+            from mcp_proxy_adapter.config import get_config
+            current_config = get_config().get_all()
+        except Exception:
+            # If global config is not available, create empty config
+            current_config = {}
 
     # Debug: Check what config is passed to create_app
     if app_config:

mcp_proxy_adapter/config.py

@@ -52,7 +52,7 @@ class Config:
         if VALIDATION_AVAILABLE:
             self.validator = ConfigValidator()
         
-        self.load_config()
+        # Don't auto-load config - let user call load_from_file explicitly
 
     def load_config(self) -> None:
         """

mcp_proxy_adapter/core/app_factory.py

@@ -78,6 +78,8 @@ async def create_and_run_server(
             sys.exit(1)
 
         try:
+            from mcp_proxy_adapter.config import Config
+            config = Config()
             config.load_from_file(str(config_file))
             app_config = config.get_all()
             print(f"✅ Configuration loaded from: {config_path}")
@@ -169,7 +171,6 @@ async def create_and_run_server(
                             f"Fix your configuration file."
                         )
                     
-                    from pathlib import Path
                     if not Path(cert_file).exists():
                         raise ValueError(
                             f"CRITICAL CONFIG ERROR: SSL certificate file does not exist: {cert_file}. "
@@ -509,6 +510,8 @@ def validate_config_file(config_path: str) -> bool:
             return False
 
         # Try to load configuration to validate JSON format
+        from mcp_proxy_adapter.config import Config
+        config = Config()
         config.load_from_file(str(config_file))
         return True
 

mcp_proxy_adapter/core/logging.py

@@ -120,46 +120,29 @@ def setup_logging(
     Returns:
         Configured logger.
     """
-    # Get parameters from configuration if not explicitly specified
-    level = level or get_config().get("logging.level", "INFO")
-
-    # Check debug level from config if debug is enabled
-    if get_config().get("debug.enabled", False):
-        debug_level = get_config().get("debug.level", "INFO")
-        # Use debug level if it's more verbose than the logging level
-        debug_level_num = getattr(logging, debug_level.upper(), logging.INFO)
-        level_num = getattr(logging, level.upper(), logging.INFO)
-        if debug_level_num < level_num:
-            level = debug_level
-            logger.debug(f"Using debug level from config: {debug_level}")
-
-    log_file = log_file or get_config().get("logging.file")
-    rotation_type = rotation_type or "size"  # Default to size-based rotation
-
-    # Get log directory and file settings from config
-    log_dir = get_config().get("logging.log_dir", "./logs")
-    log_file_name = get_config().get("logging.log_file", "mcp_proxy_adapter.log")
-    error_log_file = get_config().get("logging.error_log_file", "mcp_proxy_adapter_error.log")
-    access_log_file = get_config().get(
-        "logging.access_log_file", "mcp_proxy_adapter_access.log"
-    )
-
-    # Get rotation settings from config
-    max_file_size_str = get_config().get("logging.max_file_size", "10MB")
-    backup_count = backup_count or get_config().get("logging.backup_count", 5)
+    # Use provided parameters or defaults
+    level = level or "INFO"
+    log_file = log_file
+    rotation_type = rotation_type or "size"
+    log_dir = "./logs"
+    log_file_name = "mcp_proxy_adapter.log"
+    error_log_file = "mcp_proxy_adapter_error.log"
+    access_log_file = "mcp_proxy_adapter_access.log"
+
+    # Get rotation settings
+    max_file_size_str = "10MB"
+    backup_count = backup_count or 5
 
     # Parse max file size (e.g., "10MB" -> 10 * 1024 * 1024)
     max_bytes = max_bytes or _parse_file_size(max_file_size_str)
 
     # Get format settings
-    log_format = get_config().get(
-        "logging.format", "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-    )
-    date_format = get_config().get("logging.date_format", "%Y-%m-%d %H:%M:%S")
+    log_format = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    date_format = "%Y-%m-%d %H:%M:%S"
 
     # Get output settings
-    console_output = get_config().get("logging.console_output", True)
-    file_output = get_config().get("logging.file_output", True)
+    console_output = True
+    file_output = True
 
     # Convert string logging level to constant
     numeric_level = getattr(logging, level.upper(), None)
@@ -227,7 +210,7 @@ def setup_logging(
             logger.addHandler(access_handler)
 
     # Configure loggers for external libraries
-    log_levels = get_config().get("logging.levels", {})
+    log_levels = {}
     for logger_name, logger_level in log_levels.items():
         lib_logger = logging.getLogger(logger_name)
         lib_logger.setLevel(getattr(logging, logger_level.upper(), logging.INFO))

mcp_proxy_adapter/examples/full_application/test_minimal_server.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+"""
+Minimal server test without lifespan issues.
+"""
+
+import sys
+import os
+from pathlib import Path
+
+# Add the project root to the path
+project_root = Path(__file__).parent.parent.parent.parent
+sys.path.insert(0, str(project_root))
+
+from fastapi import FastAPI
+from mcp_proxy_adapter.api.handlers import execute_command
+import uvicorn
+
+def main():
+    """Test minimal server startup."""
+    print("🚀 Testing Minimal Server Startup")
+    print("=" * 50)
+    
+    # Create minimal FastAPI app
+    app = FastAPI(
+        title="Test Server",
+        description="Minimal test server",
+        version="1.0.0"
+    )
+    
+    # Add health endpoint
+    @app.get("/health")
+    async def health():
+        return {"status": "ok", "message": "Server is running"}
+    
+    # Add JSON-RPC endpoint
+    @app.post("/api/jsonrpc")
+    async def jsonrpc_endpoint(request: dict):
+        try:
+            # Simple health command
+            if request.get("method") == "health":
+                return {
+                    "jsonrpc": "2.0",
+                    "id": request.get("id"),
+                    "result": {"status": "ok", "message": "Health check passed"}
+                }
+            else:
+                return {
+                    "jsonrpc": "2.0",
+                    "id": request.get("id"),
+                    "error": {"code": -32601, "message": "Method not found"}
+                }
+        except Exception as e:
+            return {
+                "jsonrpc": "2.0",
+                "id": request.get("id"),
+                "error": {"code": -32603, "message": str(e)}
+            }
+    
+    print("✅ FastAPI app created successfully")
+    
+    # Start server
+    print("🚀 Starting server on http://0.0.0.0:8000")
+    print("📡 Test with: curl -X POST http://localhost:8000/api/jsonrpc -H 'Content-Type: application/json' -d '{\"jsonrpc\": \"2.0\", \"method\": \"health\", \"id\": 1}'")
+    print("🛑 Press Ctrl+C to stop")
+    
+    uvicorn.run(app, host="0.0.0.0", port=8000)
+
+if __name__ == "__main__":
+    main()

mcp_proxy_adapter/examples/full_application/test_simple_server.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+"""
+Simple server test without complex lifespan.
+"""
+
+import sys
+import os
+from pathlib import Path
+
+# Add the project root to the path
+project_root = Path(__file__).parent.parent.parent.parent
+sys.path.insert(0, str(project_root))
+
+from mcp_proxy_adapter.api.app import create_app
+from mcp_proxy_adapter.config import Config
+import uvicorn
+
+def main():
+    """Test simple server startup."""
+    print("🚀 Testing Simple Server Startup")
+    print("=" * 50)
+    
+    # Load configuration
+    config_path = "configs/http_simple_correct.json"
+    if not os.path.exists(config_path):
+        print(f"❌ Configuration file not found: {config_path}")
+        return 1
+    
+    try:
+        # Load config
+        config = Config()
+        config.load_from_file(config_path)
+        app_config = config.get_all()
+        
+        print(f"✅ Configuration loaded: {config_path}")
+        print(f"🔍 Config keys: {list(app_config.keys())}")
+        
+        # Create app
+        app = create_app(
+            title="Test Server",
+            description="Simple test server",
+            version="1.0.0",
+            app_config=app_config
+        )
+        
+        print("✅ FastAPI app created successfully")
+        
+        # Start server
+        print("🚀 Starting server on http://0.0.0.0:8000")
+        print("📡 Test with: curl -X POST http://localhost:8000/api/jsonrpc -H 'Content-Type: application/json' -d '{\"jsonrpc\": \"2.0\", \"method\": \"health\", \"id\": 1}'")
+        print("🛑 Press Ctrl+C to stop")
+        
+        uvicorn.run(app, host="0.0.0.0", port=8000)
+        
+    except Exception as e:
+        print(f"❌ Error: {e}")
+        import traceback
+        traceback.print_exc()
+        return 1
+
+if __name__ == "__main__":
+    sys.exit(main())

mcp_proxy_adapter/version.py

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

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

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

@@ -1,12 +1,12 @@
 mcp_proxy_adapter/__init__.py,sha256=iH0EBBsRj_cfZJpAIsgN_8tTdfefhnl6uUKHjLHhWDQ,1037
 mcp_proxy_adapter/__main__.py,sha256=sq3tANRuTd18euamt0Bmn1sJeAyzXENZ5VvsMwbrDFA,579
-mcp_proxy_adapter/config.py,sha256=1Ngxri2IPGoytYdCF5pXzbLUXsWcf6qYENkaDkAppg0,25323
+mcp_proxy_adapter/config.py,sha256=ow9zL4fRK6vr0ZYukUIGcHo2VKup9NCJqflrDDeGFQU,25371
 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=ZzA45mtQabpralicB2254g484POKePR2iPCTeg_clhc,75
+mcp_proxy_adapter/version.py,sha256=wNd8p-JNrRUaPPjPgiZdeLFjvBYBXlFIAoT2Vcww0L4,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_proxy_adapter/api/app.py,sha256=La7xt02j4Zbg4sSc1iL72DM3UNFVddPlN4_xpaRauVo,37214
+mcp_proxy_adapter/api/app.py,sha256=FoZ6YU_ZbvWmg_1nz9TQoyu7urd-tDybdLAGrM-moY4,37556
 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
@@ -54,7 +54,7 @@ mcp_proxy_adapter/commands/token_management_command.py,sha256=tCVjhWqAQ3KhcwSsZU
 mcp_proxy_adapter/commands/transport_management_command.py,sha256=HEnUyL4S014jheyBwO90u9gnzk0qxBlOJdC_0Sxhq9E,4585
 mcp_proxy_adapter/commands/unload_command.py,sha256=6CUM9B9c-mNxw7uvt2vcvZSnxMySfoMT5UmDhzNXq38,4984
 mcp_proxy_adapter/core/__init__.py,sha256=3yt0CFZdsIG8Ln4bg-r4ISYzipm3ZUAxTn0twYTs9FI,867
-mcp_proxy_adapter/core/app_factory.py,sha256=9nCt7NahHF8zaTjyy8X9qzN0YdrFmR9lHSDWr3G72hs,23332
+mcp_proxy_adapter/core/app_factory.py,sha256=oTSmhHTZeEqTNX9b-nXACp0Vootupsk5ZWzZqU-CtkE,23451
 mcp_proxy_adapter/core/app_runner.py,sha256=n8_rBojzKUpHLN5ksiXcR8UWoBYk6Tt5OtWk-X2kVPc,11868
 mcp_proxy_adapter/core/auth_validator.py,sha256=q8TNkdolvP-gM6Bvecc6nrVG9al5J31pocdwhguhTBk,19742
 mcp_proxy_adapter/core/certificate_utils.py,sha256=yeDwi-j42CxK_g-r5_ragGFY_HdSgDfTWHVUjDHF6nI,38480
@@ -65,7 +65,7 @@ mcp_proxy_adapter/core/config_converter.py,sha256=Wnnsrbw7DxtgDfLG-IyyzK-hkKu0_1
 mcp_proxy_adapter/core/config_validator.py,sha256=B5Tu8nE_iSvB1jFJ6qseOZrUpd0QoK7phU9Sznv1HDI,54858
 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=VIpiC6QTGLukRjiJoVpq3VEoLKhUeLNl8IdfljpW6ZU,9654
+mcp_proxy_adapter/core/logging.py,sha256=dplInPvL4Ff4P0cRDszOiCcFzwu7NXAw2qkBB2OW7_E,8452
 mcp_proxy_adapter/core/mtls_asgi.py,sha256=tvk0P9024s18dcCHY9AaQIecT4ojOTv21EuQWXwooU0,5200
 mcp_proxy_adapter/core/mtls_asgi_app.py,sha256=DT_fTUH1RkvBa3ThbyCyNb-XUHyCb4DqaKA1gcZC6z4,6538
 mcp_proxy_adapter/core/mtls_proxy.py,sha256=5APlWs0ImiHGEC65W_7F-PbVO3NZ2BVSj9r14AcUtTE,6011
@@ -124,7 +124,9 @@ mcp_proxy_adapter/examples/full_application/main.py,sha256=uQBvnIBu6C2Y9P2j5hg0-
 mcp_proxy_adapter/examples/full_application/proxy_endpoints.py,sha256=Kt_WAsG61HLTMkKQ1mQqjvlX9I4TcfwYq0NaRR9HKvM,6179
 mcp_proxy_adapter/examples/full_application/run_mtls.py,sha256=neYnzO9lfCEEruv-R__dHey18DXav5RG6hNKwu54G6Y,9455
 mcp_proxy_adapter/examples/full_application/run_simple.py,sha256=Rnmsi68EfiFEWrXx5DfUnxSks9uhmJR-ERlo-BOm9tQ,5163
+mcp_proxy_adapter/examples/full_application/test_minimal_server.py,sha256=7gAnvWOuO3AiLBWRdThm1X-g14zz1mi95bwaxzxgro8,2062
 mcp_proxy_adapter/examples/full_application/test_server.py,sha256=VRAxvx7rnhUxTgm_5muXYtTrxS7nTolYc7h0WyLmU9s,7600
+mcp_proxy_adapter/examples/full_application/test_simple_server.py,sha256=3reGMunQLHIIkgbRwFffU3IH_b4yu96JpZORCrmc_Wk,1798
 mcp_proxy_adapter/examples/full_application/commands/__init__.py,sha256=yQHxVSFkAyFLUOdk42QOebUODPlQV9IbydPgF3UKsGM,217
 mcp_proxy_adapter/examples/full_application/commands/custom_echo_command.py,sha256=H7FPJmVJNWT61rPWxep06-7hsYRt8XYBUSBiwqpBurU,3096
 mcp_proxy_adapter/examples/full_application/commands/dynamic_calculator_command.py,sha256=DFTqVnIDt6nBdZ27-vD_f1X2cFcDInVQiCEq9ltw4lA,3428
@@ -135,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.14.dist-info/METADATA,sha256=3AiYjcUebs6vjYdgggkM-SWBMIR-UsXsxiXE_GgBmBA,8511
-mcp_proxy_adapter-6.9.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.14.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.14.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.14.dist-info/RECORD,,
+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,,