Simplify the inheritance

Author: vdusek

src/apify_client/_logging.py

@@ -11,7 +11,9 @@
 if TYPE_CHECKING:
     from collections.abc import Callable
 
-    from apify_client._resource_clients.base import BaseBaseClient
+    from apify_client._resource_clients.base import BaseClient, BaseCollectionClient
+
+    _BaseClient = BaseClient | BaseCollectionClient
 
 
 logger_name = __name__.split('.')[0]
@@ -111,7 +113,7 @@ def _injects_client_details_to_log_context(fun: Callable) -> Callable:
     if inspect.iscoroutinefunction(fun):
 
         @functools.wraps(fun)
-        async def async_wrapper(resource_client: BaseBaseClient, *args: Any, **kwargs: Any) -> Any:
+        async def async_wrapper(resource_client: _BaseClient, *args: Any, **kwargs: Any) -> Any:
             log_context.client_method.set(fun.__qualname__)  # ty: ignore[unresolved-attribute]
             log_context.resource_id.set(resource_client.resource_id)
 
@@ -122,7 +124,7 @@ async def async_wrapper(resource_client: BaseBaseClient, *args: Any, **kwargs: A
     if inspect.isasyncgenfunction(fun):
 
         @functools.wraps(fun)
-        async def async_generator_wrapper(resource_client: BaseBaseClient, *args: Any, **kwargs: Any) -> Any:
+        async def async_generator_wrapper(resource_client: _BaseClient, *args: Any, **kwargs: Any) -> Any:
             log_context.client_method.set(fun.__qualname__)  # ty: ignore[unresolved-attribute]
             log_context.resource_id.set(resource_client.resource_id)
 
@@ -132,7 +134,7 @@ async def async_generator_wrapper(resource_client: BaseBaseClient, *args: Any, *
         return async_generator_wrapper
 
     @functools.wraps(fun)
-    def wrapper(resource_client: BaseBaseClient, *args: Any, **kwargs: Any) -> Any:
+    def wrapper(resource_client: _BaseClient, *args: Any, **kwargs: Any) -> Any:
         log_context.client_method.set(fun.__qualname__)  # ty: ignore[unresolved-attribute]
         log_context.resource_id.set(resource_client.resource_id)
 

src/apify_client/_resource_clients/__init__.py

@@ -4,7 +4,6 @@
 from .actor_env_var_collection import ActorEnvVarCollectionClient, ActorEnvVarCollectionClientAsync
 from .actor_version import ActorVersionClient, ActorVersionClientAsync
 from .actor_version_collection import ActorVersionCollectionClient, ActorVersionCollectionClientAsync
-from .base import ActorJobBaseClient, ActorJobBaseClientAsync
 from .build import BuildClient, BuildClientAsync
 from .build_collection import BuildCollectionClient, BuildCollectionClientAsync
 from .dataset import DatasetClient, DatasetClientAsync
@@ -36,8 +35,6 @@
     'ActorEnvVarClientAsync',
     'ActorEnvVarCollectionClient',
     'ActorEnvVarCollectionClientAsync',
-    'ActorJobBaseClient',
-    'ActorJobBaseClientAsync',
     'ActorVersionClient',
     'ActorVersionClientAsync',
     'ActorVersionCollectionClient',

src/apify_client/_resource_clients/actor.py

@@ -18,7 +18,7 @@
     ActorVersionCollectionClient,
     ActorVersionCollectionClientAsync,
 )
-from apify_client._resource_clients.base import ResourceClient, ResourceClientAsync
+from apify_client._resource_clients.base import BaseClient, BaseClientAsync
 from apify_client._resource_clients.build import BuildClient, BuildClientAsync
 from apify_client._resource_clients.build_collection import (
     BuildCollectionClient,
@@ -140,7 +140,7 @@ def get_actor_representation(
     return actor_dict
 
 
-class ActorClient(ResourceClient):
+class ActorClient(BaseClient):
     """Sub-client for manipulating a single Actor."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -566,7 +566,7 @@ def validate_input(
         return True
 
 
-class ActorClientAsync(ResourceClientAsync):
+class ActorClientAsync(BaseClientAsync):
     """Async sub-client for manipulating a single Actor."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:

src/apify_client/_resource_clients/actor_collection.py

@@ -4,11 +4,11 @@
 
 from apify_client._models import Actor, CreateActorResponse, GetListOfActorsResponse, ListOfActors
 from apify_client._resource_clients.actor import get_actor_representation
-from apify_client._resource_clients.base import ResourceCollectionClient, ResourceCollectionClientAsync
+from apify_client._resource_clients.base import BaseCollectionClient, BaseCollectionClientAsync
 from apify_client._utils import filter_out_none_values_recursively, response_to_dict
 
 
-class ActorCollectionClient(ResourceCollectionClient):
+class ActorCollectionClient(BaseCollectionClient):
     """Sub-client for manipulating Actors."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -140,7 +140,7 @@ def create(
         return CreateActorResponse.model_validate(result).data
 
 
-class ActorCollectionClientAsync(ResourceCollectionClientAsync):
+class ActorCollectionClientAsync(BaseCollectionClientAsync):
     """Async sub-client for manipulating Actors."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:

src/apify_client/_resource_clients/actor_env_var.py

@@ -3,7 +3,7 @@
 from typing import Any
 
 from apify_client._models import EnvVar, GetEnvVarResponse
-from apify_client._resource_clients.base import ResourceClient, ResourceClientAsync
+from apify_client._resource_clients.base import BaseClient, BaseClientAsync
 from apify_client._utils import filter_out_none_values_recursively
 
 
@@ -21,7 +21,7 @@ def get_actor_env_var_representation(
     }
 
 
-class ActorEnvVarClient(ResourceClient):
+class ActorEnvVarClient(BaseClient):
     """Sub-client for manipulating a single Actor environment variable."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -75,7 +75,7 @@ def delete(self) -> None:
         return self._delete()
 
 
-class ActorEnvVarClientAsync(ResourceClientAsync):
+class ActorEnvVarClientAsync(BaseClientAsync):
     """Async sub-client for manipulating a single Actor environment variable."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:

src/apify_client/_resource_clients/actor_env_var_collection.py

@@ -4,11 +4,11 @@
 
 from apify_client._models import EnvVar, GetEnvVarResponse, GetListOfEnvVarsResponse, ListOfEnvVars
 from apify_client._resource_clients.actor_env_var import get_actor_env_var_representation
-from apify_client._resource_clients.base import ResourceCollectionClient, ResourceCollectionClientAsync
+from apify_client._resource_clients.base import BaseCollectionClient, BaseCollectionClientAsync
 from apify_client._utils import filter_out_none_values_recursively, response_to_dict
 
 
-class ActorEnvVarCollectionClient(ResourceCollectionClient):
+class ActorEnvVarCollectionClient(BaseCollectionClient):
     """Sub-client for manipulating actor env vars."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -60,7 +60,7 @@ def create(
         return GetEnvVarResponse.model_validate(result).data
 
 
-class ActorEnvVarCollectionClientAsync(ResourceCollectionClientAsync):
+class ActorEnvVarCollectionClientAsync(BaseCollectionClientAsync):
     """Async sub-client for manipulating actor env vars."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:

src/apify_client/_resource_clients/actor_version.py

@@ -8,7 +8,7 @@
     ActorEnvVarCollectionClient,
     ActorEnvVarCollectionClientAsync,
 )
-from apify_client._resource_clients.base import ResourceClient, ResourceClientAsync
+from apify_client._resource_clients.base import BaseClient, BaseClientAsync
 from apify_client._utils import filter_out_none_values_recursively, maybe_extract_enum_member_value
 
 
@@ -37,7 +37,7 @@ def _get_actor_version_representation(
     }
 
 
-class ActorVersionClient(ResourceClient):
+class ActorVersionClient(BaseClient):
     """Sub-client for manipulating a single Actor version."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -127,7 +127,7 @@ def env_var(self, env_var_name: str) -> ActorEnvVarClient:
         return ActorEnvVarClient(**self._sub_resource_init_options(resource_id=env_var_name))
 
 
-class ActorVersionClientAsync(ResourceClientAsync):
+class ActorVersionClientAsync(BaseClientAsync):
     """Async sub-client for manipulating a single Actor version."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:

src/apify_client/_resource_clients/actor_version_collection.py

@@ -10,11 +10,11 @@
     VersionSourceType,
 )
 from apify_client._resource_clients.actor_version import _get_actor_version_representation
-from apify_client._resource_clients.base import ResourceCollectionClient, ResourceCollectionClientAsync
+from apify_client._resource_clients.base import BaseCollectionClient, BaseCollectionClientAsync
 from apify_client._utils import filter_out_none_values_recursively, response_to_dict
 
 
-class ActorVersionCollectionClient(ResourceCollectionClient):
+class ActorVersionCollectionClient(BaseCollectionClient):
     """Sub-client for manipulating Actor versions."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -90,7 +90,7 @@ def create(
         return GetVersionResponse.model_validate(result).data
 
 
-class ActorVersionCollectionClientAsync(ResourceCollectionClientAsync):
+class ActorVersionCollectionClientAsync(BaseCollectionClientAsync):
     """Async sub-client for manipulating Actor versions."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:

src/apify_client/_resource_clients/base/__init__.py

@@ -1,16 +1,9 @@
-from .actor_job_base_client import ActorJobBaseClient, ActorJobBaseClientAsync
-from .base_client import BaseBaseClient, BaseClient, BaseClientAsync
-from .resource_client import ResourceClient, ResourceClientAsync
-from .resource_collection_client import ResourceCollectionClient, ResourceCollectionClientAsync
+from .base_client import BaseClient, BaseClientAsync
+from .base_collection_client import BaseCollectionClient, BaseCollectionClientAsync
 
 __all__ = [
-    'ActorJobBaseClient',
-    'ActorJobBaseClientAsync',
-    'BaseBaseClient',
     'BaseClient',
     'BaseClientAsync',
-    'ResourceClient',
-    'ResourceClientAsync',
-    'ResourceCollectionClient',
-    'ResourceCollectionClientAsync',
+    'BaseCollectionClient',
+    'BaseCollectionClientAsync',
 ]