aljaz/mcp-python-sdk
1
0
Fork 0
mirror of https://github.com/aljazceru/mcp-python-sdk.git synced 2025-12-19 14:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from modelcontextprotocol/justin/omit-nulls

Browse Source 
Exclude `None`s when serializing models
This commit is contained in:
Justin Spahr-Summers
2024-10-03 11:04:42 +01:00
committed by GitHub
parent ee4a4ada2e 4040945cdf
commit 33b5a12629
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcp_python/client/sse.py
View File

@@ -104,7 +104,7 @@ async def sse_client(url: str, headers: dict[str, Any] | None = None, timeout: f
logger.debug(f"Sending client message: {message}")
response = await client.post(
endpoint_url,
json=message.model_dump(by_alias=True, mode="json"),
json=message.model_dump(by_alias=True, mode="json", exclude_none=True),
)
response.raise_for_status()
logger.debug(

2
mcp_python/client/stdio.py
View File

@@ -70,7 +70,7 @@ async def stdio_client(server: StdioServerParameters):
try:
async with write_stream_reader:
async for message in write_stream_reader:
json = message.model_dump_json(by_alias=True)
json = message.model_dump_json(by_alias=True, exclude_none=True)
await process.stdin.send((json + "\n").encode())
except anyio.ClosedResourceError:
await anyio.lowlevel.checkpoint()

2
mcp_python/server/sse.py
View File

@@ -74,7 +74,7 @@ class SseServerTransport:
await sse_stream_writer.send(
{
"event": "message",
"data": message.model_dump_json(by_alias=True),
"data": message.model_dump_json(by_alias=True, exclude_none=True),
}
)

2
mcp_python/server/stdio.py
View File

@@ -48,7 +48,7 @@ async def stdio_server(
try:
async with write_stream_reader:
async for message in write_stream_reader:
json = message.model_dump_json(by_alias=True)
json = message.model_dump_json(by_alias=True, exclude_none=True)
await stdout.write(json + "\n")
await stdout.flush()
except anyio.ClosedResourceError:

2
mcp_python/server/websocket.py
View File

@@ -47,7 +47,7 @@ async def websocket_server(scope: Scope, receive: Receive, send: Send):
try:
async with write_stream_reader:
async for message in write_stream_reader:
obj = message.model_dump(by_alias=True, mode="json")
obj = message.model_dump(by_alias=True, mode="json", exclude_none=True)
await websocket.send_json(obj)
except anyio.ClosedResourceError:
await websocket.close()

10
mcp_python/shared/session.py
View File

@@ -132,7 +132,7 @@ class BaseSession(
self._response_streams[request_id] = response_stream
jsonrpc_request = JSONRPCRequest(
jsonrpc="2.0", id=request_id, **request.model_dump(by_alias=True, mode="json")
jsonrpc="2.0", id=request_id, **request.model_dump(by_alias=True, mode="json", exclude_none=True)
)
# TODO: Support progress callbacks
@@ -150,7 +150,7 @@ class BaseSession(
Emits a notification, which is a one-way message that does not expect a response.
"""
jsonrpc_notification = JSONRPCNotification(
jsonrpc="2.0", **notification.model_dump(by_alias=True, mode="json")
jsonrpc="2.0", **notification.model_dump(by_alias=True, mode="json", exclude_none=True)
)
await self._write_stream.send(JSONRPCMessage(jsonrpc_notification))
@@ -165,7 +165,7 @@ class BaseSession(
jsonrpc_response = JSONRPCResponse(
jsonrpc="2.0",
id=request_id,
result=response.model_dump(by_alias=True, mode="json"),
result=response.model_dump(by_alias=True, mode="json", exclude_none=True),
)
await self._write_stream.send(JSONRPCMessage(jsonrpc_response))
@@ -180,7 +180,7 @@ class BaseSession(
await self._incoming_message_stream_writer.send(message)
elif isinstance(message.root, JSONRPCRequest):
validated_request = self._receive_request_type.model_validate(
message.root.model_dump(by_alias=True, mode="json")
message.root.model_dump(by_alias=True, mode="json", exclude_none=True)
)
responder = RequestResponder(
request_id=message.root.id,
@@ -196,7 +196,7 @@ class BaseSession(
await self._incoming_message_stream_writer.send(responder)
elif isinstance(message.root, JSONRPCNotification):
notification = self._receive_notification_type.model_validate(
message.root.model_dump(by_alias=True, mode="json")
message.root.model_dump(by_alias=True, mode="json", exclude_none=True)
)
await self._received_notification(notification)

6
tests/client/test_session.py
View File

@@ -35,7 +35,7 @@ async def test_client_session_initialize():
jsonrpc_request = await client_to_server_receive.receive()
assert isinstance(jsonrpc_request.root, JSONRPCRequest)
request = ClientRequest.model_validate(
jsonrpc_request.model_dump(by_alias=True, mode="json")
jsonrpc_request.model_dump(by_alias=True, mode="json", exclude_none=True)
)
assert isinstance(request.root, InitializeRequest)
@@ -59,14 +59,14 @@ async def test_client_session_initialize():
JSONRPCResponse(
jsonrpc="2.0",
id=jsonrpc_request.root.id,
result=result.model_dump(by_alias=True, mode="json"),
result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
)
)
)
jsonrpc_notification = await client_to_server_receive.receive()
assert isinstance(jsonrpc_notification.root, JSONRPCNotification)
initialized_notification = ClientNotification.model_validate(
jsonrpc_notification.model_dump(by_alias=True, mode="json")
jsonrpc_notification.model_dump(by_alias=True, mode="json", exclude_none=True)
)
async def listen_session():

2
tests/server/test_stdio.py
View File

@@ -18,7 +18,7 @@ async def test_stdio_server():
]
for message in messages:
stdin.write(message.model_dump_json() + "\n")
stdin.write(message.model_dump_json(by_alias=True, exclude_none=True) + "\n")
stdin.seek(0)
async with stdio_server(

2
tests/test_types.py
View File

@@ -15,7 +15,7 @@ def test_jsonrpc_request():
request = JSONRPCMessage.model_validate(json_data)
assert isinstance(request.root, JSONRPCRequest)
ClientRequest.model_validate(request.model_dump(by_alias=True))
ClientRequest.model_validate(request.model_dump(by_alias=True, exclude_none=True))
assert request.root.jsonrpc == "2.0"
assert request.root.id == 1