Skip to content

fix: Support both "data:" and "data: " formats for streaming responses #2584

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

Open
CaroyalKnight wants to merge 7 commits into
base: main
Choose a base branch
from
+9 −9
Open

fix: Support both "data:" and "data: " formats for streaming responses #2584

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7346ca4
fix: Support both "data:" and "data: "
CaroyalKnight Jun 11, 2026
923549e
Merge branch 'googleapis:main' into fix/handle-stream-data-colon-variant
CaroyalKnight Jun 11, 2026
c7c7694
Merge branch 'googleapis:main' into fix/handle-stream-data-colon-variant
CaroyalKnight Jun 11, 2026
1b1120c
Merge branch 'googleapis:main' into fix/handle-stream-data-colon-variant
CaroyalKnight Jun 13, 2026
4d9f695
fix: Adjust compatibility for other instances of "data:" and "data: "
CaroyalKnight Jun 13, 2026
eff5b06
Merge branch 'main' into fix/handle-stream-data-colon-variant
CaroyalKnight Jun 14, 2026
0b84d9e
Merge branch 'googleapis:main' into fix/handle-stream-data-colon-variant
CaroyalKnight Jun 16, 2026
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: 9 additions & 9 deletions google/genai/_api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,10 @@ def _iter_response_stream(self) -> Iterator[str]:
data_buffer = []
continue

# In streaming mode, the response of JSON is prefixed with "data: " which
# In streaming mode, the response of JSON is prefixed with either "data:" or "data: " which
# we must strip before parsing.
if line.startswith('data: '):
data_buffer.append(line[len('data: '):])
if line.startswith('data:'):
data_buffer.append(line[len('data:'):].lstrip())
continue

# When API returns an error message, it comes line by line. So we buffer
Expand Down Expand Up @@ -412,10 +412,10 @@ async def _aiter_response_stream(self) -> AsyncIterator[str]:
yield '\n'.join(data_buffer)
data_buffer = []
continue
# In streaming mode, the response of JSON is prefixed with "data: "
# In streaming mode, the response of JSON is prefixed with either "data:" or "data: "
# which we must strip before parsing.
if line.startswith('data: '):
data_buffer.append(line[len('data: '):])
if line.startswith('data:'):
data_buffer.append(line[len('data:'):].lstrip())
continue

# When API returns an error message, it comes line by line. So we buffer
Expand Down Expand Up @@ -465,10 +465,10 @@ async def _aiter_response_stream(self) -> AsyncIterator[str]:
data_buffer = []
continue

# In streaming mode, the response of JSON is prefixed with "data: "
# In streaming mode, the response of JSON is prefixed with either "data:" or "data: "
# which we must strip before parsing.
if line.startswith('data: '):
data_buffer.append(line[len('data: '):])
if line.startswith('data:'):
data_buffer.append(line[len('data:'):].lstrip())
continue

# When API returns an error message, it comes line by line. So we
Expand Down