Move default storage IDs to Configuration

Author: vdusek

src/apify/_actor.py

@@ -682,23 +682,7 @@ def get_env(self) -> dict:
                 config[alias] = getattr(self._configuration, field_name)
 
         env_vars = {env_var.value.lower(): env_var.name.lower() for env_var in [*ActorEnvVars, *ApifyEnvVars]}
-        result = {option_name: config[env_var] for env_var, option_name in env_vars.items() if env_var in config}
-
-        # These environment variables are not part of the Configuration model,
-        # so we need to add them manually to the result dictionary.
-        result[ActorEnvVars.DEFAULT_DATASET_ID.name.lower()] = os.environ.get(
-            ActorEnvVars.DEFAULT_DATASET_ID.value
-        ) or os.environ.get(ApifyEnvVars.DEFAULT_DATASET_ID.value)
-
-        result[ActorEnvVars.DEFAULT_KEY_VALUE_STORE_ID.name.lower()] = os.environ.get(
-            ActorEnvVars.DEFAULT_KEY_VALUE_STORE_ID.value
-        ) or os.environ.get(ApifyEnvVars.DEFAULT_KEY_VALUE_STORE_ID.value)
-
-        result[ActorEnvVars.DEFAULT_REQUEST_QUEUE_ID.name.lower()] = os.environ.get(
-            ActorEnvVars.DEFAULT_REQUEST_QUEUE_ID.value
-        ) or os.environ.get(ApifyEnvVars.DEFAULT_REQUEST_QUEUE_ID.value)
-
-        return result
+        return {option_name: config[env_var] for env_var, option_name in env_vars.items() if env_var in config}
 
     async def start(
         self,

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(