Skip to content

Don't swallow userland exceptions in openai #4861

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 1 commit into from
Sep 24, 2025
+10 −8
Merged

Don't swallow userland exceptions in openai #4861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions sentry_sdk/integrations/openai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,9 @@ def _set_output_data(span, response, kwargs, integration, finish_span=True):

def new_iterator():
# type: () -> Iterator[ChatCompletionChunk]
with capture_internal_exceptions():
count_tokens_manually = True
for x in old_iterator:
count_tokens_manually = True
for x in old_iterator:
with capture_internal_exceptions():
# OpenAI chat completion API
if hasattr(x, "choices"):
choice_index = 0
Expand Down Expand Up @@ -315,8 +315,9 @@ def new_iterator():
)
count_tokens_manually = False

yield x
yield x

with capture_internal_exceptions():
if len(data_buf) > 0:
all_responses = ["".join(chunk) for chunk in data_buf]
if should_send_default_pii() and integration.include_prompts:
Expand All @@ -337,9 +338,9 @@ def new_iterator():

async def new_iterator_async():
# type: () -> AsyncIterator[ChatCompletionChunk]
with capture_internal_exceptions():
count_tokens_manually = True
async for x in old_iterator:
count_tokens_manually = True
async for x in old_iterator:
with capture_internal_exceptions():
# OpenAI chat completion API
if hasattr(x, "choices"):
choice_index = 0
Expand Down Expand Up @@ -370,8 +371,9 @@ async def new_iterator_async():
)
count_tokens_manually = False

yield x
yield x

with capture_internal_exceptions():
if len(data_buf) > 0:
all_responses = ["".join(chunk) for chunk in data_buf]
if should_send_default_pii() and integration.include_prompts:
Expand Down