mcp-proxy-adapter 2.1.7__py3-none-any.whl → 2.1.9__py3-none-any.whl

mcp_proxy_adapter/adapter.py

@@ -493,6 +493,13 @@ class MCPProxyAdapter:
                             "details": "Request requires 'command', 'method' or 'params' field"
                         }
                     }
+                # Подмена help -> __help
+                if command == "help":
+                    command = "__help"
+                    # Переименовываем параметр внутри params
+                    if "command" in params:
+                        params["cmdname"] = params.pop("command")
+                logger.info(f"[DEBUG] MCP CMD: command={command}, params={params}")
                 
                 # Check if command exists
                 if command not in self.registry.dispatcher.get_valid_commands():
@@ -501,12 +508,14 @@ class MCPProxyAdapter:
                         "error": {
                             "code": 404,
                             "message": f"Unknown command: {command}",
-                            "details": f"Command '{command}' not found in registry. Available commands: {', '.join(self.registry.dispatcher.get_valid_commands())}"
+                            "details": f"Unknown command: {command}. Available commands: {', '.join(self.registry.dispatcher.get_valid_commands())}"
                         }
                     }
                 
+                logger.info(f"[DEBUG] MCP CMD: command={command}, params={params}")
                 # Check for required parameters
                 command_info = self.registry.dispatcher.get_command_info(command)
+                logger.info(f"[DEBUG] MCP CMD: command_info={command_info}")
                 if command_info and "params" in command_info:
                     missing_params = []
                     for param_name, param_info in command_info["params"].items():
@@ -522,7 +531,7 @@ class MCPProxyAdapter:
                                 "details": f"Command '{command}' requires following parameters: {', '.join(missing_params)}"
                             }
                         }
-                
+                logger.info(f"[DEBUG] MCP CMD: command={command}, params={params}")
                 # Check parameter types
                 type_errors = self._validate_param_types(command, params)
                 if type_errors:
@@ -534,9 +543,10 @@ class MCPProxyAdapter:
                             "details": "Check parameter types and try again"
                         }
                     }
-                
+                logger.info(f"[DEBUG] MCP CMD: command={command}, params={params}")
                 # Execute the command
                 try:
+                    logger.info(f"[DEBUG] MCP CMD: executing command={command}, params={params}")
                     result = self.registry.dispatcher.execute(command, **params)
                     
                     # Return result in MCP Proxy format

mcp_proxy_adapter/dispatchers/json_rpc_dispatcher.py

@@ -41,7 +41,7 @@ class JsonRpcDispatcher(BaseDispatcher):
             description="Returns information about available commands",
             summary="Command help",
             params={
-                "command": {
+                "cmdname": {
                     "type": "string",
                     "description": "Command name for detailed information",
                     "required": False
@@ -157,31 +157,26 @@ class JsonRpcDispatcher(BaseDispatcher):
     def _help_command(self, params: Dict[str, Any] = None) -> Dict[str, Any]:
         """
         Built-in help command for getting command information.
-        
         Args:
-            params: Command parameters
-                command: Command name for detailed information
-                
+            params: Command parameters (dict)
+                cmdname: Command name for detailed information
         Returns:
             Dict[str, Any]: Command help information
         """
-        if not params:
+        if params is None:
             params = {}
-            
         # If specific command is specified, return information only about it
-        if "command" in params and params["command"]:
-            command = params["command"]
-            if command not in self._metadata:
+        cmdname = params.get("cmdname")
+        if cmdname:
+            if cmdname not in self._metadata:
                 return {
-                    "error": f"Command '{command}' not found",
+                    "error": f"Command '{cmdname}' not found",
                     "available_commands": list(self._metadata.keys())
                 }
-            
             return {
-                "command": command,
-                "info": self._metadata[command]
+                "cmdname": cmdname,
+                "info": self._metadata[cmdname]
             }
-        
         # Otherwise return brief information about all commands
         commands_info = {}
         for cmd, info in self._metadata.items():
@@ -190,9 +185,8 @@ class JsonRpcDispatcher(BaseDispatcher):
                 "description": info["description"],
                 "params_count": len(info["params"])
             }
-        
         return {
             "commands": commands_info,
             "total": len(commands_info),
-            "note": "Use the 'command' parameter to get detailed information about a specific command"
+            "note": "Use the 'cmdname' parameter to get detailed information about a specific command"
         } 

mcp_proxy_adapter/examples/openapi_server.py

@@ -26,7 +26,7 @@ from mcp_proxy_adapter.models import JsonRpcRequest, JsonRpcResponse
 
 # Import MockRegistry from tests for example
 # (in a real project, CommandRegistry would be used)
-from tests.test_mcp_proxy_adapter import MockRegistry
+from mcp_proxy_adapter.testing_utils import MockRegistry
 
 # Configure logging
 logging.basicConfig(level=logging.DEBUG)

mcp_proxy_adapter/testing_utils.py

@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+"""
+Test utilities for MCP Proxy Adapter: mock dispatcher, registry, and OpenAPI generator.
+Can be used in examples and tests.
+"""
+
+def success_command(value: int = 1) -> dict:
+    return {"result": value * 2}
+
+def error_command() -> None:
+    raise ValueError("Test error")
+
+def param_command(required_param: str, optional_param: int = 0) -> dict:
+    return {"required": required_param, "optional": optional_param}
+
+def complex_param_command(array_param: list, object_param: dict, bool_param: bool = True) -> dict:
+    return {
+        "array_length": len(array_param),
+        "object_keys": list(object_param.keys()),
+        "bool_value": bool_param
+    }
+
+def type_error_command(param: int) -> dict:
+    return {"param": param + 1}
+
+class MockDispatcher:
+    def __init__(self):
+        self.commands = {
+            "success": success_command,
+            "error": error_command,
+            "param": param_command,
+            "execute": self.execute_from_params
+        }
+        self.commands_info = {
+            "success": {
+                "description": "Successful command",
+                "params": {"value": {"type": "integer", "description": "Input value", "required": False, "default": 1}}
+            },
+            "error": {"description": "Command with error", "params": {}},
+            "param": {
+                "description": "Command with parameters",
+                "params": {
+                    "required_param": {"type": "string", "description": "Required parameter", "required": True},
+                    "optional_param": {"type": "integer", "description": "Optional parameter", "required": False, "default": 0}
+                }
+            },
+            "execute": {
+                "description": "Universal command for executing other commands",
+                "params": {"query": {"type": "string", "description": "Command or query to execute", "required": False}}
+            },
+            "complex_param": {
+                "description": "Command with complex parameters",
+                "params": {
+                    "array_param": {"type": "array", "description": "Array of values", "required": True},
+                    "object_param": {"type": "object", "description": "Object", "required": True},
+                    "bool_param": {"type": "boolean", "description": "Boolean value", "required": False, "default": True}
+                }
+            },
+            "type_error": {
+                "description": "Command that will raise TypeError",
+                "params": {"param": {"type": "integer", "description": "Integer parameter", "required": True}}
+            }
+        }
+
+    def execute_from_params(self, **params):
+        if "query" in params and params["query"] in self.commands:
+            command = params.pop("query")
+            return self.execute(command, **params)
+        return {"available_commands": self.get_valid_commands(), "received_params": params}
+
+    def execute(self, command, **params):
+        if command not in self.commands:
+            raise KeyError(f"Unknown command: {command}")
+        return self.commands[command](**params)
+
+    def get_valid_commands(self):
+        return list(self.commands.keys())
+
+    def get_command_info(self, command):
+        return self.commands_info.get(command)
+
+    def get_commands_info(self):
+        return self.commands_info
+
+class MockRegistry:
+    def __init__(self, use_openapi_generator=False):
+        self.dispatcher = MockDispatcher()
+        self.generators = []
+        self.use_openapi_generator = use_openapi_generator
+
+    def get_commands_info(self):
+        return self.dispatcher.get_commands_info()
+
+    def add_generator(self, generator):
+        self.generators.append(generator)
+        if hasattr(generator, 'set_dispatcher'):
+            generator.set_dispatcher(self.dispatcher)
+
+class MockOpenApiGenerator:
+    def __init__(self, **kwargs):
+        self.dispatcher = None
+        self.kwargs = kwargs
+
+    def set_dispatcher(self, dispatcher):
+        self.dispatcher = dispatcher
+
+    def generate_schema(self):
+        return {
+            "openapi": "3.0.0",
+            "info": {"title": "Mock API", "version": "1.0.0"},
+            "paths": {}
+        } 

{mcp_proxy_adapter-2.1.7.dist-info → mcp_proxy_adapter-2.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 2.1.7
+Version: 2.1.9
 Summary: Adapter for exposing Command Registry commands as tools for AI models via MCP Proxy.
 Home-page: https://github.com/vasilyvz/mcp-proxy-adapter
 Author: Vasiliy VZ

{mcp_proxy_adapter-2.1.7.dist-info → mcp_proxy_adapter-2.1.9.dist-info}/RECORD

@@ -1,14 +1,15 @@
 mcp_proxy_adapter/__init__.py,sha256=_6D-TfANWp9zc550M5LUeGPvioFqG1bAl3tZj-gNmJU,463
-mcp_proxy_adapter/adapter.py,sha256=76dkVeDuqLsJ5AhuftzLlwy2M6yr_PfNbmNfo9dXVhc,28844
+mcp_proxy_adapter/adapter.py,sha256=XQGhht_lhLH7eaSAgoxl4NdbT1MwMW5mwDrTJMXl8pk,29631
 mcp_proxy_adapter/models.py,sha256=acqVQBYAojHXeJ1MJyvpMyT6-J6aMxWuZMszn_-RsOU,2338
 mcp_proxy_adapter/registry.py,sha256=jgC4TKaPbMbAsoxvGp2ToaOE4drD-VfZug7WJbm4IW4,15853
 mcp_proxy_adapter/schema.py,sha256=HZM0TTQTSi8ha1TEeVevdCyGZOUPoT1soB7Nex0hV50,10947
+mcp_proxy_adapter/testing_utils.py,sha256=RWjQFNSUtVkeP0qNzp6_jrT6_tub3w_052DrRmvxVk0,4243
 mcp_proxy_adapter/analyzers/__init__.py,sha256=2rcYZDP-bXq078MQpxP32lAwYYyRhOwAQGBcefBfBzY,368
 mcp_proxy_adapter/analyzers/docstring_analyzer.py,sha256=T3FLJEo_uChShfiEKRl8GpVoHvh5HiudZkxnj4KixfA,7541
 mcp_proxy_adapter/analyzers/type_analyzer.py,sha256=6Wac7osKwF03waFSwQ8ZM0Wqn_zAP2D-I4WMEpR0hQM,5230
 mcp_proxy_adapter/dispatchers/__init__.py,sha256=FWgimgInGphIjCEnvA3-ZExiapUzYAVis2H9C5IWivU,365
 mcp_proxy_adapter/dispatchers/base_dispatcher.py,sha256=S5_Xri058jAmOWeit1tedB_GMZQ9RLcNcYabA83ZF6k,2288
-mcp_proxy_adapter/dispatchers/json_rpc_dispatcher.py,sha256=ffu1M32E1AdC7IB44mlbV2L56eJQMsp-7fYi_r4rmHc,6331
+mcp_proxy_adapter/dispatchers/json_rpc_dispatcher.py,sha256=Iv7Z4GX5Wy6gGNESEYqjLnrPvxPYXa9WJiwaTSKMjg0,6238
 mcp_proxy_adapter/examples/analyze_config.py,sha256=vog7TNHDw5ZoYhQLbAvZvEoufmQwH54KJzQBJrSq5w4,4283
 mcp_proxy_adapter/examples/basic_integration.py,sha256=w_oA777YiQt36gzI113KPQ6k45caXbMCqW9hD8sy8zo,4657
 mcp_proxy_adapter/examples/docstring_and_schema_example.py,sha256=c96L4KF_7yWzffmvd4hyeQuXSdYyYkv7Uvuy0QxgMcQ,1929
@@ -16,13 +17,13 @@ mcp_proxy_adapter/examples/extension_example.py,sha256=vnatnFdNTapMpPcQ79Ugitk92
 mcp_proxy_adapter/examples/help_best_practices.py,sha256=wUtZRnAktnpfAc9vAvqSxUquHEr5ewaPDPyc6BoCqdQ,2637
 mcp_proxy_adapter/examples/help_usage.py,sha256=UOd3HJeYlQpQkAyceGNm66jXX_h-T05pjIGD-b7-Pfg,2568
 mcp_proxy_adapter/examples/mcp_proxy_client.py,sha256=z4IzFlGigVTQSb8TpcrQ_a0migsmC58LnNwc8wZmTfw,3811
-mcp_proxy_adapter/examples/openapi_server.py,sha256=xAt-aUEz5vusvz7fd1vFIybi4EpwlnGPXLsce3j3YZw,14024
+mcp_proxy_adapter/examples/openapi_server.py,sha256=MXCr5qifI03oexgdY05SsnbhWCe2_6ebnYOfAdk_Uug,14027
 mcp_proxy_adapter/examples/project_structure_example.py,sha256=sswTo6FZb1F5juHa0FYG3cgvrh3wfgGfJu2bBy5tCm4,1460
 mcp_proxy_adapter/examples/testing_example.py,sha256=AB13c4C1bjs1145O-yriwyreeVXtMOlQLzs2BCGmprk,1719
 mcp_proxy_adapter/validators/docstring_validator.py,sha256=Onpq2iNJ1qF4ejkJJIlBkLROuSNIVALHVmXIgkCpaFI,2934
 mcp_proxy_adapter/validators/metadata_validator.py,sha256=uCrn38-VYYn89l6f5CC_GoTAHAweaOW2Z6Esro1rtGw,3155
-mcp_proxy_adapter-2.1.7.dist-info/licenses/LICENSE,sha256=OkApFEwdgMCt_mbvUI-eIwKMSTe38K3XnU2DT5ub-wI,1072
-mcp_proxy_adapter-2.1.7.dist-info/METADATA,sha256=cvyX6qi50GMTOXHpNgygIUMgI8GeXBVIdMKyZnhJ0jQ,12578
-mcp_proxy_adapter-2.1.7.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-mcp_proxy_adapter-2.1.7.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-2.1.7.dist-info/RECORD,,
+mcp_proxy_adapter-2.1.9.dist-info/licenses/LICENSE,sha256=OkApFEwdgMCt_mbvUI-eIwKMSTe38K3XnU2DT5ub-wI,1072
+mcp_proxy_adapter-2.1.9.dist-info/METADATA,sha256=nZ4aznn1akyMf7bPXO3kQb0Az6FiOx2hoCssFuvM05Y,12578
+mcp_proxy_adapter-2.1.9.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
+mcp_proxy_adapter-2.1.9.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-2.1.9.dist-info/RECORD,,

{mcp_proxy_adapter-2.1.7.dist-info → mcp_proxy_adapter-2.1.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.1.0)
+Generator: setuptools (80.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any