rm pluck data

Author: vdusek

src/apify_client/_resource_clients/actor.py

@@ -25,7 +25,7 @@
     encode_webhook_list_to_base64,
     filter_out_none_values_recursively,
     maybe_extract_enum_member_value,
-    pluck_data,
+    response_to_dict,
 )
 
 if TYPE_CHECKING:
@@ -295,8 +295,8 @@ def start(
             params=request_params,
         )
 
-        result = pluck_data(response.json())
-        return Run.model_validate(result)
+        data = response_to_dict(response)
+        return Run.model_validate(data)
 
     def call(
         self,
@@ -414,8 +414,7 @@ def build(
             params=request_params,
         )
 
-        result = pluck_data(response.json())
-        return Build.model_validate(result)
+        return Build.model_validate(response_to_dict(response))
 
     def builds(self) -> BuildCollectionClient:
         """Retrieve a client for the builds of this Actor."""
@@ -446,7 +445,7 @@ async def default_build(
         )
 
         response = self.http_client.call(url=self._url('builds/default'), method='GET', params=request_params)
-        data = pluck_data(response.json())
+        data = response_to_dict(response)
 
         return BuildClient(
             base_url=self.base_url,
@@ -722,8 +721,8 @@ async def start(
             params=request_params,
         )
 
-        result = pluck_data(response.json())
-        return Run.model_validate(result)
+        data = response_to_dict(response)
+        return Run.model_validate(data)
 
     async def call(
         self,
@@ -845,8 +844,8 @@ async def build(
             params=request_params,
         )
 
-        result = pluck_data(response.json())
-        return Build.model_validate(result)
+        data = response_to_dict(response)
+        return Build.model_validate(data)
 
     def builds(self) -> BuildCollectionClientAsync:
         """Retrieve a client for the builds of this Actor."""
@@ -881,7 +880,7 @@ async def default_build(
             method='GET',
             params=request_params,
         )
-        data = pluck_data(response.json())
+        data = response_to_dict(response)
 
         return BuildClientAsync(
             base_url=self.base_url,

src/apify_client/_resource_clients/base/actor_job_base_client.py

@@ -8,7 +8,7 @@
 from apify_shared.consts import ActorJobStatus
 
 from apify_client._resource_clients.base.resource_client import ResourceClient, ResourceClientAsync
-from apify_client._utils import catch_not_found_or_throw, pluck_data
+from apify_client._utils import catch_not_found_or_throw, response_to_dict
 from apify_client.errors import ApifyApiError
 
 DEFAULT_WAIT_FOR_FINISH_SEC = 999999
@@ -37,7 +37,7 @@ def _wait_for_finish(self, wait_secs: int | None = None) -> dict | None:
                     method='GET',
                     params=self._params(waitForFinish=wait_for_finish),
                 )
-                job = pluck_data(response.json())
+                job = response_to_dict(response)
 
                 seconds_elapsed = math.floor((datetime.now(timezone.utc) - started_at).total_seconds())
                 if ActorJobStatus(job['status']).is_terminal or (
@@ -68,7 +68,7 @@ def _abort(self, *, gracefully: bool | None = None) -> dict:
             method='POST',
             params=self._params(gracefully=gracefully),
         )
-        return pluck_data(response.json())
+        return response_to_dict(response)
 
 
 class ActorJobBaseClientAsync(ResourceClientAsync):
@@ -91,7 +91,7 @@ async def _wait_for_finish(self, wait_secs: int | None = None) -> dict | None:
                     method='GET',
                     params=self._params(waitForFinish=wait_for_finish),
                 )
-                job = pluck_data(response.json())
+                job = response_to_dict(response)
 
                 seconds_elapsed = math.floor((datetime.now(timezone.utc) - started_at).total_seconds())
                 if ActorJobStatus(job['status']).is_terminal or (
@@ -122,4 +122,4 @@ async def _abort(self, *, gracefully: bool | None = None) -> dict:
             method='POST',
             params=self._params(gracefully=gracefully),
         )
-        return pluck_data(response.json())
+        return response_to_dict(response)

src/apify_client/_resource_clients/base/resource_client.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from apify_client._resource_clients.base.base_client import BaseClient, BaseClientAsync
-from apify_client._utils import catch_not_found_or_throw, pluck_data
+from apify_client._utils import catch_not_found_or_throw, response_to_dict
 from apify_client.errors import ApifyApiError
 
 
@@ -16,8 +16,7 @@ def _get(self, timeout_secs: int | None = None) -> dict | None:
                 params=self._params(),
                 timeout_secs=timeout_secs,
             )
-
-            return pluck_data(response.json())
+            return response_to_dict(response)
 
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)
@@ -33,7 +32,7 @@ def _update(self, updated_fields: dict, timeout_secs: int | None = None) -> dict
             timeout_secs=timeout_secs,
         )
 
-        return pluck_data(response.json())
+        return response_to_dict(response)
 
     def _delete(self, timeout_secs: int | None = None) -> None:
         try:
@@ -60,7 +59,7 @@ async def _get(self, timeout_secs: int | None = None) -> dict | None:
                 timeout_secs=timeout_secs,
             )
 
-            return pluck_data(response.json())
+            return response_to_dict(response)
 
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)
@@ -76,7 +75,7 @@ async def _update(self, updated_fields: dict, timeout_secs: int | None = None) -
             timeout_secs=timeout_secs,
         )
 
-        return pluck_data(response.json())
+        return response_to_dict(response)
 
     async def _delete(self, timeout_secs: int | None = None) -> None:
         try:

src/apify_client/_resource_clients/base/resource_collection_client.py

@@ -4,7 +4,7 @@
 
 from apify_client._resource_clients.base.base_client import BaseClient, BaseClientAsync
 from apify_client._types import ListPage
-from apify_client._utils import pluck_data
+from apify_client._utils import response_to_dict
 
 
 class ResourceCollectionClient(BaseClient):
@@ -17,7 +17,8 @@ def _list(self, **kwargs: Any) -> ListPage:
             params=self._params(**kwargs),
         )
 
-        return ListPage(pluck_data(response.json()))
+        data = response_to_dict(response)
+        return ListPage(data)
 
     def _create(self, resource: dict) -> dict:
         response = self.http_client.call(
@@ -27,7 +28,7 @@ def _create(self, resource: dict) -> dict:
             json=resource,
         )
 
-        return pluck_data(response.json())
+        return response_to_dict(response)
 
     def _get_or_create(self, name: str | None = None, resource: dict | None = None) -> dict:
         response = self.http_client.call(
@@ -37,7 +38,7 @@ def _get_or_create(self, name: str | None = None, resource: dict | None = None)
             json=resource,
         )
 
-        return pluck_data(response.json())
+        return response_to_dict(response)
 
 
 class ResourceCollectionClientAsync(BaseClientAsync):
@@ -50,7 +51,8 @@ async def _list(self, **kwargs: Any) -> ListPage:
             params=self._params(**kwargs),
         )
 
-        return ListPage(pluck_data(response.json()))
+        data = response_to_dict(response)
+        return ListPage(data)
 
     async def _create(self, resource: dict) -> dict:
         response = await self.http_client.call(
@@ -60,7 +62,7 @@ async def _create(self, resource: dict) -> dict:
             json=resource,
         )
 
-        return pluck_data(response.json())
+        return response_to_dict(response)
 
     async def _get_or_create(
         self,
@@ -74,4 +76,4 @@ async def _get_or_create(
             json=resource,
         )
 
-        return pluck_data(response.json())
+        return response_to_dict(response)

src/apify_client/_resource_clients/dataset.py

@@ -10,7 +10,7 @@
 from apify_client._models import Dataset, GetDatasetStatisticsResponse
 from apify_client._resource_clients.base import ResourceClient, ResourceClientAsync
 from apify_client._types import ListPage
-from apify_client._utils import catch_not_found_or_throw, filter_out_none_values_recursively, pluck_data
+from apify_client._utils import catch_not_found_or_throw, filter_out_none_values_recursively, response_to_dict
 from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
@@ -142,7 +142,7 @@ def list_items(
             params=request_params,
         )
 
-        data = response.json()
+        data = response_to_dict(response)
 
         return ListPage(
             {
@@ -572,7 +572,7 @@ def get_statistics(self) -> GetDatasetStatisticsResponse | None:
                 params=self._params(),
                 timeout_secs=_SMALL_TIMEOUT,
             )
-            result = pluck_data(response.json())
+            result = response.json()
             return GetDatasetStatisticsResponse.model_validate(result) if result is not None else None
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)
@@ -758,7 +758,7 @@ async def list_items(
             params=request_params,
         )
 
-        data = response.json()
+        data = response_to_dict(response)
 
         return ListPage(
             {
@@ -1094,7 +1094,7 @@ async def get_statistics(self) -> GetDatasetStatisticsResponse | None:
                 params=self._params(),
                 timeout_secs=_SMALL_TIMEOUT,
             )
-            result = pluck_data(response.json())
+            result = response.json()
             return GetDatasetStatisticsResponse.model_validate(result) if result is not None else None
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)

src/apify_client/_resource_clients/key_value_store.py

@@ -14,7 +14,6 @@
     encode_key_value_store_record_value,
     filter_out_none_values_recursively,
     maybe_parse_response,
-    pluck_data,
 )
 from apify_client.errors import ApifyApiError
 
@@ -110,7 +109,7 @@ def list_keys(
             timeout_secs=_MEDIUM_TIMEOUT,
         )
 
-        result = pluck_data(response.json())
+        result = response.json()
         return ListOfKeysResponse.model_validate(result)
 
     def get_record(self, key: str, signature: str | None = None) -> dict | None:
@@ -442,7 +441,7 @@ async def list_keys(
             timeout_secs=_MEDIUM_TIMEOUT,
         )
 
-        result = pluck_data(response.json())
+        result = response.json()
         return ListOfKeysResponse.model_validate(result)
 
     async def get_record(self, key: str, signature: str | None = None) -> dict | None: