Skip to content
This repository was archived by the owner on Feb 23, 2026. It is now read-only.

feat: iterator for processing JSON responses in REST streaming. #317

Merged
atulep merged 11 commits into from
Jan 10, 2022
Merged

feat: iterator for processing JSON responses in REST streaming. #317

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d53588c
feat: files for REST streaming.
Dec 9, 2021
a55cdfb
Merge branch 'main' into streaming
Dec 10, 2021
bdf4698
chore: adds more test cases and fixes.
Dec 13, 2021
37529f5
Merge branch 'streaming' of github.com:atulep/python-api-core into st…
Dec 13, 2021
ffe4a56
chore: fixes coverage.
Dec 13, 2021
f2213ab
chore: pr comments.
Dec 14, 2021
3f39b67
chore: pr comments.
Dec 16, 2021
ac7ef79
chore: fixes bugs.
Dec 16, 2021
1f8a9c0
chore: removes print statement.
Dec 16, 2021
b4936f7
feat: small refactor.
Jan 8, 2022
267d850
Merge branch 'main' into streaming
Jan 8, 2022
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
Prev Previous commit
Next Next commit
chore: fixes bugs.
  • Loading branch information
Aza Tulepbergenov
Aza Tulepbergenov committed Dec 16, 2021
commit ac7ef79110a097ad418930ef678287003fade714
7 changes: 5 additions & 2 deletions google/api_core/rest_streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,16 @@ def _process_chunk(self, chunk: str):
if self._level == 1:
# Level 1 corresponds to the outermost JSON object
# (i.e. the one we care about).
self._obj = char
self._obj = ""
if not self._in_string:
self._level += 1
self._obj += char
elif char == "}":
self._obj += char
if not self._in_string:
self._level -= 1
if not self._in_string and self._level == 1:
self._ready_objs.append(self._obj + char)
self._ready_objs.append(self._obj)
elif char == '"':
# Helps to deal with an escaped quotes inside of a string.
if not self._next_should_be_escaped:
Expand Down Expand Up @@ -114,6 +116,7 @@ def __next__(self):

def _grab(self):
# Add extra quotes to make json.loads happy.
print(self._ready_objs)
return self._response_message_cls.from_json(self._ready_objs.popleft())

def __iter__(self):
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/test_rest_streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def _parse_responses(self, responses: List[proto.Message]) -> bytes:
json_responses = [
self._response_message_cls.to_json(r).strip('"') for r in responses
]
logging.info(f"Sending JSON stream: {json_responses}")
ret_val = "[{}]".format(",".join(json_responses))
return bytes(ret_val, "utf-8")

Expand All @@ -122,7 +123,7 @@ def test_next_simple(random_split):
def test_next_nested(random_split):
responses = [
Song(title="some song", composer=Composer(given_name="some name")),
Song(title="another song", duration=datetime.datetime()),
Song(title="another song", date_added=datetime.datetime(2021, 12, 17)),
]
resp = ResponseMock(
responses=responses, random_split=random_split, response_cls=Song
Expand Down