get rid of inline imports

vdusek · vdusek · commit d54edda5fc87 · 2026-01-30T11:56:04.000+01:00
diff --git a/src/apify_client/_apify_client.py b/src/apify_client/_apify_client.py
@@ -51,8 +51,12 @@
     ScheduleClientAsync,
     ScheduleCollectionClient,
     ScheduleCollectionClientAsync,
+    StatusMessageWatcherAsync,
+    StatusMessageWatcherSync,
     StoreCollectionClient,
     StoreCollectionClientAsync,
+    StreamedLogAsync,
+    StreamedLogSync,
     TaskClient,
     TaskClientAsync,
     TaskCollectionClient,
@@ -124,21 +128,34 @@ def __init__(
 
         self._client_registry = ClientRegistry(
             actor_client=ActorClient,
-            actor_version_client=ActorVersionClient,
-            actor_version_collection_client=ActorVersionCollectionClient,
+            actor_collection_client=ActorCollectionClient,
             actor_env_var_client=ActorEnvVarClient,
             actor_env_var_collection_client=ActorEnvVarCollectionClient,
+            actor_version_client=ActorVersionClient,
+            actor_version_collection_client=ActorVersionCollectionClient,
             build_client=BuildClient,
             build_collection_client=BuildCollectionClient,
-            run_client=RunClient,
-            run_collection_client=RunCollectionClient,
             dataset_client=DatasetClient,
+            dataset_collection_client=DatasetCollectionClient,
             key_value_store_client=KeyValueStoreClient,
+            key_value_store_collection_client=KeyValueStoreCollectionClient,
+            log_client=LogClient,
+            status_message_watcher=StatusMessageWatcherSync,
+            streamed_log=StreamedLogSync,
             request_queue_client=RequestQueueClient,
+            request_queue_collection_client=RequestQueueCollectionClient,
+            run_client=RunClient,
+            run_collection_client=RunCollectionClient,
+            schedule_client=ScheduleClient,
+            schedule_collection_client=ScheduleCollectionClient,
+            store_collection_client=StoreCollectionClient,
+            task_client=TaskClient,
+            task_collection_client=TaskCollectionClient,
+            user_client=UserClient,
             webhook_client=WebhookClient,
             webhook_collection_client=WebhookCollectionClient,
+            webhook_dispatch_client=WebhookDispatchClient,
             webhook_dispatch_collection_client=WebhookDispatchCollectionClient,
-            log_client=LogClient,
         )
         """Registry of resource client classes used for dependency injection."""
 
@@ -352,21 +369,34 @@ def __init__(
 
         self._client_registry = ClientRegistryAsync(
             actor_client=ActorClientAsync,
-            actor_version_client=ActorVersionClientAsync,
-            actor_version_collection_client=ActorVersionCollectionClientAsync,
+            actor_collection_client=ActorCollectionClientAsync,
             actor_env_var_client=ActorEnvVarClientAsync,
             actor_env_var_collection_client=ActorEnvVarCollectionClientAsync,
+            actor_version_client=ActorVersionClientAsync,
+            actor_version_collection_client=ActorVersionCollectionClientAsync,
             build_client=BuildClientAsync,
             build_collection_client=BuildCollectionClientAsync,
-            run_client=RunClientAsync,
-            run_collection_client=RunCollectionClientAsync,
             dataset_client=DatasetClientAsync,
+            dataset_collection_client=DatasetCollectionClientAsync,
             key_value_store_client=KeyValueStoreClientAsync,
+            key_value_store_collection_client=KeyValueStoreCollectionClientAsync,
+            log_client=LogClientAsync,
+            status_message_watcher=StatusMessageWatcherAsync,
+            streamed_log=StreamedLogAsync,
             request_queue_client=RequestQueueClientAsync,
+            request_queue_collection_client=RequestQueueCollectionClientAsync,
+            run_client=RunClientAsync,
+            run_collection_client=RunCollectionClientAsync,
+            schedule_client=ScheduleClientAsync,
+            schedule_collection_client=ScheduleCollectionClientAsync,
+            store_collection_client=StoreCollectionClientAsync,
+            task_client=TaskClientAsync,
+            task_collection_client=TaskCollectionClientAsync,
+            user_client=UserClientAsync,
             webhook_client=WebhookClientAsync,
             webhook_collection_client=WebhookCollectionClientAsync,
+            webhook_dispatch_client=WebhookDispatchClientAsync,
             webhook_dispatch_collection_client=WebhookDispatchCollectionClientAsync,
-            log_client=LogClientAsync,
         )
         """Registry of resource client classes used for dependency injection."""
 
diff --git a/src/apify_client/_client_registry.py b/src/apify_client/_client_registry.py
@@ -7,6 +7,8 @@
     from apify_client._resource_clients import (
         ActorClient,
         ActorClientAsync,
+        ActorCollectionClient,
+        ActorCollectionClientAsync,
         ActorEnvVarClient,
         ActorEnvVarClientAsync,
         ActorEnvVarCollectionClient,
@@ -21,20 +23,44 @@
         BuildCollectionClientAsync,
         DatasetClient,
         DatasetClientAsync,
+        DatasetCollectionClient,
+        DatasetCollectionClientAsync,
         KeyValueStoreClient,
         KeyValueStoreClientAsync,
+        KeyValueStoreCollectionClient,
+        KeyValueStoreCollectionClientAsync,
         LogClient,
         LogClientAsync,
         RequestQueueClient,
         RequestQueueClientAsync,
+        RequestQueueCollectionClient,
+        RequestQueueCollectionClientAsync,
         RunClient,
         RunClientAsync,
         RunCollectionClient,
         RunCollectionClientAsync,
+        ScheduleClient,
+        ScheduleClientAsync,
+        ScheduleCollectionClient,
+        ScheduleCollectionClientAsync,
+        StatusMessageWatcherAsync,
+        StatusMessageWatcherSync,
+        StoreCollectionClient,
+        StoreCollectionClientAsync,
+        StreamedLogAsync,
+        StreamedLogSync,
+        TaskClient,
+        TaskClientAsync,
+        TaskCollectionClient,
+        TaskCollectionClientAsync,
+        UserClient,
+        UserClientAsync,
         WebhookClient,
         WebhookClientAsync,
         WebhookCollectionClient,
         WebhookCollectionClientAsync,
+        WebhookDispatchClient,
+        WebhookDispatchClientAsync,
         WebhookDispatchCollectionClient,
         WebhookDispatchCollectionClientAsync,
     )
@@ -44,72 +70,75 @@
 class ClientRegistry:
     """Bundle of all sync client classes for dependency injection.
 
-    This config object is passed through the client hierarchy to avoid
-    parameter explosion when clients need to create other clients.
-    Each resource client receives this config and can instantiate other
-    clients as needed without knowing about transitive dependencies.
+    This config object is passed to the resource clients to avoid circular dependencies. Each resource client
+    receives this config and can instantiate other clients as needed.
     """
 
-    # Actor-related
     actor_client: type[ActorClient]
-    actor_version_client: type[ActorVersionClient]
-    actor_version_collection_client: type[ActorVersionCollectionClient]
+    actor_collection_client: type[ActorCollectionClient]
     actor_env_var_client: type[ActorEnvVarClient]
     actor_env_var_collection_client: type[ActorEnvVarCollectionClient]
-
-    # Build-related
+    actor_version_client: type[ActorVersionClient]
+    actor_version_collection_client: type[ActorVersionCollectionClient]
     build_client: type[BuildClient]
     build_collection_client: type[BuildCollectionClient]
-
-    # Run-related
-    run_client: type[RunClient]
-    run_collection_client: type[RunCollectionClient]
-
-    # Storage-related
     dataset_client: type[DatasetClient]
+    dataset_collection_client: type[DatasetCollectionClient]
     key_value_store_client: type[KeyValueStoreClient]
+    key_value_store_collection_client: type[KeyValueStoreCollectionClient]
+    log_client: type[LogClient]
+    status_message_watcher: type[StatusMessageWatcherSync]
+    streamed_log: type[StreamedLogSync]
     request_queue_client: type[RequestQueueClient]
-
-    # Webhook-related
+    request_queue_collection_client: type[RequestQueueCollectionClient]
+    run_client: type[RunClient]
+    run_collection_client: type[RunCollectionClient]
+    schedule_client: type[ScheduleClient]
+    schedule_collection_client: type[ScheduleCollectionClient]
+    store_collection_client: type[StoreCollectionClient]
+    task_client: type[TaskClient]
+    task_collection_client: type[TaskCollectionClient]
+    user_client: type[UserClient]
     webhook_client: type[WebhookClient]
     webhook_collection_client: type[WebhookCollectionClient]
+    webhook_dispatch_client: type[WebhookDispatchClient]
     webhook_dispatch_collection_client: type[WebhookDispatchCollectionClient]
 
-    # Utilities
-    log_client: type[LogClient]
-
 
 @dataclass
 class ClientRegistryAsync:
     """Bundle of all async client classes for dependency injection.
 
-    Async version of ClientRegistry for use with ApifyClientAsync.
+    This config object is passed to the resource clients to avoid circular dependencies. Each resource client
+    receives this config and can instantiate other clients as needed.
     """
 
-    # Actor-related
     actor_client: type[ActorClientAsync]
-    actor_version_client: type[ActorVersionClientAsync]
-    actor_version_collection_client: type[ActorVersionCollectionClientAsync]
+    actor_collection_client: type[ActorCollectionClientAsync]
     actor_env_var_client: type[ActorEnvVarClientAsync]
     actor_env_var_collection_client: type[ActorEnvVarCollectionClientAsync]
-
-    # Build-related
+    actor_version_client: type[ActorVersionClientAsync]
+    actor_version_collection_client: type[ActorVersionCollectionClientAsync]
     build_client: type[BuildClientAsync]
     build_collection_client: type[BuildCollectionClientAsync]
-
-    # Run-related
-    run_client: type[RunClientAsync]
-    run_collection_client: type[RunCollectionClientAsync]
-
-    # Storage-related
     dataset_client: type[DatasetClientAsync]
+    dataset_collection_client: type[DatasetCollectionClientAsync]
     key_value_store_client: type[KeyValueStoreClientAsync]
+    key_value_store_collection_client: type[KeyValueStoreCollectionClientAsync]
+    log_client: type[LogClientAsync]
+    status_message_watcher: type[StatusMessageWatcherAsync]
+    streamed_log: type[StreamedLogAsync]
     request_queue_client: type[RequestQueueClientAsync]
-
-    # Webhook-related
+    request_queue_collection_client: type[RequestQueueCollectionClientAsync]
+    run_client: type[RunClientAsync]
+    run_collection_client: type[RunCollectionClientAsync]
+    schedule_client: type[ScheduleClientAsync]
+    schedule_collection_client: type[ScheduleCollectionClientAsync]
+    store_collection_client: type[StoreCollectionClientAsync]
+    task_client: type[TaskClientAsync]
+    task_collection_client: type[TaskCollectionClientAsync]
+    user_client: type[UserClientAsync]
     webhook_client: type[WebhookClientAsync]
     webhook_collection_client: type[WebhookCollectionClientAsync]
+    webhook_dispatch_client: type[WebhookDispatchClientAsync]
     webhook_dispatch_collection_client: type[WebhookDispatchCollectionClientAsync]
-
-    # Utilities
-    log_client: type[LogClientAsync]
diff --git a/src/apify_client/_resource_clients/__init__.py b/src/apify_client/_resource_clients/__init__.py
@@ -10,7 +10,14 @@
 from .dataset_collection import DatasetCollectionClient, DatasetCollectionClientAsync
 from .key_value_store import KeyValueStoreClient, KeyValueStoreClientAsync
 from .key_value_store_collection import KeyValueStoreCollectionClient, KeyValueStoreCollectionClientAsync
-from .log import LogClient, LogClientAsync
+from .log import (
+    LogClient,
+    LogClientAsync,
+    StatusMessageWatcherAsync,
+    StatusMessageWatcherSync,
+    StreamedLogAsync,
+    StreamedLogSync,
+)
 from .request_queue import RequestQueueClient, RequestQueueClientAsync
 from .request_queue_collection import RequestQueueCollectionClient, RequestQueueCollectionClientAsync
 from .run import RunClient, RunClientAsync
@@ -65,8 +72,12 @@
     'ScheduleClientAsync',
     'ScheduleCollectionClient',
     'ScheduleCollectionClientAsync',
+    'StatusMessageWatcherAsync',
+    'StatusMessageWatcherSync',
     'StoreCollectionClient',
     'StoreCollectionClientAsync',
+    'StreamedLogAsync',
+    'StreamedLogSync',
     'TaskClient',
     'TaskClientAsync',
     'TaskCollectionClient',
diff --git a/src/apify_client/_resource_clients/run.py b/src/apify_client/_resource_clients/run.py
