mcp-proxy-adapter 6.4.47__py3-none-any.whl → 6.4.48__py3-none-any.whl

mcp_proxy_adapter/api/handlers.py

@@ -2,6 +2,7 @@
 Module with API request handlers.
 """
 
+import asyncio
 import json
 import time
 from typing import Any, Dict, List, Optional, Union
@@ -75,7 +76,16 @@ async def execute_command(
                 "permissions": getattr(request.state, "user_permissions", ["read"]),
             }
 
-        result = await command_class.run(**params, context=context)
+        # Add timeout to prevent hanging commands
+        try:
+            result = await asyncio.wait_for(
+                command_class.run(**params, context=context),
+                timeout=10.0  # 10 seconds timeout
+            )
+        except asyncio.TimeoutError:
+            execution_time = time.time() - start_time
+            log.error(f"⏰ Command '{command_name}' timed out after {execution_time:.3f} sec")
+            raise InternalError(f"Command execution timed out after 10 seconds")
 
         execution_time = time.time() - start_time
 
@@ -136,7 +146,7 @@ async def handle_json_rpc(
     request: Optional[Request] = None,
 ) -> Dict[str, Any]:
     """
-    Handles JSON-RPC request.
+    Handles JSON-RPC request with support for both standard JSON-RPC and simplified formats.
 
     Args:
         request_data: JSON-RPC request data.
@@ -148,40 +158,66 @@ async def handle_json_rpc(
     # Create request logger if request_id is provided
     log = RequestLogger(__name__, request_id) if request_id else logger
 
-    # Check JSON-RPC version
-    if request_data.get("jsonrpc") != "2.0":
-        return _create_error_response(
-            InvalidRequestError("Invalid Request. Expected jsonrpc: 2.0"),
-            request_data.get("id"),
-        )
-
-    # Get method and parameters
-    method = request_data.get("method")
-    params = request_data.get("params", {})
-    json_rpc_id = request_data.get("id")
-
-    if not method:
-        return _create_error_response(
-            InvalidRequestError("Invalid Request. Method is required"), json_rpc_id
-        )
+    # Support both standard JSON-RPC and simplified formats
+    method = None
+    params = {}
+    json_rpc_id = None
+
+    # Check if it's a standard JSON-RPC request
+    if "jsonrpc" in request_data:
+        # Standard JSON-RPC format
+        if request_data.get("jsonrpc") != "2.0":
+            return _create_error_response(
+                InvalidRequestError("Invalid Request. Expected jsonrpc: 2.0"),
+                request_data.get("id"),
+            )
+        
+        method = request_data.get("method")
+        params = request_data.get("params", {})
+        json_rpc_id = request_data.get("id")
+        
+        if not method:
+            return _create_error_response(
+                InvalidRequestError("Invalid Request. Method is required"), json_rpc_id
+            )
+    else:
+        # Simplified format: {"command": "help"} or {"command": "echo", "params": {...}}
+        method = request_data.get("command")
+        params = request_data.get("params", {})
+        json_rpc_id = request_data.get("id", 1)  # Default ID for simplified format
+        
+        if not method:
+            return _create_error_response(
+                InvalidRequestError("Invalid Request. Command is required"), json_rpc_id
+            )
+        
+        log.info(f"Using simplified format for command: {method}")
 
     log.info(f"Executing JSON-RPC method: {method}")
 
     try:
-        # Execute command
+        # Execute command with detailed logging
+        log.info(f"🔍 Starting command execution: {method}")
+        log.debug(f"📋 Command params: {params}")
+        
         result = await execute_command(method, params, request_id, request)
 
+        log.info(f"✅ Command {method} completed successfully")
+        
         # Form successful response
         return {"jsonrpc": "2.0", "result": result, "id": json_rpc_id}
     except MicroserviceError as e:
         # Method execution error
-        log.error(f"Method execution error: {str(e)}")
+        log.error(f"❌ Method execution error: {str(e)}")
+        log.error(f"📊 Error type: {type(e).__name__}")
         return _create_error_response(e, json_rpc_id)
     except Exception as e:
         # Internal server error
-        log.exception(f"Unhandled error in JSON-RPC handler: {e}")
+        log.exception(f"❌ Unhandled error in JSON-RPC handler: {e}")
+        log.error(f"📊 Exception type: {type(e).__name__}")
+        log.error(f"📊 Exception details: {repr(e)}")
         return _create_error_response(
-            InternalError("Internal error", data={"error": str(e)}), json_rpc_id
+            InternalError("Internal error", data={"error": str(e), "error_type": type(e).__name__}), json_rpc_id
         )
 
 

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.4.47.dist-info → mcp_proxy_adapter-6.4.48.dist-info}/METADATA

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

@@ -4,10 +4,10 @@ mcp_proxy_adapter/config.py,sha256=-7iVS0mUWWKNeao7nqTAFlUD6FcMwRlDkchN7OwYsr0,2
 mcp_proxy_adapter/custom_openapi.py,sha256=XRviX-C-ZkSKdBhORhDTdeN_1FWyEfXZADiASft3t9I,28149
 mcp_proxy_adapter/main.py,sha256=idp3KUR7CT7kTXLVPvvclJlNnt8d_HYl8_jY98uknmo,4677
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=k32wsC7RY9Zrjtw0IkpujnG2YSeS3O8mXDMuYNpI8NI,75
+mcp_proxy_adapter/version.py,sha256=Qsn1lO8hzs3Z5wG56326GM6FBBR72I5vBZv3h8BXVcI,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=cxjavhNTtaYg2ea-UeHSDnKh8edKVNQ2NbXUDYbufFU,34183
-mcp_proxy_adapter/api/handlers.py,sha256=iyFGoEuUS1wxbV1ELA0zmaxIyQR7j4zw-4MrD-uIO6E,8294
+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
 mcp_proxy_adapter/api/tools.py,sha256=nDQkxwgn11e1tR7kNfdYWsLAUogKmkEv8cVOYUtOq9U,8025
@@ -130,8 +130,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.4.47.dist-info/METADATA,sha256=KeccpHX7-_B_XgrcwPoO9BSrpgotF4LHJROqP3-mUq8,8511
-mcp_proxy_adapter-6.4.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.4.47.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.4.47.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.4.47.dist-info/RECORD,,
+mcp_proxy_adapter-6.4.48.dist-info/METADATA,sha256=-oqVyOxCI_0i_8ZIvZcpFMPvwJI1dnGgnvVsef0AGII,8511
+mcp_proxy_adapter-6.4.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.4.48.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.4.48.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.4.48.dist-info/RECORD,,