Merge remote-tracking branch 'origin/master' into feat/union-dict-model-types

# Conflicts:
#	src/apify_client/_resource_clients/actor.py
#	src/apify_client/_resource_clients/task.py

Author: vdusek

CHANGELOG.md

@@ -8,11 +8,13 @@ All notable changes to this project will be documented in this file.
 ### 🚀 Features
 
 - [**breaking**] Make HTTP client pluggable with abstract base classes ([#641](https://github.com/apify/apify-client-python/pull/641)) ([5ae33a0](https://github.com/apify/apify-client-python/commit/5ae33a0a801fdacd0c456a8630fea053f9df6550)) by [@vdusek](https://github.com/vdusek), closes [#416](https://github.com/apify/apify-client-python/issues/416)
+- [**breaking**] Introduce tiered timeout system with per-endpoint configuration ([#653](https://github.com/apify/apify-client-python/pull/653)) ([723ec6e](https://github.com/apify/apify-client-python/commit/723ec6e5954474767a5ecbf4902d9b62f7d214f8)) by [@vdusek](https://github.com/vdusek)
 
 ### 🚜 Refactor
 
 - [**breaking**] Introduce fully typed clients ([#604](https://github.com/apify/apify-client-python/pull/604)) ([81ee194](https://github.com/apify/apify-client-python/commit/81ee1943b400b49797868fe4dfa52d1662e09370)) by [@vdusek](https://github.com/vdusek), closes [#21](https://github.com/apify/apify-client-python/issues/21), [#481](https://github.com/apify/apify-client-python/issues/481)
 - [**breaking**] Drop support for Python 3.10 ([#636](https://github.com/apify/apify-client-python/pull/636)) ([7895a4e](https://github.com/apify/apify-client-python/commit/7895a4e60145f490911044da4aa7e3c1c424d416)) by [@vdusek](https://github.com/vdusek)
+- [**breaking**] Update default timeout tiers on non-storage resource clients ([#664](https://github.com/apify/apify-client-python/pull/664)) ([0b35bbe](https://github.com/apify/apify-client-python/commit/0b35bbe212a8a64c5aea5d5d813315252760b055)) by [@vdusek](https://github.com/vdusek)
 
 
 <!-- git-cliff-unreleased-end -->

src/apify_client/_resource_clients/actor.py

@@ -82,7 +82,7 @@ def __init__(
             **kwargs,
         )
 
-    def get(self, *, timeout: Timeout = 'long') -> Actor | None:
+    def get(self, *, timeout: Timeout = 'short') -> Actor | None:
         """Retrieve the Actor.
 
         https://docs.apify.com/api/v2#/reference/actors/actor-object/get-actor
@@ -126,7 +126,7 @@ def update(
         pricing_infos: list[dict[str, Any]] | None = None,
         actor_permission_level: ActorPermissionLevel | None = None,
         tagged_builds: dict[str, None | dict[str, str]] | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> Actor:
         """Update the Actor with the specified fields.
 
@@ -206,7 +206,7 @@ def update(
         result = self._update(timeout=timeout, **actor_fields.model_dump(by_alias=True, exclude_none=True))
         return ActorResponse.model_validate(result).data
 
-    def delete(self, *, timeout: Timeout = 'long') -> None:
+    def delete(self, *, timeout: Timeout = 'short') -> None:
         """Delete the Actor.
 
         https://docs.apify.com/api/v2#/reference/actors/actor-object/delete-actor
@@ -230,7 +230,7 @@ def start(
         force_permission_level: ActorPermissionLevel | None = None,
         wait_for_finish: int | None = None,
         webhooks: list[dict | WebhookCreate] | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'medium',
     ) -> Run:
         """Start the Actor and immediately return the Run object.
 
@@ -307,7 +307,7 @@ def call(
         force_permission_level: ActorPermissionLevel | None = None,
         wait_duration: timedelta | None = None,
         logger: Logger | None | Literal['default'] = 'default',
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'no_timeout',
     ) -> Run | None:
         """Start the Actor and wait for it to finish before returning the Run object.
 
@@ -383,7 +383,7 @@ def build(
         tag: str | None = None,
         use_cache: bool | None = None,
         wait_for_finish: int | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'medium',
     ) -> Build:
         """Build the Actor.
 
@@ -441,7 +441,7 @@ def default_build(
         self,
         *,
         wait_for_finish: int | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> BuildClient:
         """Retrieve Actor's default build.
 
@@ -530,7 +530,7 @@ def validate_input(
         *,
         build_tag: str | None = None,
         content_type: str | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> bool:
         """Validate an input for the Actor that defines an input schema.
 
@@ -578,7 +578,7 @@ def __init__(
             **kwargs,
         )
 
-    async def get(self, *, timeout: Timeout = 'long') -> Actor | None:
+    async def get(self, *, timeout: Timeout = 'short') -> Actor | None:
         """Retrieve the Actor.
 
         https://docs.apify.com/api/v2#/reference/actors/actor-object/get-actor
@@ -622,7 +622,7 @@ async def update(
         pricing_infos: list[dict[str, Any]] | None = None,
         actor_permission_level: ActorPermissionLevel | None = None,
         tagged_builds: dict[str, None | dict[str, str]] | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> Actor:
         """Update the Actor with the specified fields.
 
@@ -702,7 +702,7 @@ async def update(
         result = await self._update(timeout=timeout, **actor_fields.model_dump(by_alias=True, exclude_none=True))
         return ActorResponse.model_validate(result).data
 
-    async def delete(self, *, timeout: Timeout = 'long') -> None:
+    async def delete(self, *, timeout: Timeout = 'short') -> None:
         """Delete the Actor.
 
         https://docs.apify.com/api/v2#/reference/actors/actor-object/delete-actor
@@ -726,7 +726,7 @@ async def start(
         force_permission_level: ActorPermissionLevel | None = None,
         wait_for_finish: int | None = None,
         webhooks: list[dict | WebhookCreate] | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'medium',
     ) -> Run:
         """Start the Actor and immediately return the Run object.
 
@@ -803,7 +803,7 @@ async def call(
         force_permission_level: ActorPermissionLevel | None = None,
         wait_duration: timedelta | None = None,
         logger: Logger | None | Literal['default'] = 'default',
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'no_timeout',
     ) -> Run | None:
         """Start the Actor and wait for it to finish before returning the Run object.
 
@@ -883,7 +883,7 @@ async def build(
         tag: str | None = None,
         use_cache: bool | None = None,
         wait_for_finish: int | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'medium',
     ) -> Build:
         """Build the Actor.
 
@@ -941,7 +941,7 @@ async def default_build(
         self,
         *,
         wait_for_finish: int | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> BuildClientAsync:
         """Retrieve Actor's default build.
 
@@ -1030,7 +1030,7 @@ async def validate_input(
         *,
         build_tag: str | None = None,
         content_type: str | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> bool:
         """Validate an input for the Actor that defines an input schema.
 

src/apify_client/_resource_clients/actor_collection.py

@@ -49,7 +49,7 @@ def list(
         offset: int | None = None,
         desc: bool | None = None,
         sort_by: Literal['createdAt', 'stats.lastRunStartedAt'] | None = 'createdAt',
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'medium',
     ) -> ListOfActors:
         """List the Actors the user has created or used.
 
@@ -94,7 +94,7 @@ def create(
         actor_standby_idle_timeout: timedelta | None = None,
         actor_standby_build: str | None = None,
         actor_standby_memory_mbytes: int | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'medium',
     ) -> Actor:
         """Create a new Actor.
 
@@ -194,7 +194,7 @@ async def list(
         offset: int | None = None,
         desc: bool | None = None,
         sort_by: Literal['createdAt', 'stats.lastRunStartedAt'] | None = 'createdAt',
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'medium',
     ) -> ListOfActors:
         """List the Actors the user has created or used.
 
@@ -239,7 +239,7 @@ async def create(
         actor_standby_idle_timeout: timedelta | None = None,
         actor_standby_build: str | None = None,
         actor_standby_memory_mbytes: int | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'medium',
     ) -> Actor:
         """Create a new Actor.
 

src/apify_client/_resource_clients/actor_env_var.py

@@ -31,7 +31,7 @@ def __init__(
             **kwargs,
         )
 
-    def get(self, *, timeout: Timeout = 'long') -> EnvVar | None:
+    def get(self, *, timeout: Timeout = 'short') -> EnvVar | None:
         """Return information about the Actor environment variable.
 
         https://docs.apify.com/api/v2#/reference/actors/environment-variable-object/get-environment-variable
@@ -53,7 +53,7 @@ def update(
         is_secret: bool | None = None,
         name: str,
         value: str,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> EnvVar:
         """Update the Actor environment variable with specified fields.
 
@@ -74,7 +74,7 @@ def update(
         )
         return EnvVarResponse.model_validate(result).data
 
-    def delete(self, *, timeout: Timeout = 'long') -> None:
+    def delete(self, *, timeout: Timeout = 'short') -> None:
         """Delete the Actor environment variable.
 
         https://docs.apify.com/api/v2#/reference/actors/environment-variable-object/delete-environment-variable
@@ -106,7 +106,7 @@ def __init__(
             **kwargs,
         )
 
-    async def get(self, *, timeout: Timeout = 'long') -> EnvVar | None:
+    async def get(self, *, timeout: Timeout = 'short') -> EnvVar | None:
         """Return information about the Actor environment variable.
 
         https://docs.apify.com/api/v2#/reference/actors/environment-variable-object/get-environment-variable
@@ -128,7 +128,7 @@ async def update(
         is_secret: bool | None = None,
         name: str,
         value: str,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> EnvVar:
         """Update the Actor environment variable with specified fields.
 
@@ -149,7 +149,7 @@ async def update(
         )
         return EnvVarResponse.model_validate(result).data
 
-    async def delete(self, *, timeout: Timeout = 'long') -> None:
+    async def delete(self, *, timeout: Timeout = 'short') -> None:
         """Delete the Actor environment variable.
 
         https://docs.apify.com/api/v2#/reference/actors/environment-variable-object/delete-environment-variable

src/apify_client/_resource_clients/actor_env_var_collection.py

@@ -29,7 +29,7 @@ def __init__(
             **kwargs,
         )
 
-    def list(self, *, timeout: Timeout = 'long') -> ListOfEnvVars:
+    def list(self, *, timeout: Timeout = 'short') -> ListOfEnvVars:
         """List the available Actor environment variables.
 
         https://docs.apify.com/api/v2#/reference/actors/environment-variable-collection/get-list-of-environment-variables
@@ -49,7 +49,7 @@ def create(
         is_secret: bool | None = None,
         name: str,
         value: str,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> EnvVar:
         """Create a new Actor environment variable.
 
@@ -90,7 +90,7 @@ def __init__(
             **kwargs,
         )
 
-    async def list(self, *, timeout: Timeout = 'long') -> ListOfEnvVars:
+    async def list(self, *, timeout: Timeout = 'short') -> ListOfEnvVars:
         """List the available Actor environment variables.
 
         https://docs.apify.com/api/v2#/reference/actors/environment-variable-collection/get-list-of-environment-variables
@@ -110,7 +110,7 @@ async def create(
         is_secret: bool | None = None,
         name: str,
         value: str,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> EnvVar:
         """Create a new Actor environment variable.
 

src/apify_client/_resource_clients/actor_version.py

@@ -49,7 +49,7 @@ def __init__(
             **kwargs,
         )
 
-    def get(self, *, timeout: Timeout = 'long') -> Version | None:
+    def get(self, *, timeout: Timeout = 'short') -> Version | None:
         """Return information about the Actor version.
 
         https://docs.apify.com/api/v2#/reference/actors/version-object/get-version
@@ -76,7 +76,7 @@ def update(
         git_repo_url: str | None = None,
         tarball_url: str | None = None,
         github_gist_url: str | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> Version:
         """Update the Actor version with specified fields.
 
@@ -115,7 +115,7 @@ def update(
         result = self._update(timeout=timeout, **version_fields.model_dump(by_alias=True, exclude_none=True))
         return VersionResponse.model_validate(result).data
 
-    def delete(self, *, timeout: Timeout = 'long') -> None:
+    def delete(self, *, timeout: Timeout = 'short') -> None:
         """Delete the Actor version.
 
         https://docs.apify.com/api/v2#/reference/actors/version-object/delete-version
@@ -165,7 +165,7 @@ def __init__(
             **kwargs,
         )
 
-    async def get(self, *, timeout: Timeout = 'long') -> Version | None:
+    async def get(self, *, timeout: Timeout = 'short') -> Version | None:
         """Return information about the Actor version.
 
         https://docs.apify.com/api/v2#/reference/actors/version-object/get-version
@@ -192,7 +192,7 @@ async def update(
         git_repo_url: str | None = None,
         tarball_url: str | None = None,
         github_gist_url: str | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> Version:
         """Update the Actor version with specified fields.
 
@@ -231,7 +231,7 @@ async def update(
         result = await self._update(timeout=timeout, **version_fields.model_dump(by_alias=True, exclude_none=True))
         return VersionResponse.model_validate(result).data
 
-    async def delete(self, *, timeout: Timeout = 'long') -> None:
+    async def delete(self, *, timeout: Timeout = 'short') -> None:
         """Delete the Actor version.
 
         https://docs.apify.com/api/v2#/reference/actors/version-object/delete-version

src/apify_client/_resource_clients/actor_version_collection.py

@@ -44,7 +44,7 @@ def __init__(
             **kwargs,
         )
 
-    def list(self, *, timeout: Timeout = 'long') -> ListOfVersions:
+    def list(self, *, timeout: Timeout = 'short') -> ListOfVersions:
         """List the available Actor versions.
 
         https://docs.apify.com/api/v2#/reference/actors/version-collection/get-list-of-versions
@@ -70,7 +70,7 @@ def create(
         git_repo_url: str | None = None,
         tarball_url: str | None = None,
         github_gist_url: str | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> Version:
         """Create a new Actor version.
 
@@ -131,7 +131,7 @@ def __init__(
             **kwargs,
         )
 
-    async def list(self, *, timeout: Timeout = 'long') -> ListOfVersions:
+    async def list(self, *, timeout: Timeout = 'short') -> ListOfVersions:
         """List the available Actor versions.
 
         https://docs.apify.com/api/v2#/reference/actors/version-collection/get-list-of-versions
@@ -157,7 +157,7 @@ async def create(
         git_repo_url: str | None = None,
         tarball_url: str | None = None,
         github_gist_url: str | None = None,
-        timeout: Timeout = 'long',
+        timeout: Timeout = 'short',
     ) -> Version:
         """Create a new Actor version.