More polishment

Author: vdusek

src/apify_client/_apify_client.py

@@ -87,15 +87,14 @@ def __init__(
             min_delay_between_retries_millis=min_delay_between_retries_millis,
             timeout_secs=timeout_secs,
         )
-
-        self.stats = ClientStatistics()
-        self.http_client = HttpClient(config=self._config, stats=self.stats)
+        self._statistics = ClientStatistics()
+        self._http_client = HttpClient(config=self._config, statistics=self._statistics)
 
     def _options(self) -> dict:
         return {
             'base_url': self._config.base_url,
             'public_base_url': self._config.public_base_url,
-            'http_client': self.http_client,
+            'http_client': self._http_client,
         }
 
     def actor(self, actor_id: str) -> ActorClient:
@@ -274,15 +273,14 @@ def __init__(
             min_delay_between_retries_millis=min_delay_between_retries_millis,
             timeout_secs=timeout_secs,
         )
-
-        self.stats = ClientStatistics()
-        self.http_client = HttpClientAsync(config=self._config, stats=self.stats)
+        self._statistics = ClientStatistics()
+        self._http_client = HttpClientAsync(config=self._config, statistics=self._statistics)
 
     def _options(self) -> dict:
         return {
             'base_url': self._config.base_url,
             'public_base_url': self._config.public_base_url,
-            'http_client': self.http_client,
+            'http_client': self._http_client,
         }
 
     def actor(self, actor_id: str) -> ActorClientAsync:

src/apify_client/_http_client.py

@@ -33,15 +33,15 @@
 class _BaseHttpClient:
     """Base class for HTTP clients with shared configuration and utilities."""
 
-    def __init__(self, config: ClientConfig, stats: ClientStatistics | None = None) -> None:
+    def __init__(self, config: ClientConfig, statistics: ClientStatistics | None = None) -> None:
         """Initialize HTTP client with configuration.
 
         Args:
             config: Immutable client configuration.
-            stats: Optional statistics tracker.
+            statistics: Optional statistics tracker.
         """
-        self.config = config
-        self.stats = stats or ClientStatistics()
+        self._config = config
+        self._statistics = statistics or ClientStatistics()
 
         # Build headers
         headers = {'Accept': 'application/json, */*'}
@@ -161,7 +161,7 @@ def call(
         log_context.method.set(method)
         log_context.url.set(url)
 
-        self.stats.calls += 1
+        self._statistics.calls += 1
 
         headers, params, content = self._prepare_request_call(headers, params, data, json)
 
@@ -171,11 +171,13 @@ def _make_request(stop_retrying: Callable, attempt: int) -> impit.Response:
             log_context.attempt.set(attempt)
             logger.debug('Sending request')
 
-            self.stats.requests += 1
+            self._statistics.requests += 1
 
             try:
                 # Increase timeout with each attempt. Max timeout is bounded by the client timeout.
-                timeout = min(self.config.timeout_secs, (timeout_secs or self.config.timeout_secs) * 2 ** (attempt - 1))
+                timeout = min(
+                    self._config.timeout_secs, (timeout_secs or self._config.timeout_secs) * 2 ** (attempt - 1)
+                )
 
                 url_with_params = self._build_url_with_params(url, params)
 
@@ -195,7 +197,7 @@ def _make_request(stop_retrying: Callable, attempt: int) -> impit.Response:
                     return response
 
                 if response.status_code == HTTPStatus.TOO_MANY_REQUESTS:
-                    self.stats.add_rate_limit_error(attempt)
+                    self._statistics.add_rate_limit_error(attempt)
 
             except Exception as exc:
                 logger.debug('Request threw exception', exc_info=exc)
@@ -217,8 +219,8 @@ def _make_request(stop_retrying: Callable, attempt: int) -> impit.Response:
 
         return retry_with_exp_backoff(
             _make_request,
-            max_retries=self.config.max_retries,
-            backoff_base_millis=self.config.min_delay_between_retries_millis,
+            max_retries=self._config.max_retries,
+            backoff_base_millis=self._config.min_delay_between_retries_millis,
             backoff_factor=DEFAULT_BACKOFF_EXPONENTIAL_FACTOR,
             random_factor=DEFAULT_BACKOFF_RANDOM_FACTOR,
         )
@@ -240,7 +242,7 @@ async def call(
         log_context.method.set(method)
         log_context.url.set(url)
 
-        self.stats.calls += 1
+        self._statistics.calls += 1
 
         headers, params, content = self._prepare_request_call(headers, params, data, json)
 
@@ -251,7 +253,9 @@ async def _make_request(stop_retrying: Callable, attempt: int) -> impit.Response
             logger.debug('Sending request')
             try:
                 # Increase timeout with each attempt. Max timeout is bounded by the client timeout.
-                timeout = min(self.config.timeout_secs, (timeout_secs or self.config.timeout_secs) * 2 ** (attempt - 1))
+                timeout = min(
+                    self._config.timeout_secs, (timeout_secs or self._config.timeout_secs) * 2 ** (attempt - 1)
+                )
 
                 url_with_params = self._build_url_with_params(url, params)
 
@@ -271,7 +275,7 @@ async def _make_request(stop_retrying: Callable, attempt: int) -> impit.Response
                     return response
 
                 if response.status_code == HTTPStatus.TOO_MANY_REQUESTS:
-                    self.stats.add_rate_limit_error(attempt)
+                    self._statistics.add_rate_limit_error(attempt)
 
             except Exception as exc:
                 logger.debug('Request threw exception', exc_info=exc)
@@ -293,8 +297,8 @@ async def _make_request(stop_retrying: Callable, attempt: int) -> impit.Response
 
         return await retry_with_exp_backoff_async(
             _make_request,
-            max_retries=self.config.max_retries,
-            backoff_base_millis=self.config.min_delay_between_retries_millis,
+            max_retries=self._config.max_retries,
+            backoff_base_millis=self._config.min_delay_between_retries_millis,
             backoff_factor=DEFAULT_BACKOFF_EXPONENTIAL_FACTOR,
             random_factor=DEFAULT_BACKOFF_RANDOM_FACTOR,
         )

src/apify_client/_logging.py

@@ -115,7 +115,7 @@ def _injects_client_details_to_log_context(fun: Callable) -> Callable:
         @functools.wraps(fun)
         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)
+            log_context.resource_id.set(resource_client._resource_id)  # noqa: SLF001
 
             return await fun(resource_client, *args, **kwargs)
 
@@ -126,7 +126,7 @@ async def async_wrapper(resource_client: _BaseClient, *args: Any, **kwargs: Any)
         @functools.wraps(fun)
         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)
+            log_context.resource_id.set(resource_client._resource_id)  # noqa: SLF001
 
             async for item in fun(resource_client, *args, **kwargs):
                 yield item
@@ -136,7 +136,7 @@ async def async_generator_wrapper(resource_client: _BaseClient, *args: Any, **kw
     @functools.wraps(fun)
     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)
+        log_context.resource_id.set(resource_client._resource_id)  # noqa: SLF001
 
         return fun(resource_client, *args, **kwargs)
 

src/apify_client/_resource_clients/_resource_client.py

@@ -61,32 +61,18 @@ def __init__(
         self._default_params = params or {}
         self._resource_path = resource_path
         self._resource_id = resource_id
-        self._resource_url = f'{self._base_url}/{self._resource_path}'
-        if self._resource_id is not None:
-            self._safe_id = to_safe_id(self._resource_id)
-            self._resource_url = f'{self._resource_url}/{self._safe_id}'
-
-    @property
-    def http_client(self) -> HttpClient:
-        """HTTP client for making API requests."""
-        return self._http_client
 
     @property
-    def url(self) -> str:
-        """Full URL of this resource."""
-        return self._resource_url
+    def _resource_url(self) -> str:
+        resource_url = f'{self._base_url}/{self._resource_path}'
 
-    @property
-    def params(self) -> dict:
-        """Default parameters for requests."""
-        return self._default_params
+        if self._resource_id is not None:
+            safe_id = to_safe_id(self._resource_id)
+            resource_url = f'{resource_url}/{safe_id}'
 
-    @property
-    def resource_id(self) -> str | None:
-        """ID of the manipulated resource."""
-        return self._resource_id
+        return resource_url
 
-    def _url(
+    def _build_url(
         self,
         path: str | None = None,
         *,
@@ -251,32 +237,18 @@ def __init__(
         self._default_params = params or {}
         self._resource_path = resource_path
         self._resource_id = resource_id
-        self._resource_url = f'{self._base_url}/{self._resource_path}'
-        if self._resource_id is not None:
-            self._safe_id = to_safe_id(self._resource_id)
-            self._resource_url = f'{self._resource_url}/{self._safe_id}'
-
-    @property
-    def http_client(self) -> HttpClientAsync:
-        """HTTP client for making API requests."""
-        return self._http_client
 
     @property
-    def url(self) -> str:
-        """Full URL of this resource."""
-        return self._resource_url
+    def _resource_url(self) -> str:
+        resource_url = f'{self._base_url}/{self._resource_path}'
 
-    @property
-    def params(self) -> dict:
-        """Default parameters for requests."""
-        return self._default_params
+        if self._resource_id is not None:
+            safe_id = to_safe_id(self._resource_id)
+            resource_url = f'{resource_url}/{safe_id}'
 
-    @property
-    def resource_id(self) -> str | None:
-        """ID of the manipulated resource."""
-        return self._resource_id
+        return resource_url
 
-    def _url(
+    def _build_url(
         self,
         path: str | None = None,
         *,