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 import WebhookEventType
+from apify_client._models_generated 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 import Run
+    from apify_client._models_generated import Run
     from crawlee._types import JsonSerializable
     from crawlee.proxy_configuration import _NewUrlFunction
 
@@ -1231,7 +1231,7 @@ async def reboot(
                 ),
                 timeout=event_listeners_timeout.total_seconds() if event_listeners_timeout else None,
             )
-        except asyncio.TimeoutError:
+        except TimeoutError:
             self.log.warning('Pre-reboot event listeners did not finish within timeout; proceeding with reboot')
             results = []
 

src/apify/_charging.py

@@ -7,7 +7,7 @@
 from decimal import Decimal
 from typing import TYPE_CHECKING, Protocol, TypedDict
 
-from apify_client._models import (
+from apify_client._models_generated import (
     FlatPricePerMonthActorPricingInfo,
     FreeActorPricingInfo,
     PayPerEventActorPricingInfo,
@@ -304,7 +304,7 @@ async def charge(self, event_name: str, count: int = 1) -> ChargeResult:
                     # the platform handles them automatically based on dataset writes.
                     pass
                 elif event_name in self._pricing_info:
-                    await self._client.run(self._actor_run_id).charge(event_name, charged_count)
+                    await self._client.run(self._actor_run_id).charge(event_name, count=charged_count)
                 else:
                     logger.warning(f"Attempting to charge for an unknown event '{event_name}'")
 

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 import (
+from apify_client._models_generated import (
     FlatPricePerMonthActorPricingInfo,
     FreeActorPricingInfo,
     PayPerEventActorPricingInfo,

src/apify/_models.py

@@ -4,7 +4,7 @@
 
 from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 
-from apify_client._models import (
+from apify_client._models_generated 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 import LockedRequestQueueHead
+    from apify_client._models_generated 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 import HeadRequest, LockedHeadRequest
-    from apify_client._models import Request as ClientRequest
+    from apify_client._models_generated import HeadRequest, LockedHeadRequest
+    from apify_client._models_generated import Request as ClientRequest
 
     from apify import Configuration
 

tests/e2e/conftest.py

@@ -14,7 +14,7 @@
 from filelock import FileLock
 
 from apify_client import ApifyClient, ApifyClientAsync
-from apify_client._models import ActorPermissionLevel, Run, VersionSourceType
+from apify_client._models_generated import ActorPermissionLevel, Run, VersionSourceType
 from crawlee import service_locator
 
 import apify._actor

tests/e2e/test_actor_api_helpers.py

@@ -5,7 +5,7 @@
 from datetime import timedelta
 from typing import TYPE_CHECKING
 
-from apify_client._models import ActorPermissionLevel
+from apify_client._models_generated import ActorPermissionLevel
 from crawlee._utils.crypto import crypto_random_object_id
 
 from ._utils import generate_unique_resource_name

tests/e2e/test_actor_scrapy.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from apify_client._models import ActorPermissionLevel
+from apify_client._models_generated import ActorPermissionLevel
 
 if TYPE_CHECKING:
     from .conftest import MakeActorFunction, RunActorFunction