apify 3.3.2b3__tar.gz → 3.3.2b5__tar.gz

{apify-3.3.2b3 → apify-3.3.2b5}/.github/workflows/_tests.yaml

@@ -71,7 +71,7 @@ jobs:
             matrix.python-version == '3.14' &&
             env.CODECOV_TOKEN != ''
           }}
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
@@ -128,7 +128,7 @@ jobs:
             matrix.python-version == '3.14' &&
             env.CODECOV_TOKEN != ''
           }}
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

{apify-3.3.2b3 → apify-3.3.2b5}/CHANGELOG.md

@@ -10,6 +10,8 @@ All notable changes to this project will be documented in this file.
 - **scrapy:** Resolve Crawlee's request data round-trip failure in request conversion ([#832](https://github.com/apify/apify-sdk-python/pull/832)) ([3b9d588](https://github.com/apify/apify-sdk-python/commit/3b9d5888611597a522300c742014c06cc0b857b9)) by [@vdusek](https://github.com/vdusek)
 - Treat `default` alias as default storage when in schema ([#827](https://github.com/apify/apify-sdk-python/pull/827)) ([1610d0d](https://github.com/apify/apify-sdk-python/commit/1610d0dda40ba30bd3b4dea28d9fef04c9b7c839)) by [@Pijukatel](https://github.com/Pijukatel)
 - Guard ReentrantLock against None task context ([#841](https://github.com/apify/apify-sdk-python/pull/841)) ([193de10](https://github.com/apify/apify-sdk-python/commit/193de10910946ca0ce93bc2fc7c741a26e9f6e9c)) by [@vdusek](https://github.com/vdusek)
+- Isolate cleanup steps in Actor `__aexit__` to prevent cascading failures ([#842](https://github.com/apify/apify-sdk-python/pull/842)) ([68c2acf](https://github.com/apify/apify-sdk-python/commit/68c2acf3dba71b78f893fc6f1e816e3a3148f0c9)) by [@vdusek](https://github.com/vdusek)
+- Handle exceptions in pre-reboot event listeners via `return_exceptions` ([#843](https://github.com/apify/apify-sdk-python/pull/843)) ([ed13597](https://github.com/apify/apify-sdk-python/commit/ed13597d7ce0d1f0c5ff5cd0d6796c96555a55ae)) by [@vdusek](https://github.com/vdusek)
 
 
 <!-- git-cliff-unreleased-end -->

{apify-3.3.2b3 → apify-3.3.2b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apify
-Version: 3.3.2b3
+Version: 3.3.2b5
 Summary: Apify SDK for Python
 Project-URL: Apify Homepage, https://apify.com
 Project-URL: Changelog, https://docs.apify.com/sdk/python/docs/changelog

{apify-3.3.2b3 → apify-3.3.2b5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apify"
-version = "3.3.2b3"
+version = "3.3.2b5"
 description = "Apify SDK for Python"
 authors = [{ name = "Apify Technologies s.r.o.", email = "support@apify.com" }]
 license = { file = "LICENSE" }

{apify-3.3.2b3 → apify-3.3.2b5}/src/apify/_actor.py

@@ -249,11 +249,21 @@ class _ActorType:
             if self._event_listeners_timeout:
                 await self.event_manager.wait_for_all_listeners_to_complete(timeout=self._event_listeners_timeout)
 
-            await self.event_manager.__aexit__(None, None, None)
-            await self._charging_manager_implementation.__aexit__(None, None, None)
+            try:
+                await self.event_manager.__aexit__(None, None, None)
+            except Exception:
+                self.log.exception('Failed to exit event manager')
+
+            try:
+                await self._charging_manager_implementation.__aexit__(None, None, None)
+            except Exception:
+                self.log.exception('Failed to exit charging manager')
 
             # Persist Actor state
-            await self._save_actor_state()
+            try:
+                await self._save_actor_state()
+            except Exception:
+                self.log.exception('Failed to save Actor state')
 
         try:
             await asyncio.wait_for(finalize(), self._cleanup_timeout.total_seconds())
@@ -1194,11 +1204,16 @@ class _ActorType:
             (self.event_manager._listeners_to_wrappers[Event.MIGRATING] or {}).values()  # noqa: SLF001
         )
 
-        await asyncio.gather(
+        results = await asyncio.gather(
             *[listener(EventPersistStateData(is_migrating=True)) for listener in persist_state_listeners],
             *[listener(EventMigratingData()) for listener in migrating_listeners],
+            return_exceptions=True,
         )
 
+        for result in results:
+            if isinstance(result, Exception):
+                self.log.exception('A pre-reboot event listener failed', exc_info=result)
+
         if not self.configuration.actor_run_id:
             raise RuntimeError('actor_run_id cannot be None when running on the Apify platform.')
 

{apify-3.3.2b3 → apify-3.3.2b5}/tests/unit/actor/test_actor_helpers.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 import warnings
 from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING
@@ -344,3 +345,57 @@ async def test_get_remaining_time_returns_positive_when_timeout_in_future() -> N
         assert result is not None
         assert result > timedelta(0)
         assert result <= timedelta(minutes=5)
+
+
+async def test_reboot_runs_all_listeners_even_when_one_fails(
+    apify_client_async_patcher: ApifyClientAsyncPatcher,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that a failing pre-reboot event listener does not prevent other listeners from running.
+
+    Directly injects raw async callables into the event manager's _listeners_to_wrappers
+    to simulate exceptions escaping the wrapper layer (the scenario return_exceptions=True guards against).
+    """
+    apify_client_async_patcher.patch('run', 'reboot', return_value=None)
+
+    persist_state_called = False
+    migrating_called = False
+
+    async def failing_listener(*_args: object) -> None:
+        raise RuntimeError('persist_state listener error')
+
+    async def successful_persist_state_listener(*_args: object) -> None:
+        nonlocal persist_state_called
+        persist_state_called = True
+
+    async def successful_migrating_listener(*_args: object) -> None:
+        nonlocal migrating_called
+        migrating_called = True
+
+    async with Actor:
+        Actor.configuration.is_at_home = True
+        Actor.configuration.actor_run_id = 'some-run-id'
+
+        # Inject raw listeners directly into the event manager's internal structure,
+        # bypassing crawlee's wrapper that would catch exceptions on its own.
+        listeners_map = Actor.event_manager._listeners_to_wrappers
+        listeners_map[Event.PERSIST_STATE] = {
+            failing_listener: [failing_listener],
+            successful_persist_state_listener: [successful_persist_state_listener],
+        }
+        listeners_map[Event.MIGRATING] = {
+            successful_migrating_listener: [successful_migrating_listener],
+        }
+
+        with caplog.at_level(logging.ERROR):
+            await Actor.reboot(custom_after_sleep=timedelta(milliseconds=1))
+
+    # All listeners ran despite the failure in one of them.
+    assert persist_state_called
+    assert migrating_called
+
+    # The exception was logged.
+    assert any('A pre-reboot event listener failed' in r.message for r in caplog.records)
+
+    # The reboot API call was still made.
+    assert len(apify_client_async_patcher.calls['run']['reboot']) == 1

{apify-3.3.2b3 → apify-3.3.2b5}/uv.lock

@@ -27,7 +27,7 @@ wheels = [
 
 [[package]]
 name = "apify"
-version = "3.3.2b3"
+version = "3.3.2b5"
 source = { editable = "." }
 dependencies = [
     { name = "apify-client" },