Merge pull request #43 from modelcontextprotocol/davidsp/request_context

dsp-ant · web-flow · commit 41a6157aee9e · 2024-11-11T21:19:24.000Z
Return a specific server session instance of request context
diff --git a/src/mcp/client/sse.py b/src/mcp/client/sse.py
@@ -84,7 +84,7 @@ async def sse_reader(
 
                                     case "message":
                                         try:
-                                            message = types.JSONRPCMessage.model_validate_json( # noqa: E501
+                                            message = types.JSONRPCMessage.model_validate_json(  # noqa: E501
                                                 sse.data
                                             )
                                             logger.debug(
diff --git a/src/mcp/server/__init__.py b/src/mcp/server/__init__.py
@@ -16,8 +16,8 @@
 
 logger = logging.getLogger(__name__)
 
-request_ctx: contextvars.ContextVar[RequestContext] = contextvars.ContextVar(
-    "request_ctx"
+request_ctx: contextvars.ContextVar[RequestContext[ServerSession]] = (
+    contextvars.ContextVar("request_ctx")
 )
 
 
@@ -115,7 +115,7 @@ def get_capabilities(
         )
 
     @property
-    def request_context(self) -> RequestContext:
+    def request_context(self) -> RequestContext[ServerSession]:
         """If called outside of a request context, this will raise a LookupError."""
         return request_ctx.get()
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ async def sse_reader(`
`84`	`84`
`85`	`85`	`case "message":`
`86`	`86`	`try:`
`87`		`- message = types.JSONRPCMessage.model_validate_json( # noqa: E501`
	`87`	`+ message = types.JSONRPCMessage.model_validate_json( # noqa: E501`
`88`	`88`	`sse.data`
`89`	`89`	`)`
`90`	`90`	`logger.debug(`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`
`17`	`17`	`logger = logging.getLogger(__name__)`
`18`	`18`
`19`		`-request_ctx: contextvars.ContextVar[RequestContext] = contextvars.ContextVar(`
`20`		`- "request_ctx"`
	`19`	`+request_ctx: contextvars.ContextVar[RequestContext[ServerSession]] = (`
	`20`	`+ contextvars.ContextVar("request_ctx")`
`21`	`21`	`)`
`22`	`22`
`23`	`23`
`@@ -115,7 +115,7 @@ def get_capabilities(`
`115`	`115`	`)`
`116`	`116`
`117`	`117`	`@property`
`118`		`- def request_context(self) -> RequestContext:`
	`118`	`+ def request_context(self) -> RequestContext[ServerSession]:`
`119`	`119`	`"""If called outside of a request context, this will raise a LookupError."""`
`120`	`120`	`return request_ctx.get()`
`121`	`121`