diff --git a/rdw_ingestion_tools/api/content_repo/extensions/httpx.py b/rdw_ingestion_tools/api/content_repo/extensions/httpx.py index c3335cd..4a7ade9 100644 --- a/rdw_ingestion_tools/api/content_repo/extensions/httpx.py +++ b/rdw_ingestion_tools/api/content_repo/extensions/httpx.py @@ -15,7 +15,8 @@ def get_paginated( data: dict = response.json() - results: dict = data["results"] + results: list[dict] = data["results"] + yield from results url = data["next"] diff --git a/rdw_ingestion_tools/api/survey/extensions/httpx.py b/rdw_ingestion_tools/api/survey/extensions/httpx.py index cc7595e..9d8be0f 100644 --- a/rdw_ingestion_tools/api/survey/extensions/httpx.py +++ b/rdw_ingestion_tools/api/survey/extensions/httpx.py @@ -15,7 +15,8 @@ def get_paginated( response = client.get(url=url, params=params) response.raise_for_status() - data: dict = response.json()["results"] + data: list[dict] = response.json()["results"] + yield from data url = response.json()["next"] diff --git a/rdw_ingestion_tools/api/turn/extensions/httpx.py b/rdw_ingestion_tools/api/turn/extensions/httpx.py index 108093a..a08b462 100644 --- a/rdw_ingestion_tools/api/turn/extensions/httpx.py +++ b/rdw_ingestion_tools/api/turn/extensions/httpx.py @@ -27,7 +27,7 @@ def get_paginated( response_json: dict = response.json() - response_data: dict = response_json["data"] + response_data: list[dict] = response_json["data"] yield from response_data try: diff --git a/rdw_ingestion_tools/api/turn_bq/extensions/httpx.py b/rdw_ingestion_tools/api/turn_bq/extensions/httpx.py index e9d0ab1..bab1a3c 100644 --- a/rdw_ingestion_tools/api/turn_bq/extensions/httpx.py +++ b/rdw_ingestion_tools/api/turn_bq/extensions/httpx.py @@ -21,7 +21,8 @@ def get_paginated( response_json: dict = response.json() - response_data: dict = response_json["items"] + response_data: list[dict] = response_json["items"] + yield from response_data if response_json["page"] < response_json["pages"]: