Merge branch 'main' into docs/fix-readme-848

Author: Lasdw6

src/mcp/client/streamable_http.py

@@ -195,7 +195,8 @@ async def handle_get_stream(
                 self.url,
                 headers=headers,
                 timeout=httpx.Timeout(
-                    self.timeout.seconds, read=self.sse_read_timeout.seconds
+                    self.timeout.total_seconds(),
+                    read=self.sse_read_timeout.total_seconds(),
                 ),
             ) as event_source:
                 event_source.response.raise_for_status()
@@ -226,7 +227,7 @@ async def _handle_resumption_request(self, ctx: RequestContext) -> None:
             self.url,
             headers=headers,
             timeout=httpx.Timeout(
-                self.timeout.seconds, read=ctx.sse_read_timeout.seconds
+                self.timeout.total_seconds(), read=ctx.sse_read_timeout.total_seconds()
             ),
         ) as event_source:
             event_source.response.raise_for_status()
@@ -468,7 +469,8 @@ async def streamablehttp_client(
             async with httpx_client_factory(
                 headers=transport.request_headers,
                 timeout=httpx.Timeout(
-                    transport.timeout.seconds, read=transport.sse_read_timeout.seconds
+                    transport.timeout.total_seconds(),
+                    read=transport.sse_read_timeout.total_seconds(),
                 ),
                 auth=transport.auth,
             ) as client:

src/mcp/types.py

@@ -34,7 +34,7 @@
 ProgressToken = str | int
 Cursor = str
 Role = Literal["user", "assistant"]
-RequestId = str | int
+RequestId = Annotated[int | str, Field(union_mode="left_to_right")]
 AnyFunction: TypeAlias = Callable[..., Any]
 
 
@@ -353,7 +353,7 @@ class ProgressNotificationParams(NotificationParams):
     """Total number of items to process (or total progress required), if known."""
     message: str | None = None
     """
-    Message related to progress. This should provide relevant human readable 
+    Message related to progress. This should provide relevant human readable
     progress information.
     """
     model_config = ConfigDict(extra="allow")

tests/shared/test_sse.py

@@ -8,12 +8,14 @@
 import httpx
 import pytest
 import uvicorn
+from inline_snapshot import snapshot
 from pydantic import AnyUrl
 from starlette.applications import Starlette
 from starlette.requests import Request
 from starlette.responses import Response
 from starlette.routing import Mount, Route
 
+import mcp.types as types
 from mcp.client.session import ClientSession
 from mcp.client.sse import sse_client
 from mcp.server import Server
@@ -503,3 +505,17 @@ async def test_request_context_isolation(context_server: None, server_url: str)
         assert ctx["request_id"] == f"request-{i}"
         assert ctx["headers"].get("x-request-id") == f"request-{i}"
         assert ctx["headers"].get("x-custom-value") == f"value-{i}"
+
+
+def test_sse_message_id_coercion():
+    """Test that string message IDs that look like integers are parsed as integers.
+
+    See <https://github.com/modelcontextprotocol/python-sdk/pull/851> for more details.
+    """
+    json_message = '{"jsonrpc": "2.0", "id": "123", "method": "ping", "params": null}'
+    msg = types.JSONRPCMessage.model_validate_json(json_message)
+    assert msg == snapshot(
+        types.JSONRPCMessage(
+            root=types.JSONRPCRequest(method="ping", jsonrpc="2.0", id=123)
+        )
+    )