fix: Propagate last_run status/origin filters to chained storage clients

Author: vdusek

src/apify_client/_resource_clients/run.py

@@ -289,6 +289,7 @@ def dataset(self) -> DatasetClient:
         """
         return self._client_registry.dataset_client(
             resource_path='dataset',
+            params=self._default_params,
             **self._base_client_kwargs,
         )
 
@@ -302,6 +303,7 @@ def key_value_store(self) -> KeyValueStoreClient:
         """
         return self._client_registry.key_value_store_client(
             resource_path='key-value-store',
+            params=self._default_params,
             **self._base_client_kwargs,
         )
 
@@ -315,6 +317,7 @@ def request_queue(self) -> RequestQueueClient:
         """
         return self._client_registry.request_queue_client(
             resource_path='request-queue',
+            params=self._default_params,
             **self._base_client_kwargs,
         )
 
@@ -328,6 +331,7 @@ def log(self) -> LogClient:
         """
         return self._client_registry.log_client(
             resource_path='log',
+            params=self._default_params,
             **self._base_client_kwargs,
         )
 
@@ -716,6 +720,7 @@ def dataset(self) -> DatasetClientAsync:
         """
         return self._client_registry.dataset_client(
             resource_path='dataset',
+            params=self._default_params,
             **self._base_client_kwargs,
         )
 
@@ -729,6 +734,7 @@ def key_value_store(self) -> KeyValueStoreClientAsync:
         """
         return self._client_registry.key_value_store_client(
             resource_path='key-value-store',
+            params=self._default_params,
             **self._base_client_kwargs,
         )
 
@@ -742,6 +748,7 @@ def request_queue(self) -> RequestQueueClientAsync:
         """
         return self._client_registry.request_queue_client(
             resource_path='request-queue',
+            params=self._default_params,
             **self._base_client_kwargs,
         )
 
@@ -755,6 +762,7 @@ def log(self) -> LogClientAsync:
         """
         return self._client_registry.log_client(
             resource_path='log',
+            params=self._default_params,
             **self._base_client_kwargs,
         )
 

tests/unit/test_last_run_params.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import pytest
+
+from apify_client import ApifyClient, ApifyClientAsync
+from apify_client.errors import NotFoundError
+
+if TYPE_CHECKING:
+    from pytest_httpserver import HTTPServer
+
+_CHILD_CLIENT_PARAMS = [
+    pytest.param('dataset', 'dataset', id='dataset'),
+    pytest.param('key_value_store', 'key-value-store', id='key-value-store'),
+    pytest.param('request_queue', 'request-queue', id='request-queue'),
+    pytest.param('log', 'log', id='log'),
+]
+
+
+_NOT_FOUND_BODY = {'error': {'type': 'record-not-found', 'message': 'not found'}}
+
+
+@pytest.mark.parametrize(('child_method', 'child_path'), _CHILD_CLIENT_PARAMS)
+def test_last_run_filters_propagate_to_chained_clients(
+    httpserver: HTTPServer,
+    child_method: str,
+    child_path: str,
+) -> None:
+    """`last_run(status=..., origin=...)` filters must be sent by the chained storage clients (regression vs 1.x)."""
+    httpserver.expect_request(f'/v2/actors/actor-id/runs/last/{child_path}').respond_with_json(
+        _NOT_FOUND_BODY, status=404
+    )
+    client = ApifyClient(token='test-token', api_url=httpserver.url_for('/').removesuffix('/'))
+
+    last_run = client.actor('actor-id').last_run(status='SUCCEEDED', origin='WEB')
+    with pytest.raises(NotFoundError):
+        getattr(last_run, child_method)().get()
+
+    request, _ = httpserver.log[-1]
+    assert request.args.get('status') == 'SUCCEEDED'
+    assert request.args.get('origin') == 'WEB'
+
+
+@pytest.mark.parametrize(('child_method', 'child_path'), _CHILD_CLIENT_PARAMS)
+async def test_last_run_filters_propagate_to_chained_clients_async(
+    httpserver: HTTPServer,
+    child_method: str,
+    child_path: str,
+) -> None:
+    """`last_run(status=..., origin=...)` filters must be sent by the chained storage clients (regression vs 1.x)."""
+    httpserver.expect_request(f'/v2/actors/actor-id/runs/last/{child_path}').respond_with_json(
+        _NOT_FOUND_BODY, status=404
+    )
+    client = ApifyClientAsync(token='test-token', api_url=httpserver.url_for('/').removesuffix('/'))
+
+    last_run = client.actor('actor-id').last_run(status='SUCCEEDED', origin='WEB')
+    with pytest.raises(NotFoundError):
+        await getattr(last_run, child_method)().get()
+
+    request, _ = httpserver.log[-1]
+    assert request.args.get('status') == 'SUCCEEDED'
+    assert request.args.get('origin') == 'WEB'