Commit d5557e2
committed
fix(agents): await cancelled tasks in _merge_agent_run_pre_3_11 to prevent aclose() RuntimeError
On Python 3.10, ParallelAgent uses _merge_agent_run_pre_3_11 instead of
asyncio.TaskGroup. When a sub-agent raises, the finally block cancelled
all tasks but did not await them. This left the internal process_an_agent
coroutines still executing their own finally blocks (which hold references
to the sub-agent async generators) when _run_async_impl subsequently called
aclose() on those generators, raising:
RuntimeError: aclose(): asynchronous generator is already running
Fix: add asyncio.gather(*tasks, return_exceptions=True) after cancellation
so that all tasks — and their generator cleanup — complete before the caller
can invoke aclose().
Fixes #52971 parent 3e282d2 commit d5557e2
2 files changed
Lines changed: 37 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
| 148 | + | |
148 | 149 | | |
149 | 150 | | |
150 | 151 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| |||
373 | 374 | | |
374 | 375 | | |
375 | 376 | | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
0 commit comments