Wip changes

Author: Pijukatel

src/apify/storage_clients/_apify/_storage_client.py

@@ -8,6 +8,7 @@
 
 from ._dataset_client import ApifyDatasetClient
 from ._key_value_store_client import ApifyKeyValueStoreClient
+from ._request_queue_client_full import ApifyRequestQueueClientFull
 from ._request_queue_client_simple import ApifyRequestQueueClientSimple
 from apify._utils import docs_group
 
@@ -21,6 +22,17 @@
 class ApifyStorageClient(StorageClient):
     """Apify storage client."""
 
+    def __init__(self, simple_request_queue: bool = True) -> None:
+        """Initialize the Apify storage client.
+
+        Args:
+            simple_request_queue: If True, the `create_rq_client` will always return `ApifyRequestQueueClientSimple`,
+                if false it will return `ApifyRequestQueueClientFull`. Simple client is suitable for single consumer
+                scenarios and makes less API calls. Full client is suitable for multiple consumers scenarios at the
+                cost of higher API usage
+        """
+        self._simple_request_queue = simple_request_queue
+
     @override
     async def create_dataset_client(
         self,
@@ -74,7 +86,10 @@ async def create_rq_client(
 
         configuration = configuration or ApifyConfiguration.get_global_configuration()
         if isinstance(configuration, ApifyConfiguration):
-            return await ApifyRequestQueueClientSimple.open(id=id, name=name, configuration=configuration)
+            if not self._simple_request_queue:
+                return await ApifyRequestQueueClientSimple.open(id=id, name=name, configuration=configuration)
+            else:
+                return await ApifyRequestQueueClientFull.open(id=id, name=name, configuration=configuration)
 
         raise TypeError(
             f'Expected "configuration" to be an instance of "apify.Configuration", '

tests/integration/test_request_queue.py

@@ -4,10 +4,12 @@
 from typing import TYPE_CHECKING
 
 import pytest
+from apify_shared.consts import ApifyEnvVars
 
 from crawlee import Request
 
 from apify import Actor
+from ._utils import generate_unique_resource_name
 
 if TYPE_CHECKING:
     from apify_client import ApifyClientAsync
@@ -1068,3 +1070,31 @@ async def test_request_queue_not_had_multiple_clients(
     api_response = await api_client.get()
     assert api_response
     assert api_response['hadMultipleClients'] is False
+
+
+async def test_cache_initialization(
+    apify_token: str, monkeypatch: pytest.MonkeyPatch, apify_client_async: ApifyClientAsync
+) -> None:
+    """Test that same `RequestQueue` created from Actor does not act as multiple clients."""
+
+    """Create an instance of the Apify request queue on the platform and drop it when the test is finished."""
+    request_queue_name = generate_unique_resource_name('request_queue')
+    monkeypatch.setenv(ApifyEnvVars.TOKEN, apify_token)
+
+    async with Actor:
+        rq = await Actor.open_request_queue(name=request_queue_name, force_cloud=True)
+        yield rq
+        await rq.drop()
+
+
+    await request_queue_force_cloud.fetch_next_request()
+    await request_queue_force_cloud.fetch_next_request()
+
+    # Check that it is correctly in the RequestQueueClient metadata
+    assert (await request_queue_force_cloud.get_metadata()).had_multiple_clients is False
+
+    # Check that it is correctly in the API
+    api_client = apify_client_async.request_queue(request_queue_id=request_queue_force_cloud.id)
+    api_response = await api_client.get()
+    assert api_response
+    assert api_response['hadMultipleClients'] is False