π The fast, Pythonic way to build MCP servers and clients.
Let a dependency's CallArgument own a tool argument (#6438)
nate nowackac3c28d62b5e
diff --git a/docs/servers/dependency-injection.mdx b/docs/servers/dependency-injection.mdxindex dd75fa703..3aee4c812 100644--- a/docs/servers/dependency-injection.mdx+++ b/docs/servers/dependency-injection.mdx@@ -495,6 +495,26 @@ When a client calls `show_account`, the factory receives the same `user_id` valuClients still cannot override dependencies this way: an argument whose name collides with a dependency parameter is stripped before resolution, so a `CallArgument` reference to that parameter resolves the dependency itself.+A dependency can also own the argument it reads. When the tool doesn't declare the parameter a `CallArgument` names, FastMCP adds it to the tool's schema and passes the client's value only to the dependency, so the tool needs no unused parameter:++```python+from fastmcp import FastMCP+from fastmcp.dependencies import CallArgument, Depends++mcp = FastMCP("Workspaces")+++async def current_workspace(workspace: str | None = CallArgument(default=None)) -> str:+ return workspace or "default"+++async def list_items(resolved: str = Depends(current_workspace)) -> str:+ return f"items in {resolved}"+```++The schema for `list_items` has an optional `workspace` argument. A reference without a `default` adds a required argument. `CallArgument(optional=True)` never adds one.+### Bindings<VersionBadge version="4.0.0" />diff --git a/fastmcp_slim/fastmcp/server/dependencies.py b/fastmcp_slim/fastmcp/server/dependencies.pyindex 151036f35..6caf3647f 100644--- a/fastmcp_slim/fastmcp/server/dependencies.py+++ b/fastmcp_slim/fastmcp/server/dependencies.py@@ -35,6 +35,7 @@ from uncalled_for import (Dependency,Provider,frame_scope,+ get_call_argument_parameters,get_dependency_parameters,)from uncalled_for.resolution import _Depends@@ -772,18 +773,34 @@ def without_injected_parameters(if not exclude:return fn+ # A dependency's CallArgument can own an argument the function doesn't+ # declare. It joins the public signature; its value reaches only the+ # dependency, never fn.+ referenced = get_call_argument_parameters(fn)+ referenced_names = {param.name for param in referenced}+# Build new signature with only user parameterssig = inspect.signature(fn)user_params = [param for name, param in sig.parameters.items() if name not in exclude]- new_sig = inspect.Signature(user_params)+ variadic = [p for p in user_params if p.kind is inspect.Parameter.VAR_KEYWORD]+ user_params = [+ p for p in user_params if p.kind is not inspect.Parameter.VAR_KEYWORD+ ]+ new_sig = inspect.Signature([*user_params, *referenced, *variadic])# Create async wrapper that handles dependency resolutionfn_is_async = is_coroutine_function(fn)async def wrapper(**user_kwargs: Any) -> Any:async with resolve_dependencies(fn, user_kwargs) as resolved_kwargs:+ if referenced_names:+ resolved_kwargs = {+ name: value+ for name, value in resolved_kwargs.items()+ if name not in referenced_names+ }if fn_is_async:result = await fn(**resolved_kwargs)elif run_in_thread:@@ -817,7 +834,7 @@ def without_injected_parameters(wrapper.__signature__ = new_sig # type: ignore[attr-defined] # ty:ignore[unresolved-attribute]wrapper.__annotations__ = {k: v for k, v in resolved_hints.items() if k not in exclude and k != "return"- }+ } | {param.name: param.annotation for param in referenced}wrapper.__name__ = getattr(fn, "__name__", "wrapper")wrapper.__doc__ = getattr(fn, "__doc__", None)wrapper.__module__ = fn.__module__diff --git a/fastmcp_slim/pyproject.toml b/fastmcp_slim/pyproject.tomlindex ff2d94c2d..532986f5e 100644--- a/fastmcp_slim/pyproject.toml+++ b/fastmcp_slim/pyproject.toml@@ -109,7 +109,7 @@ server = ["pyperclip>=1.9.0","python-multipart>=0.0.26","pyyaml>=6.0,<7.0",- "uncalled-for>=0.6.0",+ "uncalled-for>=0.6.1","uvicorn>=0.35","watchfiles>=1.0.0","websockets>=15.0.1",diff --git a/tests/server/test_call_arguments.py b/tests/server/test_call_arguments.pyindex 6b1af08cb..bd7524b2a 100644--- a/tests/server/test_call_arguments.py+++ b/tests/server/test_call_arguments.py@@ -187,3 +187,61 @@ async def test_colliding_argument_never_reaches_call_argument(mcp: FastMCP):assert isinstance(content, TextContent)assert "role=user" in content.textassert "admin" not in content.text+++async def test_dependency_owns_an_undeclared_argument(mcp: FastMCP):+ """A CallArgument naming a parameter the tool lacks joins the tool's schema."""++ async def current_workspace(+ workspace: str | None = CallArgument(default=None),+ ) -> str:+ return workspace or "default"++ @mcp.tool+ async def list_items(resolved: str = Depends(current_workspace)) -> str:+ return resolved++ tool = await mcp.get_tool("list_items")+ assert tool is not None+ assert tool.parameters["properties"] == {+ "workspace": {"anyOf": [{"type": "string"}, {"type": "null"}], "default": None}+ }+ assert "workspace" not in tool.parameters.get("required", [])++ owned = await mcp.call_tool("list_items", {"workspace": "acme"})+ fallback = await mcp.call_tool("list_items", {})+ assert isinstance(owned.content[0], TextContent)+ assert isinstance(fallback.content[0], TextContent)+ assert owned.content[0].text == "acme"+ assert fallback.content[0].text == "default"+++async def test_dependency_owned_argument_without_default_is_required(mcp: FastMCP):+ def load_user(user_id: str = CallArgument()) -> str:+ return f"user:{user_id}"++ @mcp.tool+ async def show(user: str = Depends(load_user)) -> str:+ return user++ tool = await mcp.get_tool("show")+ assert tool is not None+ assert tool.parameters["required"] == ["user_id"]+ result = await mcp.call_tool("show", {"user_id": "u-1"})+ assert isinstance(result.content[0], TextContent)+ assert result.content[0].text == "user:u-1"+++async def test_dependency_owned_argument_reaches_prompts(mcp: FastMCP):+ def load_topic(topic: str = CallArgument()) -> str:+ return topic.upper()++ @mcp.prompt+ def explain(subject: str = Depends(load_topic)) -> str:+ return f"Explain {subject}"++ prompt = await mcp.get_prompt("explain")+ assert prompt is not None+ assert [argument.name for argument in prompt.arguments or []] == ["topic"]+ result = await mcp.render_prompt("explain", {"topic": "mcp"})+ assert "Explain MCP" in str(result.messages[0].content)diff --git a/uv.lock b/uv.lockindex 5cab794ae..04eb163fc 100644--- a/uv.lock+++ b/uv.lock@@ -1053,7 +1053,7 @@ requires-dist = [{ name = "starlette", marker = "extra == 'server'", specifier = ">=1.0.1" },{ name = "typesafe-sdk", marker = "extra == 'jev'", specifier = ">=0.5.7" },{ name = "typing-extensions", specifier = ">=4.0.0" },- { name = "uncalled-for", marker = "extra == 'server'", specifier = ">=0.6.0" },+ { name = "uncalled-for", marker = "extra == 'server'", specifier = ">=0.6.1" },{ name = "uvicorn", marker = "extra == 'server'", specifier = ">=0.35" },{ name = "watchfiles", marker = "extra == 'server'", specifier = ">=1.0.0" },{ name = "websockets", marker = "extra == 'server'", specifier = ">=15.0.1" },@@ -3195,11 +3195,11 @@ wheels = [[[package]]name = "uncalled-for"-version = "0.6.0"+version = "0.6.1"source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/58/49/423c660a9b548ebe875562c4f47d3dcbc5807377e19eced0596b05894ca9/uncalled_for-0.6.0.tar.gz", hash = "sha256:5872701bf3b4eb0698930f87126d339d56a904c53f052eb0eadad64439fa9b11", size = 68911, upload-time = "2026-11-05T23:47:08.578Z" }+sdist = { url = "https://files.pythonhosted.org/packages/9c/e9/056b74ca4559f93cd38080c110696ae9a8f6d1976b162eb3638895f829e7/uncalled_for-0.6.1.tar.gz", hash = "sha256:49d9a55a806529dbb844f64a2e3adc8f44ad0b0802f5d91381a09c088c44e144", size = 71850, upload-time = "2026-11-10T21:53:02.565Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/a6/a7/d819bc9c5ea3d0ccbedc9999e36efebe9dbae61b024f494afc423483909a/uncalled_for-0.6.0-py3-none-any.whl", hash = "sha256:5c6932836965b0e6b0a80f9962388922f3bb235431d8f5d3fedc2ad07b581189", size = 16734, upload-time = "2026-11-05T23:47:07.177Z" },+ { url = "https://files.pythonhosted.org/packages/0c/d0/2db6b2299a07ddc6c6f49a39351a6faab1eb04f1c1b248a8270f1380276a/uncalled_for-0.6.1-py3-none-any.whl", hash = "sha256:1e8f86f972684db50f2888f07caa87d81a431584fa77856660e0c5e89f1cc778", size = 18957, upload-time = "2026-11-10T21:53:01.489Z" },][[package]]