Skip to content

fix(server): run after_handler_run when a handler call is cancelled - #1427

Merged
Iwaniukooo11 merged 2 commits into
a2aproject:mainfrom
v0ropaev:fix/plugin-hooks-cancel
Nov 9, 2026
Merged

Iwaniukooo11 merged 2 commits into
a2aproject:mainfrom
v0ropaev:fix/plugin-hooks-cancel

Conversation

@v0ropaev

@v0ropaev v0ropaev commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

Description

Follow-up to #1402, as asked in the review there.

server_plugin_hooks handled cancellation differently for unary and streaming methods, and neither told the plugin about it.

  • The unary wrapper only called after_handler_run from except Exception. A cancelled call (a client timeout, a disconnect, asyncio.wait_for around the handler) got before_handler_run and then nothing, so a plugin that opens a span or takes a slot in before_handler_run never got to close it.
  • The stream wrapper does call it from finally, but with error=None, so a cancelled stream looked the same as one that finished normally.

Both wrappers now catch asyncio.CancelledError alongside Exception, pass it to after_handler_run as error, and re-raise it. ServerResponse.error is already typed BaseException | None. A stream closed with aclose() still reports error=None, so test_stream_closed_early_still_gets_final_call is unchanged.

The two new tests use a task store whose get blocks, so they cancel inside on_get_task and on_subscribe_to_task without going through ActiveTask.subscribe and don't depend on #1402. Without the src change the unary test gets no after_handler_run call at all and the stream test gets error=None.

Full suite on 3.10: 2544 passed, 207 skipped, 4 xfailed, 1 xpassed. ./scripts/lint.sh passes (the three ty warnings it prints are the existing unused type: ignore in the client transports).

I left the client side alone. BaseClient._execute_with_interceptors has the same except Exception shape for after_client_request, and PluginAgentExecutor.execute passes None to after_execution when the execution is cancelled. I can send those separately if you want them.

The unary wrapper only called after_handler_run from except Exception,
so a cancelled call got before_handler_run with no matching after call.
The stream wrapper did call it from finally, but reported error=None,
which reads as a clean end of the stream. Both now pass the
CancelledError through to the after hook and re-raise it.
@v0ropaev
v0ropaev requested a review from a team as a code owner November 5, 2026 14:03
@github-actions

github-actions Bot commented Nov 5, 2026 •

Copy link
Copy Markdown

🧪 Code Coverage (vs main)

⬇️ Download Full Report

Base PR Delta
src/a2a/server/cluster/database_event_stream.py 97.27% 93.64% 🔴 -3.64%
Total 93.53% 93.49% 🔴 -0.04%

Generated by coverage-comment.yml

@Iwaniukooo11 Iwaniukooo11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Iwaniukooo11
Iwaniukooo11 merged commit 2cc1dd5 into a2aproject:main Nov 9, 2026
17 checks passed
Iwaniukooo11 pushed a commit that referenced this pull request Nov 17, 2026
🤖 I have created a release *beep* *boop*
---


##
[1.3.1](v1.3.0...v1.3.1)
(2026-11-16)


### Features

* add httpx2 support
([#1439](#1439))
([a59bb68](a59bb68))
* **cluster:** Introduce ServerCallContext to DatabaseTaskEventStream
([#1399](#1399))
([6168d59](6168d59))


### Bug Fixes

* **client:** handle case-insensitive SSE media types
([#1464](#1464))
([3932982](3932982))
* **client:** keep tenant defaults local to each call
([#1463](#1463))
([569b94f](569b94f))
* **client:** percent-encode ids in REST transport paths
([#1436](#1436))
([1bbe69c](1bbe69c))
* **client:** split SSE lines only on CR, LF and CRLF
([#1456](#1456))
([c8ccea9](c8ccea9))
* **compat:** get a v0.3 push config by task id alone
([#1380](#1380))
([aa8e966](aa8e966))
* **compat:** list push notification configs in the v0.3 REST client
([#1424](#1424))
([d830036](d830036)),
closes [#1423](#1423)
* **compat:** map v0.3 gRPC errors from their ErrorInfo reason
([#1466](#1466))
([caab6a2](caab6a2))
* **compat:** parse the v0.3 REST extended agent card as JSON
([#1420](#1420))
([076e0ec](076e0ec))
* **compat:** percent-encode ids in v0.3 REST transport paths
([#1458](#1458))
([1ff86d5](1ff86d5))
* **compat:** return -32602 for invalid v0.3 JSON-RPC params
([#1419](#1419))
([05aaff6](05aaff6))
* **compat:** return 400 for a non-integer v0.3 REST historyLength
([#1382](#1382))
([9c90c48](9c90c48)),
closes [#1381](#1381)
* **compat:** return HTTP errors from v0.3 REST streams that fail early
([#1403](#1403))
([11f1116](11f1116))
* **compat:** send no v0.3 configuration when the request has none
([#1429](#1429))
([01483cb](01483cb))
* **compat:** send v0.3 REST request bodies with json_name keys
([#1455](#1455))
([2399993](2399993))
* **compat:** serve DELETE for v0.3 REST push notification configs
([#1442](#1442))
([14e799c](14e799c))
* reject decoded values that are not objects in parse_lenient
([#1431](#1431))
([257626b](257626b))
* reject invalid REST boolean query values
([#1383](#1383))
([babc3f5](babc3f5))
* **server:** close the event queues when ActiveTask.start() fails
([#1422](#1422))
([5e0d415](5e0d415))
* **server:** create the cluster tables lazily in
VersionedDatabaseTaskStore get and delete
([#1357](#1357))
([4e133b7](4e133b7))
* **server:** fail fast when an executor produces no events
([#1345](#1345))
([ab7e36f](ab7e36f))
* **server:** fail streaming sends when an executor produces no events
([#1460](#1460))
([c16cab1](c16cab1))
* **server:** forward CancelTaskRequest.metadata to AgentExecutor.cancel
([#1416](#1416))
([f666ba3](f666ba3)),
closes [#1415](#1415)
* **server:** infer contextId from task when only taskId is provided
([#1453](#1453))
([2ba8e7b](2ba8e7b)),
closes [#1411](#1411)
* **server:** match input modes on type and subtype, ignoring case
([#1425](#1425))
([28f8a62](28f8a62))
* **server:** prevent failed cancel from overwriting terminal task state
([#1405](#1405))
([ac48ce1](ac48ce1))
* **server:** record FAILED when a task's terminal save fails
([#1400](#1400))
([4e916d8](4e916d8))
* **server:** reject out-of-range ListTasks cursor timestamps
([#1451](#1451))
([f451ed7](f451ed7))
* **server:** run after_handler_run when a handler call is cancelled
([#1427](#1427))
([2cc1dd5](2cc1dd5))
* **server:** treat request bodies that are not valid UTF-8 as parse
errors ([#1401](#1401))
([56ec855](56ec855))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants