New client commit

vdusek · vdusek · commit 9c44f3b2e201 · 2026-02-23T12:00:32.000+01:00
diff --git a/src/apify/_models.py b/src/apify/_models.py
@@ -6,7 +6,6 @@
 from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 
 from apify_client._models import ActorJobStatus, Run
-from crawlee._utils.models import timedelta_ms
 from crawlee._utils.urls import validate_http_url
 
 from apify._utils import docs_group
@@ -48,8 +47,6 @@ class WebhookStats(BaseModel):
 
     total_dispatches: Annotated[int, Field(alias='totalDispatches')]
 
-    from apify_client._models import Run
-
 
 @docs_group('Actor')
 class Webhook(BaseModel):
diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py
@@ -14,7 +14,7 @@
 from filelock import FileLock
 
 from apify_client import ApifyClient, ApifyClientAsync
-from apify_client._models import ActorJobStatus, ActorPermissionLevel, VersionSourceType
+from apify_client._models import ActorPermissionLevel, VersionSourceType
 from apify_shared.consts import ApifyEnvVars
 from crawlee import service_locator
 
@@ -49,7 +49,9 @@ def apify_client_async(apify_token: str) -> ApifyClientAsync:
     """Create an instance of the ApifyClientAsync."""
     api_url = os.getenv(_API_URL_ENV_VAR)
 
-    return ApifyClientAsync(apify_token, api_url=api_url)
+    if api_url is not None:
+        return ApifyClientAsync(apify_token, api_url=api_url)
+    return ApifyClientAsync(apify_token)
 
 
 @pytest.fixture
diff --git a/tests/e2e/test_actor_request_queue.py b/tests/e2e/test_actor_request_queue.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from datetime import timedelta
 from typing import TYPE_CHECKING
 
 from apify import Actor
@@ -32,14 +33,17 @@ async def main() -> None:
     actor = await make_actor(label='rq-clients-resurrection', main_func=main)
     run_result = await run_actor(actor)
     assert run_result.status == 'SUCCEEDED'
-
     # Resurrect the run, the RequestQueue should still use same client key and thus not have multiple clients.
     run_client = apify_client_async.run(run_id=run_result.id)
     # Redirect logs even from the resurrected run
     streamed_log = await run_client.get_streamed_log(from_start=False)
     await run_client.resurrect()
+
     async with streamed_log:
-        run_result = ActorRun.model_validate(await run_client.wait_for_finish(wait_secs=600))
+        raw_run_result = await run_client.wait_for_finish(wait_duration=timedelta(seconds=600))
+        assert raw_run_result is not None
+
+        run_result = ActorRun.from_client_actor_run(raw_run_result)
         assert run_result.status == 'SUCCEEDED'
 
 
diff --git a/tests/e2e/test_crawlee/conftest.py b/tests/e2e/test_crawlee/conftest.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from apify_client.clients.resource_clients import ActorClientAsync
+    from apify_client._resource_clients import ActorClientAsync
 
     from apify._models import ActorRun
 
diff --git a/tests/e2e/test_scrapy/conftest.py b/tests/e2e/test_scrapy/conftest.py
@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from apify_client.clients.resource_clients import ActorClientAsync
+    from apify_client._resource_clients import ActorClientAsync
 
     from apify._models import ActorRun
 
diff --git a/tests/integration/test_dataset.py b/tests/integration/test_dataset.py
@@ -117,7 +117,7 @@ async def test_force_cloud(
     try:
         dataset_details = await dataset_client.get()
         assert dataset_details is not None
-        assert dataset_details.get('name') == dataset_name
+        assert dataset_details.name == dataset_name
 
         dataset_items = await dataset_client.list_items()
         assert dataset_items.items == [dataset_item]
diff --git a/tests/integration/test_key_value_store.py b/tests/integration/test_key_value_store.py
@@ -156,7 +156,7 @@ async def test_force_cloud(
     try:
         key_value_store_details = await key_value_store_client.get()
         assert key_value_store_details is not None
-        assert key_value_store_details.get('name') == key_value_store_name
+        assert key_value_store_details.name == key_value_store_name
 
         key_value_store_record = await key_value_store_client.get_record('foo')
         assert key_value_store_record is not None
diff --git a/tests/integration/test_request_queue.py b/tests/integration/test_request_queue.py
@@ -703,7 +703,7 @@ async def test_request_deduplication_edge_cases(
     """Test edge cases in request deduplication."""
     rq_access_mode = request.node.callspec.params.get('request_queue_apify')
     if rq_access_mode == 'shared':
-        pytest.skip(reason='Test is flaky, see https://github.com/apify/apify-sdk-python/issues/786')  # ty: ignore[invalid-argument-type, parameter-already-assigned]
+        pytest.skip(reason='Test is flaky, see https://github.com/apify/apify-sdk-python/issues/786')
 
     rq = request_queue_apify
     Actor.log.info('Request queue opened')
diff --git a/tests/unit/actor/test_actor_helpers.py b/tests/unit/actor/test_actor_helpers.py
@@ -267,7 +267,7 @@ async def test_remote_method_with_timedelta_timeout(
     calls = apify_client_async_patcher.calls[client_resource][client_method]
     assert len(calls) == 1
     _, kwargs = calls[0][0], calls[0][1]
-    assert kwargs.get('timeout_secs') == 120
+    assert kwargs.get('timeout') == timedelta(seconds=120)
 
 
 async def test_call_actor_with_remaining_time_deprecation(
diff --git a/tests/unit/actor/test_actor_lifecycle.py b/tests/unit/actor/test_actor_lifecycle.py
@@ -302,7 +302,6 @@ async def handler(websocket: websockets.asyncio.server.ServerConnection) -> None
         assert event_data == EventPersistStateData(is_migrating=False)
 
 
-
 async def test_actor_fail_prevents_further_execution(caplog: pytest.LogCaptureFixture) -> None:
     """Test that calling Actor.fail() prevents further code execution in the Actor context."""
     caplog.set_level(logging.INFO)
diff --git a/tests/unit/storage_clients/test_apify_kvs_client.py b/tests/unit/storage_clients/test_apify_kvs_client.py
@@ -6,6 +6,8 @@
 
 import pytest
 
+from apify_client._models import ListOfKeys
+
 from apify.storage_clients._apify._key_value_store_client import ApifyKeyValueStoreClient
 
 
@@ -53,13 +55,18 @@ async def test_iterate_keys_single_page() -> None:
     """Test iterating keys with a single page of results."""
     api_client = AsyncMock()
     api_client.list_keys = AsyncMock(
-        return_value={
-            'items': [{'key': 'key1', 'size': 100}, {'key': 'key2', 'size': 200}],
-            'count': 2,
-            'limit': 1000,
-            'isTruncated': False,
-            'nextExclusiveStartKey': None,
-        }
+        return_value=ListOfKeys.model_validate(
+            {
+                'items': [
+                    {'key': 'key1', 'size': 100, 'recordPublicUrl': 'https://example.com/key1'},
+                    {'key': 'key2', 'size': 200, 'recordPublicUrl': 'https://example.com/key2'},
+                ],
+                'count': 2,
+                'limit': 1000,
+                'isTruncated': False,
+                'nextExclusiveStartKey': None,
+            }
+        )
     )
     client, _ = _make_kvs_client(api_client=api_client)
 
@@ -73,13 +80,17 @@ async def test_iterate_keys_with_limit() -> None:
     """Test that iterate_keys respects the limit parameter."""
     api_client = AsyncMock()
     api_client.list_keys = AsyncMock(
-        return_value={
-            'items': [{'key': f'key{i}', 'size': 100} for i in range(5)],
-            'count': 5,
-            'limit': 1000,
-            'isTruncated': True,
-            'nextExclusiveStartKey': 'key4',
-        }
+        return_value=ListOfKeys.model_validate(
+            {
+                'items': [
+                    {'key': f'key{i}', 'size': 100, 'recordPublicUrl': f'https://example.com/key{i}'} for i in range(5)
+                ],
+                'count': 5,
+                'limit': 1000,
+                'isTruncated': True,
+                'nextExclusiveStartKey': 'key4',
+            }
+        )
     )
     client, _ = _make_kvs_client(api_client=api_client)
 
@@ -89,20 +100,24 @@ async def test_iterate_keys_with_limit() -> None:
 
 async def test_iterate_keys_pagination() -> None:
     """Test that iterate_keys handles pagination across multiple pages."""
-    page1 = {
-        'items': [{'key': 'key1', 'size': 100}],
-        'count': 1,
-        'limit': 1000,
-        'isTruncated': True,
-        'nextExclusiveStartKey': 'key1',
-    }
-    page2 = {
-        'items': [{'key': 'key2', 'size': 200}],
-        'count': 1,
-        'limit': 1000,
-        'isTruncated': False,
-        'nextExclusiveStartKey': None,
-    }
+    page1 = ListOfKeys.model_validate(
+        {
+            'items': [{'key': 'key1', 'size': 100, 'recordPublicUrl': 'https://example.com/key1'}],
+            'count': 1,
+            'limit': 1000,
+            'isTruncated': True,
+            'nextExclusiveStartKey': 'key1',
+        }
+    )
+    page2 = ListOfKeys.model_validate(
+        {
+            'items': [{'key': 'key2', 'size': 200, 'recordPublicUrl': 'https://example.com/key2'}],
+            'count': 1,
+            'limit': 1000,
+            'isTruncated': False,
+            'nextExclusiveStartKey': None,
+        }
+    )
     api_client = AsyncMock()
     api_client.list_keys = AsyncMock(side_effect=[page1, page2])
     client, _ = _make_kvs_client(api_client=api_client)
diff --git a/uv.lock b/uv.lock
