Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

fix: `session: UserSession` on a resource or resource template fails at registration (#6198)

wangshun0a6ef96fc983
diff --git a/fastmcp_slim/fastmcp/server/dependencies.py b/fastmcp_slim/fastmcp/server/dependencies.py
index f10e9c018..57fc0a2ea 100644
--- a/fastmcp_slim/fastmcp/server/dependencies.py
+++ b/fastmcp_slim/fastmcp/server/dependencies.py
@@ -734,9 +734,9 @@ def without_injected_parameters(
) -> Callable[..., Any]:
"""Create a wrapper function without injected parameters.
- Returns a wrapper that excludes Context and Docket dependency parameters,
- making it safe to use with Pydantic TypeAdapter for schema generation and
- validation. The wrapper internally handles all dependency resolution and
+ Returns a wrapper that excludes Context, UserSession, and Docket dependency
+ parameters, making it safe to use with Pydantic TypeAdapter for schema
+ generation and validation. The wrapper internally handles all dependency resolution and
Context injection when called.
Handles:
@@ -754,14 +754,18 @@ def without_injected_parameters(
Async wrapper function without injected parameters
"""
from fastmcp.server.context import Context
+ from fastmcp.server.sessions import UserSession
# Identify parameters to exclude
context_kwarg = find_kwarg_by_type(fn, Context)
+ session_kwarg = find_kwarg_by_type(fn, UserSession)
dependency_params = get_dependency_parameters(fn)
exclude = set()
if context_kwarg:
exclude.add(context_kwarg)
+ if session_kwarg:
+ exclude.add(session_kwarg)
if dependency_params:
exclude.update(dependency_params.keys())
diff --git a/tests/server/test_session_provider.py b/tests/server/test_session_provider.py
index 99e1f2d64..7f49a5031 100644
--- a/tests/server/test_session_provider.py
+++ b/tests/server/test_session_provider.py
@@ -26,7 +26,9 @@ from fastmcp.server.context import Context
from fastmcp.server.dependencies import get_session
from fastmcp.server.sessions import (
SESSION_ID_DESCRIPTION,
+ CurrentSession,
InvalidSession,
+ Session,
SessionId,
SessionProvider,
UserSession,
@@ -264,6 +266,57 @@ class TestInjectedSession:
assert await reconstructed.get("cart") == ["apple"]
+class TestInjectedSessionOnResources:
+ """`session: UserSession` on a resource or template registers and is
+ injected, exactly like an explicit `= CurrentSession()` default."""
+
+ @pytest.mark.parametrize("explicit_default", [False, True])
+ async def test_static_resource(self, explicit_default: bool):
+ server = FastMCP("notes")
+
+ if explicit_default:
+
+ @server.resource("notes://latest")
+ async def latest(session: Session = CurrentSession()) -> str:
+ return await session.get("note", default="empty")
+
+ else:
+
+ @server.resource("notes://latest")
+ async def latest(session: UserSession) -> str:
+ return await session.get("note", default="empty")
+
+ with as_principal(make_token()):
+ async with Client(server) as client:
+ resources = await client.list_resources()
+ assert [str(r.uri) for r in resources] == ["notes://latest"]
+ result = await client.read_resource("notes://latest")
+ assert result[0].text == "empty"
+
+ @pytest.mark.parametrize("explicit_default", [False, True])
+ async def test_resource_template(self, explicit_default: bool):
+ server = FastMCP("notes")
+
+ if explicit_default:
+
+ @server.resource("notes://{key}")
+ async def note(key: str, session: Session = CurrentSession()) -> str:
+ return f"{key}={await session.get(key, default='empty')}"
+
+ else:
+
+ @server.resource("notes://{key}")
+ async def note(key: str, session: UserSession) -> str:
+ return f"{key}={await session.get(key, default='empty')}"
+
+ with as_principal(make_token()):
+ async with Client(server) as client:
+ templates = await client.list_resource_templates()
+ assert [t.uri_template for t in templates] == ["notes://{key}"]
+ result = await client.read_resource("notes://hello")
+ assert result[0].text == "hello=empty"
+
+
# ---------------------------------------------------------------------------
# Explicit `session_id: SessionId` β€” create then validate
# ---------------------------------------------------------------------------