Skip to content

server/sse: return response in handle_post_message #83

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/servers/simple-prompt/mcp_simple_prompt/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ async def handle_sse(request):
)

async def handle_messages(request):
await sse.handle_post_message(request.scope, request.receive, request._send)
return await sse.handle_post_message(request.scope, request.receive)

starlette_app = Starlette(
debug=True,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async def handle_sse(request):
)

async def handle_messages(request):
await sse.handle_post_message(request.scope, request.receive, request._send)
return await sse.handle_post_message(request.scope, request.receive)

starlette_app = Starlette(
debug=True,
Expand Down
2 changes: 1 addition & 1 deletion examples/servers/simple-tool/mcp_simple_tool/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ async def handle_sse(request):
)

async def handle_messages(request):
await sse.handle_post_message(request.scope, request.receive, request._send)
return await sse.handle_post_message(request.scope, request.receive)

starlette_app = Starlette(
debug=True,
Expand Down
22 changes: 7 additions & 15 deletions src/mcp/server/sse.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async def handle_sse(request):
)

async def handle_messages(request):
await sse.handle_post_message(request.scope, request.receive, request._send)
return await sse.handle_post_message(request.scope, request.receive)

# Create and run Starlette app
starlette_app = Starlette(routes=routes)
Expand Down Expand Up @@ -133,31 +133,26 @@ async def sse_writer():
logger.debug("Yielding read and write streams")
yield (read_stream, write_stream)

async def handle_post_message(
self, scope: Scope, receive: Receive, send: Send
) -> None:
async def handle_post_message(self, scope: Scope, receive: Receive) -> Response:
logger.debug("Handling POST message")
request = Request(scope, receive)

session_id_param = request.query_params.get("session_id")
if session_id_param is None:
logger.warning("Received request without session_id")
response = Response("session_id is required", status_code=400)
return await response(scope, receive, send)
return Response("session_id is required", status_code=400)

try:
session_id = UUID(hex=session_id_param)
logger.debug(f"Parsed session ID: {session_id}")
except ValueError:
logger.warning(f"Received invalid session ID: {session_id_param}")
response = Response("Invalid session ID", status_code=400)
return await response(scope, receive, send)
return Response("Invalid session ID", status_code=400)

writer = self._read_stream_writers.get(session_id)
if not writer:
logger.warning(f"Could not find session for ID: {session_id}")
response = Response("Could not find session", status_code=404)
return await response(scope, receive, send)
return Response("Could not find session", status_code=404)

json = await request.json()
logger.debug(f"Received JSON: {json}")
Expand All @@ -167,12 +162,9 @@ async def handle_post_message(
logger.debug(f"Validated client message: {message}")
except ValidationError as err:
logger.error(f"Failed to parse message: {err}")
response = Response("Could not parse message", status_code=400)
await response(scope, receive, send)
await writer.send(err)
return
return Response("Could not parse message", status_code=400)

logger.debug(f"Sending message to writer: {message}")
response = Response("Accepted", status_code=202)
await response(scope, receive, send)
await writer.send(message)
return Response("Accepted", status_code=202)
2 changes: 1 addition & 1 deletion uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.