New client commit

Author: vdusek

src/apify/_actor.py

@@ -904,7 +904,7 @@ async def start(
             content_type=content_type,
             build=build,
             memory_mbytes=memory_mbytes,
-            timeout_secs=int(actor_start_timeout.total_seconds()) if actor_start_timeout is not None else None,
+            timeout=actor_start_timeout,
             wait_for_finish=wait_for_finish,
             webhooks=serialized_webhooks,
         )
@@ -1029,9 +1029,9 @@ async def call(
             content_type=content_type,
             build=build,
             memory_mbytes=memory_mbytes,
-            timeout_secs=int(actor_call_timeout.total_seconds()) if actor_call_timeout is not None else None,
+            timeout=actor_call_timeout,
             webhooks=serialized_webhooks,
-            wait_secs=int(wait.total_seconds()) if wait is not None else None,
+            wait_duration=wait,
             logger=logger,
         )
 
@@ -1105,9 +1105,9 @@ async def call_task(
             task_input=task_input,
             build=build,
             memory_mbytes=memory_mbytes,
-            timeout_secs=int(task_call_timeout.total_seconds()) if task_call_timeout is not None else None,
+            timeout=task_call_timeout,
             webhooks=serialized_webhooks,
-            wait_secs=int(wait.total_seconds()) if wait is not None else None,
+            wait_duration=wait,
         )
 
         if run is None:

src/apify/storage_clients/_apify/_alias_resolving.py

@@ -2,6 +2,7 @@
 
 import logging
 from asyncio import Lock
+from datetime import timedelta
 from logging import getLogger
 from typing import TYPE_CHECKING, ClassVar, Literal, overload
 
@@ -254,8 +255,8 @@ async def _get_default_kvs_client(configuration: Configuration) -> KeyValueStore
             token=configuration.token,
             api_url=configuration.api_base_url,
             max_retries=8,
-            min_delay_between_retries_millis=500,
-            timeout_secs=360,
+            min_delay_between_retries=timedelta(milliseconds=500),
+            timeout=timedelta(seconds=360),
         )
 
         if not configuration.default_key_value_store_id:

src/apify/storage_clients/_apify/_api_client_creation.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from datetime import timedelta
 from typing import TYPE_CHECKING, Literal, overload
 
 from apify_client import ApifyClientAsync
@@ -177,6 +178,6 @@ def _create_api_client(configuration: Configuration) -> ApifyClientAsync:
         api_url=configuration.api_base_url,
         api_public_url=configuration.api_public_base_url,
         max_retries=8,
-        min_delay_between_retries_millis=500,
-        timeout_secs=360,
+        min_delay_between_retries=timedelta(milliseconds=500),
+        timeout=timedelta(seconds=360),
     )

src/apify/storage_clients/_apify/_request_queue_shared_client.py

@@ -432,7 +432,7 @@ async def _list_head(
 
         # Otherwise fetch from API
         locked_queue_head = await self._api_client.list_and_lock_head(
-            lock_secs=int(self._DEFAULT_LOCK_TIME.total_seconds()),
+            lock_duration=self._DEFAULT_LOCK_TIME,
             limit=limit,
         )
 

tests/integration/actor/conftest.py

@@ -6,6 +6,7 @@
 import subprocess
 import sys
 import textwrap
+from datetime import timedelta
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Protocol
 
@@ -231,7 +232,7 @@ async def _make_actor(
             name=actor_name,
             default_run_build='latest',
             default_run_memory_mbytes=256,
-            default_run_timeout_secs=600,
+            default_run_timeout=timedelta(seconds=600),
             versions=[
                 {
                     'versionNumber': '0.0',
@@ -247,7 +248,7 @@ async def _make_actor(
         print(f'Building Actor {actor_name}...')
         build_result = await actor_client.build(version_number='0.0')
         build_client = client.build(build_result.id)
-        build_client_result = await build_client.wait_for_finish(wait_secs=600)
+        build_client_result = await build_client.wait_for_finish(wait_duration=timedelta(seconds=600))
 
         assert build_client_result is not None
         assert build_client_result.status.value == 'SUCCEEDED'
@@ -327,7 +328,7 @@ async def _run_actor(
         assert call_result is not None, 'Failed to start Actor run: missing run ID in the response.'
 
         run_client = apify_client_async.run(call_result.id)
-        client_actor_run = await run_client.wait_for_finish(wait_secs=600)
+        client_actor_run = await run_client.wait_for_finish(wait_duration=timedelta(seconds=600))
 
         assert client_actor_run is not None, 'Actor run did not finish successfully within the expected time.'
 

tests/integration/actor/test_actor_api_helpers.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import json
+from datetime import timedelta
 from typing import TYPE_CHECKING
 
 from apify_client._models import ActorPermissionLevel
@@ -147,7 +148,7 @@ async def main_outer() -> None:
 
     assert run_result_outer.status.value == 'SUCCEEDED'
 
-    await inner_actor.last_run().wait_for_finish(wait_secs=600)
+    await inner_actor.last_run().wait_for_finish(wait_duration=timedelta(seconds=600))
 
     inner_output_record = await inner_actor.last_run().key_value_store().get_record('OUTPUT')
     assert inner_output_record is not None
@@ -196,7 +197,7 @@ async def main_outer() -> None:
 
     assert run_result_outer.status.value == 'SUCCEEDED'
 
-    await inner_actor.last_run().wait_for_finish(wait_secs=600)
+    await inner_actor.last_run().wait_for_finish(wait_duration=timedelta(seconds=600))
 
     inner_output_record = await inner_actor.last_run().key_value_store().get_record('OUTPUT')
     assert inner_output_record is not None
@@ -252,7 +253,7 @@ async def main_outer() -> None:
 
     assert run_result_outer.status.value == 'SUCCEEDED'
 
-    await inner_actor.last_run().wait_for_finish(wait_secs=600)
+    await inner_actor.last_run().wait_for_finish(wait_duration=timedelta(seconds=600))
 
     inner_output_record = await inner_actor.last_run().key_value_store().get_record('OUTPUT')
     assert inner_output_record is not None
@@ -295,7 +296,7 @@ async def main_outer() -> None:
     assert run_result_outer.status.value == 'SUCCEEDED'
 
     inner_actor_run_client = inner_actor.last_run()
-    inner_actor_run = await inner_actor_run_client.wait_for_finish(wait_secs=600)
+    inner_actor_run = await inner_actor_run_client.wait_for_finish(wait_duration=timedelta(seconds=600))
 
     if inner_actor_run is None:
         raise AssertionError('Failed to get inner actor run after aborting it.')
@@ -477,7 +478,7 @@ async def main_client() -> None:
     assert ac_run_result.status.value == 'SUCCEEDED'
 
     sa_run_client = server_actor.last_run()
-    sa_run_client_run = await sa_run_client.wait_for_finish(wait_secs=600)
+    sa_run_client_run = await sa_run_client.wait_for_finish(wait_duration=timedelta(seconds=600))
 
     if sa_run_client_run is None:
         raise AssertionError('Failed to get server actor run after waiting for finish.')

tests/integration/actor/test_actor_request_queue.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+from datetime import timedelta
 from typing import TYPE_CHECKING
 
 from .._utils import generate_unique_resource_name
@@ -302,7 +303,7 @@ async def main() -> None:
     await run_client.resurrect()
 
     async with streamed_log:
-        run = await run_client.wait_for_finish(wait_secs=600)
+        run = await run_client.wait_for_finish(wait_duration=timedelta(seconds=600))
 
         if run is None:
             raise AssertionError('Failed to get resurrected run.')