Skip to content

Commit 65656b6

Browse files
committed
fix: resolve all ruff linting errors
- Fix line too long in proxy.py by extracting method name to variable - Fix loop variable overwrite by sending transformed message directly - Remove unused 'received' variables in tests - All ruff checks now pass
1 parent bc743da commit 65656b6

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

src/mcp/shared/proxy.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ def log_error(error: Exception) -> None:
7070
logger.error(f"Proxy error: {error}")
7171
7272
async def inspect_client_msg(msg: SessionMessage) -> SessionMessage | None:
73-
logger.info(f"Client → Server: {msg.message.root.method if hasattr(msg.message.root, 'method') else 'response'}")
73+
method = msg.message.root.method if hasattr(msg.message.root, "method") else "response"
74+
logger.info(f"Client → Server: {method}")
7475
return msg # Forward as-is
7576
7677
async with mcp_proxy(
@@ -114,10 +115,11 @@ async def forward_messages(
114115
# Message was dropped by the transform function
115116
logger.debug(f"Message dropped by transform function in {direction}")
116117
continue
117-
message = transformed
118-
119-
# Forward the message
120-
await write_stream.send(message)
118+
# Use the transformed message instead
119+
await write_stream.send(transformed)
120+
else:
121+
# Forward the message as-is
122+
await write_stream.send(message)
121123

122124
except Exception as exc:
123125
logger.exception(f"Error forwarding message in {direction}")

tests/shared/test_proxy.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,19 @@ def _create():
2020
server_read_writer, server_read = anyio.create_memory_object_stream[SessionMessage | Exception](10)
2121
server_write, server_write_reader = anyio.create_memory_object_stream[SessionMessage](10)
2222

23-
# Track all streams for cleanup
24-
streams_to_cleanup.extend([client_read_writer, client_write_reader, server_read_writer, server_write_reader])
23+
# Track ALL 8 streams for cleanup (both send and receive ends of all 4 pairs)
24+
streams_to_cleanup.extend(
25+
[
26+
client_read_writer,
27+
client_read,
28+
client_write,
29+
client_write_reader,
30+
server_read_writer,
31+
server_read,
32+
server_write,
33+
server_write_reader,
34+
]
35+
)
2536

2637
return (
2738
(client_read, client_write),
@@ -185,7 +196,7 @@ async def drop_message(msg: SessionMessage) -> SessionMessage | None:
185196

186197
# Message should not arrive at server
187198
with anyio.move_on_after(0.1):
188-
received = await server_write_reader.receive()
199+
await server_write_reader.receive()
189200
# If we get here, the message was not dropped
190201
pytest.fail("Message should have been dropped")
191202
finally:
@@ -290,7 +301,7 @@ async def failing_transform(msg: SessionMessage) -> SessionMessage | None:
290301

291302
# Message should not arrive at server due to transform error
292303
with anyio.move_on_after(0.1):
293-
received = await server_write_reader.receive()
304+
await server_write_reader.receive()
294305
pytest.fail("Message should not have been forwarded after transform error")
295306
finally:
296307
# Clean up test streams

0 commit comments

Comments
 (0)