More tests

Author: vdusek

scripts/check_async_docstrings.py

@@ -16,6 +16,10 @@
 
 # Go through every Python file in that directory
 for client_source_path in clients_path.glob('**/*.py'):
+    # Skip _http_clients package - sync and async are in separate files there
+    if '_http_clients' in str(client_source_path):
+        continue
+
     with open(client_source_path, encoding='utf-8') as source_file:
         # Read the source file and parse the code using Red Baron
         red = RedBaron(source_code=source_file.read())
@@ -27,6 +31,8 @@
 
         # Find the corresponding sync classes (same name, but without -Async)
         sync_class = red.find('ClassNode', name=async_class.name.replace('ClientAsync', 'Client'))
+        if not sync_class:
+            continue
 
         # Go through all methods in the async class
         for async_method in async_class.find_all('DefNode'):

scripts/fix_async_docstrings.py

@@ -11,6 +11,10 @@
 
 # Go through every Python file in that directory
 for client_source_path in clients_path.glob('**/*.py'):
+    # Skip _http_clients package - sync and async are in separate files there
+    if '_http_clients' in str(client_source_path):
+        continue
+
     with open(client_source_path, 'r+', encoding='utf-8') as source_file:
         # Read the source file and parse the code using Red Baron
         red = RedBaron(source_code=source_file.read())
@@ -22,6 +26,8 @@
 
         # Find the corresponding sync classes (same name, but without -Async)
         sync_class = red.find('ClassNode', name=async_class.name.replace('ClientAsync', 'Client'))
+        if not sync_class:
+            continue
 
         # Go through all methods in the async class
         for async_method in async_class.find_all('DefNode'):

src/apify_client/_apify_client.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from apify_client._client_classes import ClientRegistry, ClientRegistryAsync
+from apify_client._client_registry import ClientRegistry, ClientRegistryAsync
 from apify_client._config import ClientConfig
 from apify_client._http_clients import HttpClient, HttpClientAsync
 from apify_client._resource_clients import (
@@ -100,7 +100,7 @@ def __init__(
         self._http_client = HttpClient(config=self._config, statistics=self._statistics)
 
         # Create client classes config for dependency injection
-        self._client_classes = ClientRegistry(
+        self._client_registry = ClientRegistry(
             actor_client=ActorClient,
             actor_version_client=ActorVersionClient,
             actor_version_collection_client=ActorVersionCollectionClient,
@@ -125,7 +125,7 @@ def _base_kwargs(self) -> dict:
             'base_url': self._config.base_url,
             'public_base_url': self._config.public_base_url,
             'http_client': self._http_client,
-            'client_classes': self._client_classes,
+            'client_registry': self._client_registry,
         }
 
     def actor(self, actor_id: str) -> ActorClient:
@@ -308,7 +308,7 @@ def __init__(
         self._http_client = HttpClientAsync(config=self._config, statistics=self._statistics)
 
         # Create async client classes config for dependency injection
-        self._client_classes = ClientRegistryAsync(
+        self._client_registry = ClientRegistryAsync(
             actor_client=ActorClientAsync,
             actor_version_client=ActorVersionClientAsync,
             actor_version_collection_client=ActorVersionCollectionClientAsync,
@@ -333,7 +333,7 @@ def _base_kwargs(self) -> dict:
             'base_url': self._config.base_url,
             'public_base_url': self._config.public_base_url,
             'http_client': self._http_client,
-            'client_classes': self._client_classes,
+            'client_registry': self._client_registry,
         }
 
     def actor(self, actor_id: str) -> ActorClientAsync:

src/apify_client/_client_classes.py src/apify_client/_client_registry.pysrc/apify_client/_client_classes.py renamed to src/apify_client/_client_registry.py

@@ -13,7 +13,7 @@
 from apify_client.errors import ApifyApiError, ApifyClientError
 
 if TYPE_CHECKING:
-    from apify_client._client_classes import ClientRegistry, ClientRegistryAsync
+    from apify_client._client_registry import ClientRegistry, ClientRegistryAsync
     from apify_client._http_clients import HttpClient, HttpClientAsync
 
 
@@ -31,7 +31,7 @@ def __init__(
         public_base_url: str,
         http_client: HttpClient,
         resource_path: str,
-        client_classes: ClientRegistry,
+        client_registry: ClientRegistry,
         resource_id: str | None = None,
         params: dict | None = None,
     ) -> None:
@@ -42,7 +42,7 @@ def __init__(
             public_base_url: Public CDN base URL.
             http_client: HTTP client for making requests.
             resource_path: Resource endpoint path (e.g., 'actors', 'datasets').
-            client_classes: Bundle of client classes for dependency injection.
+            client_registry: Bundle of client classes for dependency injection.
             resource_id: Optional resource ID for single-resource clients.
             params: Optional default parameters for all requests.
         """
@@ -55,7 +55,7 @@ def __init__(
         self._default_params = params or {}
         self._resource_path = resource_path
         self._resource_id = resource_id
-        self._client_classes = client_classes
+        self._client_registry = client_registry
 
     @property
     def _resource_url(self) -> str:
@@ -69,14 +69,14 @@ def _resource_url(self) -> str:
     def _base_client_kwargs(self) -> dict[str, Any]:
         """Base kwargs for creating nested/child clients.
 
-        Returns dict with base_url, public_base_url, http_client, and client_classes. Caller adds
+        Returns dict with base_url, public_base_url, http_client, and client_registry. Caller adds
         resource_path, resource_id, and params as needed.
         """
         return {
             'base_url': self._resource_url,
             'public_base_url': self._public_base_url,
             'http_client': self._http_client,
-            'client_classes': self._client_classes,
+            'client_registry': self._client_registry,
         }
 
     def _build_url(
@@ -209,7 +209,7 @@ def __init__(
         public_base_url: str,
         http_client: HttpClientAsync,
         resource_path: str,
-        client_classes: ClientRegistryAsync,
+        client_registry: ClientRegistryAsync,
         resource_id: str | None = None,
         params: dict | None = None,
     ) -> None:
@@ -220,7 +220,7 @@ def __init__(
             public_base_url: Public CDN base URL.
             http_client: HTTP client for making requests.
             resource_path: Resource endpoint path (e.g., 'actors', 'datasets').
-            client_classes: Bundle of client classes for dependency injection.
+            client_registry: Bundle of client classes for dependency injection.
             resource_id: Optional resource ID for single-resource clients.
             params: Optional default parameters for all requests.
         """
@@ -233,7 +233,7 @@ def __init__(
         self._default_params = params or {}
         self._resource_path = resource_path
         self._resource_id = resource_id
-        self._client_classes = client_classes
+        self._client_registry = client_registry
 
     @property
     def _resource_url(self) -> str:
@@ -247,14 +247,14 @@ def _resource_url(self) -> str:
     def _base_client_kwargs(self) -> dict[str, Any]:
         """Base kwargs for creating nested/child clients.
 
-        Returns dict with base_url, public_base_url, http_client, and client_classes. Caller adds
+        Returns dict with base_url, public_base_url, http_client, and client_registry. Caller adds
         resource_path, resource_id, and params as needed.
         """
         return {
             'base_url': self._resource_url,
             'public_base_url': self._public_base_url,
             'http_client': self._http_client,
-            'client_classes': self._client_classes,
+            'client_registry': self._client_registry,
         }
 
     def _build_url(

src/apify_client/_resource_clients/_resource_client.py

@@ -443,12 +443,12 @@ def call(
             webhooks=webhooks,
             force_permission_level=force_permission_level,
         )
-        run_client = self._client_classes.run_client(
+        run_client = self._client_registry.run_client(
             resource_id=started_run.id,
             base_url=self._base_url,
             public_base_url=self._public_base_url,
             http_client=self._http_client,
-            client_classes=self._client_classes,
+            client_registry=self._client_registry,
         )
 
         if not logger:
@@ -506,14 +506,14 @@ def build(
 
     def builds(self) -> BuildCollectionClient:
         """Retrieve a client for the builds of this Actor."""
-        return self._client_classes.build_collection_client(
+        return self._client_registry.build_collection_client(
             resource_path='builds',
             **self._base_client_kwargs,
         )
 
     def runs(self) -> RunCollectionClient:
         """Retrieve a client for the runs of this Actor."""
-        return self._client_classes.run_collection_client(
+        return self._client_registry.run_collection_client(
             resource_path='runs',
             **self._base_client_kwargs,
         )
@@ -541,12 +541,12 @@ def default_build(
         response = self._http_client.call(url=self._build_url('builds/default'), method='GET', params=request_params)
         response_as_dict = response_to_dict(response)
 
-        return self._client_classes.build_client(
+        return self._client_registry.build_client(
             resource_id=response_as_dict['data']['id'],
             base_url=self._base_url,
             public_base_url=self._public_base_url,
             http_client=self._http_client,
-            client_classes=self._client_classes,
+            client_registry=self._client_registry,
         )
 
     def last_run(
@@ -566,7 +566,7 @@ def last_run(
         Returns:
             The resource client for the last run of this Actor.
         """
-        return self._client_classes.run_client(
+        return self._client_registry.run_client(
             resource_id='last',
             resource_path='runs',
             params=self._build_params(
@@ -578,7 +578,7 @@ def last_run(
 
     def versions(self) -> ActorVersionCollectionClient:
         """Retrieve a client for the versions of this Actor."""
-        return self._client_classes.actor_version_collection_client(**self._base_client_kwargs)
+        return self._client_registry.actor_version_collection_client(**self._base_client_kwargs)
 
     def version(self, version_number: str) -> ActorVersionClient:
         """Retrieve the client for the specified version of this Actor.
@@ -589,14 +589,14 @@ def version(self, version_number: str) -> ActorVersionClient:
         Returns:
             The resource client for the specified Actor version.
         """
-        return self._client_classes.actor_version_client(
+        return self._client_registry.actor_version_client(
             resource_id=version_number,
             **self._base_client_kwargs,
         )
 
     def webhooks(self) -> WebhookCollectionClient:
         """Retrieve a client for webhooks associated with this Actor."""
-        return self._client_classes.webhook_collection_client(**self._base_client_kwargs)
+        return self._client_registry.webhook_collection_client(**self._base_client_kwargs)
 
     def validate_input(
         self, run_input: Any = None, *, build_tag: str | None = None, content_type: str | None = None
@@ -922,12 +922,12 @@ async def call(
             force_permission_level=force_permission_level,
         )
 
-        run_client = self._client_classes.run_client(
+        run_client = self._client_registry.run_client(
             resource_id=started_run.id,
             base_url=self._base_url,
             public_base_url=self._public_base_url,
             http_client=self._http_client,
-            client_classes=self._client_classes,
+            client_registry=self._client_registry,
         )
 
         if not logger:
@@ -989,14 +989,14 @@ async def build(
 
     def builds(self) -> BuildCollectionClientAsync:
         """Retrieve a client for the builds of this Actor."""
-        return self._client_classes.build_collection_client(
+        return self._client_registry.build_collection_client(
             resource_path='builds',
             **self._base_client_kwargs,
         )
 
     def runs(self) -> RunCollectionClientAsync:
         """Retrieve a client for the runs of this Actor."""
-        return self._client_classes.run_collection_client(
+        return self._client_registry.run_collection_client(
             resource_path='runs',
             **self._base_client_kwargs,
         )
@@ -1028,12 +1028,12 @@ async def default_build(
         )
         response_as_dict = response_to_dict(response)
 
-        return self._client_classes.build_client(
+        return self._client_registry.build_client(
             resource_id=response_as_dict['data']['id'],
             base_url=self._base_url,
             public_base_url=self._public_base_url,
             http_client=self._http_client,
-            client_classes=self._client_classes,
+            client_registry=self._client_registry,
         )
 
     def last_run(
@@ -1053,7 +1053,7 @@ def last_run(
         Returns:
             The resource client for the last run of this Actor.
         """
-        return self._client_classes.run_client(
+        return self._client_registry.run_client(
             resource_id='last',
             resource_path='runs',
             params=self._build_params(
@@ -1065,7 +1065,7 @@ def last_run(
 
     def versions(self) -> ActorVersionCollectionClientAsync:
         """Retrieve a client for the versions of this Actor."""
-        return self._client_classes.actor_version_collection_client(**self._base_client_kwargs)
+        return self._client_registry.actor_version_collection_client(**self._base_client_kwargs)
 
     def version(self, version_number: str) -> ActorVersionClientAsync:
         """Retrieve the client for the specified version of this Actor.
@@ -1076,14 +1076,14 @@ def version(self, version_number: str) -> ActorVersionClientAsync:
         Returns:
             The resource client for the specified Actor version.
         """
-        return self._client_classes.actor_version_client(
+        return self._client_registry.actor_version_client(
             resource_id=version_number,
             **self._base_client_kwargs,
         )
 
     def webhooks(self) -> WebhookCollectionClientAsync:
         """Retrieve a client for webhooks associated with this Actor."""
-        return self._client_classes.webhook_collection_client(**self._base_client_kwargs)
+        return self._client_registry.webhook_collection_client(**self._base_client_kwargs)
 
     async def validate_input(
         self, run_input: Any = None, *, build_tag: str | None = None, content_type: str | None = None

src/apify_client/_resource_clients/actor.py

@@ -148,7 +148,7 @@ def delete(self) -> None:
 
     def env_vars(self) -> ActorEnvVarCollectionClient:
         """Retrieve a client for the environment variables of this Actor version."""
-        return self._client_classes.actor_env_var_collection_client(**self._base_client_kwargs)
+        return self._client_registry.actor_env_var_collection_client(**self._base_client_kwargs)
 
     def env_var(self, env_var_name: str) -> ActorEnvVarClient:
         """Retrieve the client for the specified environment variable of this Actor version.
@@ -159,7 +159,7 @@ def env_var(self, env_var_name: str) -> ActorEnvVarClient:
         Returns:
             The resource client for the specified Actor environment variable.
         """
-        return self._client_classes.actor_env_var_client(
+        return self._client_registry.actor_env_var_client(
             resource_id=env_var_name,
             **self._base_client_kwargs,
         )
@@ -273,7 +273,7 @@ async def delete(self) -> None:
 
     def env_vars(self) -> ActorEnvVarCollectionClientAsync:
         """Retrieve a client for the environment variables of this Actor version."""
-        return self._client_classes.actor_env_var_collection_client(**self._base_client_kwargs)
+        return self._client_registry.actor_env_var_collection_client(**self._base_client_kwargs)
 
     def env_var(self, env_var_name: str) -> ActorEnvVarClientAsync:
         """Retrieve the client for the specified environment variable of this Actor version.
@@ -284,7 +284,7 @@ def env_var(self, env_var_name: str) -> ActorEnvVarClientAsync:
         Returns:
             The resource client for the specified Actor environment variable.
         """
-        return self._client_classes.actor_env_var_client(
+        return self._client_registry.actor_env_var_client(
             resource_id=env_var_name,
             **self._base_client_kwargs,
         )

src/apify_client/_resource_clients/actor_version.py

@@ -119,7 +119,7 @@ def log(self) -> LogClient:
         Returns:
             A client allowing access to the log of this Actor build.
         """
-        return self._client_classes.log_client(
+        return self._client_registry.log_client(
             resource_path='log',
             **self._base_client_kwargs,
         )
@@ -233,7 +233,7 @@ def log(self) -> LogClientAsync:
         Returns:
             A client allowing access to the log of this Actor build.
         """
-        return self._client_classes.log_client(
+        return self._client_registry.log_client(
             resource_path='log',
             **self._base_client_kwargs,
         )