π The fast, Pythonic way to build MCP servers and clients.
fix(tools): keep structured content for object schemas without explicit type (#5271)
εεΊη±³e9d0ea7ab22a
diff --git a/fastmcp_slim/fastmcp/tools/tool_transform.py b/fastmcp_slim/fastmcp/tools/tool_transform.pyindex 1294110f7..d0b9c7cbd 100644--- a/fastmcp_slim/fastmcp/tools/tool_transform.py+++ b/fastmcp_slim/fastmcp/tools/tool_transform.py@@ -19,7 +19,7 @@ from fastmcp.tools.base import (Tool,ToolResult,)-from fastmcp.tools.function_parsing import ParsedFunction+from fastmcp.tools.function_parsing import ParsedFunction, _is_object_schemafrom fastmcp.utilities.async_utils import (call_sync_fn_in_threadpool,is_coroutine_function,@@ -383,13 +383,15 @@ class TransformedTool(Tool):if isinstance(result, ToolResult):if self.output_schema is None:return result- elif self.output_schema.get(- "type"- ) != "object" and not self.output_schema.get("x-fastmcp-wrap-result"):+ elif not _is_object_schema(+ self.output_schema+ ) and not self.output_schema.get("x-fastmcp-wrap-result"):# Non-object explicit schemas disable structured contentreturn ToolResult(content=result.content,structured_content=None,+ is_error=result.is_error,+ meta=result.meta,)else:return resultdiff --git a/tests/tools/tool_transform/test_schemas.py b/tests/tools/tool_transform/test_schemas.pyindex 703dd7955..05471a4d9 100644--- a/tests/tools/tool_transform/test_schemas.py+++ b/tests/tools/tool_transform/test_schemas.py@@ -108,6 +108,91 @@ class TestTransformToolOutputSchema:assert isinstance(result.content[0], TextContent)assert result.content[0].text == "Result: 10"+ async def test_transform_non_object_schema_preserves_error_result(+ self, base_string_tool+ ):+ """The non-object rebuild keeps is_error and meta from the+ transform_fn's ToolResult."""++ async def custom_fn(x: int) -> ToolResult:+ return ToolResult(+ content=[TextContent(type="text", text=f"failed: {x}")],+ is_error=True,+ meta={"reason": "boom"},+ )++ new_tool = Tool.from_tool(+ base_string_tool, transform_fn=custom_fn, output_schema={"type": "string"}+ )++ result = await new_tool.run({"x": 1})++ assert result.structured_content is None+ assert result.is_error is True+ assert result.meta == {"reason": "boom"}+ assert isinstance(result.content[0], TextContent)+ assert result.content[0].text == "failed: 1"++ async def test_transform_fn_result_kept_for_properties_only_schema(+ self, base_string_tool+ ):+ """A transform_fn's ToolResult is returned unchanged when the explicit+ output schema is an object without a top-level "type": "object" key+ (properties-only), matching _is_object_schema classification."""++ async def custom_fn(x: int) -> ToolResult:+ return ToolResult(+ content=[TextContent(type="text", text=f"Result: {x}")],+ structured_content={"value": x},+ is_error=True,+ meta={"reason": "boom"},+ )++ new_tool = Tool.from_tool(+ base_string_tool,+ transform_fn=custom_fn,+ output_schema={"properties": {"value": {"type": "integer"}}},+ )++ result = await new_tool.run({"x": 5})++ assert result.structured_content == {"value": 5}+ assert result.is_error is True+ assert result.meta == {"reason": "boom"}+ assert isinstance(result.content[0], TextContent)+ assert result.content[0].text == "Result: 5"++ async def test_transform_fn_result_kept_for_root_ref_schema(self, base_string_tool):+ """A transform_fn's ToolResult is returned unchanged when the explicit+ output schema is an object via a root-level $ref, matching+ _is_object_schema classification."""++ async def custom_fn(x: int) -> ToolResult:+ return ToolResult(+ content=[TextContent(type="text", text=f"Result: {x}")],+ structured_content={"value": x},+ )++ new_tool = Tool.from_tool(+ base_string_tool,+ transform_fn=custom_fn,+ output_schema={+ "$defs": {+ "Output": {+ "type": "object",+ "properties": {"value": {"type": "integer"}},+ }+ },+ "$ref": "#/$defs/Output",+ },+ )++ result = await new_tool.run({"x": 5})++ assert result.structured_content == {"value": 5}+ assert isinstance(result.content[0], TextContent)+ assert result.content[0].text == "Result: 5"+def test_transform_with_custom_function_inferred_schema(self, base_dict_tool):"""Test that custom function's output schema is inferred."""