Addressing more feedback

Author: vdusek

src/apify/storage_clients/__init__.py

@@ -1,10 +1,9 @@
-from crawlee.storage_clients import FileSystemStorageClient, MemoryStorageClient, StorageClient
+from crawlee.storage_clients import FileSystemStorageClient, MemoryStorageClient
 
 from ._apify import ApifyStorageClient
 
 __all__ = [
     'ApifyStorageClient',
     'FileSystemStorageClient',
     'MemoryStorageClient',
-    'StorageClient',
 ]

src/apify/storage_clients/_apify/_dataset_client.py

@@ -33,6 +33,7 @@ def __init__(
         modified_at: datetime,
         item_count: int,
         api_client: DatasetClientAsync,
+        lock: asyncio.Lock,
     ) -> None:
         """Initialize a new instance.
 
@@ -50,7 +51,7 @@ def __init__(
         self._api_client = api_client
         """The Apify dataset client for API operations."""
 
-        self._lock = asyncio.Lock()
+        self._lock = lock
         """A lock to ensure that only one operation is performed at a time."""
 
     @property
@@ -75,20 +76,19 @@ async def open(
         if not api_url:
             raise ValueError(f'Apify storage client requires a valid API URL in Configuration (api_url={api_url}).')
 
-        # Otherwise, create a new one.
+        if id and name:
+            raise ValueError('Only one of "id" or "name" can be specified, not both.')
+
+        # Create Apify client with the provided token and API URL.
         apify_client_async = ApifyClientAsync(
             token=token,
             api_url=api_url,
             max_retries=8,
             min_delay_between_retries_millis=500,
             timeout_secs=360,
         )
-
         apify_datasets_client = apify_client_async.datasets()
 
-        if id and name:
-            raise ValueError('Only one of "id" or "name" can be specified, not both.')
-
         # If name is provided, get or create the storage by name.
         if name is not None and id is None:
             id = DatasetMetadata.model_validate(
@@ -118,6 +118,7 @@ async def open(
             modified_at=metadata.modified_at,
             item_count=metadata.item_count,
             api_client=apify_dataset_client,
+            lock=asyncio.Lock(),
         )
 
     @override

src/apify/storage_clients/_apify/_key_value_store_client.py

@@ -36,6 +36,7 @@ def __init__(
         accessed_at: datetime,
         modified_at: datetime,
         api_client: KeyValueStoreClientAsync,
+        lock: asyncio.Lock,
     ) -> None:
         """Initialize a new instance.
 
@@ -52,7 +53,7 @@ def __init__(
         self._api_client = api_client
         """The Apify key-value store client for API operations."""
 
-        self._lock = asyncio.Lock()
+        self._lock = lock
         """A lock to ensure that only one operation is performed at a time."""
 
     @property
@@ -77,20 +78,19 @@ async def open(
         if not api_url:
             raise ValueError(f'Apify storage client requires a valid API URL in Configuration (api_url={api_url}).')
 
-        # Otherwise, create a new one.
+        if id and name:
+            raise ValueError('Only one of "id" or "name" can be specified, not both.')
+
+        # Create Apify client with the provided token and API URL.
         apify_client_async = ApifyClientAsync(
             token=token,
             api_url=api_url,
             max_retries=8,
             min_delay_between_retries_millis=500,
             timeout_secs=360,
         )
-
         apify_kvss_client = apify_client_async.key_value_stores()
 
-        if id and name:
-            raise ValueError('Only one of "id" or "name" can be specified, not both.')
-
         # If name is provided, get or create the storage by name.
         if name is not None and id is None:
             id = KeyValueStoreMetadata.model_validate(
@@ -119,6 +119,7 @@ async def open(
             accessed_at=metadata.accessed_at,
             modified_at=metadata.modified_at,
             api_client=apify_kvs_client,
+            lock=asyncio.Lock(),
         )
 
     @override

src/apify/storage_clients/_apify/_request_queue_client.py

@@ -49,6 +49,7 @@ def __init__(
         stats: dict,
         total_request_count: int,
         api_client: RequestQueueClientAsync,
+        lock: asyncio.Lock,
     ) -> None:
         """Initialize a new instance.
 
@@ -70,7 +71,7 @@ def __init__(
         self._api_client = api_client
         """The Apify request queue client for API operations."""
 
-        self._lock = asyncio.Lock()
+        self._lock = lock
         """A lock to ensure that only one operation is performed at a time."""
 
         self._queue_head = deque[str]()
@@ -107,20 +108,19 @@ async def open(
         if not api_url:
             raise ValueError(f'Apify storage client requires a valid API URL in Configuration (api_url={api_url}).')
 
-        # Create a new API client
+        if id and name:
+            raise ValueError('Only one of "id" or "name" can be specified, not both.')
+
+        # Create Apify client with the provided token and API URL.
         apify_client_async = ApifyClientAsync(
             token=token,
             api_url=api_url,
             max_retries=8,
             min_delay_between_retries_millis=500,
             timeout_secs=360,
         )
-
         apify_rqs_client = apify_client_async.request_queues()
 
-        if id and name:
-            raise ValueError('Only one of "id" or "name" can be specified, not both.')
-
         # If name is provided, get or create the storage by name.
         if name is not None and id is None:
             id = RequestQueueMetadata.model_validate(
@@ -142,7 +142,6 @@ async def open(
         # Fetch its metadata.
         metadata = RequestQueueMetadata.model_validate(await apify_rq_client.get())
 
-        # Create the client instance
         return cls(
             id=metadata.id,
             name=metadata.name,
@@ -155,6 +154,7 @@ async def open(
             stats=metadata.stats,
             total_request_count=metadata.total_request_count,
             api_client=apify_rq_client,
+            lock=asyncio.Lock(),
         )
 
     @override