mcp-proxy-adapter 2.1.16__py3-none-any.whl → 2.1.17__py3-none-any.whl

mcp_proxy_adapter/adapter.py

@@ -236,7 +236,7 @@ class MCPProxyAdapter:
                 # Execute the command
                 logger.debug(f"Executing command {request.method} with parameters {request.params}")
                 try:
-                    result = self.registry.dispatcher.execute(
+                    result = await self.registry.dispatcher.execute(
                         request.method, 
                         **request.params
                     )
@@ -537,7 +537,7 @@ class MCPProxyAdapter:
                 
                 # Execute the command
                 try:
-                    result = self.registry.dispatcher.execute(command, **params)
+                    result = await self.registry.dispatcher.execute(command, **params)
                     
                     # Return result in MCP Proxy format
                     return {"result": result}

mcp_proxy_adapter/dispatchers/json_rpc_dispatcher.py

@@ -141,7 +141,22 @@ class JsonRpcDispatcher(BaseDispatcher):
                 async def _return_sync():
                     return result
                 return await _return_sync()
-        except Exception as e:
+        except TypeError as e:
+            # Попробовать вызвать handler(params=kwargs), если ошибка связана с лишними именованными аргументами
+            if (len(params) == 1 and 'params' in params):
+                try:
+                    if inspect.iscoroutinefunction(handler):
+                        result = handler(params=kwargs)
+                    else:
+                        result = loop.run_in_executor(None, lambda: handler(params=kwargs))
+                    if inspect.isawaitable(result):
+                        return await result
+                    else:
+                        async def _return_sync():
+                            return result
+                        return await _return_sync()
+                except Exception:
+                    pass
             raise e
 
     async def execute(self, command: str, **kwargs) -> Any:
@@ -204,7 +219,20 @@ class JsonRpcDispatcher(BaseDispatcher):
         """
         if not params:
             params = {}
-            
+        # Если передан неправильный параметр 'command', возвращаем понятную ошибку
+        if "command" in params and params["command"]:
+            return {
+                "error": "Parameter 'command' is not supported. Use 'cmdname' instead.",
+                "hint": "Send params: {\"cmdname\": \"your_command\"}",
+                "example": {"jsonrpc": "2.0", "method": "help", "params": {"cmdname": "your_command"}, "id": 1}
+            }
+        # Если handler вызывается синхронно и возвращает coroutine, возвращаем явную ошибку
+        if inspect.iscoroutinefunction(self._help_command):
+            return {
+                "error": "Help handler must be awaited. Call as await dispatcher.execute('help', ...) in async context.",
+                "hint": "Use async endpoint or await the result in your code.",
+                "example": "result = await dispatcher.execute('help', cmdname='your_command')"
+            }
         # If specific command is specified, return information only about it
         if "cmdname" in params and params["cmdname"]:
             command = params["cmdname"]
@@ -213,7 +241,6 @@ class JsonRpcDispatcher(BaseDispatcher):
                     "error": f"Command '{command}' not found",
                     "available_commands": list(self._metadata.keys())
                 }
-            
             return {
                 "command": command,
                 "info": self._metadata[command]

{mcp_proxy_adapter-2.1.16.dist-info → mcp_proxy_adapter-2.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 2.1.16
+Version: 2.1.17
 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
@@ -338,4 +338,39 @@ This project uses GitHub Actions for continuous integration and automated publis
 - All tests are run on every push and pull request.
 - On push of a new tag (vX.Y.Z), the package is built and published to PyPI automatically.
 
-See `.github/workflows/publish.yml` for details. 
+See `.github/workflows/publish.yml` for details.
+
+## Встроенная команда help: правила и типовые ошибки
+
+### Как работает
+- Команда `help` всегда встроена в MCPProxyAdapter и не требует реализации или регистрации со стороны пользователя.
+- Для получения справки по конкретной команде используйте параметр `cmdname`:
+  ```json
+  {"jsonrpc": "2.0", "method": "help", "params": {"cmdname": "имя_команды"}, "id": 1}
+  ```
+- Для получения списка всех команд:
+  ```json
+  {"jsonrpc": "2.0", "method": "help", "id": 1}
+  ```
+
+### Типовые ошибки и их решения
+- **Ошибка: передан параметр `command` вместо `cmdname`**
+  - Ответ: 
+    ```json
+    {"error": "Parameter 'command' is not supported. Use 'cmdname' instead.", "hint": "Send params: {\"cmdname\": \"your_command\"}", ...}
+    ```
+  - **Решение:** всегда используйте `cmdname`.
+- **Ошибка сериализации coroutine**
+  - Причина: handler вызывается без await, либо возвращает coroutine.
+  - Ответ:
+    ```json
+    {"error": "Help handler must be awaited. Call as await dispatcher.execute('help', ...) in async context.", ...}
+    ```
+  - **Решение:** всегда await-ить dispatcher.execute в async endpoint.
+
+### Важно для интеграторов и пользователей
+- Не реализуйте свой обработчик help — используйте встроенный.
+- Не используйте параметр `command` — только `cmdname`.
+- Все ошибки help-команды теперь сопровождаются понятной подсказкой и примером корректного запроса.
+
+--- 

{mcp_proxy_adapter-2.1.16.dist-info → mcp_proxy_adapter-2.1.17.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mcp_proxy_adapter/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-mcp_proxy_adapter/adapter.py,sha256=76dkVeDuqLsJ5AhuftzLlwy2M6yr_PfNbmNfo9dXVhc,28844
+mcp_proxy_adapter/adapter.py,sha256=x5pT-t4uT12O3GzLurrKBSQ_hwVpjhCRx5oZ5AdZnpY,28856
 mcp_proxy_adapter/models.py,sha256=8zVWU6ly18pWozOnKQ2gsGpmTgL37-fFE_Fr1SDW-Nk,2530
 mcp_proxy_adapter/registry.py,sha256=jgC4TKaPbMbAsoxvGp2ToaOE4drD-VfZug7WJbm4IW4,15853
 mcp_proxy_adapter/schema.py,sha256=HZM0TTQTSi8ha1TEeVevdCyGZOUPoT1soB7Nex0hV50,10947
@@ -9,7 +9,7 @@ mcp_proxy_adapter/analyzers/docstring_analyzer.py,sha256=T3FLJEo_uChShfiEKRl8GpV
 mcp_proxy_adapter/analyzers/type_analyzer.py,sha256=6Wac7osKwF03waFSwQ8ZM0Wqn_zAP2D-I4WMEpR0hQM,5230
 mcp_proxy_adapter/dispatchers/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 mcp_proxy_adapter/dispatchers/base_dispatcher.py,sha256=S5_Xri058jAmOWeit1tedB_GMZQ9RLcNcYabA83ZF6k,2288
-mcp_proxy_adapter/dispatchers/json_rpc_dispatcher.py,sha256=HO3RY5AzCQF3UPqnOIauB7Sq9rJC9jv7h7FTM1eDR90,8054
+mcp_proxy_adapter/dispatchers/json_rpc_dispatcher.py,sha256=DBhO8DKPBKKBsARlq6IesnOFvl4GU6XVDP8gB6hZMpk,9885
 mcp_proxy_adapter/examples/analyze_config.py,sha256=vog7TNHDw5ZoYhQLbAvZvEoufmQwH54KJzQBJrSq5w4,4283
 mcp_proxy_adapter/examples/basic_integration.py,sha256=mtRval4VSUgTb_C2p8U_DPPSEKA08dZYKZk-bOrE4H4,4470
 mcp_proxy_adapter/examples/docstring_and_schema_example.py,sha256=wFg3Cf2Jgve0J5kFzApvFSII8JOsOGaych64hIC7FqQ,2183
@@ -23,8 +23,8 @@ mcp_proxy_adapter/examples/testing_example.py,sha256=OxFUhGP9OXiu9eWjSpytpQ5MzoR
 mcp_proxy_adapter/validators/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 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.16.dist-info/licenses/LICENSE,sha256=OkApFEwdgMCt_mbvUI-eIwKMSTe38K3XnU2DT5ub-wI,1072
-mcp_proxy_adapter-2.1.16.dist-info/METADATA,sha256=ww2i2m0f6txplRMYCb65rU1h9tDAm-FL-4hq2ZBzlUE,8886
-mcp_proxy_adapter-2.1.16.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-mcp_proxy_adapter-2.1.16.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-2.1.16.dist-info/RECORD,,
+mcp_proxy_adapter-2.1.17.dist-info/licenses/LICENSE,sha256=OkApFEwdgMCt_mbvUI-eIwKMSTe38K3XnU2DT5ub-wI,1072
+mcp_proxy_adapter-2.1.17.dist-info/METADATA,sha256=Ru_MBUNRwbAxzhofC-0M8JD-NmnzmI2-h9wbgned1Z4,10822
+mcp_proxy_adapter-2.1.17.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+mcp_proxy_adapter-2.1.17.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-2.1.17.dist-info/RECORD,,