Repository navigation
Commit 7e2468c
committed
Python: fix(core): close ResponseStream when the consumer is cancelled
__anext__ only caught Exception, so a CancelledError surfacing in an
async map/flat_map transform, a transform hook, or a gate after the
provider yielded bypassed the error path entirely and left the provider
stream suspended in its async with until GC. Catch BaseException
instead, run the same error-scoped cleanup and close, and re-raise.
Regressions on both sides: real task cancellation mid-iteration, a
hook and an async map transform raising CancelledError after a yielded
update in core, and SDK stream __aexit__ firing on cancellation in the
openai package. Each new test fails if the catch is narrowed back to
Exception.1 parent 8f16e57 commit 7e2468c
3 files changed
Lines changed: 116 additions & 6 deletions
File tree
- python/packages
- core
- agent_framework
- tests/core
- openai/tests/openai
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4011 | 4011 | | |
4012 | 4012 | | |
4013 | 4013 | | |
4014 | | - | |
4015 | | - | |
4016 | | - | |
4017 | | - | |
4018 | | - | |
| 4014 | + | |
| 4015 | + | |
| 4016 | + | |
| 4017 | + | |
| 4018 | + | |
| 4019 | + | |
| 4020 | + | |
| 4021 | + | |
4019 | 4022 | | |
4020 | 4023 | | |
4021 | 4024 | | |
4022 | 4025 | | |
4023 | 4026 | | |
| 4027 | + | |
4024 | 4028 | | |
4025 | 4029 | | |
4026 | 4030 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4529 | 4529 | | |
4530 | 4530 | | |
4531 | 4531 | | |
4532 | | - | |
| 4532 | + | |
| 4533 | + | |
4533 | 4534 | | |
4534 | 4535 | | |
4535 | 4536 | | |
| |||
4538 | 4539 | | |
4539 | 4540 | | |
4540 | 4541 | | |
| 4542 | + | |
| 4543 | + | |
| 4544 | + | |
| 4545 | + | |
| 4546 | + | |
| 4547 | + | |
| 4548 | + | |
| 4549 | + | |
| 4550 | + | |
| 4551 | + | |
| 4552 | + | |
| 4553 | + | |
| 4554 | + | |
| 4555 | + | |
| 4556 | + | |
| 4557 | + | |
| 4558 | + | |
| 4559 | + | |
| 4560 | + | |
| 4561 | + | |
| 4562 | + | |
| 4563 | + | |
| 4564 | + | |
| 4565 | + | |
| 4566 | + | |
| 4567 | + | |
| 4568 | + | |
| 4569 | + | |
| 4570 | + | |
| 4571 | + | |
| 4572 | + | |
| 4573 | + | |
| 4574 | + | |
| 4575 | + | |
| 4576 | + | |
| 4577 | + | |
| 4578 | + | |
| 4579 | + | |
| 4580 | + | |
| 4581 | + | |
| 4582 | + | |
| 4583 | + | |
| 4584 | + | |
| 4585 | + | |
| 4586 | + | |
| 4587 | + | |
| 4588 | + | |
| 4589 | + | |
| 4590 | + | |
| 4591 | + | |
| 4592 | + | |
| 4593 | + | |
| 4594 | + | |
| 4595 | + | |
| 4596 | + | |
| 4597 | + | |
| 4598 | + | |
| 4599 | + | |
| 4600 | + | |
| 4601 | + | |
| 4602 | + | |
| 4603 | + | |
| 4604 | + | |
| 4605 | + | |
| 4606 | + | |
| 4607 | + | |
| 4608 | + | |
| 4609 | + | |
| 4610 | + | |
| 4611 | + | |
| 4612 | + | |
| 4613 | + | |
| 4614 | + | |
| 4615 | + | |
| 4616 | + | |
| 4617 | + | |
| 4618 | + | |
| 4619 | + | |
| 4620 | + | |
| 4621 | + | |
4541 | 4622 | | |
4542 | 4623 | | |
4543 | 4624 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
2248 | 2249 | | |
2249 | 2250 | | |
2250 | 2251 | | |
| 2252 | + | |
| 2253 | + | |
| 2254 | + | |
| 2255 | + | |
| 2256 | + | |
| 2257 | + | |
| 2258 | + | |
| 2259 | + | |
| 2260 | + | |
| 2261 | + | |
| 2262 | + | |
| 2263 | + | |
| 2264 | + | |
| 2265 | + | |
| 2266 | + | |
| 2267 | + | |
| 2268 | + | |
| 2269 | + | |
| 2270 | + | |
| 2271 | + | |
| 2272 | + | |
| 2273 | + | |
| 2274 | + | |
| 2275 | + | |
2251 | 2276 | | |
2252 | 2277 | | |
2253 | 2278 | | |
| |||
0 commit comments