Add more integration tests

Author: vdusek

scripts/utils.py

@@ -59,8 +59,8 @@ def get_published_package_versions() -> list:
         package_data = json.load(urlopen(package_info_url))  # noqa: S310
         published_versions = list(package_data['releases'].keys())
     # If the URL returns 404, it means the package has no releases yet (which is okay in our case)
-    except HTTPError as e:
-        if e.code != 404:
+    except HTTPError as exc:
+        if exc.code != 404:
             raise
         published_versions = []
     return published_versions

src/apify_client/_http_client.py

@@ -189,10 +189,10 @@ def _make_request(stop_retrying: Callable, attempt: int) -> impit.Response:
                 if response.status_code == HTTPStatus.TOO_MANY_REQUESTS:
                     self.stats.add_rate_limit_error(attempt)
 
-            except Exception as e:
-                logger.debug('Request threw exception', exc_info=e)
-                if not is_retryable_error(e):
-                    logger.debug('Exception is not retryable', exc_info=e)
+            except Exception as exc:
+                logger.debug('Request threw exception', exc_info=exc)
+                if not is_retryable_error(exc):
+                    logger.debug('Exception is not retryable', exc_info=exc)
                     stop_retrying()
                 raise
 
@@ -265,10 +265,10 @@ async def _make_request(stop_retrying: Callable, attempt: int) -> impit.Response
                 if response.status_code == HTTPStatus.TOO_MANY_REQUESTS:
                     self.stats.add_rate_limit_error(attempt)
 
-            except Exception as e:
-                logger.debug('Request threw exception', exc_info=e)
-                if not is_retryable_error(e):
-                    logger.debug('Exception is not retryable', exc_info=e)
+            except Exception as exc:
+                logger.debug('Request threw exception', exc_info=exc)
+                if not is_retryable_error(exc):
+                    logger.debug('Exception is not retryable', exc_info=exc)
                     stop_retrying()
                 raise
 

src/apify_client/_resource_clients/actor.py

@@ -463,7 +463,7 @@ def runs(self) -> RunCollectionClient:
         """Retrieve a client for the runs of this Actor."""
         return RunCollectionClient(**self._sub_resource_init_options(resource_path='runs'))
 
-    async def default_build(
+    def default_build(
         self,
         *,
         wait_for_finish: int | None = None,

tests/integration/test_actor.py

@@ -113,3 +113,53 @@ def test_actor_create_update_delete(apify_client: ApifyClient) -> None:
     # Verify deletion
     deleted_actor = actor_client.get()
     assert deleted_actor is None
+
+
+def test_actor_default_build(apify_client: ApifyClient) -> None:
+    """Test getting an actor's default build."""
+    # Use a public actor that has builds
+    actor_client = apify_client.actor('apify/hello-world')
+
+    # Get default build client
+    build_client = actor_client.default_build()
+    assert build_client is not None
+
+    # Use the returned client to get the build
+    build = build_client.get()
+    assert build is not None
+    assert build.id is not None
+    assert build.status is not None
+
+
+def test_actor_last_run(apify_client: ApifyClient) -> None:
+    """Test getting an actor's last run."""
+    # First run an actor to ensure there is a last run
+    actor_client = apify_client.actor('apify/hello-world')
+    run = actor_client.call()
+    assert run is not None
+
+    try:
+        # Get last run client
+        last_run_client = actor_client.last_run()
+        assert last_run_client is not None
+
+        # Use the returned client to get the run
+        last_run = last_run_client.get()
+        assert last_run is not None
+        assert last_run.id is not None
+        # The last run should be the one we just created
+        assert last_run.id == run.id
+
+    finally:
+        # Cleanup
+        apify_client.run(run.id).delete()
+
+
+def test_actor_validate_input(apify_client: ApifyClient) -> None:
+    """Test validating actor input."""
+    # Use a public actor with an input schema
+    actor_client = apify_client.actor('apify/hello-world')
+
+    # Valid input (hello-world accepts empty input or simple input)
+    is_valid = actor_client.validate_input({})
+    assert is_valid is True

tests/integration/test_actor_async.py

@@ -113,3 +113,53 @@ async def test_actor_create_update_delete(apify_client_async: ApifyClientAsync)
     # Verify deletion
     deleted_actor = await actor_client.get()
     assert deleted_actor is None
+
+
+async def test_actor_default_build(apify_client_async: ApifyClientAsync) -> None:
+    """Test getting an actor's default build."""
+    # Use a public actor that has builds
+    actor_client = apify_client_async.actor('apify/hello-world')
+
+    # Get default build client
+    build_client = await actor_client.default_build()
+    assert build_client is not None
+
+    # Use the returned client to get the build
+    build = await build_client.get()
+    assert build is not None
+    assert build.id is not None
+    assert build.status is not None
+
+
+async def test_actor_last_run(apify_client_async: ApifyClientAsync) -> None:
+    """Test getting an actor's last run."""
+    # First run an actor to ensure there is a last run
+    actor_client = apify_client_async.actor('apify/hello-world')
+    run = await actor_client.call()
+    assert run is not None
+
+    try:
+        # Get last run client
+        last_run_client = actor_client.last_run()
+        assert last_run_client is not None
+
+        # Use the returned client to get the run
+        last_run = await last_run_client.get()
+        assert last_run is not None
+        assert last_run.id is not None
+        # The last run should be the one we just created
+        assert last_run.id == run.id
+
+    finally:
+        # Cleanup
+        await apify_client_async.run(run.id).delete()
+
+
+async def test_actor_validate_input(apify_client_async: ApifyClientAsync) -> None:
+    """Test validating actor input."""
+    # Use a public actor with an input schema
+    actor_client = apify_client_async.actor('apify/hello-world')
+
+    # Valid input (hello-world accepts empty input or simple input)
+    is_valid = await actor_client.validate_input({})
+    assert is_valid is True

tests/integration/test_build_async.py

@@ -2,8 +2,6 @@
 
 from typing import TYPE_CHECKING
 
-import pytest
-
 from .utils import get_random_resource_name
 
 if TYPE_CHECKING:
@@ -13,7 +11,6 @@
 HELLO_WORLD_ACTOR = 'apify/hello-world'
 
 
-@pytest.mark.asyncio
 async def test_build_list_for_actor(apify_client_async: ApifyClientAsync) -> None:
     """Test listing builds for a public actor."""
     # Get builds for hello-world actor
@@ -30,7 +27,6 @@ async def test_build_list_for_actor(apify_client_async: ApifyClientAsync) -> Non
     assert first_build.act_id is not None
 
 
-@pytest.mark.asyncio
 async def test_build_get(apify_client_async: ApifyClientAsync) -> None:
     """Test getting a specific build."""
     # First list builds to get a build ID
@@ -48,7 +44,6 @@ async def test_build_get(apify_client_async: ApifyClientAsync) -> None:
     assert build.status is not None
 
 
-@pytest.mark.asyncio
 async def test_user_builds_list(apify_client_async: ApifyClientAsync) -> None:
     """Test listing all user builds."""
     # List user's builds (may be empty if user has no actors)

tests/integration/test_dataset.py

@@ -151,9 +151,9 @@ def test_get_items_as_bytes_signature(apify_client: ApifyClient, test_dataset_of
     assert test_dataset_of_another_user.expected_content == json.loads(raw_data.decode('utf-8'))
 
 
-##################################################
-# NEW TESTS - Basic CRUD operations without mocks
-##################################################
+#############
+# NEW TESTS #
+#############
 
 
 def test_dataset_get_or_create_and_get(apify_client: ApifyClient) -> None:
@@ -368,3 +368,36 @@ def test_dataset_get_statistics(apify_client: ApifyClient) -> None:
     finally:
         # Cleanup
         dataset_client.delete()
+
+
+def test_dataset_stream_items(apify_client: ApifyClient) -> None:
+    """Test streaming dataset items."""
+    dataset_name = get_random_resource_name('dataset')
+
+    created_dataset = apify_client.datasets().get_or_create(name=dataset_name)
+    dataset_client = apify_client.dataset(created_dataset.id)
+
+    try:
+        # Push some items
+        items_to_push = [
+            {'id': 1, 'name': 'Item 1', 'value': 100},
+            {'id': 2, 'name': 'Item 2', 'value': 200},
+            {'id': 3, 'name': 'Item 3', 'value': 300},
+        ]
+        dataset_client.push_items(items_to_push)
+
+        # Wait briefly for eventual consistency
+        time.sleep(1)
+
+        # Stream items using context manager
+        with dataset_client.stream_items(item_format='json') as response:
+            assert response is not None
+            assert response.status_code == 200
+            content = response.read()
+            items = json.loads(content)
+            assert len(items) == 3
+            assert items[0]['id'] == 1
+
+    finally:
+        # Cleanup
+        dataset_client.delete()

tests/integration/test_dataset_async.py

@@ -159,9 +159,9 @@ async def test_get_items_as_bytes_signature(
     assert test_dataset_of_another_user.expected_content == json.loads(raw_data.decode('utf-8'))
 
 
-##################################################
-# NEW TESTS - Basic CRUD operations without mocks
-##################################################
+#############
+# NEW TESTS #
+#############
 
 
 async def test_dataset_get_or_create_and_get(apify_client_async: ApifyClientAsync) -> None:
@@ -376,3 +376,36 @@ async def test_dataset_get_statistics(apify_client_async: ApifyClientAsync) -> N
     finally:
         # Cleanup
         await dataset_client.delete()
+
+
+async def test_dataset_stream_items(apify_client_async: ApifyClientAsync) -> None:
+    """Test streaming dataset items."""
+    dataset_name = get_random_resource_name('dataset')
+
+    created_dataset = await apify_client_async.datasets().get_or_create(name=dataset_name)
+    dataset_client = apify_client_async.dataset(created_dataset.id)
+
+    try:
+        # Push some items
+        items_to_push = [
+            {'id': 1, 'name': 'Item 1', 'value': 100},
+            {'id': 2, 'name': 'Item 2', 'value': 200},
+            {'id': 3, 'name': 'Item 3', 'value': 300},
+        ]
+        await dataset_client.push_items(items_to_push)
+
+        # Wait briefly for eventual consistency
+        await asyncio.sleep(1)
+
+        # Stream items using async context manager
+        async with dataset_client.stream_items(item_format='json') as response:
+            assert response is not None
+            assert response.status_code == 200
+            content = await response.aread()
+            items = json.loads(content)
+            assert len(items) == 3
+            assert items[0]['id'] == 1
+
+    finally:
+        # Cleanup
+        await dataset_client.delete()

tests/integration/test_dataset_collection_async.py

@@ -3,13 +3,10 @@
 import uuid
 from typing import TYPE_CHECKING
 
-import pytest
-
 if TYPE_CHECKING:
     from apify_client import ApifyClientAsync
 
 
-@pytest.mark.asyncio
 async def test_datasets_list(apify_client_async: ApifyClientAsync) -> None:
     """Test listing datasets."""
     datasets_page = await apify_client_async.datasets().list(limit=10)
@@ -19,7 +16,6 @@ async def test_datasets_list(apify_client_async: ApifyClientAsync) -> None:
     assert isinstance(datasets_page.items, list)
 
 
-@pytest.mark.asyncio
 async def test_datasets_list_pagination(apify_client_async: ApifyClientAsync) -> None:
     """Test listing datasets with pagination."""
     datasets_page = await apify_client_async.datasets().list(limit=5, offset=0)
@@ -29,7 +25,6 @@ async def test_datasets_list_pagination(apify_client_async: ApifyClientAsync) ->
     assert isinstance(datasets_page.items, list)
 
 
-@pytest.mark.asyncio
 async def test_datasets_get_or_create(apify_client_async: ApifyClientAsync) -> None:
     """Test get_or_create for datasets."""
     unique_name = f'test-dataset-{uuid.uuid4().hex[:8]}'

tests/integration/test_key_value_store.py

@@ -207,9 +207,9 @@ def test_stream_record_signature(apify_client: ApifyClient, test_kvs_of_another_
     assert test_kvs_of_another_user.expected_content[key] == value
 
 
-##################################################
-# NEW TESTS - Basic CRUD operations without mocks
-##################################################
+#############
+# NEW TESTS #
+#############
 
 
 def test_key_value_store_get_or_create_and_get(apify_client: ApifyClient) -> None: