Update

Author: vdusek

src/apify/_charging.py

@@ -351,14 +351,21 @@ async def _fetch_pricing_info(self) -> _FetchedPricingInfoDict:
             if self._actor_run_id is None:
                 raise RuntimeError('Actor run ID not found even though the Actor is running on Apify')
 
-            run = run_validator.validate_python(await self._client.run(self._actor_run_id).get())
+            run = await self._client.run(self._actor_run_id).get()
+
             if run is None:
                 raise RuntimeError('Actor run not found')
 
+            run_dict = run.model_dump(by_alias=True)
+            actor_run = run_validator.validate_python(run_dict)
+
+            if actor_run is None:
+                raise RuntimeError('Actor run not found')
+
             return _FetchedPricingInfoDict(
-                pricing_info=run.pricing_info,
-                charged_event_counts=run.charged_event_counts or {},
-                max_total_charge_usd=run.options.max_total_charge_usd or Decimal('inf'),
+                pricing_info=actor_run.pricing_info,
+                charged_event_counts=actor_run.charged_event_counts or {},
+                max_total_charge_usd=actor_run.options.max_total_charge_usd or Decimal('inf'),
             )
 
         # Local development without environment variables

tests/integration/actor/conftest.py

@@ -256,10 +256,11 @@ async def _make_actor(
 
     # Delete all the generated Actors.
     for actor_id in actors_for_cleanup:
-        actor_client = ApifyClient(token=apify_token, api_url=os.getenv(_API_URL_ENV_VAR)).actor(actor_id)
+        apify_client = ApifyClient(token=apify_token, api_url=os.getenv(_API_URL_ENV_VAR))
+        actor_client = apify_client.actor(actor_id)
+        actor = actor_client.get()
 
-        if (actor := actor_client.get()) is not None:
-            assert actor.pricing_infos is not None
+        if actor is not None and actor.pricing_infos is not None:
             new_pricing_infos = [*actor.pricing_infos, {'pricingModel': 'FREE'}]
             actor_client.update(pricing_infos=new_pricing_infos)
 
@@ -301,17 +302,16 @@ async def _run_actor(
         run_input: Any = None,
         max_total_charge_usd: Decimal | None = None,
     ) -> ActorRun:
-        call_result = await actor.call(
-            run_input=run_input,
-            max_total_charge_usd=max_total_charge_usd,
-        )
+        call_result = await actor.call(run_input=run_input, max_total_charge_usd=max_total_charge_usd)
+
+        assert call_result is not None, 'Failed to start Actor run: missing run ID in the response.'
 
-        assert isinstance(call_result, dict), 'The result of ActorClientAsync.call() is not a dictionary.'
-        assert 'id' in call_result, 'The result of ActorClientAsync.call() does not contain an ID.'
+        run_client = apify_client_async.run(call_result.id)
+        actor_run = await run_client.wait_for_finish(wait_secs=600)
 
-        run_client = apify_client_async.run(call_result['id'])
-        run_result = await run_client.wait_for_finish(wait_secs=600)
+        assert actor_run is not None, 'Actor run did not finish successfully within the expected time.'
 
-        return ActorRun.model_validate(run_result)
+        actor_run_dict = actor_run.model_dump(by_alias=True)
+        return ActorRun.model_validate(actor_run_dict)
 
     return _run_actor