Add "easy wins" tests and consolidate

Author: vdusek

src/apify_client/_models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.json
-#   timestamp: 2025-12-20T10:45:52+00:00
+#   timestamp: 2025-12-21T10:07:13+00:00
 
 from __future__ import annotations
 
@@ -1663,10 +1663,10 @@ class UpdateRequestResponse(BaseModel):
 
 class Item1(BaseModel):
     id: Annotated[str, Field(examples=['8OamqXBCpPHxyH9'])]
-    retry_count: Annotated[float, Field(alias='retryCount', examples=[0])]
+    retry_count: Annotated[float | None, Field(alias='retryCount', examples=[0])] = None
     unique_key: Annotated[str, Field(alias='uniqueKey', examples=['http://example.com'])]
     url: Annotated[str, Field(examples=['http://example.com'])]
-    method: Annotated[str, Field(examples=['GET'])]
+    method: Annotated[str | None, Field(examples=['GET'])] = None
 
 
 class Data15(BaseModel):

src/apify_client/_resource_clients/request_queue.py

@@ -16,6 +16,7 @@
     GetHeadAndLockResponse,
     GetHeadResponse,
     GetRequestQueueResponse,
+    GetRequestResponse,
     ListRequestsResponse,
     ProcessedRequest,
     ProlongRequestLockResponse,
@@ -190,7 +191,7 @@ def get_request(self, request_id: str) -> RequestQueueItems | None:
                 timeout_secs=_SMALL_TIMEOUT,
             )
             result = response.json()
-            return RequestQueueItems.model_validate(result)
+            return GetRequestResponse.model_validate(result).data
 
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)
@@ -589,12 +590,12 @@ async def get_request(self, request_id: str) -> RequestQueueItems | None:
                 timeout_secs=_SMALL_TIMEOUT,
             )
             result = response.json()
-            return RequestQueueItems.model_validate(result) if result is not None else None
-
+            validated_response = GetRequestResponse.model_validate(result) if result is not None else None
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)
-
-        return None
+            return None
+        else:
+            return validated_response.data if validated_response is not None else None
 
     async def update_request(self, request: dict, *, forefront: bool | None = None) -> RequestOperationInfo:
         """Update a request in the queue.

src/apify_client/_resource_clients/store_collection.py

@@ -3,10 +3,11 @@
 from typing import TYPE_CHECKING, Any
 
 from apify_client._resource_clients.base import ResourceCollectionClient, ResourceCollectionClientAsync
+from apify_client._types import ListPage
+from apify_client._utils import response_to_dict
 
 if TYPE_CHECKING:
     from apify_client._models import ActorShort
-    from apify_client._types import ListPage
 
 
 class StoreCollectionClient(ResourceCollectionClient):
@@ -16,6 +17,16 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         resource_path = kwargs.pop('resource_path', 'store')
         super().__init__(*args, resource_path=resource_path, **kwargs)
 
+    def _list(self, **kwargs: Any) -> ListPage:
+        """Override to unwrap the 'data' field from the store API response."""
+        response = self.http_client.call(
+            url=self._url(),
+            method='GET',
+            params=self._params(**kwargs),
+        )
+        data = response_to_dict(response)
+        return ListPage(data.get('data', {}))
+
     def list(
         self,
         *,
@@ -62,6 +73,16 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         resource_path = kwargs.pop('resource_path', 'store')
         super().__init__(*args, resource_path=resource_path, **kwargs)
 
+    async def _list(self, **kwargs: Any) -> ListPage:
+        """Override to unwrap the 'data' field from the store API response."""
+        response = await self.http_client.call(
+            url=self._url(),
+            method='GET',
+            params=self._params(**kwargs),
+        )
+        data = response_to_dict(response)
+        return ListPage(data.get('data', {}))
+
     async def list(
         self,
         *,

src/apify_client/_resource_clients/user.py

@@ -63,7 +63,10 @@ def monthly_usage(self) -> MonthlyUsage | None:
                 params=self._params(),
             )
             data = response_to_dict(response)
-            return MonthlyUsage.model_validate(data) if data is not None else None
+            if data is None:
+                return None
+            # API returns {data: {...}} structure
+            return MonthlyUsage.model_validate(data.get('data', {}))
 
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)
@@ -88,7 +91,10 @@ def limits(self) -> AccountLimits | None:
                 params=self._params(),
             )
             data = response_to_dict(response)
-            return AccountLimits.model_validate(data) if data is not None else None
+            if data is None:
+                return None
+            # API returns {data: {...}} structure
+            return AccountLimits.model_validate(data.get('data', {}))
 
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)
@@ -163,7 +169,10 @@ async def monthly_usage(self) -> MonthlyUsage | None:
                 params=self._params(),
             )
             data = response_to_dict(response)
-            return MonthlyUsage.model_validate(data) if data is not None else None
+            if data is None:
+                return None
+            # API returns {data: {...}} structure
+            return MonthlyUsage.model_validate(data.get('data', {}))
 
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)
@@ -188,7 +197,10 @@ async def limits(self) -> AccountLimits | None:
                 params=self._params(),
             )
             data = response_to_dict(response)
-            return AccountLimits.model_validate(data) if data is not None else None
+            if data is None:
+                return None
+            # API returns {data: {...}} structure
+            return AccountLimits.model_validate(data.get('data', {}))
 
         except ApifyApiError as exc:
             catch_not_found_or_throw(exc)

tests/integration/conftest.py

@@ -1,25 +1,18 @@
 import json
 import os
-import secrets
 from collections.abc import Generator
 
 import pytest
 from apify_shared.utils import create_hmac_signature, create_storage_content_signature
 
-from .integration_test_utils import TestDataset, TestKvs
+from .utils import TestDataset, TestKvs, get_crypto_random_object_id
 from apify_client import ApifyClient, ApifyClientAsync
 
 TOKEN_ENV_VAR = 'APIFY_TEST_USER_API_TOKEN'
 TOKEN_ENV_VAR_2 = 'APIFY_TEST_USER_2_API_TOKEN'
 API_URL_ENV_VAR = 'APIFY_INTEGRATION_TESTS_API_URL'
 
 
-def crypto_random_object_id(length: int = 17) -> str:
-    """Generate a random object ID."""
-    chars = 'abcdefghijklmnopqrstuvwxyzABCEDFGHIJKLMNOPQRSTUVWXYZ0123456789'
-    return ''.join(secrets.choice(chars) for _ in range(length))
-
-
 @pytest.fixture(scope='session')
 def api_token() -> str:
     token = os.getenv(TOKEN_ENV_VAR)
@@ -57,7 +50,7 @@ def test_dataset_of_another_user(api_token_2: str) -> Generator[TestDataset]:
     """Pre-existing named dataset of another test user with restricted access."""
     client = ApifyClient(api_token_2, api_url=os.getenv(API_URL_ENV_VAR))
 
-    dataset_name = f'API-test-permissions-{crypto_random_object_id()}'
+    dataset_name = f'API-test-permissions-{get_crypto_random_object_id()}'
     dataset = client.datasets().get_or_create(name=dataset_name)
     dataset_client = client.dataset(dataset_id=dataset.id)
     expected_content = [{'item1': 1, 'item2': 2, 'item3': 3}, {'item1': 4, 'item2': 5, 'item3': 6}]
@@ -87,7 +80,7 @@ def test_kvs_of_another_user(api_token_2: str) -> Generator[TestKvs]:
     """Pre-existing named key value store of another test user with restricted access."""
     client = ApifyClient(api_token_2, api_url=os.getenv(API_URL_ENV_VAR))
 
-    kvs_name = f'API-test-permissions-{crypto_random_object_id()}'
+    kvs_name = f'API-test-permissions-{get_crypto_random_object_id()}'
     kvs = client.key_value_stores().get_or_create(name=kvs_name)
     kvs_client = client.key_value_store(key_value_store_id=kvs.id)
     expected_content = {'key1': 1, 'key2': 2, 'key3': 3}

tests/integration/test_actor.py

@@ -0,0 +1,57 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from apify_client import ApifyClient
+
+
+def test_get_public_actor(apify_client: ApifyClient) -> None:
+    """Test getting a public actor by ID."""
+    # Use a well-known public actor (Apify's web scraper)
+    actor = apify_client.actor('apify/web-scraper').get()
+
+    assert actor is not None
+    assert actor.id is not None
+    assert actor.name == 'web-scraper'
+    assert actor.username == 'apify'
+
+
+def test_get_actor_by_full_name(apify_client: ApifyClient) -> None:
+    """Test getting an actor using username/actorname format."""
+    actor = apify_client.actor('apify/hello-world').get()
+
+    assert actor is not None
+    assert actor.name == 'hello-world'
+    assert actor.username == 'apify'
+
+
+def test_list_actors_my(apify_client: ApifyClient) -> None:
+    """Test listing actors created by the user."""
+    actors_page = apify_client.actors().list(my=True, limit=10)
+
+    assert actors_page is not None
+    assert actors_page.items is not None
+    # User may have 0 actors
+    assert isinstance(actors_page.items, list)
+
+
+def test_list_actors_pagination(apify_client: ApifyClient) -> None:
+    """Test listing actors with pagination parameters."""
+    # List all actors (public + owned), should return some results
+    actors_page = apify_client.actors().list(limit=5, offset=0)
+
+    assert actors_page is not None
+    assert actors_page.items is not None
+    assert isinstance(actors_page.items, list)
+    # Should have at least some actors (public ones exist)
+    assert len(actors_page.items) >= 0
+
+
+def test_list_actors_sorting(apify_client: ApifyClient) -> None:
+    """Test listing actors with sorting."""
+    actors_page = apify_client.actors().list(limit=10, desc=True, sort_by='createdAt')
+
+    assert actors_page is not None
+    assert actors_page.items is not None
+    assert isinstance(actors_page.items, list)

tests/integration/test_actor_async.py

@@ -0,0 +1,57 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from apify_client import ApifyClientAsync
+
+
+async def test_get_public_actor(apify_client_async: ApifyClientAsync) -> None:
+    """Test getting a public actor by ID."""
+    # Use a well-known public actor (Apify's web scraper)
+    actor = await apify_client_async.actor('apify/web-scraper').get()
+
+    assert actor is not None
+    assert actor.id is not None
+    assert actor.name == 'web-scraper'
+    assert actor.username == 'apify'
+
+
+async def test_get_actor_by_full_name(apify_client_async: ApifyClientAsync) -> None:
+    """Test getting an actor using username/actorname format."""
+    actor = await apify_client_async.actor('apify/hello-world').get()
+
+    assert actor is not None
+    assert actor.name == 'hello-world'
+    assert actor.username == 'apify'
+
+
+async def test_list_actors_my(apify_client_async: ApifyClientAsync) -> None:
+    """Test listing actors created by the user."""
+    actors_page = await apify_client_async.actors().list(my=True, limit=10)
+
+    assert actors_page is not None
+    assert actors_page.items is not None
+    # User may have 0 actors
+    assert isinstance(actors_page.items, list)
+
+
+async def test_list_actors_pagination(apify_client_async: ApifyClientAsync) -> None:
+    """Test listing actors with pagination parameters."""
+    # List all actors (public + owned), should return some results
+    actors_page = await apify_client_async.actors().list(limit=5, offset=0)
+
+    assert actors_page is not None
+    assert actors_page.items is not None
+    assert isinstance(actors_page.items, list)
+    # Should have at least some actors (public ones exist)
+    assert len(actors_page.items) >= 0
+
+
+async def test_list_actors_sorting(apify_client_async: ApifyClientAsync) -> None:
+    """Test listing actors with sorting."""
+    actors_page = await apify_client_async.actors().list(limit=10, desc=True, sort_by='createdAt')
+
+    assert actors_page is not None
+    assert actors_page.items is not None
+    assert isinstance(actors_page.items, list)

tests/integration/test_apify_client.py

@@ -5,18 +5,11 @@
 from apify_client._models import UserPrivateInfo, UserPublicInfo
 
 if TYPE_CHECKING:
-    from apify_client import ApifyClient, ApifyClientAsync
+    from apify_client import ApifyClient
 
 
-def test_apify_client_sync(apify_client: ApifyClient) -> None:
+def test_apify_client(apify_client: ApifyClient) -> None:
     user_client = apify_client.user('me')
     me = user_client.get()
     assert isinstance(me, (UserPrivateInfo, UserPublicInfo))
     assert me.username is not None
-
-
-async def test_apify_client_async(apify_client_async: ApifyClientAsync) -> None:
-    user_client = apify_client_async.user('me')
-    me = await user_client.get()
-    assert isinstance(me, (UserPrivateInfo, UserPublicInfo))
-    assert me.username is not None

tests/integration/test_apify_client_async.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from apify_client._models import UserPrivateInfo, UserPublicInfo
+
+if TYPE_CHECKING:
+    from apify_client import ApifyClientAsync
+
+
+async def test_apify_client(apify_client_async: ApifyClientAsync) -> None:
+    user_client = apify_client_async.user('me')
+    me = await user_client.get()
+    assert isinstance(me, (UserPrivateInfo, UserPublicInfo))
+    assert me.username is not None