resolve

Author: Mantisus

src/apify_client/_http_client.py

@@ -13,10 +13,10 @@
 import impit
 from apify_shared.utils import ignore_docs
 
-from apify_client._errors import ApifyApiError, is_retryable_error
 from apify_client._logging import log_context, logger_name
 from apify_client._statistics import Statistics
-from apify_client._utils import retry_with_exp_backoff, retry_with_exp_backoff_async
+from apify_client._utils import is_retryable_error, retry_with_exp_backoff, retry_with_exp_backoff_async
+from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
     from collections.abc import Callable

src/apify_client/_utils.py

@@ -9,6 +9,7 @@
 from http import HTTPStatus
 from typing import TYPE_CHECKING, Any, TypeVar, cast
 
+import impit
 from apify_shared.utils import (
     is_content_type_json,
     is_content_type_text,
@@ -17,14 +18,14 @@
     maybe_extract_enum_member_value,
 )
 
-from apify_client._errors import InvalidResponseBodyError
+from apify_client.errors import InvalidResponseBodyError
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable
 
     from impit import Response
 
-    from apify_client._errors import ApifyApiError
+    from apify_client.errors import ApifyApiError
 
 PARSE_DATE_FIELDS_MAX_DEPTH = 3
 PARSE_DATE_FIELDS_KEY_SUFFIX = 'At'
@@ -180,3 +181,16 @@ def maybe_parse_response(response: Response) -> Any:
         raise InvalidResponseBodyError(response) from err
     else:
         return response_data
+
+
+def is_retryable_error(exc: Exception) -> bool:
+    """Check if the given error is retryable."""
+    return isinstance(
+        exc,
+        (
+            InvalidResponseBodyError,
+            impit.NetworkError,
+            impit.TimeoutException,
+            impit.RemoteProtocolError,
+        ),
+    )

src/apify_client/clients/base/actor_job_base_client.py

@@ -9,9 +9,9 @@
 from apify_shared.consts import ActorJobStatus
 from apify_shared.utils import ignore_docs, parse_date_fields
 
-from apify_client._errors import ApifyApiError
 from apify_client._utils import catch_not_found_or_throw, pluck_data
 from apify_client.clients.base.resource_client import ResourceClient, ResourceClientAsync
+from apify_client.errors import ApifyApiError
 
 DEFAULT_WAIT_FOR_FINISH_SEC = 999999
 

src/apify_client/clients/base/resource_client.py

@@ -4,9 +4,9 @@
 
 from apify_shared.utils import ignore_docs, parse_date_fields
 
-from apify_client._errors import ApifyApiError
 from apify_client._utils import catch_not_found_or_throw, pluck_data
 from apify_client.clients.base.base_client import BaseClient, BaseClientAsync
+from apify_client.errors import ApifyApiError
 
 
 @ignore_docs

src/apify_client/clients/resource_clients/dataset.py

@@ -8,9 +8,9 @@
 from apify_shared.models import ListPage
 from apify_shared.utils import filter_out_none_values_recursively, ignore_docs
 
-from apify_client._errors import ApifyApiError
 from apify_client._utils import catch_not_found_or_throw, pluck_data
 from apify_client.clients.base import ResourceClient, ResourceClientAsync
+from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator

src/apify_client/clients/resource_clients/key_value_store.py

@@ -1,21 +1,20 @@
 from __future__ import annotations
 
 import json as jsonlib
-import warnings
 from contextlib import asynccontextmanager, contextmanager
 from http import HTTPStatus
 from typing import TYPE_CHECKING, Any
 
 from apify_shared.utils import filter_out_none_values_recursively, ignore_docs, parse_date_fields
 
-from apify_client._errors import ApifyApiError
 from apify_client._utils import (
     catch_not_found_or_throw,
     encode_key_value_store_record_value,
     maybe_parse_response,
     pluck_data,
 )
 from apify_client.clients.base import ResourceClient, ResourceClientAsync
+from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator
@@ -107,43 +106,18 @@ def list_keys(
 
         return parse_date_fields(pluck_data(jsonlib.loads(response.text)))
 
-    def get_record(self, key: str, *, as_bytes: bool = False, as_file: bool = False) -> dict | None:
+    def get_record(self, key: str) -> dict | None:
         """Retrieve the given record from the key-value store.
 
         https://docs.apify.com/api/v2#/reference/key-value-stores/record/get-record
 
         Args:
             key: Key of the record to retrieve.
-            as_bytes: Deprecated, use `get_record_as_bytes()` instead. Whether to retrieve the record as raw bytes,
-                default False.
-            as_file: Deprecated, use `stream_record()` instead. Whether to retrieve the record as a file-like object,
-                default False.
 
         Returns:
             The requested record, or None, if the record does not exist.
         """
         try:
-            if as_bytes and as_file:
-                raise ValueError('You cannot have both as_bytes and as_file set.')
-
-            if as_bytes:
-                warnings.warn(
-                    '`KeyValueStoreClient.get_record(..., as_bytes=True)` is deprecated, '
-                    'use `KeyValueStoreClient.get_record_as_bytes()` instead.',
-                    DeprecationWarning,
-                    stacklevel=2,
-                )
-                return self.get_record_as_bytes(key)
-
-            if as_file:
-                warnings.warn(
-                    '`KeyValueStoreClient.get_record(..., as_file=True)` is deprecated, '
-                    'use `KeyValueStoreClient.stream_record()` instead.',
-                    DeprecationWarning,
-                    stacklevel=2,
-                )
-                return self.stream_record(key)  # type: ignore[return-value]
-
             response = self.http_client.call(
                 url=self._url(f'records/{key}'),
                 method='GET',
@@ -380,10 +354,6 @@ async def get_record(self, key: str) -> dict | None:
 
         Args:
             key: Key of the record to retrieve.
-            as_bytes: Deprecated, use `get_record_as_bytes()` instead. Whether to retrieve the record as raw bytes,
-                default False.
-            as_file: Deprecated, use `stream_record()` instead. Whether to retrieve the record as a file-like object,
-                default False.
 
         Returns:
             The requested record, or None, if the record does not exist.

src/apify_client/clients/resource_clients/log.py

@@ -13,9 +13,9 @@
 
 from apify_shared.utils import ignore_docs
 
-from apify_client._errors import ApifyApiError
 from apify_client._utils import catch_not_found_or_throw
 from apify_client.clients.base import ResourceClient, ResourceClientAsync
+from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator

src/apify_client/clients/resource_clients/request_queue.py

@@ -11,9 +11,9 @@
 from apify_shared.utils import filter_out_none_values_recursively, ignore_docs, parse_date_fields
 from more_itertools import constrained_batches
 
-from apify_client._errors import ApifyApiError
 from apify_client._utils import catch_not_found_or_throw, pluck_data
 from apify_client.clients.base import ResourceClient, ResourceClientAsync
+from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
     from datetime import timedelta

src/apify_client/clients/resource_clients/schedule.py

@@ -5,9 +5,9 @@
 
 from apify_shared.utils import filter_out_none_values_recursively, ignore_docs
 
-from apify_client._errors import ApifyApiError
 from apify_client._utils import catch_not_found_or_throw, pluck_data_as_list
 from apify_client.clients.base import ResourceClient, ResourceClientAsync
+from apify_client.errors import ApifyApiError
 
 
 def _get_schedule_representation(

src/apify_client/clients/resource_clients/task.py

@@ -10,7 +10,6 @@
     parse_date_fields,
 )
 
-from apify_client._errors import ApifyApiError
 from apify_client._utils import catch_not_found_or_throw, encode_webhook_list_to_base64, pluck_data
 from apify_client.clients.base import ResourceClient, ResourceClientAsync
 from apify_client.clients.resource_clients.run import RunClient, RunClientAsync
@@ -19,6 +18,7 @@
     WebhookCollectionClient,
     WebhookCollectionClientAsync,
 )
+from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
     from apify_shared.consts import ActorJobStatus, MetaOrigin