Add storage tests

Author: Pijukatel

src/apify/storage_clients/_apify/_storage_client.py

@@ -9,6 +9,7 @@
 from ._dataset_client import ApifyDatasetClient
 from ._key_value_store_client import ApifyKeyValueStoreClient
 from ._request_queue_client import ApifyRequestQueueClient
+from apify._configuration import service_locator
 from apify._utils import docs_group
 
 if TYPE_CHECKING:
@@ -19,6 +20,15 @@
 class ApifyStorageClient(StorageClient):
     """Apify storage client."""
 
+    def __init__(self, configuration: Configuration | None = None) -> None:
+        """Initialize the file system storage client.
+
+        Args:
+            configuration: Optional configuration instance to use with the storage client.
+                If not provided, the global configuration will be used.
+        """
+        self._configuration = configuration or service_locator.get_configuration()
+
     @override
     async def create_dataset_client(
         self,
@@ -30,13 +40,12 @@ async def create_dataset_client(
         # Import here to avoid circular imports.
         from apify import Configuration as ApifyConfiguration  # noqa: PLC0415
 
-        configuration = configuration or ApifyConfiguration.get_global_configuration()
-        if isinstance(configuration, ApifyConfiguration):
-            return await ApifyDatasetClient.open(id=id, name=name, configuration=configuration)
+        if isinstance(self._configuration, ApifyConfiguration):
+            return await ApifyDatasetClient.open(id=id, name=name, configuration=self._configuration)
 
         raise TypeError(
             f'Expected "configuration" to be an instance of "apify.Configuration", '
-            f'but got {type(configuration).__name__} instead.'
+            f'but got {type(self._configuration).__name__} instead.'
         )
 
     @override
@@ -50,13 +59,12 @@ async def create_kvs_client(
         # Import here to avoid circular imports.
         from apify import Configuration as ApifyConfiguration  # noqa: PLC0415
 
-        configuration = configuration or ApifyConfiguration.get_global_configuration()
-        if isinstance(configuration, ApifyConfiguration):
-            return await ApifyKeyValueStoreClient.open(id=id, name=name, configuration=configuration)
+        if isinstance(self._configuration, ApifyConfiguration):
+            return await ApifyKeyValueStoreClient.open(id=id, name=name, configuration=self._configuration)
 
         raise TypeError(
             f'Expected "configuration" to be an instance of "apify.Configuration", '
-            f'but got {type(configuration).__name__} instead.'
+            f'but got {type(self._configuration).__name__} instead.'
         )
 
     @override
@@ -70,11 +78,15 @@ async def create_rq_client(
         # Import here to avoid circular imports.
         from apify import Configuration as ApifyConfiguration  # noqa: PLC0415
 
-        configuration = configuration or ApifyConfiguration.get_global_configuration()
-        if isinstance(configuration, ApifyConfiguration):
-            return await ApifyRequestQueueClient.open(id=id, name=name, configuration=configuration)
+        if isinstance(self._configuration, ApifyConfiguration):
+            return await ApifyRequestQueueClient.open(id=id, name=name, configuration=self._configuration)
 
         raise TypeError(
             f'Expected "configuration" to be an instance of "apify.Configuration", '
-            f'but got {type(configuration).__name__} instead.'
+            f'but got {type(self._configuration).__name__} instead.'
         )
+
+    @override
+    def create_client(self, configuration: Configuration) -> ApifyStorageClient:
+        """Create a storage client from an existing storage client potentially just replacing the configuration."""
+        return ApifyStorageClient(configuration)

tests/unit/actor/test_configuration.py

@@ -136,3 +136,26 @@ async def test_crawler_global_configuration() -> None:
 
     assert service_locator.get_configuration() is config_global
     assert crawler_1._service_locator.get_configuration() is config_global
+
+
+async def test_storage_retrieved_is_different_with_different_config() -> None:
+    """Test that retrieving storage depends on used configuration."""
+    config_actor = ApifyConfiguration()
+    apify_crawler_1 = ApifyConfiguration()
+
+    async with Actor(configuration=config_actor):
+        actor_kvs = await Actor.open_key_value_store()
+        crawler_1 = BasicCrawler(configuration=apify_crawler_1)
+        crawler_kvs = await crawler_1.get_key_value_store()
+
+    assert actor_kvs is not crawler_kvs
+
+
+async def test_storage_retrieved_is_same_with_same_config() -> None:
+    """Test that retrieving storage is same if same configuration is used."""
+    async with Actor():
+        actor_kvs = await Actor.open_key_value_store()
+        crawler_1 = BasicCrawler()
+        crawler_kvs = await crawler_1.get_key_value_store()
+
+    assert actor_kvs is crawler_kvs