mirror of
https://github.com/PrefectHQ/fastmcp.git
synced 2026-08-19 20:14:17 +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)
276 lines
10 KiB
Python
276 lines
10 KiB
Python
"""Tests for tool injection middleware."""
|
|
|
|
import math
|
|
|
|
import pytest
|
|
from inline_snapshot import snapshot
|
|
from mcp.types import Tool as SDKTool
|
|
|
|
from fastmcp import FastMCP
|
|
from fastmcp.client import Client
|
|
from fastmcp.client.client import CallToolResult
|
|
from fastmcp.client.transports import FastMCPTransport
|
|
from fastmcp.server.middleware.tool_injection import (
|
|
ToolInjectionMiddleware,
|
|
)
|
|
from fastmcp.tools.base import Tool
|
|
from fastmcp.tools.function_tool import FunctionTool
|
|
|
|
|
|
def multiply_fn(a: int, b: int) -> int:
|
|
"""Multiply two numbers."""
|
|
return a * b
|
|
|
|
|
|
def divide_fn(a: int, b: int) -> float:
|
|
"""Divide two numbers."""
|
|
if b == 0:
|
|
raise ValueError("Cannot divide by zero")
|
|
return a / b
|
|
|
|
|
|
multiply_tool = Tool.from_function(fn=multiply_fn, name="multiply", tags={"math"})
|
|
divide_tool = Tool.from_function(fn=divide_fn, name="divide", tags={"math"})
|
|
|
|
|
|
class TestToolInjectionMiddleware:
|
|
"""Tests with real FastMCP server."""
|
|
|
|
@pytest.fixture
|
|
def base_server(self):
|
|
"""Create a base FastMCP server."""
|
|
mcp = FastMCP("BaseServer")
|
|
|
|
@mcp.tool
|
|
def add(a: int, b: int) -> int:
|
|
"""Add two numbers."""
|
|
return a + b
|
|
|
|
@mcp.tool
|
|
def subtract(a: int, b: int) -> int:
|
|
"""Subtract two numbers."""
|
|
return a - b
|
|
|
|
return mcp
|
|
|
|
async def test_list_tools_includes_injected_tools(self, base_server: FastMCP):
|
|
"""Test that list_tools returns both base and injected tools."""
|
|
|
|
injected_tools: list[FunctionTool] = [
|
|
multiply_tool,
|
|
divide_tool,
|
|
]
|
|
middleware: ToolInjectionMiddleware = ToolInjectionMiddleware(
|
|
tools=injected_tools
|
|
)
|
|
base_server.add_middleware(middleware)
|
|
|
|
async with Client[FastMCPTransport](base_server) as client:
|
|
tools: list[SDKTool] = await client.list_tools()
|
|
|
|
# Should have all tools: multiply, divide, add, subtract
|
|
assert len(tools) == 4
|
|
tool_names: list[str] = [tool.name for tool in tools]
|
|
assert "multiply" in tool_names
|
|
assert "divide" in tool_names
|
|
assert "add" in tool_names
|
|
assert "subtract" in tool_names
|
|
|
|
async def test_call_injected_tool(self, base_server: FastMCP):
|
|
"""Test that injected tools can be called successfully."""
|
|
|
|
injected_tools: list[FunctionTool] = [multiply_tool]
|
|
middleware: ToolInjectionMiddleware = ToolInjectionMiddleware(
|
|
tools=injected_tools
|
|
)
|
|
base_server.add_middleware(middleware)
|
|
|
|
async with Client[FastMCPTransport](base_server) as client:
|
|
result: CallToolResult = await client.call_tool(
|
|
name="multiply", arguments={"a": 7, "b": 6}
|
|
)
|
|
|
|
assert result.structured_content is not None
|
|
assert isinstance(result.structured_content, dict)
|
|
assert result.structured_content["result"] == 42
|
|
|
|
async def test_call_base_tool_still_works(self, base_server: FastMCP):
|
|
"""Test that base server tools still work after injecting tools."""
|
|
|
|
injected_tools: list[FunctionTool] = [multiply_tool]
|
|
middleware: ToolInjectionMiddleware = ToolInjectionMiddleware(
|
|
tools=injected_tools
|
|
)
|
|
base_server.add_middleware(middleware)
|
|
|
|
async with Client[FastMCPTransport](base_server) as client:
|
|
result: CallToolResult = await client.call_tool(
|
|
name="add", arguments={"a": 10, "b": 5}
|
|
)
|
|
|
|
assert result.structured_content is not None
|
|
assert isinstance(result.structured_content, dict)
|
|
assert result.structured_content["result"] == 15
|
|
|
|
async def test_injected_tool_error_handling(self, base_server: FastMCP):
|
|
"""Test that errors in injected tools are properly handled."""
|
|
|
|
injected_tools: list[FunctionTool] = [divide_tool]
|
|
middleware: ToolInjectionMiddleware = ToolInjectionMiddleware(
|
|
tools=injected_tools
|
|
)
|
|
base_server.add_middleware(middleware)
|
|
|
|
async with Client[FastMCPTransport](base_server) as client:
|
|
with pytest.raises(Exception, match="Cannot divide by zero"):
|
|
_ = await client.call_tool(name="divide", arguments={"a": 10, "b": 0})
|
|
|
|
async def test_multiple_tool_injections(self, base_server: FastMCP):
|
|
"""Test multiple tool injection middlewares can be stacked."""
|
|
|
|
def power(a: int, b: int) -> int:
|
|
"""Raise a to the power of b."""
|
|
return int(math.pow(float(a), float(b)))
|
|
|
|
def modulo(a: int, b: int) -> int:
|
|
"""Calculate a modulo b."""
|
|
return a % b
|
|
|
|
middleware1 = ToolInjectionMiddleware(
|
|
tools=[Tool.from_function(fn=power, name="power")]
|
|
)
|
|
middleware2 = ToolInjectionMiddleware(
|
|
tools=[Tool.from_function(fn=modulo, name="modulo")]
|
|
)
|
|
|
|
base_server.add_middleware(middleware1)
|
|
base_server.add_middleware(middleware2)
|
|
|
|
async with Client(base_server) as client:
|
|
tools = await client.list_tools()
|
|
|
|
# Should have all tools
|
|
assert len(tools) == 4
|
|
tool_names = [tool.name for tool in tools]
|
|
assert "power" in tool_names
|
|
assert "modulo" in tool_names
|
|
assert "add" in tool_names
|
|
assert "subtract" in tool_names
|
|
|
|
# Test that both injected tools work
|
|
async with Client(base_server) as client:
|
|
power_result = await client.call_tool("power", {"a": 2, "b": 3})
|
|
assert power_result.structured_content is not None
|
|
assert isinstance(power_result.structured_content, dict)
|
|
assert power_result.structured_content["result"] == 8
|
|
|
|
modulo_result = await client.call_tool("modulo", {"a": 10, "b": 3})
|
|
assert modulo_result.structured_content is not None
|
|
assert isinstance(modulo_result.structured_content, dict)
|
|
assert modulo_result.structured_content["result"] == 1
|
|
|
|
async def test_injected_tool_with_complex_return_type(self, base_server: FastMCP):
|
|
"""Test injected tools with complex return types."""
|
|
|
|
def calculate_stats(numbers: list[int]) -> dict[str, int | float]:
|
|
"""Calculate statistics for a list of numbers."""
|
|
return {
|
|
"sum": sum(numbers),
|
|
"average": sum(numbers) / len(numbers),
|
|
"min": min(numbers),
|
|
"max": max(numbers),
|
|
"count": len(numbers),
|
|
}
|
|
|
|
middleware = ToolInjectionMiddleware(
|
|
tools=[Tool.from_function(fn=calculate_stats, name="calculate_stats")]
|
|
)
|
|
base_server.add_middleware(middleware)
|
|
|
|
async with Client(base_server) as client:
|
|
result = await client.call_tool(
|
|
"calculate_stats", {"numbers": [1, 2, 3, 4, 5]}
|
|
)
|
|
|
|
assert result.structured_content is not None
|
|
|
|
assert isinstance(result.structured_content, dict)
|
|
|
|
assert result.structured_content == snapshot(
|
|
{"sum": 15, "average": 3.0, "min": 1, "max": 5, "count": 5}
|
|
)
|
|
|
|
async def test_injected_tool_metadata_preserved(self, base_server: FastMCP):
|
|
"""Test that injected tool metadata is preserved."""
|
|
|
|
def multiply(a: int, b: int) -> int:
|
|
"""Multiply two numbers."""
|
|
return a * b
|
|
|
|
injected_tools = [Tool.from_function(fn=multiply, name="multiply")]
|
|
middleware = ToolInjectionMiddleware(tools=injected_tools)
|
|
base_server.add_middleware(middleware)
|
|
|
|
async with Client(base_server) as client:
|
|
tools = await client.list_tools()
|
|
|
|
multiply_tool = next(t for t in tools if t.name == "multiply")
|
|
assert multiply_tool.description == "Multiply two numbers."
|
|
assert "a" in multiply_tool.inputSchema["properties"]
|
|
assert "b" in multiply_tool.inputSchema["properties"]
|
|
|
|
async def test_injected_tool_does_not_conflict_with_base_tool(
|
|
self, base_server: FastMCP
|
|
):
|
|
"""Test that injected tools with same name as base tools are called correctly."""
|
|
|
|
def add(a: int, b: int) -> int:
|
|
"""Injected add that multiplies instead."""
|
|
return a * b
|
|
|
|
middleware: ToolInjectionMiddleware = ToolInjectionMiddleware(
|
|
tools=[Tool.from_function(fn=add, name="add")]
|
|
)
|
|
base_server.add_middleware(middleware)
|
|
|
|
async with Client[FastMCPTransport](base_server) as client:
|
|
result: CallToolResult = await client.call_tool(
|
|
name="add", arguments={"a": 5, "b": 3}
|
|
)
|
|
|
|
# Should use the injected tool (multiply behavior)
|
|
assert result.structured_content is not None
|
|
assert result.structured_content["result"] == 15
|
|
|
|
async def test_injected_tool_bypass_filtering(self, base_server: FastMCP):
|
|
"""Test that injected tools bypass filtering."""
|
|
middleware: ToolInjectionMiddleware = ToolInjectionMiddleware(
|
|
tools=[multiply_tool]
|
|
)
|
|
base_server.add_middleware(middleware)
|
|
base_server.disable(tags={"math"})
|
|
|
|
async with Client[FastMCPTransport](base_server) as client:
|
|
tools: list[SDKTool] = await client.list_tools()
|
|
tool_names: list[str] = [tool.name for tool in tools]
|
|
assert "multiply" in tool_names
|
|
|
|
async def test_empty_tool_injection(self, base_server: FastMCP):
|
|
"""Test that middleware with no tools doesn't affect behavior."""
|
|
middleware: ToolInjectionMiddleware = ToolInjectionMiddleware(tools=[])
|
|
base_server.add_middleware(middleware)
|
|
|
|
async with Client[FastMCPTransport](base_server) as client:
|
|
tools: list[SDKTool] = await client.list_tools()
|
|
result: CallToolResult = await client.call_tool(
|
|
name="add", arguments={"a": 3, "b": 4}
|
|
)
|
|
|
|
# Should only have the base tools
|
|
assert len(tools) == 2
|
|
tool_names: list[str] = [tool.name for tool in tools]
|
|
assert "add" in tool_names
|
|
assert "subtract" in tool_names
|
|
assert result.structured_content is not None
|
|
assert isinstance(result.structured_content, dict)
|
|
assert result.structured_content["result"] == 7
|