type instead of try/except

Author: abdullahkady

src/mcp/server/lowlevel/server.py

@@ -514,7 +514,7 @@ async def _handle_message(
 
     async def _handle_request(
         self,
-        message: RequestResponder,
+        message: RequestResponder[types.ClientRequest, types.ServerResult],
         req: Any,
         session: ServerSession,
         lifespan_context: LifespanResultT,
@@ -526,12 +526,6 @@ async def _handle_request(
             logger.debug(f"Dispatching request of type {type(req).__name__}")
 
             token = None
-            headers = {}
-            try:
-                # TODO: This try/catch and ignoring the type is wrong.
-                headers = message.request.root.headers  # type: ignore
-            except Exception:
-                pass
             try:
                 # Set our global state that can be retrieved via
                 # app.get_request_context()
@@ -541,7 +535,7 @@ async def _handle_request(
                         message.request_meta,
                         session,
                         lifespan_context,
-                        headers,
+                        message.request.root.headers or {},
                     )
                 )
                 response = await handler(req)

src/mcp/types.py

@@ -74,6 +74,7 @@ class Request(BaseModel, Generic[RequestParamsT, MethodT]):
 
     method: MethodT
     params: RequestParamsT
+    headers: dict[str, str] | None = None
     model_config = ConfigDict(extra="allow")
 
 
@@ -118,7 +119,6 @@ class JSONRPCRequest(Request):
     jsonrpc: Literal["2.0"]
     id: RequestId
     params: dict[str, Any] | None = None
-    headers: dict[str, str] | None = None
 
 
 class JSONRPCNotification(Notification):