Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid double JSON encoding/decoding #287

Merged
merged 1 commit into from
Mar 14, 2025
Merged

Avoid double JSON encoding/decoding #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/mcp/server/sse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,11 @@ async def handle_post_message(
response = Response("Could not find session", status_code=404)
return await response(scope, receive, send)

json = await request.json()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The json() calls the json module, we can just use the body, and Pydantic's model_validate_json. It's faster.

logger.debug(f"Received JSON: {json}")
body = await request.body()
logger.debug(f"Received JSON: {body}")

try:
message = types.JSONRPCMessage.model_validate(json)
message = types.JSONRPCMessage.model_validate_json(body)
logger.debug(f"Validated client message: {message}")
except ValidationError as err:
logger.error(f"Failed to parse message: {err}")
Expand Down
13 changes: 6 additions & 7 deletions src/mcp/server/websocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import anyio
from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
from pydantic_core import ValidationError
from starlette.types import Receive, Scope, Send
from starlette.websockets import WebSocket

Expand Down Expand Up @@ -33,10 +34,10 @@ async def websocket_server(scope: Scope, receive: Receive, send: Send):
async def ws_reader():
try:
async with read_stream_writer:
async for message in websocket.iter_json():
async for msg in websocket.iter_text():
try:
client_message = types.JSONRPCMessage.model_validate(message)
except Exception as exc:
client_message = types.JSONRPCMessage.model_validate_json(msg)
except ValidationError as exc:
await read_stream_writer.send(exc)
continue

Expand All @@ -48,10 +49,8 @@ async def ws_writer():
try:
async with write_stream_reader:
async for message in write_stream_reader:
obj = message.model_dump(
by_alias=True, mode="json", exclude_none=True
)
await websocket.send_json(obj)
obj = message.model_dump_json(by_alias=True, exclude_none=True)
await websocket.send_text(obj)
except anyio.ClosedResourceError:
await websocket.close()

Expand Down