mcp-proxy-adapter 6.2.26__py3-none-any.whl → 6.2.28__py3-none-any.whl

mcp_proxy_adapter/config.py

@@ -119,6 +119,7 @@ class Config:
                 "server_id": "mcp_proxy_adapter",
                 "server_name": "MCP Proxy Adapter",
                 "description": "JSON-RPC API for interacting with MCP Proxy",
+                "version": "6.2.28",
                 "registration_timeout": 30,
                 "retry_attempts": 3,
                 "retry_delay": 5,

mcp_proxy_adapter/core/proxy_client.py

@@ -58,13 +58,15 @@ class ProxyClient:
             config: Client configuration
         """
         self.config = config
-        self.registration_config = config.get("registration", {})
+        # Try both registration and proxy_registration for backward compatibility
+        self.registration_config = config.get("registration", config.get("proxy_registration", {}))
         
         # Basic settings
-        self.proxy_url = self.registration_config.get("server_url")
-        self.server_id = self.registration_config.get("proxy_info", {}).get("name", "mcp_proxy_adapter")
-        self.server_name = self.registration_config.get("proxy_info", {}).get("name", "MCP Proxy Adapter")
-        self.description = self.registration_config.get("proxy_info", {}).get("description", "")
+        self.proxy_url = self.registration_config.get("proxy_url", self.registration_config.get("server_url"))
+        self.server_id = self.registration_config.get("server_id", self.registration_config.get("proxy_info", {}).get("name", "mcp_proxy_adapter"))
+        self.server_name = self.registration_config.get("server_name", self.registration_config.get("proxy_info", {}).get("name", "MCP Proxy Adapter"))
+        self.description = self.registration_config.get("description", self.registration_config.get("proxy_info", {}).get("description", ""))
+        self.version = self.registration_config.get("version", self.registration_config.get("proxy_info", {}).get("version", "1.0.0"))
         
         # Authentication settings
         self.auth_method = self.registration_config.get("auth_method", "none")
@@ -227,7 +229,7 @@ class ProxyClient:
             "server_url": self.server_url,
             "server_name": self.server_name,
             "description": self.description,
-            "version": proxy_info.get("version", "1.0.0"),
+            "version": self.version,
             "capabilities": proxy_info.get("capabilities", ["jsonrpc", "rest"]),
             "endpoints": proxy_info.get("endpoints", {
                 "jsonrpc": "/api/jsonrpc",

mcp_proxy_adapter/core/proxy_registration.py

@@ -45,13 +45,15 @@ class ProxyRegistrationManager:
             config: Application configuration
         """
         self.config = config
-        self.registration_config = config.get("registration", {})
+        # Try both registration and proxy_registration for backward compatibility
+        self.registration_config = config.get("registration", config.get("proxy_registration", {}))
         
         # Basic registration settings
-        self.proxy_url = self.registration_config.get("server_url", "https://proxy-registry.example.com")
-        self.server_id = self.registration_config.get("proxy_info", {}).get("name", "mcp_proxy_adapter")
-        self.server_name = self.registration_config.get("proxy_info", {}).get("name", "MCP Proxy Adapter")
-        self.description = self.registration_config.get("proxy_info", {}).get("description", "JSON-RPC API for interacting with MCP Proxy")
+        self.proxy_url = self.registration_config.get("proxy_url", self.registration_config.get("server_url", "https://proxy-registry.example.com"))
+        self.server_id = self.registration_config.get("server_id", self.registration_config.get("proxy_info", {}).get("name", "mcp_proxy_adapter"))
+        self.server_name = self.registration_config.get("server_name", self.registration_config.get("proxy_info", {}).get("name", "MCP Proxy Adapter"))
+        self.description = self.registration_config.get("description", self.registration_config.get("proxy_info", {}).get("description", "JSON-RPC API for interacting with MCP Proxy"))
+        self.version = self.registration_config.get("version", self.registration_config.get("proxy_info", {}).get("version", "1.0.0"))
         
         # Heartbeat settings
         heartbeat_config = self.registration_config.get("heartbeat", {})
@@ -162,7 +164,7 @@ class ProxyRegistrationManager:
             "server_url": self.server_url,
             "server_name": self.server_name,
             "description": self.description,
-            "version": proxy_info.get("version", "1.0.0"),
+            "version": self.version,
             "capabilities": proxy_info.get("capabilities", ["jsonrpc", "rest"]),
             "endpoints": proxy_info.get("endpoints", {
                 "jsonrpc": "/api/jsonrpc",

mcp_proxy_adapter/examples/generate_test_configs.py

@@ -9,7 +9,11 @@ import json
 import os
 import argparse
 from typing import Dict, Any
-def generate_http_simple_config(port: int = 20000, certs_dir: str = "certs", keys_dir: str = "keys") -> Dict[str, Any]:
+
+
+def generate_http_simple_config(
+    port: int = 20000, certs_dir: str = "certs", keys_dir: str = "keys"
+) -> Dict[str, Any]:
     """Generate HTTP configuration without authorization."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -23,13 +27,27 @@ def generate_http_simple_config(port: int = 20000, certs_dir: str = "certs", key
             "proxy_info": {
                 "name": "mcp_example_server",
                 "capabilities": ["jsonrpc", "rest", "proxy_registration"],
-                "endpoints": {"jsonrpc": "/api/jsonrpc", "rest": "/cmd", "health": "/health"}
+                "endpoints": {
+                    "jsonrpc": "/api/jsonrpc",
+                    "rest": "/cmd",
+                    "health": "/health"
+                }
             },
             "heartbeat": {"enabled": True, "interval": 30}
         },
-        "protocols": {"enabled": True, "allowed_protocols": ["http"]}
+        "protocols": {
+            "enabled": True,
+            "allowed_protocols": ["http"]
+        }
     }
-def generate_http_token_config(port: int = 20001, certs_dir: str = "certs", keys_dir: str = "keys", roles_file: str = "configs/roles.json") -> Dict[str, Any]:
+
+
+def generate_http_token_config(
+    port: int = 20001,
+    certs_dir: str = "certs",
+    keys_dir: str = "keys",
+    roles_file: str = "configs/roles.json"
+) -> Dict[str, Any]:
     """Generate HTTP configuration with token authorization."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -59,9 +77,16 @@ def generate_http_token_config(port: int = 20001, certs_dir: str = "certs", keys
             "retry_delay": 5,
             "heartbeat": {"enabled": True, "interval": 30}
         },
-        "protocols": {"enabled": True, "allowed_protocols": ["http"]}
+        "protocols": {
+            "enabled": True,
+            "allowed_protocols": ["http"]
+        }
     }
-def generate_https_simple_config(port: int = 20002, certs_dir: str = "certs", keys_dir: str = "keys") -> Dict[str, Any]:
+
+
+def generate_https_simple_config(
+    port: int = 20002, certs_dir: str = "certs", keys_dir: str = "keys"
+) -> Dict[str, Any]:
     """Generate HTTPS configuration without client certificate verification and authorization."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -80,9 +105,16 @@ def generate_https_simple_config(port: int = 20002, certs_dir: str = "certs", ke
             "retry_delay": 5,
             "heartbeat": {"enabled": True, "interval": 30}
         },
-        "protocols": {"enabled": True, "allowed_protocols": ["http", "https"]}
+        "protocols": {
+            "enabled": True,
+            "allowed_protocols": ["http", "https"]
+        }
     }
-def generate_https_token_config(port: int = 20003, certs_dir: str = "certs", keys_dir: str = "keys") -> Dict[str, Any]:
+
+
+def generate_https_token_config(
+    port: int = 20003, certs_dir: str = "certs", keys_dir: str = "keys"
+) -> Dict[str, Any]:
     """Generate HTTPS configuration without client certificate verification with token authorization."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -115,9 +147,16 @@ def generate_https_token_config(port: int = 20003, certs_dir: str = "certs", key
             "retry_delay": 5,
             "heartbeat": {"enabled": True, "interval": 30}
         },
-        "protocols": {"enabled": True, "allowed_protocols": ["http", "https"]}
+        "protocols": {
+            "enabled": True,
+            "allowed_protocols": ["http", "https"]
+        }
     }
-def generate_mtls_no_roles_config(port: int = 20004, certs_dir: str = "certs", keys_dir: str = "keys") -> Dict[str, Any]:
+
+
+def generate_mtls_no_roles_config(
+    port: int = 20004, certs_dir: str = "certs", keys_dir: str = "keys"
+) -> Dict[str, Any]:
     """Generate mTLS configuration without roles."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -126,16 +165,30 @@ def generate_mtls_no_roles_config(port: int = 20004, certs_dir: str = "certs", k
             "cert_file": f"{certs_dir}/localhost_server.crt",
             "key_file": f"{keys_dir}/localhost_server.key",
             "ca_cert": f"{certs_dir}/mcp_proxy_adapter_ca_ca.crt",
-            "verify_client": True
+            "verify_client": True,
+            "client_cert_required": True
         },
         "security": {
             "enabled": True,
             "auth": {"enabled": True, "methods": ["certificate"]},
             "permissions": {"enabled": False}
         },
-        "protocols": {"enabled": True, "allowed_protocols": ["https", "mtls"]}
+        "registration": {
+            "enabled": False
+        },
+        "protocols": {
+            "enabled": True,
+            "allowed_protocols": ["https", "mtls"]
+        }
     }
-def generate_mtls_with_roles_config(port: int = 20005, certs_dir: str = "certs", keys_dir: str = "keys", roles_file: str = "configs/roles.json") -> Dict[str, Any]:
+
+
+def generate_mtls_with_roles_config(
+    port: int = 20005,
+    certs_dir: str = "certs",
+    keys_dir: str = "keys",
+    roles_file: str = "configs/roles.json"
+) -> Dict[str, Any]:
     """Generate mTLS configuration with roles."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -154,7 +207,11 @@ def generate_mtls_with_roles_config(port: int = 20005, certs_dir: str = "certs",
             "proxy_info": {
                 "name": "mcp_example_server",
                 "capabilities": ["jsonrpc", "rest", "security", "proxy_registration"],
-                "endpoints": {"jsonrpc": "/api/jsonrpc", "rest": "/cmd", "health": "/health"}
+                "endpoints": {
+                    "jsonrpc": "/api/jsonrpc",
+                    "rest": "/cmd",
+                    "health": "/health"
+                }
             },
             "heartbeat": {"enabled": True, "interval": 30}
         },
@@ -163,8 +220,13 @@ def generate_mtls_with_roles_config(port: int = 20005, certs_dir: str = "certs",
             "auth": {"enabled": True, "methods": ["certificate"]},
             "permissions": {"enabled": True, "roles_file": roles_file}
         },
-        "protocols": {"enabled": True, "allowed_protocols": ["https", "mtls"]}
+        "protocols": {
+            "enabled": True,
+            "allowed_protocols": ["https", "mtls"]
+        }
     }
+
+
 def generate_roles_config() -> Dict[str, Any]:
     """Generate roles configuration for testing."""
     return {
@@ -222,7 +284,14 @@ def generate_roles_config() -> Dict[str, Any]:
             "tokens": ["proxy-token-123"]
         }
     }
-def generate_all_configs(output_dir: str, certs_dir: str = "certs", keys_dir: str = "keys", roles_file: str = "configs/roles.json") -> None:
+
+
+def generate_all_configs(
+    output_dir: str,
+    certs_dir: str = "certs",
+    keys_dir: str = "keys",
+    roles_file: str = "configs/roles.json"
+) -> None:
     """Generate all 6 configuration types and save them to files."""
     # Ensure output directory exists first
     os.makedirs(output_dir, exist_ok=True)
@@ -235,17 +304,17 @@ def generate_all_configs(output_dir: str, certs_dir: str = "certs", keys_dir: st
         "mtls_no_roles": generate_mtls_no_roles_config(20004, certs_dir, keys_dir),
         "mtls_with_roles": generate_mtls_with_roles_config(20005, certs_dir, keys_dir, roles_file)
     }
-    # Ensure output directory exists
-    os.makedirs(output_dir, exist_ok=True)
+
     # Generate each configuration
     for name, config in configs.items():
         filename = os.path.join(output_dir, f"{name}.json")
         with open(filename, 'w', encoding='utf-8') as f:
             json.dump(config, f, indent=2, ensure_ascii=False)
         print(f"Generated: {filename}")
+
     # Generate roles configuration
     roles_config = generate_roles_config()
-    
+
     # Create roles.json in the root directory (test environment root) for compatibility
     # When running as module, we need to create roles.json in the current working directory
     # This is the directory where the user is running the command from
@@ -253,30 +322,30 @@ def generate_all_configs(output_dir: str, certs_dir: str = "certs", keys_dir: st
         # Get the current working directory where the user is running the command
         current_dir = os.getcwd()
         root_roles_filename = os.path.join(current_dir, "roles.json")
-        
+
         # Create roles.json in the current working directory
         with open(root_roles_filename, 'w', encoding='utf-8') as f:
             json.dump(roles_config, f, indent=2, ensure_ascii=False)
         print(f"Generated: {root_roles_filename}")
-        
+
         # Also create a copy in the output directory for reference
         backup_roles_filename = os.path.join(output_dir, "roles_backup.json")
         with open(backup_roles_filename, 'w', encoding='utf-8') as f:
             json.dump(roles_config, f, indent=2, ensure_ascii=False)
         print(f"Generated backup: {backup_roles_filename}")
-        
+
     except Exception as e:
         print(f"Warning: Could not create roles.json in current directory: {e}")
         print(f"Current working directory: {os.getcwd()}")
         print(f"Script directory: {os.path.dirname(os.path.abspath(__file__))}")
-    
+
     # Also create roles.json in configs directory for reference
     roles_filename = os.path.join(output_dir, "roles.json")
     with open(roles_filename, 'w', encoding='utf-8') as f:
         json.dump(roles_config, f, indent=2, ensure_ascii=False)
     print(f"Generated: {roles_filename}")
     print(f"\nGenerated {len(configs)} configuration files and roles.json in {output_dir}")
-    
+
     print("\n" + "=" * 60)
     print("✅ CONFIGURATION GENERATION COMPLETED SUCCESSFULLY")
     print("=" * 60)
@@ -288,7 +357,9 @@ def generate_all_configs(output_dir: str, certs_dir: str = "certs", keys_dir: st
     print("\n3. Start full application example:")
     print("   python -m mcp_proxy_adapter.examples.full_application.main --config configs/mtls_with_roles.json")
     print("=" * 60)
-def main():
+
+
+def main() -> int:
     """Main function for command line execution."""
     parser = argparse.ArgumentParser(
         description="Generate test configurations for MCP Proxy Adapter"
@@ -314,6 +385,7 @@ def main():
         help="Roles file path (default: configs/roles.json)"
     )
     args = parser.parse_args()
+
     try:
         generate_all_configs(args.output_dir, args.certs_dir, args.keys_dir, args.roles_file)
         print("Configuration generation completed successfully!")
@@ -327,5 +399,7 @@ def main():
         print("=" * 60)
         return 1
     return 0
+
+
 if __name__ == "__main__":
     exit(main())

mcp_proxy_adapter/version.py

@@ -2,5 +2,5 @@
 Version information for MCP Proxy Adapter.
 """
 
-__version__ = "6.2.24"
+__version__ = "6.2.28"
 

{mcp_proxy_adapter-6.2.26.dist-info → mcp_proxy_adapter-6.2.28.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 mcp_proxy_adapter/__init__.py,sha256=B7m1YWyv_Wb87-Q-JqVpHQgwajnfIgDyZ_iIxzdTbBY,1021
 mcp_proxy_adapter/__main__.py,sha256=-Wp1myP9DzJNB9j97mj62C8kFk5YUbCmd0e7Rnwte0A,769
-mcp_proxy_adapter/config.py,sha256=ss6A-7Ef1I7iyZ-h-bzGWGwddB47642wEhN7uwnt5bk,21563
+mcp_proxy_adapter/config.py,sha256=trWPH97f6-s0NHWrhGBoB6DrQ9N_m6VPMewzj7J9ORY,21600
 mcp_proxy_adapter/custom_openapi.py,sha256=jYUrCy8C1mShh3sjKj-JkzSMLAvxDLTvtzSJFj5HUNg,15023
 mcp_proxy_adapter/main.py,sha256=9qt_pEQdq8roUc73CumfDn6jDWP_NyfdE1lCGEynv5I,2841
 mcp_proxy_adapter/openapi.py,sha256=36vOEbJjGnVZR6hUhl6mHCD29HYOEFKo2bL0JdGSm-4,13952
-mcp_proxy_adapter/version.py,sha256=he5ZytTjuzxFCrKQ9AxOJw6hhMuKvgK4oyLQ4ErooZQ,76
+mcp_proxy_adapter/version.py,sha256=KHrvoL3BnoiDgpKrK5g0qVgBZuVAm-W980XLAQGsoDg,76
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=khl4kaI4mJ6dNbfAK7hR97Ek-eWC9NBeuXHr6GVbLoU,28911
 mcp_proxy_adapter/api/handlers.py,sha256=DcZT7MVBV33q-0EJ0iFqxE0VgBkFt6d_SqoRkntwyvc,8477
@@ -67,8 +67,8 @@ mcp_proxy_adapter/core/logging.py,sha256=jQlFz52Xwapef6UD4p0acmaGFumD9XuexwW4frD
 mcp_proxy_adapter/core/mtls_asgi.py,sha256=X2lAj3wk3L85amRCp_-10sqvZa5wJf_diXhwrrQReSo,5311
 mcp_proxy_adapter/core/mtls_asgi_app.py,sha256=VeolP08TTaqYU5fGeaZexj6EBWBDugoVrEGXzJW4PuM,6406
 mcp_proxy_adapter/core/protocol_manager.py,sha256=ISFRXjUuK4Q3uMbVB8-O_ozQSsDEH0PQA_HAKGeUrrw,14763
-mcp_proxy_adapter/core/proxy_client.py,sha256=shP373Yelz7Fja22U6XnH0kT9XtPtWEFwOFlYFO97gw,22511
-mcp_proxy_adapter/core/proxy_registration.py,sha256=87ko1vw61nHJGo0-xrObXiyQhrYK2K6nKr8rXID-j8c,19424
+mcp_proxy_adapter/core/proxy_client.py,sha256=n44T5iBS29y6E2lQLGKpOQxPYVrxIl98OAs6mMuhEsM,22916
+mcp_proxy_adapter/core/proxy_registration.py,sha256=OeSDjID-1ofJxRQhmzKGoXM6E-Pk0WmuUfMdsiSo2u0,19829
 mcp_proxy_adapter/core/role_utils.py,sha256=wMoTVz3gF5fM7jozNMwsEwPkp1tui26M-t_KH1Oz8gs,12880
 mcp_proxy_adapter/core/security_adapter.py,sha256=wZ3OH1WzhUdpN8N8CrGJSFFVNi474DqdazIqQ1T8PN4,13343
 mcp_proxy_adapter/core/security_factory.py,sha256=4r7qvBq30XfosGD_b1ZHyNVLN8rOQ3NAKuaCOCEK8jA,8262
@@ -88,7 +88,7 @@ mcp_proxy_adapter/examples/demo_client.py,sha256=inic-FP5qG8oQXUaCrtEhmhac_PDZ1p
 mcp_proxy_adapter/examples/generate_all_certificates.py,sha256=rgcwqIkQ1eDfEIRFRXGIOz-jOSS1w0GPBRhYvMl6Vjc,16948
 mcp_proxy_adapter/examples/generate_certificates.py,sha256=A34OHUEiFvINOHrm3_JiDSbp-WG-eQXIvKCsE8JAeXQ,6616
 mcp_proxy_adapter/examples/generate_certificates_and_tokens.py,sha256=J0qHm_BMY8RYqfuwf7V7xKsHcsRJx8E7x-8JxmW5sPw,15988
-mcp_proxy_adapter/examples/generate_test_configs.py,sha256=NLhPrA9AfPlQ0WCbOJ1B_V9OC445tanKTmq7aAWKULU,13672
+mcp_proxy_adapter/examples/generate_test_configs.py,sha256=OQjLJ0x1YrvYAFR1agu_Tl314KI_Mhjmo4o64H00wVw,14132
 mcp_proxy_adapter/examples/proxy_registration_example.py,sha256=g59_QG2D1CCqhIXEvgy2XmgXI3toLmLyH7hL3uHZwC8,12647
 mcp_proxy_adapter/examples/run_example.py,sha256=o8rcy9Xo0UuZG4MpKdex3pFWYdtAi6uW8dEBQE6Yzbw,2539
 mcp_proxy_adapter/examples/run_full_test_suite.py,sha256=7Z6qDOvbndGPue1P9v-GcYZxy_XPqoC9voJ7tR8eKQ8,12428
@@ -132,9 +132,9 @@ mcp_proxy_adapter/examples/scripts/config_generator.py,sha256=4qruYxQ2kGLVOukLX2
 mcp_proxy_adapter/examples/scripts/create_certificates_simple.py,sha256=xkIvUYl6hbKlWImQmenG0k_CvIsOsc9ZHICiKY3rtI8,26380
 mcp_proxy_adapter/examples/scripts/generate_certificates_and_tokens.py,sha256=J0qHm_BMY8RYqfuwf7V7xKsHcsRJx8E7x-8JxmW5sPw,15988
 mcp_proxy_adapter/utils/config_generator.py,sha256=2dxwBh9k_nUw9kgytZso5TNOQpBqd3c-RpKSTLoHlLE,46465
-mcp_proxy_adapter-6.2.26.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
-mcp_proxy_adapter-6.2.26.dist-info/METADATA,sha256=mDyAz2q3ZwP_HqgYHcE5RyhkIYP7i78KwcH_6jniqpg,22348
-mcp_proxy_adapter-6.2.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.2.26.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.2.26.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.2.26.dist-info/RECORD,,
+mcp_proxy_adapter-6.2.28.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
+mcp_proxy_adapter-6.2.28.dist-info/METADATA,sha256=Dn8sbGOeKXfSpUlpo4Y1_UcerzkwPKOE_IzK6adGUgU,22348
+mcp_proxy_adapter-6.2.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.2.28.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.2.28.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.2.28.dist-info/RECORD,,