Skip to content

fix(openai): catch and propagate asyncio.CancelledError #14290

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

Merged
merged 2 commits into from
Aug 13, 2025
Merged

fix(openai): catch and propagate asyncio.CancelledError #14290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05ba2df
Fix for agent cancel error
Yun-Kim Aug 13, 2025
36e414c
Catch and raise all baseexception
Yun-Kim Aug 13, 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
4 changes: 2 additions & 2 deletions ddtrace/contrib/internal/openai/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def patched_endpoint(openai, pin, func, instance, args, kwargs):
resp, err = None, None
try:
resp = func(*args, **kwargs)
except Exception as e:
except BaseException as e:
err = e
raise
finally:
Expand Down Expand Up @@ -296,7 +296,7 @@ async def patched_endpoint(openai, pin, func, instance, args, kwargs):
try:
resp = await func(*args, **kwargs)
return resp
except Exception as e:
except BaseException as e:
err = e
raise
finally:
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/fix-openai-catch-base-exception-a59c36fa8b0f40a0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
openai: Resolves an issue in the OpenAI integration where ``asyncio.CancelledError`` was not caught or re-raised.
Loading