Skip to content

Commit babe65f

Browse files
chore(internal): streaming refactors (#2012)
1 parent d9c966d commit babe65f

File tree

1 file changed

+32
-34
lines changed

1 file changed

+32
-34
lines changed

Diff for: src/openai/_streaming.py

+32-34
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,22 @@ def __stream__(self) -> Iterator[_T]:
5959
if sse.data.startswith("[DONE]"):
6060
break
6161

62-
if sse.event is None:
63-
data = sse.json()
64-
if is_mapping(data) and data.get("error"):
65-
message = None
66-
error = data.get("error")
67-
if is_mapping(error):
68-
message = error.get("message")
69-
if not message or not isinstance(message, str):
70-
message = "An error occurred during streaming"
71-
72-
raise APIError(
73-
message=message,
74-
request=self.response.request,
75-
body=data["error"],
76-
)
77-
78-
yield process_data(data=data, cast_to=cast_to, response=response)
62+
data = sse.json()
63+
if is_mapping(data) and data.get("error"):
64+
message = None
65+
error = data.get("error")
66+
if is_mapping(error):
67+
message = error.get("message")
68+
if not message or not isinstance(message, str):
69+
message = "An error occurred during streaming"
70+
71+
raise APIError(
72+
message=message,
73+
request=self.response.request,
74+
body=data["error"],
75+
)
76+
77+
yield process_data(data=data, cast_to=cast_to, response=response)
7978

8079
else:
8180
data = sse.json()
@@ -161,23 +160,22 @@ async def __stream__(self) -> AsyncIterator[_T]:
161160
if sse.data.startswith("[DONE]"):
162161
break
163162

164-
if sse.event is None:
165-
data = sse.json()
166-
if is_mapping(data) and data.get("error"):
167-
message = None
168-
error = data.get("error")
169-
if is_mapping(error):
170-
message = error.get("message")
171-
if not message or not isinstance(message, str):
172-
message = "An error occurred during streaming"
173-
174-
raise APIError(
175-
message=message,
176-
request=self.response.request,
177-
body=data["error"],
178-
)
179-
180-
yield process_data(data=data, cast_to=cast_to, response=response)
163+
data = sse.json()
164+
if is_mapping(data) and data.get("error"):
165+
message = None
166+
error = data.get("error")
167+
if is_mapping(error):
168+
message = error.get("message")
169+
if not message or not isinstance(message, str):
170+
message = "An error occurred during streaming"
171+
172+
raise APIError(
173+
message=message,
174+
request=self.response.request,
175+
body=data["error"],
176+
)
177+
178+
yield process_data(data=data, cast_to=cast_to, response=response)
181179

182180
else:
183181
data = sse.json()

0 commit comments

Comments
 (0)