mirror of
https://github.com/PrefectHQ/fastmcp.git
synced 2026-08-19 03:54: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)
231 lines
7.8 KiB
Python
231 lines
7.8 KiB
Python
"""Tests for JSON schema generation from FastMCP BaseModel classes.
|
|
|
|
Validates that callable fields are properly excluded from generated schemas
|
|
using SkipJsonSchema annotations.
|
|
"""
|
|
|
|
from fastmcp.prompts.function_prompt import FunctionPrompt
|
|
from fastmcp.resources.function_resource import FunctionResource
|
|
from fastmcp.resources.template import FunctionResourceTemplate
|
|
from fastmcp.tools.base import Tool
|
|
from fastmcp.tools.function_tool import FunctionTool
|
|
from fastmcp.tools.tool_transform import TransformedTool
|
|
|
|
|
|
class TestToolJsonSchema:
|
|
"""Test JSON schema generation for Tool classes."""
|
|
|
|
def test_tool_json_schema_generation(self):
|
|
"""Verify Tool.model_json_schema() works without errors."""
|
|
# This should not raise an error
|
|
schema = Tool.model_json_schema()
|
|
|
|
# Verify schema is valid
|
|
assert schema["type"] == "object"
|
|
assert "properties" in schema
|
|
|
|
# Verify callable fields are excluded from schema
|
|
assert "serializer" not in schema["properties"]
|
|
# auth already uses exclude=True, so it shouldn't be in schema
|
|
assert "auth" not in schema["properties"]
|
|
|
|
def test_function_tool_json_schema_generation(self):
|
|
"""Verify FunctionTool.model_json_schema() works without errors."""
|
|
|
|
def sample_tool(x: int, y: int) -> int:
|
|
"""Add two numbers."""
|
|
return x + y
|
|
|
|
tool = FunctionTool.from_function(sample_tool)
|
|
|
|
# This should not raise an error
|
|
schema = tool.model_json_schema()
|
|
|
|
# Verify schema is valid
|
|
assert schema["type"] == "object"
|
|
assert "properties" in schema
|
|
|
|
# Verify callable field 'fn' is excluded from schema
|
|
assert "fn" not in schema["properties"]
|
|
|
|
def test_transformed_tool_json_schema_generation(self):
|
|
"""Verify TransformedTool.model_json_schema() works without errors."""
|
|
|
|
def parent_fn(x: int) -> int:
|
|
return x * 2
|
|
|
|
parent_tool = FunctionTool.from_function(parent_fn)
|
|
transformed_tool = TransformedTool.from_tool(parent_tool, name="doubled")
|
|
|
|
# This should not raise an error
|
|
schema = transformed_tool.model_json_schema()
|
|
|
|
# Verify schema is valid
|
|
assert schema["type"] == "object"
|
|
assert "properties" in schema
|
|
|
|
# Verify callable fields are excluded from schema
|
|
assert "fn" not in schema["properties"]
|
|
assert "forwarding_fn" not in schema["properties"]
|
|
assert "parent_tool" not in schema["properties"]
|
|
|
|
|
|
class TestResourceJsonSchema:
|
|
"""Test JSON schema generation for Resource classes."""
|
|
|
|
def test_function_resource_json_schema_generation(self):
|
|
"""Verify FunctionResource.model_json_schema() works without errors."""
|
|
|
|
def sample_resource() -> str:
|
|
"""Return sample data."""
|
|
return "Hello, world!"
|
|
|
|
resource = FunctionResource.from_function(
|
|
sample_resource, uri="test://resource"
|
|
)
|
|
|
|
# This should not raise an error
|
|
schema = resource.model_json_schema()
|
|
|
|
# Verify schema is valid
|
|
assert schema["type"] == "object"
|
|
assert "properties" in schema
|
|
|
|
# Verify callable field 'fn' is excluded from schema
|
|
assert "fn" not in schema["properties"]
|
|
# auth already uses exclude=True
|
|
assert "auth" not in schema["properties"]
|
|
|
|
def test_function_resource_template_json_schema_generation(self):
|
|
"""Verify FunctionResourceTemplate.model_json_schema() works without errors."""
|
|
|
|
def sample_template(name: str) -> str:
|
|
"""Return greeting for name."""
|
|
return f"Hello, {name}!"
|
|
|
|
template = FunctionResourceTemplate.from_function(
|
|
sample_template, uri_template="greeting://{name}"
|
|
)
|
|
|
|
# This should not raise an error
|
|
schema = template.model_json_schema()
|
|
|
|
# Verify schema is valid
|
|
assert schema["type"] == "object"
|
|
assert "properties" in schema
|
|
|
|
# Verify callable field 'fn' is excluded from schema
|
|
assert "fn" not in schema["properties"]
|
|
|
|
|
|
class TestPromptJsonSchema:
|
|
"""Test JSON schema generation for Prompt classes."""
|
|
|
|
def test_function_prompt_json_schema_generation(self):
|
|
"""Verify FunctionPrompt.model_json_schema() works without errors."""
|
|
|
|
def sample_prompt(topic: str) -> str:
|
|
"""Generate prompt about topic."""
|
|
return f"Tell me about {topic}"
|
|
|
|
prompt = FunctionPrompt.from_function(sample_prompt)
|
|
|
|
# This should not raise an error
|
|
schema = prompt.model_json_schema()
|
|
|
|
# Verify schema is valid
|
|
assert schema["type"] == "object"
|
|
assert "properties" in schema
|
|
|
|
# Verify callable field 'fn' is excluded from schema
|
|
assert "fn" not in schema["properties"]
|
|
# auth already uses exclude=True
|
|
assert "auth" not in schema["properties"]
|
|
|
|
|
|
class TestJsonSchemaIntegration:
|
|
"""Integration tests for JSON schema generation across all classes."""
|
|
|
|
def test_all_classes_generate_valid_schemas(self):
|
|
"""Verify all affected classes can generate valid JSON schemas."""
|
|
|
|
# Create instances of all affected classes
|
|
def tool_fn(x: int) -> int:
|
|
return x
|
|
|
|
def resource_fn() -> str:
|
|
return "data"
|
|
|
|
def template_fn(id: str) -> str:
|
|
return f"data-{id}"
|
|
|
|
def prompt_fn(input: str) -> str:
|
|
return f"Prompt: {input}"
|
|
|
|
tool = FunctionTool.from_function(tool_fn)
|
|
transformed_tool = TransformedTool.from_tool(tool)
|
|
resource = FunctionResource.from_function(resource_fn, uri="test://resource")
|
|
template = FunctionResourceTemplate.from_function(
|
|
template_fn, uri_template="test://{id}"
|
|
)
|
|
prompt = FunctionPrompt.from_function(prompt_fn)
|
|
|
|
# All of these should succeed without errors
|
|
schemas = [
|
|
Tool.model_json_schema(),
|
|
tool.model_json_schema(),
|
|
transformed_tool.model_json_schema(),
|
|
resource.model_json_schema(),
|
|
template.model_json_schema(),
|
|
prompt.model_json_schema(),
|
|
]
|
|
|
|
# Verify all schemas are valid
|
|
for schema in schemas:
|
|
assert isinstance(schema, dict)
|
|
assert schema["type"] == "object"
|
|
assert "properties" in schema
|
|
|
|
def test_callable_fields_not_in_any_schema(self):
|
|
"""Verify no callable fields appear in any generated schema."""
|
|
|
|
# Define test functions
|
|
def tool_fn(x: int) -> int:
|
|
return x
|
|
|
|
def resource_fn() -> str:
|
|
return "data"
|
|
|
|
def template_fn(id: str) -> str:
|
|
return f"data-{id}"
|
|
|
|
def prompt_fn(input: str) -> str:
|
|
return f"Prompt: {input}"
|
|
|
|
# Create instances
|
|
tool = FunctionTool.from_function(tool_fn)
|
|
transformed_tool = TransformedTool.from_tool(tool)
|
|
resource = FunctionResource.from_function(resource_fn, uri="test://resource")
|
|
template = FunctionResourceTemplate.from_function(
|
|
template_fn, uri_template="test://{id}"
|
|
)
|
|
prompt = FunctionPrompt.from_function(prompt_fn)
|
|
|
|
# List of (instance, callable_field_names) tuples
|
|
test_cases = [
|
|
(tool, ["fn", "serializer"]),
|
|
(transformed_tool, ["fn", "forwarding_fn", "parent_tool", "serializer"]),
|
|
(resource, ["fn"]),
|
|
(template, ["fn"]),
|
|
(prompt, ["fn"]),
|
|
]
|
|
|
|
for instance, callable_fields in test_cases:
|
|
schema = instance.model_json_schema()
|
|
properties = schema.get("properties", {})
|
|
|
|
# Verify none of the callable fields are in the schema
|
|
for field in callable_fields:
|
|
assert field not in properties, (
|
|
f"Callable field '{field}' found in schema for {type(instance).__name__}"
|
|
)
|