New client commit and test fixes

Author: vdusek

docs/02_concepts/code/07_webhook.py

@@ -7,7 +7,7 @@ async def main() -> None:
     async with Actor:
         # Create a webhook that will be triggered when the Actor run fails.
         webhook = Webhook(
-            event_types=['ACTOR.RUN.FAILED'],  # ty: ignore[invalid-argument-type]
+            event_types=['ACTOR.RUN.FAILED'],
             request_url='https://example.com/run-failed',
         )
 

docs/02_concepts/code/07_webhook_preventing.py

@@ -7,7 +7,7 @@ async def main() -> None:
     async with Actor:
         # Create a webhook that will be triggered when the Actor run fails.
         webhook = Webhook(
-            event_types=['ACTOR.RUN.FAILED'],  # ty: ignore[invalid-argument-type]
+            event_types=['ACTOR.RUN.FAILED'],
             request_url='https://example.com/run-failed',
         )
 

src/apify/_models.py

@@ -6,7 +6,7 @@
 
 from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 
-from apify_client._models import ActorJobStatus, RunOrigin, WebhookEventType
+from apify_client._models import ActorJobStatus
 from crawlee._utils.models import timedelta_ms
 from crawlee._utils.urls import validate_http_url
 
@@ -18,10 +18,10 @@
 
 @docs_group('Actor')
 class Webhook(BaseModel):
-    __model_config__ = ConfigDict(populate_by_name=True)
+    __model_config__ = ConfigDict(populate_by_name=True, use_enum_values=True)
 
     event_types: Annotated[
-        list[WebhookEventType],
+        list[str],
         Field(description='Event types that should trigger the webhook'),
     ]
     request_url: Annotated[
@@ -37,9 +37,9 @@ class Webhook(BaseModel):
 
 @docs_group('Actor')
 class ActorRunMeta(BaseModel):
-    __model_config__ = ConfigDict(populate_by_name=True)
+    __model_config__ = ConfigDict(populate_by_name=True, use_enum_values=True)
 
-    origin: Annotated[RunOrigin, Field()]
+    origin: Annotated[str, Field()]
 
 
 @docs_group('Actor')
@@ -96,7 +96,7 @@ class ActorRunUsage(BaseModel):
 class ActorRun(BaseModel):
     """Represents an Actor run and its associated data."""
 
-    __model_config__ = ConfigDict(populate_by_name=True)
+    __model_config__ = ConfigDict(populate_by_name=True, use_enum_values=True)
 
     id: Annotated[str, Field(alias='id')]
     """Unique identifier of the Actor run."""

tests/integration/README.md

@@ -52,7 +52,7 @@ async def test_something(
     actor = await make_actor(label='something', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 ```
 
 These Actors will have the `src/main.py` file set to the `main` function definition, prepended with `import asyncio` and `from apify import Actor`, for your convenience.
@@ -74,7 +74,7 @@ async def test_something(
     actor = await make_actor(label='something', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 ```
 
 #### Creating Actor from source files
@@ -135,7 +135,7 @@ async def test_something(
     actor = await make_actor(label='something', source_files=actor_source_files)
     actor_run = await run_actor(actor)
 
-    assert actor_run.status == 'SUCCEEDED'
+    assert actor_run.status.value == 'SUCCEEDED'
 ```
 
 #### Asserts
@@ -158,5 +158,5 @@ async def test_add_and_fetch_requests(
     actor = await make_actor(label='rq-test', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 ```

tests/integration/actor/conftest.py

@@ -13,7 +13,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 .._utils import generate_unique_resource_name
 from apify._models import ActorRun
@@ -230,7 +230,7 @@ async def _make_actor(
                 {
                     'versionNumber': '0.0',
                     'buildTag': 'latest',
-                    'sourceType': VersionSourceType.SOURCE_FILES,
+                    'sourceType': VersionSourceType.SOURCE_FILES.value,
                     'sourceFiles': source_files_for_api,
                 }
             ],
@@ -244,7 +244,7 @@ async def _make_actor(
         build_client_result = await build_client.wait_for_finish(wait_secs=600)
 
         assert build_client_result is not None
-        assert build_client_result.status == ActorJobStatus.SUCCEEDED
+        assert build_client_result.status.value == '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/integration/actor/test_actor_api_helpers.py

@@ -4,7 +4,7 @@
 import json
 from typing import TYPE_CHECKING
 
-from apify_client._models import ActorPermissionLevel
+from apify_client._models import ActorJobStatus, ActorPermissionLevel
 from crawlee._utils.crypto import crypto_random_object_id
 
 from .._utils import generate_unique_resource_name
@@ -28,7 +28,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 == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
 
 async def test_actor_retrieves_env_vars(
@@ -52,7 +52,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 == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
 
 async def test_actor_creates_new_client_instance(
@@ -76,7 +76,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 == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
     output_record = await actor.last_run().key_value_store().get_record('OUTPUT')
     assert output_record is not None
@@ -129,7 +129,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 in ['READY', 'RUNNING']
+            assert inner_run_status.status.value 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)
@@ -175,9 +175,10 @@ async def main_outer() -> None:
 
             await Actor.call(inner_actor_id, run_input={'test_value': test_value})
 
-            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 == 'SUCCEEDED'
+            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'
 
     inner_actor = await make_actor(label='call-inner', main_func=main_inner)
     outer_actor = await make_actor(label='call-outer', main_func=main_outer)
@@ -223,9 +224,10 @@ async def main_outer() -> None:
 
             await Actor.call_task(inner_task_id)
 
-            inner_run_status = await Actor.apify_client.task(inner_task_id).last_run().get()
-            assert inner_run_status is not None
-            assert inner_run_status.status == 'SUCCEEDED'
+            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'
 
     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)
@@ -248,7 +250,7 @@ async def main_outer() -> None:
         force_permission_level=ActorPermissionLevel.FULL_PERMISSIONS,
     )
 
-    assert run_result_outer.status == 'SUCCEEDED'
+    assert run_result_outer.status.value == 'SUCCEEDED'
 
     await inner_actor.last_run().wait_for_finish(wait_secs=600)
 
@@ -301,7 +303,7 @@ async def main_outer() -> None:
     inner_actor_run_dict = inner_actor_run.model_dump(by_alias=True)
     inner_actor_last_run = ActorRun.model_validate(inner_actor_run_dict)
 
-    assert inner_actor_last_run.status == 'ABORTED'
+    assert inner_actor_last_run.status == ActorJobStatus.ABORTED
 
     inner_output_record = await inner_actor.last_run().key_value_store().get_record('OUTPUT')
     assert inner_output_record is None
@@ -394,7 +396,7 @@ async def main() -> None:
         run_input={'counter_key': 'reboot_counter'},
     )
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == '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
@@ -450,7 +452,7 @@ async def main_client() -> None:
 
             await Actor.add_webhook(
                 Webhook(
-                    event_types=[WebhookEventType.ACTOR_RUN_SUCCEEDED],
+                    event_types=[WebhookEventType.ACTOR_RUN_SUCCEEDED.value],
                     request_url=server_actor_container_url,
                 )
             )

tests/integration/actor/test_actor_call_timeouts.py

@@ -53,7 +53,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 == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
 
 async def test_actor_call_inherit_timeout(
@@ -102,4 +102,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 == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'

tests/integration/actor/test_actor_charge.py

@@ -6,8 +6,6 @@
 
 import pytest_asyncio
 
-from apify_client._models import ActorJobStatus
-
 from apify import Actor
 from apify._models import ActorRun
 
@@ -91,7 +89,7 @@ async def test_actor_charge_basic(
         run = ActorRun.model_validate(updated_run_dict)
 
         try:
-            assert run.status == ActorJobStatus.SUCCEEDED
+            assert run.status == 'SUCCEEDED'
             assert run.charged_event_counts == {'foobar': 4}
             break
         except AssertionError:
@@ -104,22 +102,22 @@ async def test_actor_charge_limit(
     run_actor: RunActorFunction,
     apify_client_async: ApifyClientAsync,
 ) -> None:
-    run = await run_actor(ppe_actor, max_total_charge_usd=Decimal('0.2'))
+    run_result = await run_actor(ppe_actor, max_total_charge_usd=Decimal('0.2'))
 
     # Refetch until the platform gets its act together
     for is_last_attempt, _ in retry_counter(30):
         await asyncio.sleep(1)
 
-        run_client = apify_client_async.run(run.id)
+        run_client = apify_client_async.run(run_result.id)
         updated_run = await run_client.get()
         assert updated_run is not None, 'Updated run should not be None'
 
         updated_run_dict = updated_run.model_dump(by_alias=True)
-        run = ActorRun.model_validate(updated_run_dict)
+        run_result = ActorRun.model_validate(updated_run_dict)
 
         try:
-            assert run.status == ActorJobStatus.SUCCEEDED
-            assert run.charged_event_counts == {'foobar': 2}
+            assert run_result.status.value == 'SUCCEEDED'
+            assert run_result.charged_event_counts == {'foobar': 2}
             break
         except AssertionError:
             if is_last_attempt:

tests/integration/actor/test_actor_create_proxy_configuration.py

@@ -30,7 +30,7 @@ async def main() -> None:
     actor = await make_actor(label='proxy-configuration', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
 
 async def test_create_proxy_configuration_with_groups_and_country(
@@ -70,4 +70,4 @@ async def main() -> None:
     actor = await make_actor(label='proxy-configuration', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'

tests/integration/actor/test_actor_dataset.py

@@ -29,7 +29,7 @@ async def main() -> None:
     actor = await make_actor(label='push-data', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
     list_page = await actor.last_run().dataset().list_items()
     assert list_page.items[0]['id'] == 0
@@ -48,7 +48,7 @@ async def main() -> None:
     actor = await make_actor(label='push-data-over-9mb', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
     async for item in actor.last_run().dataset().iterate_items():
         assert item['str'] == 'x' * 10000
@@ -71,7 +71,7 @@ async def main() -> None:
 
     actor = await make_actor(label='test_dataset_iter_items', main_func=main)
     run_result = await run_actor(actor)
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
 
 async def test_same_references_in_default_dataset(
@@ -87,7 +87,7 @@ async def main() -> None:
     actor = await make_actor(label='dataset-same-ref-default', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
 
 async def test_same_references_in_named_dataset(
@@ -115,7 +115,7 @@ async def main() -> None:
     actor = await make_actor(label='dataset-same-ref-named', main_func=main)
     run_result = await run_actor(actor, run_input={'datasetName': dataset_name})
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
 
 async def test_force_cloud(
@@ -183,7 +183,7 @@ async def main() -> None:
     actor = await make_actor(label='dataset-defaults', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'
 
 
 async def test_dataset_aliases(
@@ -227,4 +227,4 @@ async def main() -> None:
     actor = await make_actor(label='dataset-aliases', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status.value == 'SUCCEEDED'