server: skip duplicate response on CancelledError #1153
Merged
+117
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When a tool call is cancelled, RequestResponder.cancel() sends an error response. Previously, _handle_request would try to send another error response, causing "Request already responded to" assertion. This fix catches CancelledError and returns early, preventing the duplicate response. Fixes modelcontextprotocol#1152
ihrpr
requested changes
Jul 21, 2025
| @@ -0,0 +1,138 @@ | |||
| """Test that cancelled requests don't cause double responses.""" | |||
|
|
|||
There was a problem hiding this comment.
There is a lot of mocking happening. I'd suggest to use test_integration or leverage create_connected_server_and_client_session and test with CancelledNotification
There was a problem hiding this comment.
Fixed, thanks for the directions!
- Use anyio.get_cancelled_exc_class() instead of asyncio.CancelledError for proper backend compatibility (supports both asyncio and trio) - Rewrote cancel handling tests to use integration testing pattern with create_connected_server_and_client_session instead of mocking - Tests now properly send CancelledNotification messages through real client-server communication - Added proper type annotations and fixed type issues in tests Addresses review feedback about using anyio idioms and integration testing. Reported-by: @ihrpr
lukacf
force-pushed
the
fix-cancelled-error-response
branch
from
89075b0 to
a5a112a
Compare
ihrpr
requested changes
Jul 22, 2025
tests/server/test_cancel_handling.py
Outdated
|
|
||
|
|
||
| @pytest.mark.anyio | ||
| async def test_cancelled_request_no_double_response(): |
There was a problem hiding this comment.
why do we need this test? it doesn't look like it's testing much and test_server_remains_functional_after_cancel looks complete to cover the fix?
ihrpr
approved these changes
Jul 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When clients cancel long-running tool calls, the server crashes with an assertion error and becomes unresponsive. This PR fixes the issue by preventing duplicate responses.
Problem
Solution
Catch CancelledError in _handle_request and return early without sending a second response.
Testing
Added test that cancels a tool call and verifies the server remains responsive.
Fixes #1152
Related: jlowin/fastmcp#508, jlowin/fastmcp#823