fixup!

Author: dtmeadows

src/openai/_streaming.py

@@ -59,9 +59,9 @@ def __stream__(self) -> Iterator[_T]:
             if sse.data.startswith("[DONE]"):
                 break
 
-            data = sse.json()
-            if sse.event is not None and sse.event == "error":
-                if sse.event == "error" and is_mapping(data) and data.get("error"):
+            if sse.event is not None and not sse.event.startswith("thread."):
+                data = sse.json()
+                if is_mapping(data) and data.get("error"):
                     message = None
                     error = data.get("error")
                     if is_mapping(error):
@@ -74,11 +74,11 @@ def __stream__(self) -> Iterator[_T]:
                         request=self.response.request,
                         body=data["error"],
                     )
-            elif sse.event is not None and sse.event.startswith("thread."):
-                # have to manually create part of the event since we don't have a full event
-                yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
+
+                yield process_data(data=data, cast_to=cast_to, response=response)
             else:
-                if is_mapping(data) and data.get("error"):
+                data = sse.json()
+                if sse.event == "error" and is_mapping(data) and data.get("error"):
                     message = None
                     error = data.get("error")
                     if is_mapping(error):
@@ -91,8 +91,8 @@ def __stream__(self) -> Iterator[_T]:
                         request=self.response.request,
                         body=data["error"],
                     )
-
-                yield process_data(data=data, cast_to=cast_to, response=response)
+                # have to manually create part of the event since we don't have a full event
+                yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
 
         # Ensure the entire stream is consumed
         for _sse in iterator: