Added support for raw request injection in RequestContext.

Author: Yassine Lassoued

.idea/.gitignore

@@ -14,14 +14,14 @@
 class SamplingFnT(Protocol):
     async def __call__(
         self,
-        context: RequestContext["ClientSession", Any],
+        context: RequestContext["ClientSession", Any, Any],
         params: types.CreateMessageRequestParams,
     ) -> types.CreateMessageResult | types.ErrorData: ...
 
 
 class ListRootsFnT(Protocol):
     async def __call__(
-        self, context: RequestContext["ClientSession", Any]
+        self, context: RequestContext["ClientSession", Any, Any]
     ) -> types.ListRootsResult | types.ErrorData: ...
 
 
@@ -50,7 +50,7 @@ async def _default_message_handler(
 
 
 async def _default_sampling_callback(
-    context: RequestContext["ClientSession", Any],
+    context: RequestContext["ClientSession", Any, Any],
     params: types.CreateMessageRequestParams,
 ) -> types.CreateMessageResult | types.ErrorData:
     return types.ErrorData(
@@ -60,7 +60,7 @@ async def _default_sampling_callback(
 
 
 async def _default_list_roots_callback(
-    context: RequestContext["ClientSession", Any],
+    context: RequestContext["ClientSession", Any, Any],
 ) -> types.ListRootsResult | types.ErrorData:
     return types.ErrorData(
         code=types.INVALID_REQUEST,
@@ -331,7 +331,7 @@ async def send_roots_list_changed(self) -> None:
     async def _received_request(
         self, responder: RequestResponder[types.ServerRequest, types.ClientResult]
     ) -> None:
-        ctx = RequestContext[ClientSession, Any](
+        ctx = RequestContext[ClientSession, Any, Any](
             request_id=responder.request_id,
             meta=responder.request_meta,
             session=self,

.idea/deployment.xml

@@ -36,7 +36,7 @@
 from mcp.server.session import ServerSession, ServerSessionT
 from mcp.server.sse import SseServerTransport
 from mcp.server.stdio import stdio_server
-from mcp.shared.context import LifespanContextT, RequestContext
+from mcp.shared.context import LifespanContextT, RequestContext, RequestT
 from mcp.types import (
     AnyFunction,
     EmbeddedResource,
@@ -182,7 +182,7 @@ async def list_tools(self) -> list[MCPTool]:
             for info in tools
         ]
 
-    def get_context(self) -> Context[ServerSession, object]:
+    def get_context(self) -> Context[ServerSession, object, Request]:
         """
         Returns a Context object. Note that the context will only be valid
         during a request; outside a request, most methods will error.
@@ -491,6 +491,7 @@ async def handle_sse(request: Request) -> None:
                     streams[0],
                     streams[1],
                     self._mcp_server.create_initialization_options(),
+                    request=request,
                 )
 
         return Starlette(
@@ -558,7 +559,7 @@ def _convert_to_content(
     return [TextContent(type="text", text=result)]
 
 
-class Context(BaseModel, Generic[ServerSessionT, LifespanContextT]):
+class Context(BaseModel, Generic[ServerSessionT, LifespanContextT, RequestT]):
     """Context object providing access to MCP capabilities.
 
     This provides a cleaner interface to MCP's RequestContext functionality.
@@ -592,13 +593,13 @@ def my_tool(x: int, ctx: Context) -> str:
     The context is optional - tools that don't need it can omit the parameter.
     """
 
-    _request_context: RequestContext[ServerSessionT, LifespanContextT] | None
+    _request_context: RequestContext[ServerSessionT, LifespanContextT, RequestT] | None
     _fastmcp: FastMCP | None
 
     def __init__(
         self,
         *,
-        request_context: RequestContext[ServerSessionT, LifespanContextT] | None = None,
+        request_context: RequestContext[ServerSessionT, LifespanContextT, RequestT] | None = None,
         fastmcp: FastMCP | None = None,
         **kwargs: Any,
     ):

.idea/inspectionProfiles/profiles_settings.xml

@@ -76,7 +76,7 @@ def from_function(
     async def run(
         self,
         arguments: dict[str, Any],
-        context: Context[ServerSessionT, LifespanContextT] | None = None,
+        context: Context[ServerSessionT, LifespanContextT, Any] | None = None,
     ) -> Any:
         """Run the tool with arguments."""
         try:

.idea/misc.xml

@@ -50,7 +50,7 @@ async def call_tool(
         self,
         name: str,
         arguments: dict[str, Any],
-        context: Context[ServerSessionT, LifespanContextT] | None = None,
+        context: Context[ServerSessionT, LifespanContextT, Any] | None = None,
     ) -> Any:
         """Call a tool by name with arguments."""
         tool = self.get_tool(name)

.idea/modules.xml

@@ -82,7 +82,7 @@ async def main():
 from mcp.server.models import InitializationOptions
 from mcp.server.session import ServerSession
 from mcp.server.stdio import stdio_server as stdio_server
-from mcp.shared.context import RequestContext
+from mcp.shared.context import RequestContext, RequestT
 from mcp.shared.exceptions import McpError
 from mcp.shared.session import RequestResponder
 
@@ -91,7 +91,7 @@ async def main():
 LifespanResultT = TypeVar("LifespanResultT")
 
 # This will be properly typed in each Server instance's context
-request_ctx: contextvars.ContextVar[RequestContext[ServerSession, Any]] = (
+request_ctx: contextvars.ContextVar[RequestContext[ServerSession, Any, RequestT]] = (
     contextvars.ContextVar("request_ctx")
 )
 
@@ -109,7 +109,7 @@ def __init__(
 
 
 @asynccontextmanager
-async def lifespan(server: Server[LifespanResultT]) -> AsyncIterator[object]:
+async def lifespan(server: Server[LifespanResultT, RequestT]) -> AsyncIterator[object]:
     """Default lifespan context manager that does nothing.
 
     Args:
@@ -121,14 +121,14 @@ async def lifespan(server: Server[LifespanResultT]) -> AsyncIterator[object]:
     yield {}
 
 
-class Server(Generic[LifespanResultT]):
+class Server(Generic[LifespanResultT, RequestT]):
     def __init__(
         self,
         name: str,
         version: str | None = None,
         instructions: str | None = None,
         lifespan: Callable[
-            [Server[LifespanResultT]], AbstractAsyncContextManager[LifespanResultT]
+            [Server[LifespanResultT, RequestT]], AbstractAsyncContextManager[LifespanResultT]
         ] = lifespan,
     ):
         self.name = name
@@ -213,7 +213,7 @@ def get_capabilities(
         )
 
     @property
-    def request_context(self) -> RequestContext[ServerSession, LifespanResultT]:
+    def request_context(self) -> RequestContext[ServerSession, LifespanResultT, RequestT]:
         """If called outside of a request context, this will raise a LookupError."""
         return request_ctx.get()
 
@@ -479,6 +479,7 @@ async def run(
         # but also make tracing exceptions much easier during testing and when using
         # in-process servers.
         raise_exceptions: bool = False,
+        request: RequestT | None = None,
     ):
         async with AsyncExitStack() as stack:
             lifespan_context = await stack.enter_async_context(self.lifespan(self))
@@ -496,6 +497,7 @@ async def run(
                         session,
                         lifespan_context,
                         raise_exceptions,
+                        request,
                     )
 
     async def _handle_message(
@@ -506,6 +508,7 @@ async def _handle_message(
         session: ServerSession,
         lifespan_context: LifespanResultT,
         raise_exceptions: bool = False,
+        request: RequestT | None = None,
     ):
         with warnings.catch_warnings(record=True) as w:
             # TODO(Marcelo): We should be checking if message is Exception here.
@@ -515,7 +518,7 @@ async def _handle_message(
                 ):
                     with responder:
                         await self._handle_request(
-                            message, req, session, lifespan_context, raise_exceptions
+                            message, req, session, lifespan_context, raise_exceptions, request
                         )
                 case types.ClientNotification(root=notify):
                     await self._handle_notification(notify)
@@ -530,6 +533,7 @@ async def _handle_request(
         session: ServerSession,
         lifespan_context: LifespanResultT,
         raise_exceptions: bool,
+        request: RequestT | None,
     ):
         logger.info(f"Processing request of type {type(req).__name__}")
         if type(req) in self.request_handlers:
@@ -546,6 +550,7 @@ async def _handle_request(
                         message.request_meta,
                         session,
                         lifespan_context,
+                        request=request,
                     )
                 )
                 response = await handler(req)

.idea/python-sdk.iml

@@ -8,11 +8,13 @@
 
 SessionT = TypeVar("SessionT", bound=BaseSession[Any, Any, Any, Any, Any])
 LifespanContextT = TypeVar("LifespanContextT")
+RequestT = TypeVar("RequestT")
 
 
 @dataclass
-class RequestContext(Generic[SessionT, LifespanContextT]):
+class RequestContext(Generic[SessionT, LifespanContextT, RequestT]):
     request_id: RequestId
     meta: RequestParams.Meta | None
     session: SessionT
     lifespan_context: LifespanContextT
+    request: RequestT | None = None

.idea/vcs.xml

@@ -59,7 +59,7 @@ async def create_client_server_memory_streams() -> (
 
 @asynccontextmanager
 async def create_connected_server_and_client_session(
-    server: Server[Any],
+    server: Server[Any, Any],
     read_timeout_seconds: timedelta | None = None,
     sampling_callback: SamplingFnT | None = None,
     list_roots_callback: ListRootsFnT | None = None,

src/mcp/client/session.py

@@ -1,7 +1,7 @@
 from collections.abc import Generator
 from contextlib import contextmanager
 from dataclasses import dataclass, field
-from typing import Generic
+from typing import Generic, Any
 
 from pydantic import BaseModel
 
@@ -62,6 +62,7 @@ def progress(
             ReceiveNotificationT,
         ],
         LifespanContextT,
+        Any,
     ],
     total: float | None = None,
 ) -> Generator[

src/mcp/server/fastmcp/server.py

@@ -1,3 +1,5 @@
+from types import NoneType
+
 import pytest
 from pydantic import FileUrl
 
@@ -30,7 +32,7 @@ async def test_list_roots_callback():
     )
 
     async def list_roots_callback(
-        context: RequestContext[ClientSession, None],
+        context: RequestContext[ClientSession, None, None],
     ) -> ListRootsResult:
         return callback_return