integration tests

Author: Pijukatel

src/apify_client/_resource_clients/dataset.py

@@ -196,14 +196,8 @@ def list_items(
             A page of the list of dataset items according to the specified filters.
         """
 
-        def _fetch_page(
-            *,
-            offset: int | None = None,
-            limit: int | None = None,
-        ) -> PageOfDatasetItems:
+        def _fetch_page(**kwargs: Any) -> PageOfDatasetItems:
             request_params = self._build_params(
-                offset=offset,
-                limit=limit,
                 desc=desc,
                 clean=clean,
                 fields=fields,
@@ -214,6 +208,8 @@ def _fetch_page(
                 flatten=flatten,
                 view=view,
                 signature=signature,
+                timeout=timeout,
+                **kwargs,
             )
 
             response = self._http_client.call(
@@ -226,13 +222,15 @@ def _fetch_page(
             # When using signature, API returns items as list directly
             items = response_to_list(response)
 
+            # When using signature, API returns items as list directly
+
             return PageOfDatasetItems(
                 items=items,
                 total=int(response.headers['x-apify-pagination-total']),
                 offset=int(response.headers['x-apify-pagination-offset']),
                 # x-apify-pagination-count returns count of processed items, not count of returned items
                 # This makes difference when items were filtered using hidden/empty
-                count=int(response.headers['x-apify-pagination-count']),
+                count=max(int(response.headers['x-apify-pagination-count']), len(items)),
                 # API returns 999999999999 when no limit is used
                 limit=int(response.headers['x-apify-pagination-limit']),
                 desc=response.headers['x-apify-pagination-desc'].lower() == 'true',
@@ -919,7 +917,7 @@ async def _fetch_page(
                 offset=int(response.headers['x-apify-pagination-offset']),
                 # x-apify-pagination-count returns count of processed items, not count of returned items
                 # This makes difference when items were filtered using hidden/empty
-                count=int(response.headers['x-apify-pagination-count']),
+                count=max(int(response.headers['x-apify-pagination-count']), len(items)),
                 # API returns 999999999999 when no limit is used
                 limit=int(response.headers['x-apify-pagination-limit']),
                 desc=response.headers['x-apify-pagination-desc'].lower() == 'true',

tests/integration/test_dataset.py

@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING, cast
 
 from apify_client._models_generated import DatasetListItem
-from apify_client._pagination_classes import PageOfItems
+from apify_client._pagination_classes import PageOfDatasetItems, PageOfItems
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator
@@ -265,8 +265,8 @@ async def test_dataset_push_and_list_items(client: ApifyClient | ApifyClientAsyn
         await maybe_sleep(1, is_async=is_async)
 
         # List items
-        result = await maybe_await(dataset_client.list_items())
-        items_page = cast('DatasetItemsPage', result)
+        items_page = await maybe_await(dataset_client.list_items())
+        assert isinstance(items_page, PageOfDatasetItems)
         assert items_page is not None
         assert len(items_page.items) == 3
         assert items_page.count == 3
@@ -298,22 +298,21 @@ async def test_dataset_list_items_with_pagination(client: ApifyClient | ApifyCli
         await maybe_sleep(1, is_async=is_async)
 
         # List with limit
-        result = await maybe_await(dataset_client.list_items(limit=5))
-        items_page = cast('DatasetItemsPage', result)
+        items_page = await maybe_await(dataset_client.list_items(limit=5))
+        assert isinstance(items_page, PageOfDatasetItems)
         assert len(items_page.items) == 5
         assert items_page.count == 5
         # Note: items_page.total may be 0 immediately after push due to eventual consistency
         assert items_page.limit == 5
 
         # List with offset
-        result = await maybe_await(dataset_client.list_items(offset=5, limit=5))
-        items_page_offset = cast('DatasetItemsPage', result)
+        items_page_offset = await maybe_await(dataset_client.list_items(offset=5, limit=5))
+        assert isinstance(items_page_offset, PageOfDatasetItems)
         assert len(items_page_offset.items) == 5
         assert items_page_offset.offset == 5
         # Note: items_page.total may be 0 immediately after push due to eventual consistency
-
         # Verify different items
-        assert items_page.items[0]['index'] != items_page_offset.items[0]['index']
+        assert items_page_offset.items[0]['index'] != items_page.items[0]['index']
     finally:
         await maybe_await(dataset_client.delete())
 
@@ -338,8 +337,8 @@ async def test_dataset_list_items_with_fields(client: ApifyClient | ApifyClientA
         await maybe_sleep(1, is_async=is_async)
 
         # List with fields filter
-        result = await maybe_await(dataset_client.list_items(fields=['id', 'name']))
-        items_page = cast('DatasetItemsPage', result)
+        items_page = await maybe_await(dataset_client.list_items(fields=['id', 'name']))
+        assert isinstance(items_page, PageOfDatasetItems)
         assert len(items_page.items) == 2
 
         # Verify only specified fields are returned

tests/integration/test_key_value_store.py

@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING, cast
 
 from apify_client._models_generated import KeyValueStore, KeyValueStoreKey
-from apify_client._pagination_classes import PageOfKeys
+from apify_client._pagination_classes import PageOfItems, PageOfKeys
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterator
@@ -26,7 +26,7 @@ async def test_key_value_store_collection_list(client: ApifyClient | ApifyClient
     """Test listing key-value stores."""
     kvs_page = await maybe_await(client.key_value_stores().list(limit=10))
 
-    assert isinstance(kvs_page, PageOfKeys)
+    assert isinstance(kvs_page, PageOfItems)
     assert isinstance(kvs_page.items, list)
     if kvs_page.items:
         assert isinstance(kvs_page.items[0], KeyValueStore)
@@ -36,7 +36,7 @@ async def test_key_value_store_collection_list_pagination(client: ApifyClient |
     """Test listing key-value stores with pagination."""
     kvs_page = await maybe_await(client.key_value_stores().list(limit=5, offset=0))
 
-    assert isinstance(kvs_page, PageOfKeys)
+    assert isinstance(kvs_page, PageOfItems)
     assert isinstance(kvs_page.items, list)
     if kvs_page.items:
         assert isinstance(kvs_page.items[0], KeyValueStore)