test: align structured tool result assertions with types

Author: lavish0000

tests/server/mcpserver/test_tool_manager.py

@@ -1,7 +1,8 @@
 import json
 import logging
+from collections.abc import Sequence
 from dataclasses import dataclass
-from typing import Any, TypedDict
+from typing import Any, TypedDict, cast
 
 import pytest
 from pydantic import BaseModel
@@ -12,7 +13,12 @@
 from mcp.server.mcpserver.tools import Tool, ToolManager
 from mcp.server.mcpserver.utilities.func_metadata import ArgModelBase, FuncMetadata
 from mcp.server.session import ServerSessionT
-from mcp.types import TextContent, ToolAnnotations
+from mcp.types import ContentBlock, TextContent, ToolAnnotations
+
+
+def _text_contents(unstructured_content: Sequence[ContentBlock]) -> list[TextContent]:
+    assert all(isinstance(item, TextContent) for item in unstructured_content)
+    return [cast(TextContent, item) for item in unstructured_content]
 
 
 class TestAddTools:
@@ -456,7 +462,12 @@ def get_user(user_id: int) -> UserOutput:
         manager.add_tool(get_user)
         result = await manager.call_tool("get_user", {"user_id": 1}, Context(), convert_result=True)
         # don't test unstructured output here, just the structured conversion
-        assert len(result) == 2 and result[1] == {"name": "John", "age": 30}
+        assert isinstance(result, tuple)
+        assert len(result) == 2
+        unstructured_content, structured_content = cast(tuple[Sequence[ContentBlock], dict[str, Any]], result)
+        text_items = _text_contents(unstructured_content)
+        assert structured_content == {"name": "John", "age": 30}
+        assert json.loads(text_items[0].text) == structured_content
 
     @pytest.mark.anyio
     async def test_tool_with_primitive_output(self):
@@ -471,7 +482,12 @@ def double_number(n: int) -> int:
         result = await manager.call_tool("double_number", {"n": 5}, Context())
         assert result == 10
         result = await manager.call_tool("double_number", {"n": 5}, Context(), convert_result=True)
-        assert isinstance(result[0][0], TextContent) and result[1] == {"result": 10}
+        assert isinstance(result, tuple)
+        assert len(result) == 2
+        unstructured_content, structured_content = cast(tuple[Sequence[ContentBlock], dict[str, Any]], result)
+        text_items = _text_contents(unstructured_content)
+        assert text_items[0].text == "10"
+        assert structured_content == {"result": 10}
 
     @pytest.mark.anyio
     async def test_tool_with_typeddict_output(self):
@@ -511,7 +527,12 @@ def get_person() -> Person:
         manager.add_tool(get_person)
         result = await manager.call_tool("get_person", {}, Context(), convert_result=True)
         # don't test unstructured output here, just the structured conversion
-        assert len(result) == 2 and result[1] == expected_output
+        assert isinstance(result, tuple)
+        assert len(result) == 2
+        unstructured_content, structured_content = cast(tuple[Sequence[ContentBlock], dict[str, Any]], result)
+        text_items = _text_contents(unstructured_content)
+        assert structured_content == expected_output
+        assert json.loads(text_items[0].text) == structured_content
 
     @pytest.mark.anyio
     async def test_tool_with_list_output(self):
@@ -529,7 +550,12 @@ def get_numbers() -> list[int]:
         result = await manager.call_tool("get_numbers", {}, Context())
         assert result == expected_list
         result = await manager.call_tool("get_numbers", {}, Context(), convert_result=True)
-        assert isinstance(result[0][0], TextContent) and result[1] == expected_output
+        assert isinstance(result, tuple)
+        assert len(result) == 2
+        unstructured_content, structured_content = cast(tuple[Sequence[ContentBlock], dict[str, Any]], result)
+        text_items = _text_contents(unstructured_content)
+        assert [item.text for item in text_items] == ["1", "2", "3", "4", "5"]
+        assert structured_content == expected_output
 
     @pytest.mark.anyio
     async def test_tool_without_structured_output(self):