mirror of
https://github.com/PrefectHQ/fastmcp.git
synced 2026-08-31 03:23:19 +02:00
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Jeremiah Lowin <jlowin@users.noreply.github.com> Co-authored-by: Marvin Context Protocol <41898282+Marvin Context Protocol@users.noreply.github.com> Co-authored-by: voidborne-d <voidborne-d@users.noreply.github.com> Co-authored-by: marvin-context-protocol[bot] <225465937+marvin-context-protocol[bot]@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: d 🔹 <258577966+voidborne-d@users.noreply.github.com> Co-authored-by: Jeremiah Lowin <153965+jlowin@users.noreply.github.com> Co-authored-by: nightcityblade <nightcityblade@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Bill Easton <strawgate@users.noreply.github.com> Co-authored-by: Sumanshu Nankana <sumanshunankana@gmail.com> Co-authored-by: Eric Robinson <ericrobinson@indeed.com> Co-authored-by: Martim Santos <martimfasantos@gmail.com> Co-authored-by: d 🔹 <liusway405@gmail.com> Co-authored-by: Matthieu B <66959271+mtthidoteu@users.noreply.github.com> Co-authored-by: Sascha Buehrle <47737812+saschabuehrle@users.noreply.github.com> Co-authored-by: Hakancan <142545736+hkc5@users.noreply.github.com> Co-authored-by: nightcityblade <jackchen@haloailabs.com> Co-authored-by: Matt Hallowell <17804673+mhallo@users.noreply.github.com> Co-authored-by: nate nowack <thrast36@gmail.com> Co-authored-by: Bill Easton <williamseaston@gmail.com> Co-authored-by: Marcus Shu <46469249+shulkx@users.noreply.github.com> Co-authored-by: Rushabh Doshi <radoshi@gmail.com> Co-authored-by: AIKAWA Shigechika <shige@aikawa.jp> Co-authored-by: Jeremy Simon <simonjer805@gmail.com> Co-authored-by: Miguel Miranda Dias <7780875+pandego@users.noreply.github.com> Co-authored-by: Anthony James Padavano <padavano.anthony@gmail.com> Co-authored-by: Mostafa Kamal <hiremostafa@gmail.com> Fix auto-close MRE script posting comment without closing (#3386) Fix WorkOS token scope verification bypass 🤖 Generated with Codex (#3407) Fix initialize McpError fallthrough 🤖 Generated with Codex (#3413) Fix transform arg collisions with passthrough params (#3431) Fix get_* returning None when latest version is disabled (#3439) Fix get_* returning None when latest version is disabled (#3421) Fix server lifespan overlap teardown (#3415) Fix $ref output schema object detection regression (#3420) resolved annotations (#3429) Fix async partial callables rejected by iscoroutinefunction (#3438) Fix async partial callables rejected by iscoroutinefunction (#3423) fix: add version to components (#3458) fix: use intent-based flag for OIDC scope patch in load_access_token (#3465) Fixes #3461 fix: normalize Google scope shorthands and surface valid_scopes (#3477) fix: resolve ty 0.0.23 type-checking errors and bump pin (#3481) fix: shield lifespan teardown from cancellation (#3480) fix: forward custom_route endpoints from mounted servers (#3462) fix updates _get_additional_http_routes() to traverse providers, Fixes #3457 fix: remove hardcoded version from CLI help text (#3456) fix: monty 0.0.8 compatibility, drop external_functions from constructor (#3468) fix: task test teardown hanging 5s per test (#3499) Closes #3498 fix: validate workspace path is a directory before cursor install (#3440) Fixes #3426 fix: handle re.error from malformed URI templates in build_regex (#3501) fix: reject empty/OIDC-only required_scopes in AzureProvider (#3503) fix: restrict $ref resolution to local refs only (SSRF/LFI) (#3502) fix warnings and timeouts (#3504) close upgrade check issue when build passes (#3505) Closes #3484 fix: URL-encode path params to prevent SSRF/path traversal (GHSA-vv7q-7jx5-f767) (#3507) fix: prevent path traversal in skill download (#3493) fix: prefer IdP-granted scopes over client-requested scopes in OAuthProxy (#3492) fix: remove unrelated transform and http.py changes from PR scope fix: remove forced follow_redirects from httpx_client_factory calls (#3496) fix: stop passing follow_redirects to httpx_client_factory fix: restore follow_redirects=True for custom httpx client factories Closes #3509 fix: CSRF double-submit cookie check in consent flow (#3519) fix: validate server names in install commands (#3522) fix: use raw strings for regex in pytest.raises match (#3523) fix: reject refresh tokens used as Bearer access tokens (#3524) fix: route ResourcesAsTools/PromptsAsTools through server middleware (#3495) fix: resolve Pyright "Module is not callable" on @tool, @resource, @prompt decorators (#3540) fix: filter warnings by message in KEY_PREFIX test (#3549) fix: suppress output schema for ToolResult subclass annotations (#3548) fix: increase sleep duration in proxy cache tests (#3567) fix: store absolute token expiry to prevent stale expires_in on reload (#3572) fix: preserve tool properties named 'title' during schema compression (#3582) Fix loopback redirect URI port matching per RFC 8252 §7.3 (#3589) Fix app tool routing: visibility check and middleware propagation (#3591) Fix query parameter serialization to respect OpenAPI explode/style settings (#3595) Fix dev apps form: union types, textarea support, JSON parsing (#3597) fix(google): replace deprecated /oauth2/v1/tokeninfo with /oauth2/v3/userinfo (#3603) fix: resolve EntraOBOToken dependency injection through MultiAuth (#3609) fix(docs): correct misleading stateless_http header (#3622) fix: filesystem provider import machinery (#3626) Closes #3625 (issues 2, 3, 6) fix: recover StdioTransport after subprocess exits (#3630) fix(server): preserve mounted tool task metadata (#3632) fix: scope deprecation warning filter to FastMCPDeprecationWarning (#3649) fix imports, add PrefabAppConfig (#3650) fix: resolve CurrentFastMCP/ctx.fastmcp to child server in mounted background tasks (#3651) Fix blocking docs issues: chart imports, Select API, Rx consistency (#3652) closed by default (#3657) Fix prompt caching middleware missing wrap/unwrap round-trip (#3666) fix: serialize object query params per OpenAPI style/explode rules (#3662) Fixes #2857 fix: HTTP request headers not accessible in background task workers (#3631) fix: restore HTTP headers in worker execution path for background tasks (#3681) fix: strip discriminator after dereferencing schemas (#3682) fix: remove stale ty:ignore directives for ty 0.0.26 (#3684) Fix docs gaps in app provider pages (#3690) fix: dev apps log panel UX improvements (#3698) fix dev server empty string args (#3700)
405 lines
13 KiB
Python
405 lines
13 KiB
Python
"""Tests for tool output schemas."""
|
|
|
|
from dataclasses import dataclass
|
|
from typing import Any, Literal
|
|
|
|
import pytest
|
|
from mcp.types import (
|
|
TextContent,
|
|
)
|
|
from pydantic import AnyUrl, BaseModel, TypeAdapter
|
|
from typing_extensions import TypeAliasType, TypedDict
|
|
|
|
from fastmcp import FastMCP
|
|
from fastmcp.tools.base import ToolResult
|
|
from fastmcp.tools.function_parsing import _is_object_schema
|
|
from fastmcp.utilities.json_schema import compress_schema
|
|
|
|
|
|
def _normalize_anyof_order(schema):
|
|
"""Normalize the order of items in anyOf arrays for consistent comparison."""
|
|
if isinstance(schema, dict):
|
|
if "anyOf" in schema:
|
|
schema = schema.copy()
|
|
schema["anyOf"] = sorted(schema["anyOf"], key=str)
|
|
return {k: _normalize_anyof_order(v) for k, v in schema.items()}
|
|
elif isinstance(schema, list):
|
|
return [_normalize_anyof_order(item) for item in schema]
|
|
return schema
|
|
|
|
|
|
class PersonTypedDict(TypedDict):
|
|
name: str
|
|
age: int
|
|
|
|
|
|
class PersonModel(BaseModel):
|
|
name: str
|
|
age: int
|
|
|
|
|
|
@dataclass
|
|
class PersonDataclass:
|
|
name: str
|
|
age: int
|
|
|
|
|
|
class TestToolOutputSchema:
|
|
@pytest.mark.parametrize("annotation", [str, int, float, bool, list, AnyUrl])
|
|
async def test_simple_output_schema(self, annotation):
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool
|
|
def f() -> annotation:
|
|
return "hello"
|
|
|
|
tools = await mcp.list_tools()
|
|
assert len(tools) == 1
|
|
|
|
type_schema = TypeAdapter(annotation).json_schema()
|
|
type_schema = compress_schema(type_schema, prune_titles=True)
|
|
assert tools[0].output_schema == {
|
|
"type": "object",
|
|
"properties": {"result": type_schema},
|
|
"required": ["result"],
|
|
"x-fastmcp-wrap-result": True,
|
|
}
|
|
|
|
@pytest.mark.parametrize(
|
|
"annotation",
|
|
[dict[str, int | str], PersonTypedDict, PersonModel, PersonDataclass],
|
|
)
|
|
async def test_structured_output_schema(self, annotation):
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool
|
|
def f() -> annotation:
|
|
return {"name": "John", "age": 30}
|
|
|
|
tools = await mcp.list_tools()
|
|
|
|
type_schema = compress_schema(
|
|
TypeAdapter(annotation).json_schema(), prune_titles=True
|
|
)
|
|
assert len(tools) == 1
|
|
|
|
actual_schema = _normalize_anyof_order(tools[0].output_schema)
|
|
expected_schema = _normalize_anyof_order(type_schema)
|
|
assert actual_schema == expected_schema
|
|
|
|
async def test_disabled_output_schema_no_structured_content(self):
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool(output_schema=None)
|
|
def f() -> int:
|
|
return 42
|
|
|
|
result = await mcp.call_tool("f", {})
|
|
assert isinstance(result.content, list)
|
|
assert isinstance(result.content[0], TextContent)
|
|
assert result.content[0].text == "42"
|
|
assert result.structured_content is None
|
|
|
|
async def test_manual_structured_content(self):
|
|
from typing import cast
|
|
|
|
from fastmcp.tools.function_tool import DecoratedTool
|
|
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool
|
|
def f() -> ToolResult:
|
|
return ToolResult(
|
|
content="Hello, world!", structured_content={"message": "Hello, world!"}
|
|
)
|
|
|
|
# In new decorator mode, check metadata instead of attributes
|
|
from fastmcp.utilities.types import NotSet
|
|
|
|
decorated = cast(DecoratedTool, f)
|
|
assert hasattr(f, "__fastmcp__")
|
|
assert decorated.__fastmcp__.output_schema is NotSet
|
|
|
|
result = await mcp.call_tool("f", {})
|
|
assert isinstance(result.content, list)
|
|
assert isinstance(result.content[0], TextContent)
|
|
assert result.content[0].text == "Hello, world!"
|
|
assert result.structured_content == {"message": "Hello, world!"}
|
|
|
|
async def test_output_schema_none(self):
|
|
"""Test that output_schema=None works correctly."""
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool(output_schema=None)
|
|
def simple_tool() -> int:
|
|
return 42
|
|
|
|
tools = await mcp.list_tools()
|
|
tool = next(t for t in tools if t.name == "simple_tool")
|
|
assert tool.output_schema is None
|
|
|
|
result = await mcp.call_tool("simple_tool", {})
|
|
assert result.structured_content is None
|
|
assert isinstance(result.content, list)
|
|
assert isinstance(result.content[0], TextContent)
|
|
assert result.content[0].text == "42"
|
|
|
|
async def test_output_schema_explicit_object(self):
|
|
"""Test explicit object output schema."""
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool(
|
|
output_schema={
|
|
"type": "object",
|
|
"properties": {
|
|
"greeting": {"type": "string"},
|
|
"count": {"type": "integer"},
|
|
},
|
|
"required": ["greeting"],
|
|
}
|
|
)
|
|
def explicit_tool() -> dict[str, Any]:
|
|
return {"greeting": "Hello", "count": 42}
|
|
|
|
tools = await mcp.list_tools()
|
|
tool = next(t for t in tools if t.name == "explicit_tool")
|
|
expected_schema = {
|
|
"type": "object",
|
|
"properties": {
|
|
"greeting": {"type": "string"},
|
|
"count": {"type": "integer"},
|
|
},
|
|
"required": ["greeting"],
|
|
}
|
|
assert tool.output_schema == expected_schema
|
|
|
|
result = await mcp.call_tool("explicit_tool", {})
|
|
assert result.structured_content == {"greeting": "Hello", "count": 42}
|
|
|
|
async def test_output_schema_wrapped_primitive(self):
|
|
"""Test wrapped primitive output schema."""
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool
|
|
def primitive_tool() -> str:
|
|
return "Hello, primitives!"
|
|
|
|
tools = await mcp.list_tools()
|
|
tool = next(t for t in tools if t.name == "primitive_tool")
|
|
expected_schema = {
|
|
"type": "object",
|
|
"properties": {"result": {"type": "string"}},
|
|
"required": ["result"],
|
|
"x-fastmcp-wrap-result": True,
|
|
}
|
|
assert tool.output_schema == expected_schema
|
|
|
|
result = await mcp.call_tool("primitive_tool", {})
|
|
assert result.structured_content == {"result": "Hello, primitives!"}
|
|
|
|
async def test_output_schema_complex_type(self):
|
|
"""Test complex type output schema."""
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool
|
|
def complex_tool() -> list[dict[str, int]]:
|
|
return [{"a": 1, "b": 2}, {"c": 3, "d": 4}]
|
|
|
|
tools = await mcp.list_tools()
|
|
tool = next(t for t in tools if t.name == "complex_tool")
|
|
expected_inner_schema = compress_schema(
|
|
TypeAdapter(list[dict[str, int]]).json_schema(), prune_titles=True
|
|
)
|
|
expected_schema = {
|
|
"type": "object",
|
|
"properties": {"result": expected_inner_schema},
|
|
"required": ["result"],
|
|
"x-fastmcp-wrap-result": True,
|
|
}
|
|
assert tool.output_schema == expected_schema
|
|
|
|
result = await mcp.call_tool("complex_tool", {})
|
|
expected_data = [{"a": 1, "b": 2}, {"c": 3, "d": 4}]
|
|
assert result.structured_content == {"result": expected_data}
|
|
|
|
async def test_output_schema_dataclass(self):
|
|
"""Test dataclass output schema."""
|
|
mcp = FastMCP()
|
|
|
|
@dataclass
|
|
class User:
|
|
name: str
|
|
age: int
|
|
|
|
@mcp.tool
|
|
def dataclass_tool() -> User:
|
|
return User(name="Alice", age=30)
|
|
|
|
tools = await mcp.list_tools()
|
|
tool = next(t for t in tools if t.name == "dataclass_tool")
|
|
expected_schema = compress_schema(
|
|
TypeAdapter(User).json_schema(), prune_titles=True
|
|
)
|
|
assert tool.output_schema == expected_schema
|
|
assert tool.output_schema and "x-fastmcp-wrap-result" not in tool.output_schema
|
|
|
|
result = await mcp.call_tool("dataclass_tool", {})
|
|
assert result.structured_content == {"name": "Alice", "age": 30}
|
|
|
|
async def test_output_schema_mixed_content_types(self):
|
|
"""Test tools with mixed content and output schemas."""
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool
|
|
def mixed_output() -> list[Any]:
|
|
return [
|
|
"text message",
|
|
{"structured": "data"},
|
|
TextContent(type="text", text="direct MCP content"),
|
|
]
|
|
|
|
result = await mcp.call_tool("mixed_output", {})
|
|
assert isinstance(result.content, list)
|
|
assert len(result.content) == 3
|
|
assert isinstance(result.content[0], TextContent)
|
|
assert result.content[0].text == "text message"
|
|
assert isinstance(result.content[1], TextContent)
|
|
assert result.content[1].text == '{"structured":"data"}'
|
|
assert isinstance(result.content[2], TextContent)
|
|
assert result.content[2].text == "direct MCP content"
|
|
|
|
async def test_wrapped_result_includes_meta_flag(self):
|
|
"""Wrapped results include wrap_result in meta."""
|
|
server = FastMCP()
|
|
|
|
@server.tool
|
|
def list_tool() -> list[dict]:
|
|
return [{"a": 1}]
|
|
|
|
result = await server.call_tool("list_tool", {})
|
|
assert result.structured_content == {"result": [{"a": 1}]}
|
|
assert result.meta == {"fastmcp": {"wrap_result": True}}
|
|
|
|
async def test_unwrapped_result_has_no_meta_flag(self):
|
|
"""Unwrapped dict results do not include wrap_result in meta."""
|
|
server = FastMCP()
|
|
|
|
@server.tool
|
|
def dict_tool() -> dict[str, int]:
|
|
return {"value": 42}
|
|
|
|
result = await server.call_tool("dict_tool", {})
|
|
assert result.structured_content == {"value": 42}
|
|
assert result.meta is None
|
|
|
|
async def test_output_schema_serialization_edge_cases(self):
|
|
"""Test edge cases in output schema serialization."""
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool
|
|
def edge_case_tool() -> tuple[int, str]:
|
|
return (42, "hello")
|
|
|
|
tools = await mcp.list_tools()
|
|
tool = next(t for t in tools if t.name == "edge_case_tool")
|
|
|
|
assert tool.output_schema and "x-fastmcp-wrap-result" in tool.output_schema
|
|
|
|
result = await mcp.call_tool("edge_case_tool", {})
|
|
assert result.structured_content == {"result": [42, "hello"]}
|
|
|
|
async def test_output_schema_wraps_non_object_ref_schema(self):
|
|
"""Root $ref schemas should only skip wrapping when they resolve to objects."""
|
|
mcp = FastMCP()
|
|
AliasType = TypeAliasType("AliasType", Literal["foo", "bar"])
|
|
|
|
@mcp.tool
|
|
def alias_tool() -> AliasType:
|
|
return "foo"
|
|
|
|
tools = await mcp.list_tools()
|
|
tool = next(t for t in tools if t.name == "alias_tool")
|
|
|
|
expected_inner_schema = compress_schema(
|
|
TypeAdapter(AliasType).json_schema(mode="serialization"),
|
|
prune_titles=True,
|
|
)
|
|
assert tool.output_schema == {
|
|
"type": "object",
|
|
"properties": {"result": expected_inner_schema},
|
|
"required": ["result"],
|
|
"x-fastmcp-wrap-result": True,
|
|
}
|
|
|
|
result = await mcp.call_tool("alias_tool", {})
|
|
assert result.structured_content == {"result": "foo"}
|
|
|
|
|
|
class TestIsObjectSchemaRefResolution:
|
|
"""Tests for $ref resolution in _is_object_schema, including JSON Pointer
|
|
escaping and nested $defs paths."""
|
|
|
|
def test_simple_ref_to_object(self):
|
|
schema = {
|
|
"$ref": "#/$defs/MyModel",
|
|
"$defs": {
|
|
"MyModel": {"type": "object", "properties": {"x": {"type": "int"}}}
|
|
},
|
|
}
|
|
assert _is_object_schema(schema) is True
|
|
|
|
def test_simple_ref_to_non_object(self):
|
|
schema = {
|
|
"$ref": "#/$defs/MyEnum",
|
|
"$defs": {"MyEnum": {"enum": ["a", "b"]}},
|
|
}
|
|
assert _is_object_schema(schema) is False
|
|
|
|
def test_nested_defs_path(self):
|
|
"""Refs like #/$defs/Outer/$defs/Inner should walk into nested dicts."""
|
|
schema = {
|
|
"$ref": "#/$defs/Outer/$defs/Inner",
|
|
"$defs": {
|
|
"Outer": {
|
|
"$defs": {
|
|
"Inner": {
|
|
"type": "object",
|
|
"properties": {"y": {"type": "string"}},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
assert _is_object_schema(schema) is True
|
|
|
|
def test_nested_defs_non_object(self):
|
|
schema = {
|
|
"$ref": "#/$defs/Outer/$defs/Inner",
|
|
"$defs": {
|
|
"Outer": {
|
|
"$defs": {
|
|
"Inner": {"type": "string"},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
assert _is_object_schema(schema) is False
|
|
|
|
def test_json_pointer_tilde_escape(self):
|
|
"""~0 should unescape to ~ and ~1 should unescape to /."""
|
|
schema = {
|
|
"$ref": "#/$defs/has~1slash~0tilde",
|
|
"$defs": {"has/slash~tilde": {"type": "object", "properties": {}}},
|
|
}
|
|
assert _is_object_schema(schema) is True
|
|
|
|
def test_missing_nested_segment_returns_false(self):
|
|
schema = {
|
|
"$ref": "#/$defs/Outer/$defs/Missing",
|
|
"$defs": {
|
|
"Outer": {
|
|
"$defs": {},
|
|
},
|
|
},
|
|
}
|
|
assert _is_object_schema(schema) is False
|