modelcontextprotocol/python-sdk
Watch
1
0
Fork
You've already forked python-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert unintended changes

Browse source
This commit is contained in:
Nick Merrill 2025-01-14 11:47:00 -05:00
commit 5097bb7ef8
No known key found for this signature in database
1 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/mcp/client/sse.py
View file

@ -24,20 +24,12 @@ async def sse_client(
headers: dict[str, Any] | None = None, headers: dict[str, Any] | None = None,
timeout: float = 5, timeout: float = 5,
sse_read_timeout: float = 60 * 5, sse_read_timeout: float = 60 * 5,
client: httpx.AsyncClient | None = None,
): ):
""" """
Client transport for SSE. Client transport for SSE.
`sse_read_timeout` determines how long (in seconds) the client will wait for a new `sse_read_timeout` determines how long (in seconds) the client will wait for a new
event before disconnecting. All other HTTP operations are controlled by `timeout`. event before disconnecting. All other HTTP operations are controlled by `timeout`.
Args:
url: The URL to connect to
headers: Optional headers to send with the request
timeout: Connection timeout in seconds
sse_read_timeout: Read timeout in seconds
client: Optional httpx.AsyncClient instance to use for requests
""" """
read_stream: MemoryObjectReceiveStream[types.JSONRPCMessage | Exception] read_stream: MemoryObjectReceiveStream[types.JSONRPCMessage | Exception]
read_stream_writer: MemoryObjectSendStream[types.JSONRPCMessage | Exception] read_stream_writer: MemoryObjectSendStream[types.JSONRPCMessage | Exception]
@ -51,13 +43,7 @@ async def sse_client(
async with anyio.create_task_group() as tg: async with anyio.create_task_group() as tg:
try: try:
logger.info(f"Connecting to SSE endpoint: {remove_request_params(url)}") logger.info(f"Connecting to SSE endpoint: {remove_request_params(url)}")
if client is None: async with httpx.AsyncClient(headers=headers) as client:
client = httpx.AsyncClient(headers=headers)
should_close_client = True
else:
should_close_client = False
try:
async with aconnect_sse( async with aconnect_sse(
client, client,
"GET", "GET",
@ -151,9 +137,6 @@ async def sse_client(
yield read_stream, write_stream yield read_stream, write_stream
finally: finally:
tg.cancel_scope.cancel() tg.cancel_scope.cancel()
finally:
if should_close_client:
await client.aclose()
finally: finally:
await read_stream_writer.aclose() await read_stream_writer.aclose()
await write_stream.aclose() await write_stream.aclose()