mcp-proxy-adapter 2.1.9__tar.gz → 2.1.11__tar.gz

{mcp_proxy_adapter-2.1.9/mcp_proxy_adapter.egg-info → mcp_proxy_adapter-2.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 2.1.9
+Version: 2.1.11
 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.9 → mcp_proxy_adapter-2.1.11}/mcp_proxy_adapter/adapter.py

@@ -493,13 +493,6 @@ 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():
@@ -508,14 +501,12 @@ class MCPProxyAdapter:
                         "error": {
                             "code": 404,
                             "message": f"Unknown command: {command}",
-                            "details": f"Unknown command: {command}. Available commands: {', '.join(self.registry.dispatcher.get_valid_commands())}"
+                            "details": f"Command '{command}' not found in registry. 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():
@@ -531,7 +522,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:
@@ -543,10 +534,9 @@ 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-2.1.9 → mcp_proxy_adapter-2.1.11}/mcp_proxy_adapter/dispatchers/json_rpc_dispatcher.py

@@ -157,26 +157,31 @@ 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 (dict)
+            params: Command parameters
                 cmdname: Command name for detailed information
+                
         Returns:
             Dict[str, Any]: Command help information
         """
-        if params is None:
+        if not params:
             params = {}
-        # If specific command is specified, return information only about it
-        cmdname = params.get("cmdname")
-        if cmdname:
+            
+        # Only support 'cmdname' parameter
+        if "cmdname" in params and params["cmdname"]:
+            cmdname = params["cmdname"]
             if cmdname not in self._metadata:
                 return {
                     "error": f"Command '{cmdname}' not found",
                     "available_commands": list(self._metadata.keys())
                 }
+            
             return {
                 "cmdname": cmdname,
                 "info": self._metadata[cmdname]
             }
+        
         # Otherwise return brief information about all commands
         commands_info = {}
         for cmd, info in self._metadata.items():
@@ -185,8 +190,9 @@ class JsonRpcDispatcher(BaseDispatcher):
                 "description": info["description"],
                 "params_count": len(info["params"])
             }
+        
         return {
             "commands": commands_info,
             "total": len(commands_info),
-            "note": "Use the 'cmdname' parameter to get detailed information about a specific command"
+            "note": "To get info about a specific command, call help with parameter: POST /cmd {\"command\": \"help\", \"params\": {\"cmdname\": \"<command_name>\"}}. Only the 'cmdname' parameter is supported. Calling 'help <command>' (with space) is NOT supported."
         } 

{mcp_proxy_adapter-2.1.9 → mcp_proxy_adapter-2.1.11}/mcp_proxy_adapter/examples/help_best_practices.py

@@ -12,10 +12,10 @@ Run:
 """
 import os
 import sys
-sys.path.insert(0, os.path.abspath(os.path.dirname(os.path.dirname(__file__))))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
 from typing import Any, Dict
 from mcp_proxy_adapter.adapter import MCPProxyAdapter
-from tests.test_mcp_proxy_adapter import MockRegistry
+from mcp_proxy_adapter.testing_utils import MockRegistry
 
 # --- Setup registry and adapter ---
 registry = MockRegistry()

{mcp_proxy_adapter-2.1.9 → mcp_proxy_adapter-2.1.11}/mcp_proxy_adapter/examples/help_usage.py

@@ -12,41 +12,41 @@ Run:
 """
 import os
 import sys
-sys.path.insert(0, os.path.abspath(os.path.dirname(os.path.dirname(__file__))))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
 from typing import Any, Dict
 
 # Assume MCPProxyAdapter and MockRegistry are available from src and tests
 from mcp_proxy_adapter.adapter import MCPProxyAdapter
-from tests.test_mcp_proxy_adapter import MockRegistry
+from mcp_proxy_adapter.testing_utils import MockRegistry
 
 # --- Setup registry and adapter ---
 registry = MockRegistry()
 adapter = MCPProxyAdapter(registry)
 
 # --- Best practice: always check if 'help' is in commands ---
-def call_help(command: str = None) -> Dict[str, Any]:
+def call_help(cmdname: str = None) -> Dict[str, Any]:
     """Call help command with or without parameter."""
     dispatcher = registry.dispatcher
     if "help" in dispatcher.get_valid_commands():
-        if command:
+        if cmdname:
             try:
-                return dispatcher.help_command(command=command)
+                return dispatcher.help_command(cmdname=cmdname)
             except Exception as e:
                 print(f"Project help failed: {e}. Fallback to adapter help.")
-                return adapter_help(command)
+                return adapter_help(cmdname)
         else:
             return dispatcher.help_command()
     else:
-        return adapter_help(command)
+        return adapter_help(cmdname)
 
-def adapter_help(command: str = None) -> Dict[str, Any]:
+def adapter_help(cmdname: str = None) -> Dict[str, Any]:
     """Fallback: call adapter's help (simulate)."""
     dispatcher = registry.dispatcher
-    if not command:
+    if not cmdname:
         return {"source": "adapter", "commands": dispatcher.get_valid_commands()}
-    if command in dispatcher.get_valid_commands():
-        return {"source": "adapter", "command": command, "info": {"description": "Adapter help for command"}}
-    return {"source": "adapter", "error": f"Command '{command}' not found (adapter)", "available_commands": dispatcher.get_valid_commands()}
+    if cmdname in dispatcher.get_valid_commands():
+        return {"source": "adapter", "cmdname": cmdname, "info": {"description": "Adapter help for command"}}
+    return {"source": "adapter", "error": f"Command '{cmdname}' not found (adapter)", "available_commands": dispatcher.get_valid_commands()}
 
 if __name__ == "__main__":
     print("=== Project help (no param) ===")

{mcp_proxy_adapter-2.1.9 → mcp_proxy_adapter-2.1.11}/mcp_proxy_adapter/examples/openapi_server.py

@@ -171,7 +171,7 @@ class MockDispatcher:
             "help": {
                 "description": "Show information about available commands or a specific command.",
                 "params": {
-                    "command": {
+                    "cmdname": {
                         "type": "string",
                         "description": "Command name for detailed info",
                         "required": False
@@ -278,119 +278,105 @@ class MockDispatcher:
 
     def help_command(self, **params):
         """Return info about all commands or a specific command."""
-        # Если в будущем появится пользовательская команда help, можно реализовать её здесь
-        command = params.get("command")
-        if command:
-            info = self.commands_info.get(command)
+        cmdname = params.get("cmdname")
+        if cmdname:
+            info = self.commands_info.get(cmdname)
             if info:
-                return {"command": command, "info": info}
+                return {"cmdname": cmdname, "info": info}
             else:
-                return {"error": f"Command '{command}' not found", "available_commands": list(self.commands_info.keys())}
-        # Если параметр command не указан, возвращаем краткую информацию обо всех
+                return {"error": f"Command '{cmdname}' not found", "available_commands": list(self.commands_info.keys())}
+        # Если параметр cmdname не указан, возвращаем краткую информацию обо всех
         return {
             "commands": {cmd: {"description": info["description"], "params": info["params"]} for cmd, info in self.commands_info.items()},
             "total": len(self.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"
         }
 
+# --- Создание registry и FastAPI-приложения на верхнем уровне ---
 class CustomMockRegistry(MockRegistry):
     """Custom command registry for example."""
-    
     def __init__(self):
-        """Initialization with custom dispatcher."""
         self.dispatcher = MockDispatcher()
         self.generators = []
 
-def main():
-    """Main function to start server."""
-    # Create command registry
-    registry = CustomMockRegistry()
-    
-    # Create FastAPI object
-    app = FastAPI(
-        title="OpenAPI Server Example",
-        description="Example OpenAPI server with MCP Proxy Adapter integration",
-        version="1.0.0"
-    )
-    
-    # Configure CORS
-    from fastapi.middleware.cors import CORSMiddleware
-    app.add_middleware(
-        CORSMiddleware,
-        allow_origins=["*"],  # Allow requests from all sources
-        allow_credentials=True,
-        allow_methods=["*"],  # Allow all methods
-        allow_headers=["*"],  # Allow all headers
-    )
-    
-    # Create MCP Proxy adapter with explicit endpoint
-    adapter = MCPProxyAdapter(registry, cmd_endpoint="/cmd")
-    
-    # Register adapter endpoints
-    adapter.register_endpoints(app)
-    
-    # Save MCP Proxy configuration to file
-    config_path = os.path.join(os.path.dirname(__file__), "mcp_proxy_config.json")
-    adapter.save_config_to_file(config_path)
-    logger.info(f"MCP Proxy configuration saved to {config_path}")
-    
-    # Define REST endpoints for example (not related to MCP Proxy)
-    @app.get("/")
-    def read_root():
-        """Root endpoint."""
-        return {
-            "message": "OpenAPI Server Example with MCP Proxy Adapter integration",
-            "endpoints": {
-                "items": "/items",
-                "item": "/items/{item_id}",
-                "search": "/items/search",
-                "mcp_proxy": "/cmd"
-            }
+registry = CustomMockRegistry()
+app = FastAPI(
+    title="OpenAPI Server Example",
+    description="Example OpenAPI server with MCP Proxy Adapter integration",
+    version="1.0.0"
+)
+
+# Configure CORS
+from fastapi.middleware.cors import CORSMiddleware
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+# Create MCP Proxy adapter with explicit endpoint
+adapter = MCPProxyAdapter(registry, cmd_endpoint="/cmd")
+# Register adapter endpoints
+adapter.register_endpoints(app)
+# Save MCP Proxy configuration to file
+config_path = os.path.join(os.path.dirname(__file__), "mcp_proxy_config.json")
+adapter.save_config_to_file(config_path)
+logger.info(f"MCP Proxy configuration saved to {config_path}")
+
+# --- REST endpoints ---
+@app.get("/")
+def read_root():
+    return {
+        "message": "OpenAPI Server Example with MCP Proxy Adapter integration",
+        "endpoints": {
+            "items": "/items",
+            "item": "/items/{item_id}",
+            "search": "/items/search",
+            "mcp_proxy": "/cmd"
         }
-    
-    @app.get("/items", response_model=List[Item])
-    def read_items():
-        """Get all items."""
-        return items_db
-    
-    @app.get("/items/{item_id}", response_model=Item)
-    def read_item(item_id: int = Path(..., description="Item ID", gt=0)):
-        """Get item by ID."""
-        try:
-            return registry.dispatcher.get_item(item_id)
-        except ValueError as e:
-            return {"error": str(e)}
-    
-    @app.post("/items", response_model=Item)
-    def create_new_item(item: Item = Body(..., description="Data of new item")):
-        """Create new item."""
-        return registry.dispatcher.create_item(item.model_dump())
-    
-    @app.put("/items/{item_id}", response_model=Item)
-    def update_existing_item(
-        item_id: int = Path(..., description="Item ID to update", gt=0),
-        item: Item = Body(..., description="Updated item data")
-    ):
-        """Update item by ID."""
-        try:
-            return registry.dispatcher.update_item(item_id, item.model_dump())
-        except ValueError as e:
-            return {"error": str(e)}
-    
-    @app.delete("/items/{item_id}")
-    def delete_existing_item(item_id: int = Path(..., description="Item ID to delete", gt=0)):
-        """Delete item by ID."""
-        try:
-            return registry.dispatcher.delete_item(item_id)
-        except ValueError as e:
-            return {"error": str(e)}
-    
-    @app.get("/items/search", response_model=List[Item])
-    def search_items_by_keyword(keyword: str = Query(..., description="Search keyword")):
-        """Search items by keyword."""
-        return registry.dispatcher.search_items(keyword)
-    
-    # Start server
+    }
+
+@app.get("/items", response_model=List[Item])
+def read_items():
+    return items_db
+
+@app.get("/items/{item_id}", response_model=Item)
+def read_item(item_id: int = Path(..., description="Item ID", gt=0)):
+    try:
+        return registry.dispatcher.get_item(item_id)
+    except ValueError as e:
+        return {"error": str(e)}
+
+@app.post("/items", response_model=Item)
+def create_new_item(item: Item = Body(..., description="Data of new item")):
+    return registry.dispatcher.create_item(item.model_dump())
+
+@app.put("/items/{item_id}", response_model=Item)
+def update_existing_item(
+    item_id: int = Path(..., description="Item ID to update", gt=0),
+    item: Item = Body(..., description="Updated item data")
+):
+    try:
+        return registry.dispatcher.update_item(item_id, item.model_dump())
+    except ValueError as e:
+        return {"error": str(e)}
+
+@app.delete("/items/{item_id}")
+def delete_existing_item(item_id: int = Path(..., description="Item ID to delete", gt=0)):
+    try:
+        return registry.dispatcher.delete_item(item_id)
+    except ValueError as e:
+        return {"error": str(e)}
+
+@app.get("/items/search", response_model=List[Item])
+def search_items_by_keyword(keyword: str = Query(..., description="Search keyword")):
+    return registry.dispatcher.search_items(keyword)
+
+# --- main() только для запуска через python ---
+def main():
+    import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=8000)
 
 if __name__ == "__main__":

{mcp_proxy_adapter-2.1.9 → mcp_proxy_adapter-2.1.11/mcp_proxy_adapter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 2.1.9
+Version: 2.1.11
 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.9 → mcp_proxy_adapter-2.1.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mcp-proxy-adapter"
-version = "2.1.9"
+version = "2.1.11"
 description = "Adapter for exposing Command Registry commands as tools for AI models via MCP Proxy."
 readme = "README.md"
 requires-python = ">=3.9"

{mcp_proxy_adapter-2.1.9 → mcp_proxy_adapter-2.1.11}/setup.py

@@ -14,7 +14,7 @@ with open(os.path.join(here, 'requirements.txt'), encoding='utf-8') as f:
 
 setup(
     name="mcp-proxy-adapter",
-    version="2.1.9",
+    version="2.1.11",
     description="Adapter for exposing Command Registry commands as tools for AI models via MCP Proxy.",
     long_description=long_description,
     long_description_content_type="text/markdown",

{mcp_proxy_adapter-2.1.9 → mcp_proxy_adapter-2.1.11}/tests/test_adapter.py

@@ -29,8 +29,6 @@ except ImportError:
     from src.adapter import MCPProxyAdapter, configure_logger
     from src.registry import CommandRegistry
 
-print('LOADED test_adapter.py')
-
 # Test command functions
 def success_command(value: int = 1) -> dict:
     """Test command that completes successfully."""
@@ -65,7 +63,7 @@ class BaseDispatcher:
         raise NotImplementedError("Method must be overridden in subclass")
 
 # Mock for command dispatcher
-class MockDispatcherXXX(BaseDispatcher):
+class MockDispatcher(BaseDispatcher):
     """Mock for command dispatcher in tests."""
     
     def __init__(self):
@@ -73,8 +71,7 @@ class MockDispatcherXXX(BaseDispatcher):
             "success": success_command,
             "error": error_command,
             "param": param_command,
-            "execute": self.execute_from_params,
-            "__help": self.help_command
+            "execute": self.execute_from_params
         }
         self.commands_info = {
             "success": {
@@ -117,16 +114,6 @@ class MockDispatcherXXX(BaseDispatcher):
                         "required": False
                     }
                 }
-            },
-            "__help": {
-                "description": "Show help for commands",
-                "params": {
-                    "cmdname": {
-                        "type": "string",
-                        "description": "Command name for detailed info",
-                        "required": False
-                    }
-                }
             }
         }
     
@@ -134,8 +121,6 @@ class MockDispatcherXXX(BaseDispatcher):
         """Executes command based on parameters."""
         if "query" in params and params["query"] in self.commands:
             command = params.pop("query")
-            if command == "help":
-                command = "__help"
             return self.execute(command, **params)
         return {
             "available_commands": self.get_valid_commands(),
@@ -143,48 +128,25 @@ class MockDispatcherXXX(BaseDispatcher):
         }
     
     def execute(self, command, **params):
-        print(f"[DEBUG] execute called: command={command}, params={params}")
-        if command == "help":
-            command = "__help"
         if command not in self.commands:
             raise KeyError(f"Unknown command: {command}")
-        if command == "__help":
-            return self.commands[command](params=params)
         return self.commands[command](**params)
     
     def get_valid_commands(self):
         return list(self.commands.keys())
     
     def get_command_info(self, command):
-        if command == "help":
-            command = "__help"
         return self.commands_info.get(command)
     
     def get_commands_info(self):
         return self.commands_info
 
-    def help_command(self, params=None):
-        import traceback; print(f"[DEBUG] help_command called with params: {params}"); print(f"[DEBUG] commands_info: {self.commands_info}"); traceback.print_stack()
-        if params is None:
-            params = {}
-        cmdname = params.get("cmdname")
-        if cmdname:
-            if cmdname in self.commands_info:
-                return {"cmdname": cmdname, "info": self.commands_info[cmdname]}
-            else:
-                return {"error": f"Command '{cmdname}' not found", "available_commands": list(self.commands_info.keys())}
-        return {
-            "commands": {cmd: {"description": info["description"], "params": info["params"]} for cmd, info in self.commands_info.items()},
-            "total": len(self.commands_info),
-            "note": "Use the 'cmdname' parameter to get detailed information about a specific command"
-        }
-
 # Mock for CommandRegistry
 class MockRegistry:
     """Mock for CommandRegistry in tests."""
     
     def __init__(self):
-        self.dispatcher = MockDispatcherXXX()
+        self.dispatcher = MockDispatcher()
         self.generators = []
     
     def get_commands_info(self):
@@ -457,9 +419,9 @@ def test_save_config_to_file(adapter, tmp_path):
     
     assert "version" in config
     assert "tools" in config
-    assert len(config["tools"]) == 5  # Теперь 5 команд (включая help)
+    assert len(config["tools"]) == 4  # Corrected: now we have 4 commands
     assert "routes" in config
-    assert len(config["routes"]) == 5  # Теперь 5 маршрутов
+    assert len(config["routes"]) == 4  # Corrected: now we have 4 routes, corresponding to commands
 
 def test_parameter_type_validation(test_app):
     """Test parameter type validation."""
@@ -564,62 +526,4 @@ def test_params_only_format(test_app):
     data = response.json()
     assert "result" in data
     assert "available_commands" in data["result"]
-    assert "received_params" in data["result"]
-
-def test_jsonrpc_proxy_and_help_conflict(test_app):
-    """Test JSON-RPC proxying and help/command param conflict."""
-    # Обычный JSON-RPC вызов существующей команды
-    response = test_app.post("/cmd", json={
-        "jsonrpc": "2.0",
-        "method": "success",
-        "params": {"value": 3},
-        "id": 42
-    })
-    assert response.status_code == 200
-    data = response.json()
-    assert "result" in data
-    assert data["result"] == {"result": 6}
-
-    # Вызов help по конкретной команде (не должно быть multiple values for argument 'command')
-    response = test_app.post("/cmd", json={
-        "jsonrpc": "2.0",
-        "method": "help",
-        "params": {"cmdname": "success"},
-        "id": 43
-    })
-    assert response.status_code == 200
-    data = response.json()
-    assert "result" in data
-    assert data["result"]["cmdname"] == "success"
-    assert "info" in data["result"]
-    assert "description" in data["result"]["info"]
-
-    # Вызов help по несуществующей команде
-    response = test_app.post("/cmd", json={
-        "jsonrpc": "2.0",
-        "method": "help",
-        "params": {"cmdname": "not_a_command"},
-        "id": 44
-    })
-    assert response.status_code == 200
-    data = response.json()
-    assert "result" in data
-    # Ошибка может быть либо в data['result']['error'], либо в data['error']['message']
-    found = False
-    if "error" in data["result"] and "not found" in data["result"]["error"]:
-        found = True
-    if "error" in data and "message" in data["error"] and "not found" in data["error"]["message"]:
-        found = True
-    assert found, f"No 'not found' in error: {data}"
-
-    # Вызов несуществующей команды
-    response = test_app.post("/cmd", json={
-        "jsonrpc": "2.0",
-        "method": "not_a_command",
-        "params": {},
-        "id": 45
-    })
-    assert response.status_code == 200
-    data = response.json()
-    assert "error" in data
-    assert "Unknown command" in data["error"]["message"] 
+    assert "received_params" in data["result"] 

{mcp_proxy_adapter-2.1.9 → mcp_proxy_adapter-2.1.11}/tests/test_examples.py

@@ -3,7 +3,7 @@ import sys
 import os
 import pytest
 
-EXAMPLES_DIR = os.path.join(os.path.dirname(__file__), "..", "examples")
+EXAMPLES_DIR = os.path.join(os.path.dirname(__file__), "..", "mcp_proxy_adapter", "examples")
 
 @pytest.mark.parametrize("script,expected", [
     ("help_usage.py", ["Project help", "Adapter help"]),