feat: update to Crawlee v0.6 (#420)

Author: vdusek

pyproject.toml

@@ -35,8 +35,8 @@ keywords = [
 ]
 dependencies = [
     "apify-client>=1.9.2",
-    "apify-shared>=1.2.1",
-    "crawlee~=0.5.0",
+    "apify-shared>=1.3.0",
+    "crawlee~=0.6.0",
     "cryptography>=42.0.0",
     "httpx>=0.27.0",
     "lazy-object-proxy>=1.10.0",

src/apify/_actor.py

@@ -43,7 +43,7 @@
     from typing_extensions import Self
 
     from crawlee.proxy_configuration import _NewUrlFunction
-    from crawlee.storage_clients import BaseStorageClient
+    from crawlee.storage_clients import StorageClient
 
     from apify._models import Webhook
 
@@ -171,7 +171,7 @@ def log(self) -> logging.Logger:
         return logger
 
     @property
-    def _local_storage_client(self) -> BaseStorageClient:
+    def _local_storage_client(self) -> StorageClient:
         """The local storage client the Actor instance uses."""
         return service_locator.get_storage_client()
 

src/apify/apify_storage_client/_apify_storage_client.py

@@ -6,7 +6,7 @@
 
 from apify_client import ApifyClientAsync
 from crawlee._utils.crypto import crypto_random_object_id
-from crawlee.storage_clients import BaseStorageClient
+from crawlee.storage_clients import StorageClient
 
 from apify._utils import docs_group
 from apify.apify_storage_client._dataset_client import DatasetClient
@@ -21,7 +21,7 @@
 
 
 @docs_group('Classes')
-class ApifyStorageClient(BaseStorageClient):
+class ApifyStorageClient(StorageClient):
     """A storage client implementation based on the Apify platform storage."""
 
     def __init__(self, *, configuration: Configuration) -> None:
@@ -68,5 +68,5 @@ async def purge_on_start(self) -> None:
         pass
 
     @override
-    def get_rate_limit_errors(self) -> dict[int, int]:  # type: ignore[misc]
+    def get_rate_limit_errors(self) -> dict[int, int]:
         return self._apify_client.stats.rate_limit_errors

src/apify/apify_storage_client/_dataset_client.py

@@ -4,7 +4,7 @@
 
 from typing_extensions import override
 
-from crawlee.storage_clients._base import BaseDatasetClient
+from crawlee.storage_clients._base import DatasetClient as BaseDatasetClient
 from crawlee.storage_clients.models import DatasetItemsListPage, DatasetMetadata
 
 if TYPE_CHECKING:

src/apify/apify_storage_client/_dataset_collection_client.py

@@ -4,7 +4,7 @@
 
 from typing_extensions import override
 
-from crawlee.storage_clients._base import BaseDatasetCollectionClient
+from crawlee.storage_clients._base import DatasetCollectionClient as BaseDatasetCollectionClient
 from crawlee.storage_clients.models import DatasetListPage, DatasetMetadata
 
 if TYPE_CHECKING:

src/apify/apify_storage_client/_key_value_store_client.py

@@ -5,7 +5,7 @@
 
 from typing_extensions import override
 
-from crawlee.storage_clients._base import BaseKeyValueStoreClient
+from crawlee.storage_clients._base import KeyValueStoreClient as BaseKeyValueStoreClient
 from crawlee.storage_clients.models import KeyValueStoreListKeysPage, KeyValueStoreMetadata, KeyValueStoreRecord
 
 if TYPE_CHECKING:

src/apify/apify_storage_client/_key_value_store_collection_client.py

@@ -4,7 +4,7 @@
 
 from typing_extensions import override
 
-from crawlee.storage_clients._base import BaseKeyValueStoreCollectionClient
+from crawlee.storage_clients._base import KeyValueStoreCollectionClient as BaseKeyValueStoreCollectionClient
 from crawlee.storage_clients.models import KeyValueStoreListPage, KeyValueStoreMetadata
 
 if TYPE_CHECKING:

src/apify/apify_storage_client/_request_queue_client.py

@@ -5,7 +5,7 @@
 from typing_extensions import override
 
 from crawlee import Request
-from crawlee.storage_clients._base import BaseRequestQueueClient
+from crawlee.storage_clients._base import RequestQueueClient as BaseRequestQueueClient
 from crawlee.storage_clients.models import (
     BatchRequestsOperationResponse,
     ProcessedRequest,

src/apify/apify_storage_client/_request_queue_collection_client.py

@@ -4,7 +4,7 @@
 
 from typing_extensions import override
 
-from crawlee.storage_clients._base import BaseRequestQueueCollectionClient
+from crawlee.storage_clients._base import RequestQueueCollectionClient as BaseRequestQueueCollectionClient
 from crawlee.storage_clients.models import RequestQueueListPage, RequestQueueMetadata
 
 if TYPE_CHECKING:

src/apify/storages/_request_list.py

@@ -10,7 +10,7 @@
 
 from crawlee import Request
 from crawlee._types import HttpMethod
-from crawlee.http_clients import BaseHttpClient, HttpxHttpClient
+from crawlee.http_clients import HttpClient, HttpxHttpClient
 from crawlee.request_loaders import RequestList as CrawleeRequestList
 
 from apify._utils import docs_group
@@ -49,7 +49,7 @@ class RequestList(CrawleeRequestList):
     async def open(
         name: str | None = None,
         request_list_sources_input: list[dict[str, Any]] | None = None,
-        http_client: BaseHttpClient | None = None,
+        http_client: HttpClient | None = None,
     ) -> RequestList:
         """Creates RequestList from Actor input requestListSources.
 
@@ -78,7 +78,7 @@ async def open(
 
     @staticmethod
     async def _create_request_list(
-        name: str | None, request_list_sources_input: list[dict[str, Any]], http_client: BaseHttpClient | None
+        name: str | None, request_list_sources_input: list[dict[str, Any]], http_client: HttpClient | None
     ) -> RequestList:
         if not http_client:
             http_client = HttpxHttpClient()
@@ -108,7 +108,7 @@ def _create_requests_from_input(simple_url_inputs: list[_SimpleUrlInput]) -> lis
 
     @staticmethod
     async def _fetch_requests_from_url(
-        remote_url_requests_inputs: list[_RequestsFromUrlInput], http_client: BaseHttpClient
+        remote_url_requests_inputs: list[_RequestsFromUrlInput], http_client: HttpClient
     ) -> list[Request]:
         """Crete list of requests from url.