opening storages get default id from config

Author: vdusek

src/apify/storage_clients/_apify/_dataset_client.py

@@ -1,14 +1,12 @@
 from __future__ import annotations
 
 import asyncio
-import os
 from logging import getLogger
 from typing import TYPE_CHECKING, Any
 
 from typing_extensions import override
 
 from apify_client import ApifyClientAsync
-from apify_shared.consts import ActorEnvVars, ApifyEnvVars
 from crawlee.storage_clients._base import DatasetClient
 from crawlee.storage_clients.models import DatasetItemsListPage, DatasetMetadata
 
@@ -99,13 +97,7 @@ async def open(
 
         # If both id and name are None, try to get the default storage ID from environment variables.
         if id is None and name is None:
-            id = os.environ.get(
-                ActorEnvVars.DEFAULT_DATASET_ID.value,
-                None,
-            ) or os.environ.get(
-                ApifyEnvVars.DEFAULT_DATASET_ID.value,
-                None,
-            )
+            id = getattr(configuration, 'default_dataset_id', None)
 
         if id is None:
             raise ValueError(

src/apify/storage_clients/_apify/_key_value_store_client.py

@@ -1,15 +1,13 @@
 from __future__ import annotations
 
 import asyncio
-import os
 from logging import getLogger
 from typing import TYPE_CHECKING, Any
 
 from typing_extensions import override
 from yarl import URL
 
 from apify_client import ApifyClientAsync
-from apify_shared.consts import ActorEnvVars, ApifyEnvVars
 from crawlee.storage_clients._base import KeyValueStoreClient
 from crawlee.storage_clients.models import KeyValueStoreMetadata, KeyValueStoreRecord, KeyValueStoreRecordMetadata
 
@@ -101,13 +99,7 @@ async def open(
 
         # If both id and name are None, try to get the default storage ID from environment variables.
         if id is None and name is None:
-            id = os.environ.get(
-                ActorEnvVars.DEFAULT_KEY_VALUE_STORE_ID.value,
-                None,
-            ) or os.environ.get(
-                ApifyEnvVars.DEFAULT_KEY_VALUE_STORE_ID.value,
-                None,
-            )
+            id = getattr(configuration, 'default_key_value_store_id', None)
 
         if id is None:
             raise ValueError(

src/apify/storage_clients/_apify/_request_queue_client.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import os
 from collections import deque
 from datetime import datetime, timedelta, timezone
 from logging import getLogger
@@ -11,7 +10,6 @@
 from typing_extensions import override
 
 from apify_client import ApifyClientAsync
-from apify_shared.consts import ActorEnvVars, ApifyEnvVars
 from crawlee._utils.requests import unique_key_to_request_id
 from crawlee.storage_clients._base import RequestQueueClient
 from crawlee.storage_clients.models import AddRequestsResponse, ProcessedRequest, RequestQueueMetadata
@@ -131,13 +129,7 @@ async def open(
 
         # If both id and name are None, try to get the default storage ID from environment variables.
         if id is None and name is None:
-            id = os.environ.get(
-                ActorEnvVars.DEFAULT_REQUEST_QUEUE_ID.value,
-                None,
-            ) or os.environ.get(
-                ApifyEnvVars.DEFAULT_REQUEST_QUEUE_ID.value,
-                None,
-            )
+            id = getattr(configuration, 'default_request_queue_id', None)
 
         if id is None:
             raise ValueError(