Refactor p2

Author: vdusek

src/apify_client/_apify_client.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from apify_client._client_config import ClientConfig
+from apify_client._config import ClientConfig
 from apify_client._http_client import HttpClient, HttpClientAsync
 from apify_client._resource_clients import (
     ActorClient,
@@ -50,7 +50,7 @@
     WebhookDispatchCollectionClient,
     WebhookDispatchCollectionClientAsync,
 )
-from apify_client._statistics import Statistics
+from apify_client._statistics import ClientStatistics
 
 
 class ApifyClient:
@@ -88,7 +88,7 @@ def __init__(
             timeout_secs=timeout_secs,
         )
 
-        self.stats = Statistics()
+        self.stats = ClientStatistics()
         self.http_client = HttpClient(config=self._config, stats=self.stats)
 
     def _options(self) -> dict:
@@ -104,11 +104,7 @@ def actor(self, actor_id: str) -> ActorClient:
         Args:
             actor_id: ID of the Actor to be manipulated.
         """
-        return ActorClient(
-            resource_id=actor_id,
-            resource_path='acts',
-            **self._options()
-        )
+        return ActorClient(resource_id=actor_id, resource_path='acts', **self._options())
 
     def actors(self) -> ActorCollectionClient:
         """Retrieve the sub-client for manipulating Actors."""
@@ -279,7 +275,7 @@ def __init__(
             timeout_secs=timeout_secs,
         )
 
-        self.stats = Statistics()
+        self.stats = ClientStatistics()
         self.http_client = HttpClientAsync(config=self._config, stats=self.stats)
 
     def _options(self) -> dict:

src/apify_client/_client_config.py src/apify_client/_config.pysrc/apify_client/_client_config.py renamed to src/apify_client/_config.py

@@ -3,6 +3,27 @@
 from __future__ import annotations
 
 from enum import Enum
+from typing import Any
+
+# Type aliases
+JsonSerializable = str | int | float | bool | None | dict[str, Any] | list[Any]
+"""Type for representing json-serializable values. It's close enough to the real thing supported by json.parse.
+It was suggested in a discussion with (and approved by) Guido van Rossum, so I'd consider it correct enough.
+"""
+
+# Constants for wait_for_finish functionality
+DEFAULT_WAIT_FOR_FINISH_SEC = 999999
+"""Default maximum wait time for job completion (effectively infinite)."""
+
+DEFAULT_WAIT_WHEN_JOB_NOT_EXIST_SEC = 3
+"""How long to wait for a job to exist before giving up."""
+
+# Standard timeout values for API operations
+FAST_OPERATION_TIMEOUT_SECS = 5
+"""Timeout for fast, idempotent operations (e.g., GET, DELETE)."""
+
+STANDARD_OPERATION_TIMEOUT_SECS = 30
+"""Timeout for operations that may take longer (e.g., list operations, batch operations)."""
 
 
 class ActorJobStatus(str, Enum):

src/apify_client/_consts.py

@@ -14,15 +14,15 @@
 import impit
 
 from apify_client._logging import log_context, logger_name
-from apify_client._statistics import Statistics
+from apify_client._statistics import ClientStatistics
 from apify_client._utils import is_retryable_error, retry_with_exp_backoff, retry_with_exp_backoff_async
 from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
     from collections.abc import Callable
 
-    from apify_client._client_config import ClientConfig
-    from apify_client._utils import JsonSerializable
+    from apify_client._config import ClientConfig
+    from apify_client._consts import JsonSerializable
 
 DEFAULT_BACKOFF_EXPONENTIAL_FACTOR = 2
 DEFAULT_BACKOFF_RANDOM_FACTOR = 1
@@ -33,15 +33,15 @@
 class _BaseHttpClient:
     """Base class for HTTP clients with shared configuration and utilities."""
 
-    def __init__(self, config: ClientConfig, stats: Statistics | None = None) -> None:
+    def __init__(self, config: ClientConfig, stats: ClientStatistics | None = None) -> None:
         """Initialize HTTP client with configuration.
 
         Args:
             config: Immutable client configuration.
             stats: Optional statistics tracker.
         """
         self.config = config
-        self.stats = stats or Statistics()
+        self.stats = stats or ClientStatistics()
 
         # Build headers
         headers = {'Accept': 'application/json, */*'}

src/apify_client/_http_client.py

@@ -119,9 +119,7 @@ def _url(
         # Convert to public URL if requested
         if public:
             if not url.startswith(self._base_url):
-                raise ValueError(
-                    f'Cannot convert to public URL: {url} does not start with base URL {self._base_url}'
-                )
+                raise ValueError(f'Cannot convert to public URL: {url} does not start with base URL {self._base_url}')
             url = url.replace(self._base_url, self._public_base_url, 1)
 
         # Append query parameters if provided
@@ -153,9 +151,6 @@ def _build_params(self, **kwargs: Any) -> dict:
         merged = {**self._default_params, **kwargs}
         return {k: v for k, v in merged.items() if v is not None}
 
-    # Backwards compatibility alias
-    _params = _build_params
-
     def _nested_client_config(self, **kwargs: Any) -> NestedClientConfig:
         """Build configuration dict for initializing a nested resource client.
 
@@ -180,10 +175,14 @@ def _nested_client_config(self, **kwargs: Any) -> NestedClientConfig:
         }
         return {**options, **kwargs}
 
-    # Backwards compatibility alias
-    _sub_resource_init_options = _nested_client_config
-
-    def _create_sibling_client(self, client_class: type, *, resource_id: str, resource_path: str | None = None, **kwargs: Any) -> Any:
+    def _create_sibling_client(
+        self,
+        client_class: type,
+        *,
+        resource_id: str,
+        resource_path: str | None = None,
+        **kwargs: Any,
+    ) -> Any:
         """Create a sibling resource client (e.g., RunClient from ActorClient).
 
         This is used when a resource client needs to create another resource client
@@ -310,9 +309,7 @@ def _url(
         # Convert to public URL if requested
         if public:
             if not url.startswith(self._base_url):
-                raise ValueError(
-                    f'Cannot convert to public URL: {url} does not start with base URL {self._base_url}'
-                )
+                raise ValueError(f'Cannot convert to public URL: {url} does not start with base URL {self._base_url}')
             url = url.replace(self._base_url, self._public_base_url, 1)
 
         # Append query parameters if provided
@@ -344,9 +341,6 @@ def _build_params(self, **kwargs: Any) -> dict:
         merged = {**self._default_params, **kwargs}
         return {k: v for k, v in merged.items() if v is not None}
 
-    # Backwards compatibility alias
-    _params = _build_params
-
     def _nested_client_config(self, **kwargs: Any) -> NestedClientConfig:
         """Build configuration dict for initializing a nested resource client.
 
@@ -371,10 +365,14 @@ def _nested_client_config(self, **kwargs: Any) -> NestedClientConfig:
         }
         return {**options, **kwargs}
 
-    # Backwards compatibility alias
-    _sub_resource_init_options = _nested_client_config
-
-    def _create_sibling_client(self, client_class: type, *, resource_id: str, resource_path: str | None = None, **kwargs: Any) -> Any:
+    def _create_sibling_client(
+        self,
+        client_class: type,
+        *,
+        resource_id: str,
+        resource_path: str | None = None,
+        **kwargs: Any,
+    ) -> Any:
         """Create a sibling resource client (e.g., RunClientAsync from ActorClientAsync).
 
         This is used when a resource client needs to create another resource client