Do Pydantic workaround

Author: Pijukatel

src/apify/_actor.py

@@ -128,10 +128,6 @@ def __init__(
         self._configure_logging = configure_logging
         self._apify_client = self.new_client()
 
-        # Create an instance of the cloud storage client, the local storage client is obtained
-        # from the service locator.
-        self._cloud_storage_client = ApifyStorageClient()
-
         # Set the event manager based on whether the Actor is running on the platform or locally.
         self._event_manager = (
             ApifyEventManager(
@@ -282,6 +278,10 @@ async def init(self) -> None:
         if _ActorType._is_any_instance_initialized:
             self.log.warning('Repeated Actor initialization detected - this is non-standard usage, proceed with care')
 
+        # Create an instance of the cloud storage client, the local storage client is obtained
+        # from the service locator
+        self._cloud_storage_client = ApifyStorageClient(configuration=self.configuration)
+
         # Make sure that the currently initialized instance is also available through the global `Actor` proxy
         cast('Proxy', Actor).__wrapped__ = self
 

src/apify/_configuration.py

@@ -445,17 +445,17 @@ def get_configuration(self) -> Configuration:
             return self._configuration
 
         stored_configuration = super().get_configuration()
+        apify_configuration = Configuration()
 
         # Ensure the returned configuration is of type Apify Configuration.
         # Most likely crawlee configuration was already set. Create Apify configuration from it.
-        # Env vars will have lower priority than the stored configuration.
-        model_dump = stored_configuration.model_dump()
-        # The configuration will read env variables first and overridden with stored_configuration
-        _config = Configuration()
-        for key in model_dump:
-            if model_dump[key]:
-                setattr(_config, key, model_dump[key])
-        return _config
+        # Due to known Pydantic issue https://github.com/pydantic/pydantic/issues/9516, creating new instance of
+        # Configuration from existing one in situation where environment can have some fields set by alias is very
+        # unpredictable. Use the stable workaround.
+        for name in stored_configuration.model_fields:
+            setattr(apify_configuration, name, getattr(stored_configuration, name))
+
+        return apify_configuration
 
 
 # Ensure that ApifyServiceLocator is used to make sure Apify Configuration is used.