refactor: Introduce new Apify storage client

Makefile

@@ -26,13 +26,13 @@ type-check:
 	uv run mypy
 
 unit-tests:
-	uv run pytest --numprocesses=auto --verbose --cov=src/apify tests/unit
+	uv run pytest --numprocesses=auto -vv --cov=src/apify tests/unit
 
 unit-tests-cov:
-	uv run pytest --numprocesses=auto --verbose --cov=src/apify --cov-report=html tests/unit
+	uv run pytest --numprocesses=auto -vv --cov=src/apify --cov-report=html tests/unit
 
 integration-tests:
-	uv run pytest --numprocesses=$(INTEGRATION_TESTS_CONCURRENCY) --verbose tests/integration
+	uv run pytest --numprocesses=$(INTEGRATION_TESTS_CONCURRENCY) -vv tests/integration
 
 format:
 	uv run ruff check --fix

docs/03_concepts/code/03_dataset_exports.py

@@ -11,14 +11,14 @@ async def main() -> None:
         await dataset.export_to(
             content_type='csv',
             key='data.csv',
-            to_key_value_store_name='my-cool-key-value-store',
+            to_kvs_name='my-cool-key-value-store',
         )
 
         # Export the data as JSON
         await dataset.export_to(
             content_type='json',
             key='data.json',
-            to_key_value_store_name='my-cool-key-value-store',
+            to_kvs_name='my-cool-key-value-store',
         )
 
         # Print the exported records

docs/03_concepts/code/conditional_actor_charge.py

@@ -6,8 +6,8 @@ async def main() -> None:
         # Check the dataset because there might already be items
         # if the run migrated or was restarted
         default_dataset = await Actor.open_dataset()
-        dataset_info = await default_dataset.get_info()
-        charged_items = dataset_info.item_count if dataset_info else 0
+        metadata = await default_dataset.get_metadata()
+        charged_items = metadata.item_count
 
         # highlight-start
         if Actor.get_charging_manager().get_pricing_info().is_pay_per_event:

pyproject.toml

@@ -34,9 +34,10 @@ keywords = [
     "scraping",
 ]
 dependencies = [
-    "apify-client>=1.11.0",
+    "apify-client>=1.12.0",
     "apify-shared>=1.3.0",
-    "crawlee~=0.6.0",
+    "cachetools>=5.5.0",
+    "crawlee@git+https://github.com/apify/crawlee-python.git@9dfac4b8afb8027979d85947f0db303f384b7158",
     "cryptography>=42.0.0",
     "httpx>=0.27.0",
     # TODO: ensure compatibility with the latest version of lazy-object-proxy
@@ -76,11 +77,15 @@ dev = [
     "respx~=0.22.0",
     "ruff~=0.12.0",
     "setuptools", # setuptools are used by pytest but not explicitly required
+    "types-cachetools>=6.0.0.20250525",
 ]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/apify"]
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.ruff]
 line-length = 120
 include = ["src/**/*.py", "tests/**/*.py", "docs/**/*.py", "website/**/*.py"]

src/apify/_actor.py

@@ -33,8 +33,8 @@
 from apify._platform_event_manager import EventManager, LocalEventManager, PlatformEventManager
 from apify._proxy_configuration import ProxyConfiguration
 from apify._utils import docs_group, docs_name, get_system_info, is_running_in_ipython
-from apify.apify_storage_client import ApifyStorageClient
 from apify.log import _configure_logging, logger
+from apify.storage_clients import ApifyStorageClient
 from apify.storages import Dataset, KeyValueStore, RequestQueue
 
 if TYPE_CHECKING:
@@ -89,7 +89,7 @@ def __init__(
 
         # Create an instance of the cloud storage client, the local storage client is obtained
         # from the service locator.
-        self._cloud_storage_client = ApifyStorageClient.from_config(config=self._configuration)
+        self._cloud_storage_client = ApifyStorageClient()
 
         # Set the event manager based on whether the Actor is running on the platform or locally.
         self._event_manager = (

src/apify/_configuration.py

@@ -140,6 +140,39 @@ class Configuration(CrawleeConfiguration):
         ),
     ] = None
 
+    default_dataset_id: Annotated[
+        str,
+        Field(
+            validation_alias=AliasChoices(
+                'actor_default_dataset_id',
+                'apify_default_dataset_id',
+            ),
+            description='Default dataset ID used by the Apify storage client when no ID or name is provided.',
+        ),
+    ] = 'default'
+
+    default_key_value_store_id: Annotated[
+        str,
+        Field(
+            validation_alias=AliasChoices(
+                'actor_default_key_value_store_id',
+                'apify_default_key_value_store_id',
+            ),
+            description='Default key-value store ID for the Apify storage client when no ID or name is provided.',
+        ),
+    ] = 'default'
+
+    default_request_queue_id: Annotated[
+        str,
+        Field(
+            validation_alias=AliasChoices(
+                'actor_default_request_queue_id',
+                'apify_default_request_queue_id',
+            ),
+            description='Default request queue ID for the Apify storage client when no ID or name is provided.',
+        ),
+    ] = 'default'
+
     disable_outdated_warning: Annotated[
         bool,
         Field(

src/apify/_proxy_configuration.py

@@ -21,7 +21,8 @@
 
 if TYPE_CHECKING:
     from apify_client import ApifyClientAsync
-    from crawlee import Request
+
+    from apify import Request
 
 APIFY_PROXY_VALUE_REGEX = re.compile(r'^[\w._~]+$')
 COUNTRY_CODE_REGEX = re.compile(r'^[A-Z]{2}$')