mirror of
https://github.com/PrefectHQ/fastmcp.git
synced 2026-08-23 14:04:18 +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)
184 lines
6.5 KiB
Python
184 lines
6.5 KiB
Python
from dataclasses import dataclass
|
|
from typing import Any
|
|
|
|
import pytest
|
|
|
|
from fastmcp.tools.base import Tool, ToolResult
|
|
|
|
|
|
class TestToolResultCasting:
|
|
@pytest.fixture
|
|
async def client(self):
|
|
from fastmcp import FastMCP
|
|
from fastmcp.client import Client
|
|
|
|
mcp = FastMCP()
|
|
|
|
@mcp.tool
|
|
def test_tool(
|
|
unstructured: str | None = None,
|
|
structured: dict[str, Any] | None = None,
|
|
meta: dict[str, Any] | None = None,
|
|
):
|
|
return ToolResult(
|
|
content=unstructured,
|
|
structured_content=structured,
|
|
meta=meta,
|
|
)
|
|
|
|
async with Client(mcp) as client:
|
|
yield client
|
|
|
|
async def test_only_unstructured_content(self, client):
|
|
result = await client.call_tool("test_tool", {"unstructured": "test data"})
|
|
|
|
assert result.content[0].type == "text"
|
|
assert result.content[0].text == "test data"
|
|
assert result.structured_content is None
|
|
assert result.meta is None
|
|
|
|
async def test_neither_unstructured_or_structured_content(self, client):
|
|
from fastmcp.exceptions import ToolError
|
|
|
|
with pytest.raises(ToolError):
|
|
await client.call_tool("test_tool", {})
|
|
|
|
async def test_structured_and_unstructured_content(self, client):
|
|
result = await client.call_tool(
|
|
"test_tool",
|
|
{"unstructured": "test data", "structured": {"data_type": "test"}},
|
|
)
|
|
|
|
assert result.content[0].type == "text"
|
|
assert result.content[0].text == "test data"
|
|
assert result.structured_content == {"data_type": "test"}
|
|
assert result.meta is None
|
|
|
|
async def test_structured_unstructured_and_meta_content(self, client):
|
|
result = await client.call_tool(
|
|
"test_tool",
|
|
{
|
|
"unstructured": "test data",
|
|
"structured": {"data_type": "test"},
|
|
"meta": {"some": "metadata"},
|
|
},
|
|
)
|
|
|
|
assert result.content[0].type == "text"
|
|
assert result.content[0].text == "test data"
|
|
assert result.structured_content == {"data_type": "test"}
|
|
assert result.meta == {"some": "metadata"}
|
|
|
|
|
|
class TestUnionReturnTypes:
|
|
"""Tests for tools with union return types."""
|
|
|
|
async def test_dataclass_union_string_works(self):
|
|
"""Test that union of dataclass and string works correctly."""
|
|
|
|
@dataclass
|
|
class Data:
|
|
value: int
|
|
|
|
def get_data(return_error: bool) -> Data | str:
|
|
if return_error:
|
|
return "error occurred"
|
|
return Data(value=42)
|
|
|
|
tool = Tool.from_function(get_data)
|
|
|
|
# Test returning dataclass
|
|
result1 = await tool.run({"return_error": False})
|
|
assert result1.structured_content == {"result": {"value": 42}}
|
|
|
|
# Test returning string
|
|
result2 = await tool.run({"return_error": True})
|
|
assert result2.structured_content == {"result": "error occurred"}
|
|
|
|
|
|
class TestSerializationAlias:
|
|
"""Tests for Pydantic field serialization alias support in tool output schemas."""
|
|
|
|
def test_output_schema_respects_serialization_alias(self):
|
|
"""Test that Tool.from_function generates output schema using serialization alias."""
|
|
from typing import Annotated
|
|
|
|
from pydantic import AliasChoices, BaseModel, Field
|
|
|
|
class Component(BaseModel):
|
|
"""Model with multiple validation aliases but specific serialization alias."""
|
|
|
|
component_id: str = Field(
|
|
validation_alias=AliasChoices("id", "componentId"),
|
|
serialization_alias="componentId",
|
|
description="The ID of the component",
|
|
)
|
|
|
|
async def get_component(
|
|
component_id: str,
|
|
) -> Annotated[Component, Field(description="The component.")]:
|
|
# API returns data with 'id' field
|
|
api_data = {"id": component_id}
|
|
return Component.model_validate(api_data)
|
|
|
|
tool = Tool.from_function(get_component, name="get-component")
|
|
|
|
# The output schema should use the serialization alias 'componentId'
|
|
# not the first validation alias 'id'
|
|
assert tool.output_schema is not None
|
|
|
|
# Object schemas have properties directly at root (MCP spec compliance)
|
|
# Root-level $refs are resolved to ensure type: object at root
|
|
assert "properties" in tool.output_schema
|
|
assert tool.output_schema.get("type") == "object"
|
|
|
|
# Should have 'componentId' not 'id' in properties
|
|
assert "componentId" in tool.output_schema["properties"]
|
|
assert "id" not in tool.output_schema["properties"]
|
|
|
|
# Should require 'componentId' not 'id'
|
|
assert "componentId" in tool.output_schema.get("required", [])
|
|
assert "id" not in tool.output_schema.get("required", [])
|
|
|
|
async def test_tool_execution_with_serialization_alias(self):
|
|
"""Test that tool execution works correctly with serialization aliases."""
|
|
from typing import Annotated
|
|
|
|
from pydantic import AliasChoices, BaseModel, Field
|
|
|
|
from fastmcp import Client, FastMCP
|
|
|
|
class Component(BaseModel):
|
|
"""Model with multiple validation aliases but specific serialization alias."""
|
|
|
|
component_id: str = Field(
|
|
validation_alias=AliasChoices("id", "componentId"),
|
|
serialization_alias="componentId",
|
|
description="The ID of the component",
|
|
)
|
|
|
|
mcp = FastMCP("TestServer")
|
|
|
|
@mcp.tool
|
|
async def get_component(
|
|
component_id: str,
|
|
) -> Annotated[Component, Field(description="The component.")]:
|
|
# API returns data with 'id' field
|
|
api_data = {"id": component_id}
|
|
return Component.model_validate(api_data)
|
|
|
|
async with Client(mcp) as client:
|
|
# Execute the tool - this should work without validation errors
|
|
result = await client.call_tool(
|
|
"get_component", {"component_id": "test123"}
|
|
)
|
|
|
|
# The result should contain the serialized form with 'componentId'
|
|
assert result.structured_content is not None
|
|
# Object types may be wrapped in "result" or not, depending on schema structure
|
|
if "result" in result.structured_content:
|
|
component_data = result.structured_content["result"]
|
|
else:
|
|
component_data = result.structured_content
|
|
assert component_data["componentId"] == "test123"
|
|
assert "id" not in component_data
|