Rm client config

Author: vdusek

src/apify_client/_apify_client.py

@@ -3,8 +3,14 @@
 from functools import cached_property
 
 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._consts import (
+    API_VERSION,
+    DEFAULT_API_URL,
+    DEFAULT_MAX_RETRIES,
+    DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS,
+    DEFAULT_TIMEOUT_SECS,
+)
+from apify_client._http_clients import AsyncHttpClient, SyncHttpClient
 from apify_client._resource_clients import (
     ActorClient,
     ActorClientAsync,
@@ -71,11 +77,11 @@ def __init__(
         self,
         token: str | None = None,
         *,
-        api_url: str | None = None,
-        api_public_url: str | None = None,
-        max_retries: int | None = 8,
-        min_delay_between_retries_millis: int | None = 500,
-        timeout_secs: int | None = 360,
+        api_url: str = DEFAULT_API_URL,
+        api_public_url: str | None = DEFAULT_API_URL,
+        max_retries: int = DEFAULT_MAX_RETRIES,
+        min_delay_between_retries_millis: int = DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS,
+        timeout_secs: int = DEFAULT_TIMEOUT_SECS,
     ) -> None:
         """Initialize a new instance.
 
@@ -84,26 +90,37 @@ def __init__(
             api_url: The URL of the Apify API server to which to connect. Defaults to https://api.apify.com. It can
                 be an internal URL that is not globally accessible, in such case `api_public_url` should be set as well.
             api_public_url: The globally accessible URL of the Apify API server. It should be set only if the `api_url`
-                is an internal URL that is not globally accessible.
+                is an internal URL that is not globally accessible. Defaults to https://api.apify.com.
             max_retries: How many times to retry a failed request at most.
             min_delay_between_retries_millis: How long will the client wait between retrying requests
                 (increases exponentially from this value).
             timeout_secs: The socket timeout of the HTTP requests sent to the Apify API.
         """
-        self._config = ClientConfig.from_user_params(
-            token=token,
-            api_url=api_url,
-            api_public_url=api_public_url,
-            max_retries=max_retries,
-            min_delay_between_retries_millis=min_delay_between_retries_millis,
-            timeout_secs=timeout_secs,
-        )
-        """Resolved client configuration."""
+        # We need to do this because of mocking in tests and default mutable arguments.
+        api_url = DEFAULT_API_URL if api_url is None else api_url
+        api_public_url = DEFAULT_API_URL if api_public_url is None else api_public_url
+
+        self._token = token
+        """Apify API token for authentication."""
+
+        self._base_url = f'{api_url.rstrip("/")}/{API_VERSION}'
+        """Base URL of the Apify API."""
+
+        self._public_base_url = f'{api_public_url.rstrip("/")}/{API_VERSION}'
+        """Public base URL for CDN access."""
 
         self._statistics = ClientStatistics()
         """Collector for client request statistics."""
 
-        self._http_client = HttpClient(config=self._config, statistics=self._statistics)
+        self._http_client = SyncHttpClient(
+            token=token,
+            timeout_secs=timeout_secs or DEFAULT_TIMEOUT_SECS,
+            max_retries=max_retries or DEFAULT_MAX_RETRIES,
+            min_delay_between_retries_millis=(
+                min_delay_between_retries_millis or DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS
+            ),
+            statistics=self._statistics,
+        )
         """HTTP client used to communicate with the Apify API."""
 
         self._client_registry = ClientRegistry(
@@ -130,16 +147,16 @@ def __init__(
     def _base_kwargs(self) -> dict:
         """Base keyword arguments for resource client construction."""
         return {
-            'base_url': self._config.base_url,
-            'public_base_url': self._config.public_base_url,
+            'base_url': self._base_url,
+            'public_base_url': self._public_base_url,
             'http_client': self._http_client,
             'client_registry': self._client_registry,
         }
 
     @property
     def token(self) -> str | None:
         """The Apify API token used by the client."""
-        return self._config.token
+        return self._token
 
     def actor(self, actor_id: str) -> ActorClient:
         """Retrieve the sub-client for manipulating a single Actor.
@@ -290,11 +307,11 @@ def __init__(
         self,
         token: str | None = None,
         *,
-        api_url: str | None = None,
-        api_public_url: str | None = None,
-        max_retries: int | None = 8,
-        min_delay_between_retries_millis: int | None = 500,
-        timeout_secs: int | None = 360,
+        api_url: str = DEFAULT_API_URL,
+        api_public_url: str | None = DEFAULT_API_URL,
+        max_retries: int = DEFAULT_MAX_RETRIES,
+        min_delay_between_retries_millis: int = DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS,
+        timeout_secs: int = DEFAULT_TIMEOUT_SECS,
     ) -> None:
         """Initialize a new instance.
 
@@ -303,26 +320,37 @@ def __init__(
             api_url: The URL of the Apify API server to which to connect. Defaults to https://api.apify.com. It can
                 be an internal URL that is not globally accessible, in such case `api_public_url` should be set as well.
             api_public_url: The globally accessible URL of the Apify API server. It should be set only if the `api_url`
-                is an internal URL that is not globally accessible.
+                is an internal URL that is not globally accessible. Defaults to https://api.apify.com.
             max_retries: How many times to retry a failed request at most.
             min_delay_between_retries_millis: How long will the client wait between retrying requests
                 (increases exponentially from this value).
             timeout_secs: The socket timeout of the HTTP requests sent to the Apify API.
         """
-        self._config = ClientConfig.from_user_params(
-            token=token,
-            api_url=api_url,
-            api_public_url=api_public_url,
-            max_retries=max_retries,
-            min_delay_between_retries_millis=min_delay_between_retries_millis,
-            timeout_secs=timeout_secs,
-        )
-        """Resolved client configuration."""
+        # We need to do this because of mocking in tests and default mutable arguments.
+        api_url = DEFAULT_API_URL if api_url is None else api_url
+        api_public_url = DEFAULT_API_URL if api_public_url is None else api_public_url
+
+        self._token = token
+        """Apify API token for authentication."""
+
+        self._base_url = f'{api_url.rstrip("/")}/{API_VERSION}'
+        """Base URL of the Apify API."""
+
+        self._public_base_url = f'{api_public_url.rstrip("/")}/{API_VERSION}'
+        """Public base URL for CDN access."""
 
         self._statistics = ClientStatistics()
         """Collector for client request statistics."""
 
-        self._http_client = HttpClientAsync(config=self._config, statistics=self._statistics)
+        self._http_client = AsyncHttpClient(
+            token=token,
+            timeout_secs=timeout_secs or DEFAULT_TIMEOUT_SECS,
+            max_retries=max_retries or DEFAULT_MAX_RETRIES,
+            min_delay_between_retries_millis=(
+                min_delay_between_retries_millis or DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS
+            ),
+            statistics=self._statistics,
+        )
         """HTTP client used to communicate with the Apify API."""
 
         self._client_registry = ClientRegistryAsync(
@@ -349,16 +377,16 @@ def __init__(
     def _base_kwargs(self) -> dict:
         """Base keyword arguments for resource client construction."""
         return {
-            'base_url': self._config.base_url,
-            'public_base_url': self._config.public_base_url,
+            'base_url': self._base_url,
+            'public_base_url': self._public_base_url,
             'http_client': self._http_client,
             'client_registry': self._client_registry,
         }
 
     @property
     def token(self) -> str | None:
         """The Apify API token used by the client."""
-        return self._config.token
+        return self._token
 
     def actor(self, actor_id: str) -> ActorClientAsync:
         """Retrieve the sub-client for manipulating a single Actor.

src/apify_client/_config.py

@@ -3,6 +3,21 @@
 from enum import Enum
 from typing import Any
 
+DEFAULT_API_URL = 'https://api.apify.com'
+"""Default base URL for the Apify API."""
+
+API_VERSION = 'v2'
+"""Current Apify API version."""
+
+DEFAULT_TIMEOUT_SECS = 360
+"""Default request timeout in seconds."""
+
+DEFAULT_MAX_RETRIES = 8
+"""Default maximum number of retries for failed requests."""
+
+DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS = 500
+"""Default minimum delay between retries in milliseconds."""
+
 # 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.

src/apify_client/_consts.py

@@ -1,5 +1,5 @@
-from ._async import HttpClientAsync
-from ._sync import HttpClient
+from ._async import AsyncHttpClient
+from ._sync import SyncHttpClient
 
 __all__ = [
     'HttpClient',

src/apify_client/_http_clients/__init__.py

@@ -8,14 +8,14 @@
 
 import impit
 
+from apify_client._consts import DEFAULT_MAX_RETRIES, DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS, DEFAULT_TIMEOUT_SECS
 from apify_client._http_clients._base import BaseHttpClient
 from apify_client._logging import log_context, logger_name
 from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Callable
 
-    from apify_client._config import ClientConfig
     from apify_client._consts import JsonSerializable
     from apify_client._statistics import ClientStatistics
 
@@ -24,22 +24,39 @@
 logger = logging.getLogger(logger_name)
 
 
-class HttpClientAsync(BaseHttpClient):
+class AsyncHttpClient(BaseHttpClient):
     """Asynchronous HTTP client for Apify API with automatic retries and exponential backoff."""
 
-    def __init__(self, config: ClientConfig, statistics: ClientStatistics | None = None) -> None:
+    def __init__(
+        self,
+        *,
+        token: str | None = None,
+        timeout_secs: int = DEFAULT_TIMEOUT_SECS,
+        max_retries: int = DEFAULT_MAX_RETRIES,
+        min_delay_between_retries_millis: int = DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS,
+        statistics: ClientStatistics | None = None,
+    ) -> None:
         """Initialize the asynchronous HTTP client.
 
         Args:
-            config: Client configuration with API URL, token, timeout, and retry settings.
+            token: Apify API token for authentication.
+            timeout_secs: Request timeout in seconds.
+            max_retries: Maximum number of retries for failed requests.
+            min_delay_between_retries_millis: Minimum delay between retries in milliseconds.
             statistics: Statistics tracker for API calls. Created automatically if not provided.
         """
-        super().__init__(config, statistics)
+        super().__init__(
+            token=token,
+            timeout_secs=timeout_secs,
+            max_retries=max_retries,
+            min_delay_between_retries_millis=min_delay_between_retries_millis,
+            statistics=statistics,
+        )
 
         self._impit_async_client = impit.AsyncClient(
             headers=self._headers,
             follow_redirects=True,
-            timeout=self._config.timeout_secs,
+            timeout=self._timeout_secs,
         )
 
     async def call(
@@ -92,8 +109,8 @@ async def call(
                 stream=stream,
                 timeout_secs=timeout_secs,
             ),
-            max_retries=self._config.max_retries,
-            backoff_base_millis=self._config.min_delay_between_retries_millis,
+            max_retries=self._max_retries,
+            backoff_base_millis=self._min_delay_between_retries_millis,
         )
 
     async def _make_request(