Skip to content

fix(openai): guard against choices=None in OpenAI integration #6216

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

Open
cla7aye15I4nd wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −4
Open

fix(openai): guard against choices=None in OpenAI integration #6216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a3dfb0
fix(openai): guard against choices=None in OpenAI integration
May 6, 2026
2f14008
fix(openai): guard against choices=None in streaming chunk iterators
May 6, 2026
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
8 changes: 4 additions & 4 deletions sentry_sdk/integrations/openai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def _calculate_completions_token_usage(
if streaming_message_responses is not None:
for message in streaming_message_responses:
output_tokens += count_tokens(message)
elif hasattr(response, "choices"):
elif hasattr(response, "choices") and response.choices is not None:
for choice in response.choices:
if hasattr(choice, "message") and hasattr(choice.message, "content"):
output_tokens += count_tokens(choice.message.content)
Expand Down Expand Up @@ -583,7 +583,7 @@ def _set_common_output_data(
set_data_normalized(span, SPANDATA.GEN_AI_RESPONSE_MODEL, response.model)

# Chat Completions API
if hasattr(response, "choices"):
if hasattr(response, "choices") and response.choices is not None:
if should_send_default_pii() and integration.include_prompts:
response_text = [
choice.message.model_dump()
Comment thread
sentry[bot] marked this conversation as resolved.
Expand Down Expand Up @@ -839,7 +839,7 @@ def _wrap_synchronous_completions_chunk_iterator(
span.set_data(SPANDATA.GEN_AI_RESPONSE_MODEL, x.model)

with capture_internal_exceptions():
if hasattr(x, "choices"):
if hasattr(x, "choices") and x.choices is not None:
choice_index = 0
for choice in x.choices:
if hasattr(choice, "delta") and hasattr(choice.delta, "content"):
Expand Down Expand Up @@ -901,7 +901,7 @@ async def _wrap_asynchronous_completions_chunk_iterator(
span.set_data(SPANDATA.GEN_AI_RESPONSE_MODEL, x.model)

with capture_internal_exceptions():
if hasattr(x, "choices"):
if hasattr(x, "choices") and x.choices is not None:
choice_index = 0
for choice in x.choices:
if hasattr(choice, "delta") and hasattr(choice.delta, "content"):
Expand Down