Update

Author: vdusek

docs/02_concepts/code/05_retries_async.py

@@ -10,5 +10,5 @@ async def main() -> None:
         token=TOKEN,
         max_retries=8,
         min_delay_between_retries=timedelta(milliseconds=500),
-        timeout_short=timedelta(seconds=360),
+        timeout=timedelta(seconds=360),
     )

docs/02_concepts/code/05_retries_sync.py

@@ -10,5 +10,5 @@ def main() -> None:
         token=TOKEN,
         max_retries=8,
         min_delay_between_retries=timedelta(milliseconds=500),
-        timeout_short=timedelta(seconds=360),
+        timeout=timedelta(seconds=360),
     )

src/apify_client/_http_clients/_base.py

@@ -21,6 +21,7 @@
 )
 from apify_client._docs import docs_group
 from apify_client._statistics import ClientStatistics
+from apify_client._utils import to_seconds
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator, Mapping
@@ -141,45 +142,6 @@ def __init__(
 
         self._headers = {**default_headers, **(headers or {})}
 
-    @property
-    def timeout_short(self) -> timedelta:
-        """Timeout for fast CRUD operations (e.g., get, update, delete)."""
-        return self._timeout_short
-
-    @property
-    def timeout(self) -> timedelta:
-        """Timeout for batch, list, and data transfer operations."""
-        return self._timeout
-
-    @property
-    def timeout_long(self) -> timedelta:
-        """Timeout for long-polling, streaming, and other heavy operations."""
-        return self._timeout_long
-
-    @property
-    def timeout_max(self) -> timedelta:
-        """Maximum timeout cap for exponential timeout growth across retries."""
-        return self._timeout_max
-
-    def _resolve_timeout(self, timeout: Timeout) -> timedelta | None:
-        """Resolve a timeout tier literal or value to a concrete timedelta.
-
-        Args:
-            timeout: The timeout specification to resolve.
-
-        Returns:
-            A `timedelta` for tier literals and explicit values, `None` for `'no_timeout'`.
-        """
-        if timeout == 'no_timeout':
-            return None
-        if timeout == 'short':
-            return self._timeout_short
-        if timeout == 'default':
-            return self._timeout
-        if timeout == 'long':
-            return self._timeout_long
-        return timeout
-
     @staticmethod
     def _parse_params(params: dict[str, Any] | None) -> dict[str, Any] | None:
         """Convert request parameters to Apify API-compatible formats.
@@ -204,6 +166,34 @@ def _parse_params(params: dict[str, Any] | None) -> dict[str, Any] | None:
 
         return parsed_params
 
+    def _compute_timeout(self, timeout: Timeout, attempt: int) -> int | float | None:
+        """Resolve a timeout tier and compute the timeout for a request attempt with exponential increase.
+
+        For `'no_timeout'`, returns `None`. For tier literals and explicit `timedelta` values, doubles the timeout
+        with each attempt but caps at `timeout_max`.
+
+        Args:
+            timeout: The timeout specification to resolve (tier literal or explicit `timedelta`).
+            attempt: Current attempt number (1-indexed).
+
+        Returns:
+            Timeout in seconds, or `None` for `'no_timeout'`.
+        """
+        if timeout == 'no_timeout':
+            return None
+
+        if timeout == 'short':
+            resolved = self._timeout_short
+        elif timeout == 'default':
+            resolved = self._timeout
+        elif timeout == 'long':
+            resolved = self._timeout_long
+        else:
+            resolved = timeout
+
+        new_timeout = min(resolved * (2 ** (attempt - 1)), self._timeout_max)
+        return to_seconds(new_timeout)
+
     def _prepare_request_call(
         self,
         headers: dict[str, str] | None = None,
@@ -280,9 +270,9 @@ def call(
             data: Raw request body data. Cannot be used together with json.
             json: JSON-serializable data for the request body. Cannot be used together with data.
             stream: Whether to stream the response body.
-            timeout: Timeout for the API HTTP request.
-                Use `'short'`, `'default'`, or `'long'` tier literals for preconfigured timeouts.
-                A `timedelta` overrides it for this call, and `'no_timeout'` disables the timeout entirely.
+            timeout: Timeout for the API HTTP request. Use `'short'`, `'default'`, or `'long'` tier literals for
+                preconfigured timeouts. A `timedelta` overrides it for this call, and `'no_timeout'` disables
+                the timeout entirely.
 
         Returns:
             The HTTP response object.
@@ -324,9 +314,9 @@ async def call(
             data: Raw request body data. Cannot be used together with json.
             json: JSON-serializable data for the request body. Cannot be used together with data.
             stream: Whether to stream the response body.
-            timeout: Timeout for the API HTTP request.
-                Use `'short'`, `'default'`, or `'long'` tier literals for preconfigured timeouts.
-                A `timedelta` overrides it for this call, and `'no_timeout'` disables the timeout entirely.
+            timeout: Timeout for the API HTTP request. Use `'short'`, `'default'`, or `'long'` tier literals for
+                preconfigured timeouts. A `timedelta` overrides it for this call, and `'no_timeout'` disables
+                the timeout entirely.
 
         Returns:
             The HTTP response object.

src/apify_client/_http_clients/_impit.py

@@ -52,24 +52,6 @@ def _is_retryable_error(exc: Exception) -> bool:
     )
 
 
-def _compute_timeout(
-    base_timeout: timedelta | None,
-    attempt: int,
-    timeout_max: timedelta,
-) -> float | None:
-    """Compute timeout for a request attempt with exponential increase, bounded by timeout_max.
-
-    For `None` (resolved from `'no_timeout'`), returns `None` — impit uses client-level default.
-    For `timedelta` values, doubles the timeout with each attempt but caps at the maximum timeout.
-    """
-    if base_timeout is None:
-        return None
-
-    timeout_secs = to_seconds(base_timeout)
-    timeout_max_secs = to_seconds(timeout_max)
-    return min(timeout_max_secs, timeout_secs * 2 ** (attempt - 1))
-
-
 @docs_group('HTTP clients')
 class ImpitHttpClient(HttpClient):
     """Synchronous HTTP client for the Apify API built on top of [Impit](https://github.com/apify/impit).
@@ -145,9 +127,9 @@ def call(
             data: Raw request body data. Cannot be used together with json.
             json: JSON-serializable data for the request body. Cannot be used together with data.
             stream: Whether to stream the response body.
-            timeout: Timeout for the API HTTP request.
-                Use `'short'`, `'default'`, or `'long'` tier literals for preconfigured timeouts.
-                A `timedelta` overrides it for this call, and `'no_timeout'` disables the timeout entirely.
+            timeout: Timeout for the API HTTP request. Use `'short'`, `'default'`, or `'long'` tier literals for
+                preconfigured timeouts. A `timedelta` overrides it for this call, and `'no_timeout'` disables
+                the timeout entirely.
 
         Returns:
             The HTTP response object.
@@ -219,13 +201,12 @@ def _make_request(
         try:
             url_with_params = self._build_url_with_params(url, params)
 
-            resolved_timeout = self._resolve_timeout(timeout)
             response = self._impit_client.request(
                 method=method,
                 url=url_with_params,
                 headers=headers,
                 content=content,
-                timeout=_compute_timeout(resolved_timeout, attempt, self._timeout_max),
+                timeout=self._compute_timeout(timeout, attempt),
                 stream=stream or False,
             )
 
@@ -383,9 +364,9 @@ async def call(
             data: Raw request body data. Cannot be used together with json.
             json: JSON-serializable data for the request body. Cannot be used together with data.
             stream: Whether to stream the response body.
-            timeout: Timeout for the API HTTP request.
-                Use `'short'`, `'default'`, or `'long'` tier literals for preconfigured timeouts.
-                A `timedelta` overrides it for this call, and `'no_timeout'` disables the timeout entirely.
+            timeout: Timeout for the API HTTP request. Use `'short'`, `'default'`, or `'long'` tier literals for
+                preconfigured timeouts. A `timedelta` overrides it for this call, and `'no_timeout'` disables
+                the timeout entirely.
 
         Returns:
             The HTTP response object.
@@ -457,13 +438,12 @@ async def _make_request(
         try:
             url_with_params = self._build_url_with_params(url, params)
 
-            resolved_timeout = self._resolve_timeout(timeout)
             response = await self._impit_async_client.request(
                 method=method,
                 url=url_with_params,
                 headers=headers,
                 content=content,
-                timeout=_compute_timeout(resolved_timeout, attempt, self._timeout_max),
+                timeout=self._compute_timeout(timeout, attempt),
                 stream=stream or False,
             )
 

src/apify_client/_resource_clients/_resource_client.py

@@ -284,8 +284,7 @@ def _wait_for_finish(
             url: Full URL to the job endpoint.
             params: Base query parameters to include in each request.
             wait_duration: Maximum time to wait (None = indefinite).
-            timeout: Timeout for each HTTP request. Since polling duration is controlled
-                by `wait_duration`, the per-request timeout is typically left unlimited.
+            timeout: Timeout for each individual HTTP request.
 
         Returns:
             Job data dict when finished, or None if job doesn't exist after
@@ -464,8 +463,7 @@ async def _wait_for_finish(
             url: Full URL to the job endpoint.
             params: Base query parameters to include in each request.
             wait_duration: Maximum time to wait (None = indefinite).
-            timeout: Timeout for each HTTP request. Since polling duration is controlled
-                by `wait_duration`, the per-request timeout is typically left unlimited.
+            timeout: Timeout for each individual HTTP request.
 
         Returns:
             Job data dict when finished, or None if job doesn't exist after

src/apify_client/_resource_clients/actor.py

@@ -91,8 +91,7 @@ def get(self, *, timeout: Timeout = 'short') -> Actor | None:
         https://docs.apify.com/api/v2#/reference/actors/actor-object/get-actor
 
         Args:
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The retrieved Actor.
@@ -169,8 +168,7 @@ def update(
             tagged_builds: A dictionary mapping build tag names to their settings. Use it to create, update,
                 or remove build tags. To assign a tag, provide a dict with 'buildId' key. To remove a tag,
                 set its value to None. Example: {'latest': {'buildId': 'abc'}, 'beta': None}.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The updated Actor.
@@ -217,8 +215,7 @@ def delete(self, *, timeout: Timeout = 'short') -> None:
         https://docs.apify.com/api/v2#/reference/actors/actor-object/delete-actor
 
         Args:
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
         """
         self._delete(timeout=timeout)
 
@@ -267,8 +264,7 @@ def start(
                     * `event_types`: List of `WebhookEventType` values which trigger the webhook.
                     * `request_url`: URL to which to send the webhook HTTP request.
                     * `payload_template`: Optional template for the request payload.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The run object.
@@ -347,8 +343,7 @@ def call(
                 default logger will be used. Setting `None` will disable any log propagation. Passing custom logger
                 will redirect logs to the provided logger. The logger is also used to capture status and status message
                 of the other Actor run.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The run object.
@@ -408,8 +403,7 @@ def build(
                 This is to enable quick rebuild during development. By default, the cache is not used.
             wait_for_finish: The maximum number of seconds the server waits for the build to finish before returning.
                 By default it is 0, the maximum value is 60.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The build object.
@@ -459,8 +453,7 @@ def default_build(
         Args:
             wait_for_finish: The maximum number of seconds the server waits for the build to finish before returning.
                 By default it is 0, the maximum value is 60.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The resource client for the default build of this Actor.
@@ -548,8 +541,7 @@ def validate_input(
             run_input: The input to validate.
             build_tag: The Actor's build tag.
             content_type: The content type of the input.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             True if the input is valid, else raise an exception with validation error details.
@@ -595,8 +587,7 @@ async def get(self, *, timeout: Timeout = 'short') -> Actor | None:
         https://docs.apify.com/api/v2#/reference/actors/actor-object/get-actor
 
         Args:
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The retrieved Actor.
@@ -673,8 +664,7 @@ async def update(
             tagged_builds: A dictionary mapping build tag names to their settings. Use it to create, update,
                 or remove build tags. To assign a tag, provide a dict with 'buildId' key. To remove a tag,
                 set its value to None. Example: {'latest': {'buildId': 'abc'}, 'beta': None}.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The updated Actor.
@@ -721,8 +711,7 @@ async def delete(self, *, timeout: Timeout = 'short') -> None:
         https://docs.apify.com/api/v2#/reference/actors/actor-object/delete-actor
 
         Args:
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
         """
         await self._delete(timeout=timeout)
 
@@ -771,8 +760,7 @@ async def start(
                     * `event_types`: List of `WebhookEventType` values which trigger the webhook.
                     * `request_url`: URL to which to send the webhook HTTP request.
                     * `payload_template`: Optional template for the request payload.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The run object.
@@ -851,8 +839,7 @@ async def call(
                 default logger will be used. Setting `None` will disable any log propagation. Passing custom logger
                 will redirect logs to the provided logger. The logger is also used to capture status and status message
                 of the other Actor run.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The run object.
@@ -916,8 +903,7 @@ async def build(
                 This is to enable quick rebuild during development. By default, the cache is not used.
             wait_for_finish: The maximum number of seconds the server waits for the build to finish before returning.
                 By default it is 0, the maximum value is 60.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The build object.
@@ -967,8 +953,7 @@ async def default_build(
         Args:
             wait_for_finish: The maximum number of seconds the server waits for the build to finish before returning.
                 By default it is 0, the maximum value is 60.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             The resource client for the default build of this Actor.
@@ -1056,8 +1041,7 @@ async def validate_input(
             run_input: The input to validate.
             build_tag: The Actor's build tag.
             content_type: The content type of the input.
-            timeout: Timeout for the API HTTP request. Uses the method's default tier.
-                Use `'short'`, `'default'`, or `'long'` tier literals, a `timedelta`, or `'no_timeout'`.
+            timeout: Timeout for the API HTTP request.
 
         Returns:
             True if the input is valid, else raise an exception with validation error details.