Adapt to the new client's commits

Author: vdusek

src/apify/__init__.py

@@ -1,6 +1,6 @@
 from importlib import metadata
 
-from apify_client._models_generated import WebhookEventType
+from apify_client._literals import WebhookEventType
 from crawlee import Request
 from crawlee.events import (
     Event,

src/apify/_actor.py

@@ -43,7 +43,7 @@
     from types import TracebackType
     from typing import Self
 
-    from apify_client._models_generated import Run
+    from apify_client._models import Run
     from crawlee._types import JsonSerializable
     from crawlee.proxy_configuration import _NewUrlFunction
 

src/apify/_charging.py

@@ -7,7 +7,7 @@
 from decimal import Decimal
 from typing import TYPE_CHECKING, Protocol, TypedDict
 
-from apify_client._models_generated import (
+from apify_client._models import (
     FlatPricePerMonthActorPricingInfo,
     FreeActorPricingInfo,
     PayPerEventActorPricingInfo,

src/apify/_configuration.py

@@ -10,7 +10,7 @@
 from pydantic import AliasChoices, BeforeValidator, Field, model_validator
 from typing_extensions import TypedDict, deprecated
 
-from apify_client._models_generated import (
+from apify_client._models import (
     FlatPricePerMonthActorPricingInfo,
     FreeActorPricingInfo,
     PayPerEventActorPricingInfo,

src/apify/_models.py

@@ -4,7 +4,7 @@
 
 from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 
-from apify_client._models_generated import (
+from apify_client._models import (
     ExampleWebhookDispatch,
     WebhookCondition,
     WebhookStats,

src/apify/storage_clients/_apify/_models.py

@@ -11,7 +11,7 @@
 from apify._utils import docs_group
 
 if TYPE_CHECKING:
-    from apify_client._models_generated import LockedRequestQueueHead
+    from apify_client._models import LockedRequestQueueHead
 
 
 @docs_group('Storage data')

src/apify/storage_clients/_apify/_utils.py

@@ -10,8 +10,8 @@
 from apify import Request
 
 if TYPE_CHECKING:
-    from apify_client._models_generated import HeadRequest, LockedHeadRequest
-    from apify_client._models_generated import Request as ClientRequest
+    from apify_client._models import HeadRequest, LockedHeadRequest
+    from apify_client._models import Request as ClientRequest
 
     from apify import Configuration
 

tests/e2e/conftest.py

@@ -14,7 +14,6 @@
 from filelock import FileLock
 
 from apify_client import ApifyClient, ApifyClientAsync
-from apify_client._models_generated import ActorPermissionLevel, Run, VersionSourceType
 from crawlee import service_locator
 
 import apify._actor
@@ -26,6 +25,8 @@
     from collections.abc import Awaitable, Callable, Coroutine, Iterator, Mapping
     from decimal import Decimal
 
+    from apify_client._literals import ActorPermissionLevel
+    from apify_client._models import Run
     from apify_client._resource_clients import ActorClientAsync
 
 _TOKEN_ENV_VAR = 'APIFY_TEST_USER_API_TOKEN'
@@ -313,7 +314,7 @@ async def _make_actor(
                 {
                     'versionNumber': '0.0',
                     'buildTag': 'latest',
-                    'sourceType': VersionSourceType.SOURCE_FILES,
+                    'sourceType': 'SOURCE_FILES',
                     'sourceFiles': source_files_for_api,
                 }
             ],
@@ -327,7 +328,7 @@ async def _make_actor(
         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'
+        assert build_client_result.status == 'SUCCEEDED'
 
         # We only mark the client for cleanup if the build succeeded, so that if something goes wrong here,
         # you have a chance to check the error.

tests/e2e/test_actor_api_helpers.py

@@ -5,7 +5,6 @@
 from datetime import timedelta
 from typing import TYPE_CHECKING
 
-from apify_client._models_generated import ActorPermissionLevel
 from crawlee._utils.crypto import crypto_random_object_id
 
 from ._utils import generate_unique_resource_name
@@ -28,7 +27,7 @@ async def main() -> None:
     actor = await make_actor(label='is-at-home', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status.value == 'SUCCEEDED'
+    assert run_result.status == 'SUCCEEDED'
 
 
 async def test_actor_retrieves_env_vars(
@@ -52,7 +51,7 @@ async def main() -> None:
     actor = await make_actor(label='get-env', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status.value == 'SUCCEEDED'
+    assert run_result.status == 'SUCCEEDED'
 
 
 async def test_actor_creates_new_client_instance(
@@ -76,7 +75,7 @@ async def main() -> None:
     actor = await make_actor(label='new-client', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status.value == 'SUCCEEDED'
+    assert run_result.status == 'SUCCEEDED'
 
     output_record = await actor.last_run().key_value_store().get_record('OUTPUT')
     assert output_record is not None
@@ -95,13 +94,13 @@ async def main() -> None:
     actor = await make_actor(label='set-status-message', main_func=main)
     run_result_1 = await run_actor(actor)
 
-    assert run_result_1.status.value == 'SUCCEEDED'
+    assert run_result_1.status == 'SUCCEEDED'
     assert run_result_1.status_message == 'testing-status-message'
     assert run_result_1.is_status_message_terminal is None
 
     run_result_2 = await run_actor(actor, run_input={'is_terminal': True})
 
-    assert run_result_2.status.value == 'SUCCEEDED'
+    assert run_result_2.status == 'SUCCEEDED'
     assert run_result_2.status_message == 'testing-status-message'
     assert run_result_2.is_status_message_terminal is True
 
@@ -129,7 +128,7 @@ async def main_outer() -> None:
 
             inner_run_status = await Actor.apify_client.actor(inner_actor_id).last_run().get()
             assert inner_run_status is not None
-            assert inner_run_status.status.value in {'READY', 'RUNNING'}
+            assert inner_run_status.status in {'READY', 'RUNNING'}
 
     inner_actor = await make_actor(label='start-inner', main_func=main_inner)
     outer_actor = await make_actor(label='start-outer', main_func=main_outer)
@@ -145,7 +144,7 @@ async def main_outer() -> None:
         run_input={'test_value': test_value, 'inner_actor_id': inner_actor_id},
     )
 
-    assert run_result_outer.status.value == 'SUCCEEDED'
+    assert run_result_outer.status == 'SUCCEEDED'
 
     await inner_actor.last_run().wait_for_finish(wait_duration=timedelta(seconds=600))
 
@@ -178,7 +177,7 @@ async def main_outer() -> None:
             run_result_inner = await Actor.apify_client.actor(inner_actor_id).last_run().get()
 
             assert run_result_inner is not None
-            assert run_result_inner.status.value == 'SUCCEEDED'
+            assert run_result_inner.status == 'SUCCEEDED'
 
     inner_actor = await make_actor(label='call-inner', main_func=main_inner)
     outer_actor = await make_actor(label='call-outer', main_func=main_outer)
@@ -194,7 +193,7 @@ async def main_outer() -> None:
         run_input={'test_value': test_value, 'inner_actor_id': inner_actor_id},
     )
 
-    assert run_result_outer.status.value == 'SUCCEEDED'
+    assert run_result_outer.status == 'SUCCEEDED'
 
     await inner_actor.last_run().wait_for_finish(wait_duration=timedelta(seconds=600))
 
@@ -227,7 +226,7 @@ async def main_outer() -> None:
             run_result_inner = await Actor.apify_client.task(inner_task_id).last_run().get()
 
             assert run_result_inner is not None
-            assert run_result_inner.status.value == 'SUCCEEDED'
+            assert run_result_inner.status == 'SUCCEEDED'
 
     inner_actor = await make_actor(label='call-task-inner', main_func=main_inner)
     outer_actor = await make_actor(label='call-task-outer', main_func=main_outer)
@@ -247,10 +246,10 @@ async def main_outer() -> None:
     run_result_outer = await run_actor(
         outer_actor,
         run_input={'test_value': test_value, 'inner_task_id': task.id},
-        force_permission_level=ActorPermissionLevel.FULL_PERMISSIONS,
+        force_permission_level='FULL_PERMISSIONS',
     )
 
-    assert run_result_outer.status.value == 'SUCCEEDED'
+    assert run_result_outer.status == 'SUCCEEDED'
 
     await inner_actor.last_run().wait_for_finish(wait_duration=timedelta(seconds=600))
 
@@ -283,16 +282,16 @@ async def main_outer() -> None:
     inner_actor = await make_actor(label='abort-inner', main_func=main_inner)
     outer_actor = await make_actor(label='abort-outer', main_func=main_outer)
 
-    run_result_inner = await inner_actor.start(force_permission_level=ActorPermissionLevel.FULL_PERMISSIONS)
+    run_result_inner = await inner_actor.start(force_permission_level='FULL_PERMISSIONS')
     inner_run_id = run_result_inner.id
 
     run_result_outer = await run_actor(
         outer_actor,
         run_input={'inner_run_id': inner_run_id},
-        force_permission_level=ActorPermissionLevel.FULL_PERMISSIONS,
+        force_permission_level='FULL_PERMISSIONS',
     )
 
-    assert run_result_outer.status.value == 'SUCCEEDED'
+    assert run_result_outer.status == 'SUCCEEDED'
 
     inner_actor_run_client = inner_actor.last_run()
     inner_actor_run = await inner_actor_run_client.wait_for_finish(wait_duration=timedelta(seconds=600))
@@ -302,7 +301,7 @@ async def main_outer() -> None:
 
     inner_actor_last_run = inner_actor_run
 
-    assert inner_actor_last_run.status.value == 'ABORTED'
+    assert inner_actor_last_run.status == 'ABORTED'
 
     inner_output_record = await inner_actor.last_run().key_value_store().get_record('OUTPUT')
     assert inner_output_record is None
@@ -357,7 +356,7 @@ async def main_outer() -> None:
         run_input={'test_value': test_value, 'inner_actor_id': inner_actor_id},
     )
 
-    assert run_result_outer.status.value == 'SUCCEEDED'
+    assert run_result_outer.status == 'SUCCEEDED'
 
     outer_run_key_value_store = outer_actor.last_run().key_value_store()
 
@@ -395,7 +394,7 @@ async def main() -> None:
         run_input={'counter_key': 'reboot_counter'},
     )
 
-    assert run_result.status.value == 'SUCCEEDED'
+    assert run_result.status == 'SUCCEEDED'
 
     not_written_value = await actor.last_run().key_value_store().get_record('THIS_KEY_SHOULD_NOT_BE_WRITTEN')
     assert not_written_value is None
@@ -443,15 +442,15 @@ def do_POST(self) -> None:
             await Actor.set_value('WEBHOOK_BODY', webhook_body)
 
     async def main_client() -> None:
-        from apify import Webhook, WebhookEventType
+        from apify import Webhook
 
         async with Actor:
             actor_input = await Actor.get_input() or {}
             server_actor_container_url = str(actor_input.get('server_actor_container_url'))
 
             await Actor.add_webhook(
                 Webhook(
-                    event_types=[WebhookEventType.ACTOR_RUN_SUCCEEDED],
+                    event_types=['ACTOR.RUN.SUCCEEDED'],
                     request_url=server_actor_container_url,
                 )
             )
@@ -474,7 +473,7 @@ async def main_client() -> None:
         run_input={'server_actor_container_url': server_actor_container_url},
     )
 
-    assert ac_run_result.status.value == 'SUCCEEDED'
+    assert ac_run_result.status == 'SUCCEEDED'
 
     sa_run_client = server_actor.last_run()
     sa_run_client_run = await sa_run_client.wait_for_finish(wait_duration=timedelta(seconds=600))
@@ -484,7 +483,7 @@ async def main_client() -> None:
 
     sa_run_result = sa_run_client_run
 
-    assert sa_run_result.status.value == 'SUCCEEDED'
+    assert sa_run_result.status == 'SUCCEEDED'
 
     webhook_body_record = await server_actor.last_run().key_value_store().get_record('WEBHOOK_BODY')
     assert webhook_body_record is not None

tests/e2e/test_actor_call_timeouts.py

@@ -56,7 +56,7 @@ async def main() -> None:
     actor = await make_actor(label='inherit-timeout', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status.value == 'SUCCEEDED'
+    assert run_result.status == 'SUCCEEDED'
 
 
 async def test_actor_call_inherit_timeout(
@@ -108,4 +108,4 @@ async def main() -> None:
     actor = await make_actor(label='remaining-timeout', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status.value == 'SUCCEEDED'
+    assert run_result.status == 'SUCCEEDED'