Skip to content

fix(openai): guard against AttributeError on LegacyAPIResponse in streaming helpers #5913

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

Closed
NIK-TIGER-BILL wants to merge 1 commit into from
Closed

fix(openai): guard against AttributeError on LegacyAPIResponse in streaming helpers #5913

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: 18 additions & 0 deletions sentry_sdk/integrations/openai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,15 @@ def _set_streaming_completions_api_output_data(
ttft: "Optional[float]" = None
data_buf: "list[list[str]]" = [] # one for each choice

if not hasattr(response, "_iterator"):
# The response is not a Stream object (e.g. a LegacyAPIResponse returned
# when third-party libraries such as LiteLLM use the openai client with
# openai >= 2.x). We cannot wrap the iterator, so we skip instrumentation
# and close the span immediately to avoid an AttributeError.
if finish_span:
span.__exit__(None, None, None)
return

old_iterator = response._iterator

def new_iterator() -> "Iterator[ChatCompletionChunk]":
Expand Down Expand Up @@ -756,6 +765,15 @@ def _set_streaming_responses_api_output_data(
ttft: "Optional[float]" = None
data_buf: "list[list[str]]" = [] # one for each choice

if not hasattr(response, "_iterator"):
# The response is not a Stream object (e.g. a LegacyAPIResponse returned
# when third-party libraries such as LiteLLM use the openai client with
# openai >= 2.x). We cannot wrap the iterator, so we skip instrumentation
# and close the span immediately to avoid an AttributeError.
if finish_span:
span.__exit__(None, None, None)
return

old_iterator = response._iterator

def new_iterator() -> "Iterator[ChatCompletionChunk]":
Expand Down
Loading