apify 1.7.1__py3-none-any.whl → 1.7.1b2__py3-none-any.whl

apify/actor.py

@@ -5,7 +5,7 @@ import contextlib
 import inspect
 import os
 import sys
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any, Awaitable, Callable, TypeVar, cast
 
 from apify_client import ApifyClientAsync
@@ -301,7 +301,6 @@ class Actor(metaclass=_ActorContextManager):
         exit_code: int = 0,
         event_listeners_timeout_secs: float | None = EVENT_LISTENERS_TIMEOUT_SECS,
         status_message: str | None = None,
-        cleanup_timeout: timedelta = timedelta(seconds=30),
     ) -> None:
         """Exit the actor instance.
 
@@ -315,13 +314,11 @@ class Actor(metaclass=_ActorContextManager):
             exit_code (int, optional): The exit code with which the actor should fail (defaults to `0`).
             event_listeners_timeout_secs (float, optional): How long should the actor wait for actor event listeners to finish before exiting.
             status_message (str, optional): The final status message that the actor should display.
-            cleanup_timeout (timedelta, optional): How long we should wait for event listeners.
         """
         return await cls._get_default_instance().exit(
             exit_code=exit_code,
             event_listeners_timeout_secs=event_listeners_timeout_secs,
             status_message=status_message,
-            cleanup_timeout=cleanup_timeout,
         )
 
     async def _exit_internal(
@@ -330,7 +327,6 @@ class Actor(metaclass=_ActorContextManager):
         exit_code: int = 0,
         event_listeners_timeout_secs: float | None = EVENT_LISTENERS_TIMEOUT_SECS,
         status_message: str | None = None,
-        cleanup_timeout: timedelta = timedelta(seconds=30),
     ) -> None:
         self._raise_if_not_initialized()
 
@@ -340,23 +336,21 @@ class Actor(metaclass=_ActorContextManager):
 
         self.log.info('Exiting actor', extra={'exit_code': exit_code})
 
-        async def finalize() -> None:
-            await self._cancel_event_emitting_intervals()
+        await self._cancel_event_emitting_intervals()
 
-            # Send final persist state event
-            if not self._was_final_persist_state_emitted:
-                self._event_manager.emit(ActorEventTypes.PERSIST_STATE, {'isMigrating': False})
-                self._was_final_persist_state_emitted = True
+        # Send final persist state event
+        if not self._was_final_persist_state_emitted:
+            self._event_manager.emit(ActorEventTypes.PERSIST_STATE, {'isMigrating': False})
+            self._was_final_persist_state_emitted = True
 
-            if status_message is not None:
-                await self.set_status_message(status_message, is_terminal=True)
+        if status_message is not None:
+            await self.set_status_message(status_message, is_terminal=True)
 
-            # Sleep for a bit so that the listeners have a chance to trigger
-            await asyncio.sleep(0.1)
+        # Sleep for a bit so that the listeners have a chance to trigger
+        await asyncio.sleep(0.1)
 
-            await self._event_manager.close(event_listeners_timeout_secs=event_listeners_timeout_secs)
+        await self._event_manager.close(event_listeners_timeout_secs=event_listeners_timeout_secs)
 
-        await asyncio.wait_for(finalize(), cleanup_timeout.total_seconds())
         self._is_initialized = False
 
         if is_running_in_ipython():

{apify-1.7.1.dist-info → apify-1.7.1b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 1.7.1
+Version: 1.7.1b2
 Summary: Apify SDK for Python
 Author-email: "Apify Technologies s.r.o." <support@apify.com>
 License: Apache Software License
@@ -37,23 +37,23 @@ Requires-Dist: sortedcollections >=2.0.1
 Requires-Dist: typing-extensions >=4.1.0
 Requires-Dist: websockets >=10.1
 Provides-Extra: dev
-Requires-Dist: build ~=1.2.0 ; extra == 'dev'
-Requires-Dist: filelock ~=3.14.0 ; extra == 'dev'
-Requires-Dist: mypy ~=1.10.0 ; extra == 'dev'
-Requires-Dist: pre-commit ~=3.5.0 ; extra == 'dev'
-Requires-Dist: pydoc-markdown ~=4.8.0 ; extra == 'dev'
-Requires-Dist: pytest ~=8.2.0 ; extra == 'dev'
-Requires-Dist: pytest-asyncio ~=0.23.0 ; extra == 'dev'
-Requires-Dist: pytest-cov ~=5.0.0 ; extra == 'dev'
-Requires-Dist: pytest-only ~=2.1.0 ; extra == 'dev'
-Requires-Dist: pytest-timeout ~=2.3.0 ; extra == 'dev'
-Requires-Dist: pytest-xdist ~=3.6.0 ; extra == 'dev'
-Requires-Dist: respx ~=0.21.0 ; extra == 'dev'
-Requires-Dist: ruff ~=0.4.0 ; extra == 'dev'
-Requires-Dist: twine ~=5.1.0 ; extra == 'dev'
-Requires-Dist: types-aiofiles ~=23.2.0.20240403 ; extra == 'dev'
-Requires-Dist: types-colorama ~=0.4.15.20240311 ; extra == 'dev'
-Requires-Dist: types-psutil ~=5.9.5.20240516 ; extra == 'dev'
+Requires-Dist: build ~=1.0.3 ; extra == 'dev'
+Requires-Dist: filelock ~=3.12.4 ; extra == 'dev'
+Requires-Dist: mypy ~=1.7.1 ; extra == 'dev'
+Requires-Dist: pre-commit ~=3.4.0 ; extra == 'dev'
+Requires-Dist: pydoc-markdown ~=4.8.2 ; extra == 'dev'
+Requires-Dist: pytest ~=7.4.2 ; extra == 'dev'
+Requires-Dist: pytest-asyncio ~=0.21.0 ; extra == 'dev'
+Requires-Dist: pytest-cov ~=4.1.0 ; extra == 'dev'
+Requires-Dist: pytest-only ~=2.0.0 ; extra == 'dev'
+Requires-Dist: pytest-timeout ~=2.2.0 ; extra == 'dev'
+Requires-Dist: pytest-xdist ~=3.3.1 ; extra == 'dev'
+Requires-Dist: respx ~=0.20.1 ; extra == 'dev'
+Requires-Dist: ruff ~=0.1.13 ; extra == 'dev'
+Requires-Dist: twine ~=4.0.2 ; extra == 'dev'
+Requires-Dist: types-aiofiles ~=23.2.0.0 ; extra == 'dev'
+Requires-Dist: types-colorama ~=0.4.15.12 ; extra == 'dev'
+Requires-Dist: types-psutil ~=5.9.5.17 ; extra == 'dev'
 Provides-Extra: scrapy
 Requires-Dist: scrapy >=2.11.0 ; extra == 'scrapy'
 

{apify-1.7.1.dist-info → apify-1.7.1b2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 apify/__init__.py,sha256=aAjho-r0-XAqUjD9j55ueCo4lZJzyytOWjk0VCmkeeY,283
 apify/_crypto.py,sha256=mbqwfgVz7efAw6ko1PTtpaaRqlBvTi-oskiZmWufTrk,5822
 apify/_utils.py,sha256=7_iHGRw8AZA7ITStg5cN8k_ZmqMKdAQ_ev2ZRcO3X0M,16963
-apify/actor.py,sha256=lwgE9huMDVgw8ehTFNrZAk5hwSlQNGuYeBx6aKcHiBM,60423
+apify/actor.py,sha256=v_hefwMXy2qCIBjcZvVHE9zdHg2jut0Xuf6IodX_vvo,59997
 apify/config.py,sha256=mPbTqKe09hJXXGqKLuNRXGdBNod9mn1ACujRSm80GRQ,8785
 apify/consts.py,sha256=eSD23HmwLKwWG8bRp5O1c7bmtlhvYE17Yw46BKs4vQQ,2263
 apify/event_manager.py,sha256=k4_f977esIOvgGshec4yUSulU10-UsEkoVEV4sZEjwg,10612
@@ -34,8 +34,8 @@ apify/storages/dataset.py,sha256=gfMlJ6dSXDdjCykkStZCyp4u8xKCIZqflGS9-jLzK74,233
 apify/storages/key_value_store.py,sha256=BUGYPI4MuRlOJ_aPzZr8bq7ay_K04qAZ7yKW7C8ItV4,10760
 apify/storages/request_queue.py,sha256=68pM2nJUYjkdpBTM315NnjRYE_yzeoslVtBQRB7bm74,28829
 apify/storages/storage_client_manager.py,sha256=fvXg3PRojATNamEN29BBZyZZ5GWN_s0r29A59aiL-wQ,2465
-apify-1.7.1.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
-apify-1.7.1.dist-info/METADATA,sha256=H-UOaxDoYG3NWbttM8afCLu5seZa_w6oQzafcEa8XMI,6253
-apify-1.7.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-apify-1.7.1.dist-info/top_level.txt,sha256=2oFNsHggn5m_rCaaP7xijQg_-Va2ByOSYuvKgACsS5w,6
-apify-1.7.1.dist-info/RECORD,,
+apify-1.7.1b2.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
+apify-1.7.1b2.dist-info/METADATA,sha256=kQJG_mMb2B39CARYzxbsWxKpKxPtHnq4y6D9nfkshjE,6236
+apify-1.7.1b2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+apify-1.7.1b2.dist-info/top_level.txt,sha256=2oFNsHggn5m_rCaaP7xijQg_-Va2ByOSYuvKgACsS5w,6
+apify-1.7.1b2.dist-info/RECORD,,