Skip to content
Open
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions src/openai/_streaming.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ def __stream__(self) -> Iterator[_T]:
if sse.event and sse.event.startswith("thread."):
data = sse.json()

if sse.event == "error" and is_mapping(data) and data.get("error"):
yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
elif sse.event == "error":
data = sse.json()
if is_mapping(data) and data.get("error"):
Comment on lines +71 to +73

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve event:error items when payload lacks error key

This new elif sse.event == "error" branch no longer yields anything when the payload does not contain a top-level error field, so event:error SSEs can be silently dropped. In Assistants streaming, ErrorEvent is modeled as { "event": "error", "data": ErrorObject } (not {"error": ...}), so this path will skip the APIError raise and also skip process_data, meaning consumers never receive the event; the same regression is duplicated in AsyncStream.__stream__.

Useful? React with 👍 / 👎.

message = None
error = data.get("error")
if is_mapping(error):
Expand All @@ -80,8 +83,6 @@ def __stream__(self) -> Iterator[_T]:
request=self.response.request,
body=data["error"],
)

yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
else:
data = sse.json()
if is_mapping(data) and data.get("error"):
Expand Down Expand Up @@ -177,7 +178,10 @@ async def __stream__(self) -> AsyncIterator[_T]:
if sse.event and sse.event.startswith("thread."):
data = sse.json()

if sse.event == "error" and is_mapping(data) and data.get("error"):
yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
elif sse.event == "error":
data = sse.json()
if is_mapping(data) and data.get("error"):
message = None
error = data.get("error")
if is_mapping(error):
Expand All @@ -190,8 +194,6 @@ async def __stream__(self) -> AsyncIterator[_T]:
request=self.response.request,
body=data["error"],
)

yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
else:
data = sse.json()
if is_mapping(data) and data.get("error"):
Expand Down