From b6f7aefece7ddb3c5f62c283a75c5b310a1b8b77 Mon Sep 17 00:00:00 2001 From: jay-dhamale Date: Thu, 25 Dec 2025 22:21:43 +0530 Subject: [PATCH] fix(streaming): move error event handling outside thread.* condition Fixes #2796 The error handling logic for `sse.event == "error"` was incorrectly nested inside the `if sse.event.startswith("thread.")` condition, making it logically unreachable (dead code). A string cannot both equal "error" AND start with "thread." simultaneously. This was a regression introduced in commit abc25966 which attempted to fix indentation but accidentally moved the error handler into the wrong conditional block. The fix restructures the logic to: 1. Check for error events first (before any event type routing) 2. Handle thread.* events with their special data structure 3. Handle all other events in the else block This ensures error events are properly caught and raise APIError with the appropriate error message. --- src/openai/_streaming.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/openai/_streaming.py b/src/openai/_streaming.py index 61a742668a..107cdfacf0 100644 --- a/src/openai/_streaming.py +++ b/src/openai/_streaming.py @@ -60,11 +60,10 @@ def __stream__(self) -> Iterator[_T]: if sse.data.startswith("[DONE]"): break - # we have to special case the Assistants `thread.` events since we won't have an "event" key in the data - if sse.event and sse.event.startswith("thread."): + # Check for error events first + if sse.event == "error": data = sse.json() - - if sse.event == "error" and is_mapping(data) and data.get("error"): + if is_mapping(data) and data.get("error"): message = None error = data.get("error") if is_mapping(error): @@ -78,6 +77,9 @@ def __stream__(self) -> Iterator[_T]: body=data["error"], ) + # we have to special case the Assistants `thread.` events since we won't have an "event" key in the data + if sse.event and sse.event.startswith("thread."): + data = sse.json() yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response) else: data = sse.json() @@ -163,11 +165,10 @@ async def __stream__(self) -> AsyncIterator[_T]: if sse.data.startswith("[DONE]"): break - # we have to special case the Assistants `thread.` events since we won't have an "event" key in the data - if sse.event and sse.event.startswith("thread."): + # Check for error events first + if sse.event == "error": data = sse.json() - - if sse.event == "error" and is_mapping(data) and data.get("error"): + if is_mapping(data) and data.get("error"): message = None error = data.get("error") if is_mapping(error): @@ -181,6 +182,9 @@ async def __stream__(self) -> AsyncIterator[_T]: body=data["error"], ) + # we have to special case the Assistants `thread.` events since we won't have an "event" key in the data + if sse.event and sse.event.startswith("thread."): + data = sse.json() yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response) else: data = sse.json()