unwrap mcp results

Author: h3xxit

plugins/communication_protocols/mcp/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utcp-mcp"
-version = "1.1.1"
+version = "1.1.2"
 authors = [
   { name = "UTCP Contributors" },
 ]

plugins/communication_protocols/mcp/src/utcp_mcp/mcp_communication_protocol.py

@@ -387,6 +387,9 @@ def _process_tool_result(self, result, tool_name: str) -> Any:
         # Check for structured output first - this is the expected behavior
         if hasattr(result, 'structuredContent'):
             self._log_info(f"Found structuredContent: {result.structuredContent}")
+            # If structuredContent has a 'result' key, unwrap it
+            if isinstance(result.structuredContent, dict) and 'result' in result.structuredContent:
+                return result.structuredContent['result']
             return result.structuredContent
 
         # Process content if available (fallback)

plugins/communication_protocols/mcp/tests/test_mcp_http_transport.py

@@ -136,7 +136,7 @@ async def test_http_unstructured_output(
 
     # Call the greet tool and verify the result
     result = await transport.call_tool(None, f"{HTTP_SERVER_NAME}.greet", {"name": "Alice"}, http_mcp_provider)
-    assert result == {"result": "Hello, Alice!"}
+    assert result == "Hello, Alice!"
 
 
 @pytest.mark.asyncio
@@ -152,9 +152,9 @@ async def test_http_list_output(
     # Call the list_items tool and verify the result
     result = await transport.call_tool(None, f"{HTTP_SERVER_NAME}.list_items", {"count": 3}, http_mcp_provider)
 
-    assert isinstance(result, dict)
-    assert "result" in result
-    assert result == {"result": ["item_0", "item_1", "item_2"]}
+    assert isinstance(result, list)
+    assert len(result) == 3
+    assert result == ["item_0", "item_1", "item_2"]
 
 
 @pytest.mark.asyncio
@@ -170,7 +170,7 @@ async def test_http_numeric_output(
     # Call the add_numbers tool and verify the result
     result = await transport.call_tool(None, f"{HTTP_SERVER_NAME}.add_numbers", {"a": 5, "b": 7}, http_mcp_provider)
 
-    assert result == {"result": 12}
+    assert result == 12
 
 
 @pytest.mark.asyncio

plugins/communication_protocols/mcp/tests/test_mcp_transport.py

@@ -98,7 +98,7 @@ async def test_unstructured_string_output(transport: McpCommunicationProtocol, m
     await transport.register_manual(None, mcp_manual)
 
     result = await transport.call_tool(None, f"{SERVER_NAME}.greet", {"name": "Alice"}, mcp_manual)
-    assert result == {"result": "Hello, Alice!"}
+    assert result == "Hello, Alice!"
 
 
 @pytest.mark.asyncio
@@ -108,9 +108,9 @@ async def test_list_output(transport: McpCommunicationProtocol, mcp_manual: McpC
 
     result = await transport.call_tool(None, f"{SERVER_NAME}.list_items", {"count": 3}, mcp_manual)
 
-    assert isinstance(result, dict)
-    assert "result" in result
-    assert result == {"result": ["item_0", "item_1", "item_2"]}
+    assert isinstance(result, list)
+    assert len(result) == 3
+    assert result == ["item_0", "item_1", "item_2"]
 
 
 @pytest.mark.asyncio
@@ -120,7 +120,7 @@ async def test_numeric_output(transport: McpCommunicationProtocol, mcp_manual: M
 
     result = await transport.call_tool(None, f"{SERVER_NAME}.add_numbers", {"a": 5, "b": 7}, mcp_manual)
 
-    assert result == {"result": 12}
+    assert result == 12
 
 
 @pytest.mark.asyncio