Utilize to_seconds helper

Author: vdusek

src/apify_client/_http_clients/_async.py

@@ -12,6 +12,7 @@
 from apify_client._consts import DEFAULT_MAX_RETRIES, DEFAULT_MIN_DELAY_BETWEEN_RETRIES, DEFAULT_TIMEOUT
 from apify_client._http_clients._base import BaseHttpClient
 from apify_client._logging import log_context, logger_name
+from apify_client._utils import to_seconds
 from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
@@ -57,7 +58,7 @@ def __init__(
         self._impit_async_client = impit.AsyncClient(
             headers=self._headers,
             follow_redirects=True,
-            timeout=self._timeout.total_seconds(),
+            timeout=to_seconds(self._timeout),
         )
 
     async def call(
@@ -230,7 +231,7 @@ def stop_retrying() -> None:
                     raise
 
             random_sleep_factor = random.uniform(1, 1 + random_factor)
-            backoff_base_secs = backoff_base.total_seconds()
+            backoff_base_secs = to_seconds(backoff_base)
             backoff_exp_factor = backoff_factor ** (attempt - 1)
 
             sleep_time_secs = random_sleep_factor * backoff_base_secs * backoff_exp_factor

src/apify_client/_http_clients/_base.py

@@ -13,6 +13,7 @@
 
 from apify_client._consts import DEFAULT_MAX_RETRIES, DEFAULT_MIN_DELAY_BETWEEN_RETRIES, DEFAULT_TIMEOUT
 from apify_client._statistics import ClientStatistics
+from apify_client._utils import to_seconds
 from apify_client.errors import InvalidResponseBodyError
 
 if TYPE_CHECKING:
@@ -149,6 +150,6 @@ def _build_url_with_params(self, url: str, params: dict[str, Any] | None = None)
 
     def _calculate_timeout(self, attempt: int, timeout: timedelta | None = None) -> float:
         """Calculate timeout for a request attempt with exponential increase, bounded by client timeout."""
-        timeout_secs = (timeout or self._timeout).total_seconds()
-        client_timeout_secs = self._timeout.total_seconds()
+        timeout_secs = to_seconds(timeout or self._timeout)
+        client_timeout_secs = to_seconds(self._timeout)
         return min(client_timeout_secs, timeout_secs * 2 ** (attempt - 1))

src/apify_client/_http_clients/_sync.py

@@ -12,6 +12,7 @@
 from apify_client._consts import DEFAULT_MAX_RETRIES, DEFAULT_MIN_DELAY_BETWEEN_RETRIES, DEFAULT_TIMEOUT
 from apify_client._http_clients._base import BaseHttpClient
 from apify_client._logging import log_context, logger_name
+from apify_client._utils import to_seconds
 from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
@@ -57,7 +58,7 @@ def __init__(
         self._impit_client = impit.Client(
             headers=self._headers,
             follow_redirects=True,
-            timeout=self._timeout.total_seconds(),
+            timeout=to_seconds(self._timeout),
         )
 
     def call(
@@ -230,7 +231,7 @@ def stop_retrying() -> None:
                     raise
 
             random_sleep_factor = random.uniform(1, 1 + random_factor)
-            backoff_base_secs = backoff_base.total_seconds()
+            backoff_base_secs = to_seconds(backoff_base)
             backoff_exp_factor = backoff_factor ** (attempt - 1)
 
             sleep_time_secs = random_sleep_factor * backoff_base_secs * backoff_exp_factor

src/apify_client/_representations.py

@@ -8,9 +8,7 @@
 
 from typing import TYPE_CHECKING, Any
 
-from typing_extensions import overload
-
-from apify_client._utils import enum_to_value
+from apify_client._utils import enum_to_value, to_seconds
 
 if TYPE_CHECKING:
     from datetime import timedelta
@@ -19,24 +17,6 @@
     from apify_client._models import ActorPermissionLevel, VersionSourceType
 
 
-@overload
-def to_seconds(td: timedelta) -> int: ...
-@overload
-def to_seconds(td: None) -> None: ...
-
-
-def to_seconds(td: timedelta | None) -> int | None:
-    """Convert timedelta to seconds.
-
-    Args:
-        td: The timedelta to convert, or None.
-
-    Returns:
-        The total seconds as an integer, or None if input is None.
-    """
-    return int(td.total_seconds()) if td is not None else None
-
-
 def build_actor_standby_dict(
     *,
     is_enabled: bool | None = None,

src/apify_client/_resource_clients/_resource_client.py

@@ -9,8 +9,7 @@
 
 from apify_client._consts import DEFAULT_WAIT_FOR_FINISH, DEFAULT_WAIT_WHEN_JOB_NOT_EXIST, ActorJobStatus
 from apify_client._logging import WithLogDetailsClient
-from apify_client._representations import to_seconds
-from apify_client._utils import catch_not_found_or_throw, response_to_dict, to_safe_id
+from apify_client._utils import catch_not_found_or_throw, response_to_dict, to_safe_id, to_seconds
 from apify_client.errors import ApifyApiError, ApifyClientError
 
 if TYPE_CHECKING:
@@ -171,7 +170,7 @@ def _wait_for_finish(
                 )
                 job_response = response_to_dict(response)
                 job = job_response.get('data') if isinstance(job_response, dict) else job_response
-                seconds_elapsed = (datetime.now(timezone.utc) - started_at).total_seconds()
+                seconds_elapsed = to_seconds(datetime.now(timezone.utc) - started_at)
 
                 if not isinstance(job, dict):
                     raise ApifyClientError(
@@ -193,7 +192,7 @@ def _wait_for_finish(
 
                 # If there are still not found errors after DEFAULT_WAIT_WHEN_JOB_NOT_EXIST, we give up
                 # and return None. In such case, the requested record probably really doesn't exist.
-                if seconds_elapsed > DEFAULT_WAIT_WHEN_JOB_NOT_EXIST.total_seconds():
+                if seconds_elapsed > to_seconds(DEFAULT_WAIT_WHEN_JOB_NOT_EXIST):
                     return None
 
             # It might take some time for database replicas to get up-to-date so sleep a bit before retrying
@@ -340,10 +339,10 @@ async def _wait_for_finish(
         should_repeat = True
         job: dict | None = None
         seconds_elapsed = 0.0
-        wait_secs = wait_duration.total_seconds() if wait_duration is not None else None
+        wait_secs = to_seconds(wait_duration)
 
         while should_repeat:
-            wait_for_finish = int(DEFAULT_WAIT_FOR_FINISH.total_seconds())
+            wait_for_finish = to_seconds(DEFAULT_WAIT_FOR_FINISH)
             if wait_secs is not None:
                 wait_for_finish = int(wait_secs - seconds_elapsed)
 
@@ -362,7 +361,7 @@ async def _wait_for_finish(
                         f'Expected dict with "status" field, got: {type(job).__name__}'
                     )
 
-                seconds_elapsed = (datetime.now(timezone.utc) - started_at).total_seconds()
+                seconds_elapsed = to_seconds(datetime.now(timezone.utc) - started_at)
                 is_terminal = ActorJobStatus(job['status']).is_terminal
                 is_timed_out = wait_secs is not None and seconds_elapsed >= wait_secs
                 if is_terminal or is_timed_out:
@@ -377,7 +376,7 @@ async def _wait_for_finish(
 
                 # If there are still not found errors after DEFAULT_WAIT_WHEN_JOB_NOT_EXIST, we give up
                 # and return None. In such case, the requested record probably really doesn't exist.
-                if seconds_elapsed > DEFAULT_WAIT_WHEN_JOB_NOT_EXIST.total_seconds():
+                if seconds_elapsed > to_seconds(DEFAULT_WAIT_WHEN_JOB_NOT_EXIST):
                     return None
 
             # It might take some time for database replicas to get up-to-date so sleep a bit before retrying

src/apify_client/_resource_clients/actor.py

@@ -22,6 +22,7 @@
     enum_to_value,
     filter_none_values,
     response_to_dict,
+    to_seconds,
 )
 from apify_client.errors import ApifyApiError
 
@@ -266,7 +267,7 @@ def start(
             maxTotalChargeUsd=max_total_charge_usd,
             restartOnError=restart_on_error,
             memory=memory_mbytes,
-            timeout=int(timeout.total_seconds()) if timeout is not None else None,
+            timeout=to_seconds(timeout),
             waitForFinish=wait_for_finish,
             forcePermissionLevel=force_permission_level.value if force_permission_level is not None else None,
             webhooks=encode_webhook_list_to_base64(webhooks) if webhooks is not None else None,
@@ -744,7 +745,7 @@ async def start(
             maxTotalChargeUsd=max_total_charge_usd,
             restartOnError=restart_on_error,
             memory=memory_mbytes,
-            timeout=int(timeout.total_seconds()) if timeout is not None else None,
+            timeout=to_seconds(timeout),
             waitForFinish=wait_for_finish,
             forcePermissionLevel=force_permission_level.value if force_permission_level is not None else None,
             webhooks=encode_webhook_list_to_base64(webhooks) if webhooks is not None else None,

src/apify_client/_resource_clients/dataset.py

@@ -685,7 +685,7 @@ def create_items_public_url(
             signature = create_storage_content_signature(
                 resource_id=dataset.id,
                 url_signing_secret_key=dataset.url_signing_secret_key,
-                expires_in_millis=int(expires_in.total_seconds() * 1000) if expires_in is not None else None,
+                expires_in=expires_in,
             )
             request_params['signature'] = signature
 
@@ -1233,7 +1233,7 @@ async def create_items_public_url(
             signature = create_storage_content_signature(
                 resource_id=dataset.id,
                 url_signing_secret_key=dataset.url_signing_secret_key,
-                expires_in_millis=int(expires_in.total_seconds() * 1000) if expires_in is not None else None,
+                expires_in=expires_in,
             )
             request_params['signature'] = signature
 

src/apify_client/_resource_clients/key_value_store.py

@@ -456,7 +456,7 @@ def create_keys_public_url(
             signature = create_storage_content_signature(
                 resource_id=metadata.id,
                 url_signing_secret_key=metadata.url_signing_secret_key,
-                expires_in_millis=int(expires_in.total_seconds() * 1000) if expires_in is not None else None,
+                expires_in=expires_in,
             )
             request_params['signature'] = signature
 
@@ -865,7 +865,7 @@ async def create_keys_public_url(
             signature = create_storage_content_signature(
                 resource_id=metadata.id,
                 url_signing_secret_key=metadata.url_signing_secret_key,
-                expires_in_millis=int(expires_in.total_seconds() * 1000) if expires_in is not None else None,
+                expires_in=expires_in,
             )
             request_params['signature'] = signature
 

src/apify_client/_resource_clients/log.py

@@ -14,7 +14,7 @@
 from typing_extensions import Self
 
 from apify_client._resource_clients._resource_client import ResourceClient, ResourceClientAsync
-from apify_client._utils import catch_not_found_or_throw
+from apify_client._utils import catch_not_found_or_throw, to_seconds
 from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
@@ -403,7 +403,7 @@ def __init__(self, *, to_logger: logging.Logger, check_period: timedelta = timed
         if self._force_propagate:
             to_logger.propagate = True
         self._to_logger = to_logger
-        self._check_period = check_period.total_seconds()
+        self._check_period = to_seconds(check_period)
         self._last_status_message = ''
 
     def _log_run_data(self, run_data: Run | None) -> bool:

src/apify_client/_resource_clients/request_queue.py

@@ -36,7 +36,7 @@
     UnlockRequestsResult,
 )
 from apify_client._resource_clients._resource_client import ResourceClient, ResourceClientAsync
-from apify_client._utils import catch_not_found_or_throw, filter_none_values, response_to_dict
+from apify_client._utils import catch_not_found_or_throw, filter_none_values, response_to_dict, to_seconds
 from apify_client.errors import ApifyApiError
 
 if TYPE_CHECKING:
@@ -169,9 +169,7 @@ def list_and_lock_head(self, *, lock_duration: timedelta, limit: int | None = No
         Returns:
             The desired number of locked requests from the beginning of the queue.
         """
-        request_params = self._build_params(
-            lockSecs=int(lock_duration.total_seconds()), limit=limit, clientKey=self.client_key
-        )
+        request_params = self._build_params(lockSecs=to_seconds(lock_duration), limit=limit, clientKey=self.client_key)
 
         response = self._http_client.call(
             url=self._build_url('head/lock'),
@@ -297,7 +295,7 @@ def prolong_request_lock(
             lock_duration: By how much to prolong the lock.
         """
         request_params = self._build_params(
-            clientKey=self.client_key, forefront=forefront, lockSecs=int(lock_duration.total_seconds())
+            clientKey=self.client_key, forefront=forefront, lockSecs=to_seconds(lock_duration)
         )
 
         response = self._http_client.call(
@@ -598,9 +596,7 @@ async def list_and_lock_head(self, *, lock_duration: timedelta, limit: int | Non
         Returns:
             The desired number of locked requests from the beginning of the queue.
         """
-        request_params = self._build_params(
-            lockSecs=int(lock_duration.total_seconds()), limit=limit, clientKey=self.client_key
-        )
+        request_params = self._build_params(lockSecs=to_seconds(lock_duration), limit=limit, clientKey=self.client_key)
 
         response = await self._http_client.call(
             url=self._build_url('head/lock'),
@@ -724,7 +720,7 @@ async def prolong_request_lock(
             lock_duration: By how much to prolong the lock.
         """
         request_params = self._build_params(
-            clientKey=self.client_key, forefront=forefront, lockSecs=int(lock_duration.total_seconds())
+            clientKey=self.client_key, forefront=forefront, lockSecs=to_seconds(lock_duration)
         )
 
         response = await self._http_client.call(