Assert structured content for typing.Dict and NewType returns

Author: Kludex

docs/servers/structured-output.md

@@ -149,7 +149,7 @@ Ask for a two-day forecast and `structured_content` is `{"result": [{...}, {...}
 
 ## Dictionaries
 
-`dict[str, ...]` is the one generic that already *is* a JSON object, so it isn't wrapped:
+`dict[str, ...]` (or `typing.Dict[str, ...]`) is the one generic that already *is* a JSON object, so it isn't wrapped:
 
 ```python title="server.py" hl_lines="9"
 --8<-- "docs_src/structured_output/tutorial006.py"

tests/server/mcpserver/test_func_metadata.py

@@ -296,14 +296,18 @@ def func_dict_list() -> dict[str, list[int]]:  # pragma: no cover
         "title": "func_dict_listDictOutput",
     }
 
-    def func_typing_dict() -> typing.Dict[str, str]:  # noqa: UP006  # pragma: no cover
+    def func_typing_dict() -> typing.Dict[str, str]:  # noqa: UP006
         return {"name": "John"}
 
-    assert func_metadata(func_typing_dict).output_schema == {
+    meta = func_metadata(func_typing_dict)
+    assert meta.output_schema == {
         "type": "object",
         "additionalProperties": {"type": "string"},
         "title": "func_typing_dictDictOutput",
     }
+    result = meta.convert_result(func_typing_dict())
+    assert isinstance(result, CallToolResult)
+    assert result.structured_content == {"name": "John"}
 
     # Test dict[int, str] - should be wrapped since key is not str
     def func_dict_int_key() -> dict[int, str]:  # pragma: no cover
@@ -786,7 +790,7 @@ def func_optional() -> str | None:  # pragma: no cover
 
     UserId = typing.NewType("UserId", int)
 
-    def func_new_type() -> UserId:  # pragma: no cover
+    def func_new_type() -> UserId:
         return UserId(1)
 
     meta = func_metadata(func_new_type)
@@ -796,6 +800,9 @@ def func_new_type() -> UserId:  # pragma: no cover
         "required": ["result"],
         "title": "func_new_typeOutput",
     }
+    result = meta.convert_result(func_new_type())
+    assert isinstance(result, CallToolResult)
+    assert result.structured_content == {"result": 1}
 
 
 def test_structured_output_dataclass():