Skip to content

Sending cancellation notification to server based on client anyio.CancelScope status #628

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.

Sign up for GitHub

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
davemssavage wants to merge 37 commits into from
Closed

Sending cancellation notification to server based on client anyio.CancelScope status #628

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f9598ad
attempt to support cancelation
davemssavage May 4, 2025
dfb3686
fix sending cancel
davemssavage May 4, 2025
abda067
add decorator for handling cancelation
davemssavage May 4, 2025
24553c6
fix capitalisation on error message
davemssavage May 4, 2025
fe49931
try to check notification event received
davemssavage May 4, 2025
efd0ffd
fix test
davemssavage May 4, 2025
1364b7a
fix debug message
davemssavage May 4, 2025
17ae44c
prevent cancel on intialisation as per https://modelcontextprotocol.i…
davemssavage May 4, 2025
06f4b3c
remove unused imports
davemssavage May 4, 2025
07e1a52
fixed long line
davemssavage May 4, 2025
92f806b
fixed long line
davemssavage May 4, 2025
e46c693
updates from ruff format
davemssavage May 4, 2025
2a24e0c
removed dev print statements committed by mistake
davemssavage May 4, 2025
87722f8
add constant for request cancelled and use it in case of cancelled task
davemssavage May 4, 2025
f0782d2
fix long line
davemssavage May 4, 2025
a0164f9
fix import order
davemssavage May 4, 2025
bf220d5
add assert that cancel scope triggered on server, add comments for re…
davemssavage May 5, 2025
45ac52a
trivial update to comment capitalisation
davemssavage May 5, 2025
8b7f1cd
simplify test code
davemssavage May 5, 2025
ac4b822
add tests to assert cancellable=False behaves as expected
davemssavage May 5, 2025
d86b4a5
tidy up ruff check
davemssavage May 5, 2025
6f4ae44
ruff format update
davemssavage May 5, 2025
11d2e52
fixed test description
davemssavage May 5, 2025
235df35
use defined types in decorator
davemssavage May 5, 2025
f96aaa5
Add docstring info for cancellable and add TODO note for initialised …
davemssavage May 5, 2025
bd73448
set read_timeout_seconds to avoid test blocking for ever in case some…
davemssavage May 5, 2025
3817fe2
remove unnecessary shielded cancel scope
davemssavage May 5, 2025
2fd27a2
whitespace
davemssavage May 5, 2025
2e86d32
clarified doc string comment
davemssavage May 6, 2025
1039b99
fixed doc string and added comment on internal notification method
davemssavage May 6, 2025
b926970
Merge branch 'main' into cancellation
davemssavage May 9, 2025
cf1bb2b
merge from upstream main
davemssavage May 17, 2025
39f7739
ignore type warning for internal use of send_notification
davemssavage May 17, 2025
598756d
Merge branch 'main' into cancellation
davemssavage May 24, 2025
4842cee
Merge branch 'main' into cancellation
davemssavage Jun 27, 2025
8f2cfca
ruff format
davemssavage Jun 28, 2025
64a2ae0
remove unused import
davemssavage Jun 28, 2025
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
Prev Previous commit
Next Next commit
fix capitalisation on error message
  • Loading branch information
@davemssavage
davemssavage committed May 4, 2025
commit 24553c65abd4944eeb4209955a85500ef6362ded
2 changes: 1 addition & 1 deletion src/mcp/shared/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ async def send_request(
await self._send_notification_internal(notification, request_id)

raise McpError(
ErrorData(code=32601, message="request cancelled")
ErrorData(code=32601, message="Request cancelled")
)

except TimeoutError:
Expand Down