modelcontextprotocol/python-sdk
Watch
1
0
Fork
You've already forked python-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use proper generic for Context (#245)

Browse source
This commit is contained in:
Marcelo Trylesinski 2025-03-11 14:15:07 +01:00 • committed by GitHub
commit 5cbea24ecb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/mcp/server/fastmcp/server.py
View file

@ -37,7 +37,7 @@ from mcp.server.lowlevel.server import (
from mcp.server.session import ServerSession from mcp.server.session import ServerSession
from mcp.server.sse import SseServerTransport from mcp.server.sse import SseServerTransport
from mcp.server.stdio import stdio_server from mcp.server.stdio import stdio_server
from mcp.shared.context import RequestContext from mcp.shared.context import LifespanContextT, RequestContext
from mcp.types import ( from mcp.types import (
AnyFunction, AnyFunction,
EmbeddedResource, EmbeddedResource,
@ -564,7 +564,7 @@ def _convert_to_content(
return [TextContent(type="text", text=result)] return [TextContent(type="text", text=result)]
class Context(BaseModel): class Context(BaseModel, Generic[LifespanContextT]):
"""Context object providing access to MCP capabilities. """Context object providing access to MCP capabilities.
This provides a cleaner interface to MCP's RequestContext functionality. This provides a cleaner interface to MCP's RequestContext functionality.
@ -598,13 +598,13 @@ class Context(BaseModel):
The context is optional - tools that don't need it can omit the parameter. The context is optional - tools that don't need it can omit the parameter.
""" """
_request_context: RequestContext[ServerSession, Any] | None _request_context: RequestContext[ServerSession, LifespanContextT] | None
_fastmcp: FastMCP | None _fastmcp: FastMCP | None
def __init__( def __init__(
self, self,
*, *,
request_context: RequestContext | None = None, request_context: RequestContext[ServerSession, LifespanContextT] | None = None,
fastmcp: FastMCP | None = None, fastmcp: FastMCP | None = None,
**kwargs: Any, **kwargs: Any,
): ):
@ -620,7 +620,7 @@ class Context(BaseModel):
return self._fastmcp return self._fastmcp
@property @property
def request_context(self) -> RequestContext: def request_context(self) -> RequestContext[ServerSession, LifespanContextT]:
"""Access to the underlying request context.""" """Access to the underlying request context."""
if self._request_context is None: if self._request_context is None:
raise ValueError("Context is not available outside of a request") raise ValueError("Context is not available outside of a request")

8
src/mcp/shared/context.py
View file

@ -1,11 +1,13 @@
from dataclasses import dataclass from dataclasses import dataclass
from typing import Generic, TypeVar from typing import Any, Generic
from typing_extensions import TypeVar
from mcp.shared.session import BaseSession from mcp.shared.session import BaseSession
from mcp.types import RequestId, RequestParams from mcp.types import RequestId, RequestParams
SessionT = TypeVar("SessionT", bound=BaseSession) SessionT = TypeVar("SessionT", bound=BaseSession[Any, Any, Any, Any, Any])
LifespanContextT = TypeVar("LifespanContextT") LifespanContextT = TypeVar("LifespanContextT", default=None)
@dataclass @dataclass