apify 1.7.1b4__py3-none-any.whl → 1.7.2__py3-none-any.whl

apify/actor.py

@@ -5,7 +5,7 @@ import contextlib
 import inspect
 import os
 import sys
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING, Any, Awaitable, Callable, TypeVar, cast
 
 from apify_client import ApifyClientAsync
@@ -301,6 +301,7 @@ 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.
 
@@ -314,11 +315,13 @@ 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(
@@ -327,6 +330,7 @@ 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()
 
@@ -336,21 +340,23 @@ class Actor(metaclass=_ActorContextManager):
 
         self.log.info('Exiting actor', extra={'exit_code': exit_code})
 
-        await self._cancel_event_emitting_intervals()
+        async def finalize() -> None:
+            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/config.py

@@ -35,6 +35,7 @@ class Configuration:
         proxy_status_url: str | None = None,
         purge_on_start: bool | None = None,
         token: str | None = None,
+        standby_port: int | None = None,
         system_info_interval_millis: int | None = None,
     ) -> None:
         """Create a `Configuration` instance.
@@ -65,6 +66,7 @@ class Configuration:
             purge_on_start (str, optional): Whether the actor should purge its default storages on startup, when running locally.
             token (str, optional): The API token for the Apify API this actor should use.
             system_info_interval_millis (str, optional): How often should the actor emit the SYSTEM_INFO event when running locally.
+            standby_port (int, optional): The port on which the container can listen for Actor Standby HTTP requests.
         """
         # TODO: Document all these members
         # https://github.com/apify/apify-sdk-python/issues/147
@@ -103,6 +105,7 @@ class Configuration:
         self.proxy_port = proxy_port or fetch_and_parse_env_var(ApifyEnvVars.PROXY_PORT, 8000)
         self.proxy_status_url = proxy_status_url or fetch_and_parse_env_var(ApifyEnvVars.PROXY_STATUS_URL, 'http://proxy.apify.com')
         self.purge_on_start = purge_on_start or fetch_and_parse_env_var(ApifyEnvVars.PURGE_ON_START, default=False)
+        self.standby_port = standby_port or fetch_and_parse_env_var(ActorEnvVars.STANDBY_PORT, 4322)
         self.started_at = fetch_and_parse_env_var(ActorEnvVars.STARTED_AT)
         self.timeout_at = fetch_and_parse_env_var(ActorEnvVars.TIMEOUT_AT)
         self.token = token or fetch_and_parse_env_var(ApifyEnvVars.TOKEN)

{apify-1.7.1b4.dist-info → apify-1.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 1.7.1b4
+Version: 1.7.2
 Summary: Apify SDK for Python
 Author-email: "Apify Technologies s.r.o." <support@apify.com>
 License: Apache Software License
@@ -24,21 +24,21 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apify-client ~=1.6.2
-Requires-Dist: apify-shared ~=1.1.1
+Requires-Dist: apify-client ~=1.6.0
+Requires-Dist: apify-shared ~=1.1.2
 Requires-Dist: aiofiles >=22.1.0
 Requires-Dist: aioshutil >=1.0
 Requires-Dist: colorama >=0.4.6
 Requires-Dist: cryptography >=39.0.0
-Requires-Dist: httpx >=0.24.1
-Requires-Dist: psutil >=5.9.5
-Requires-Dist: pyee >=11.0.1
-Requires-Dist: sortedcollections >=2.0.1
+Requires-Dist: httpx >=0.24.0
+Requires-Dist: psutil >=5.9.0
+Requires-Dist: pyee >=11.0.0
+Requires-Dist: sortedcollections >=2.0.0
 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: filelock ~=3.15.1 ; 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'
@@ -50,6 +50,7 @@ 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: setuptools ~=70.1.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'

{apify-1.7.1b4.dist-info → apify-1.7.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
 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=v_hefwMXy2qCIBjcZvVHE9zdHg2jut0Xuf6IodX_vvo,59997
-apify/config.py,sha256=mPbTqKe09hJXXGqKLuNRXGdBNod9mn1ACujRSm80GRQ,8785
+apify/actor.py,sha256=lwgE9huMDVgw8ehTFNrZAk5hwSlQNGuYeBx6aKcHiBM,60423
+apify/config.py,sha256=1orNGYPiqcT_3Q8_DPRIpX1LjicqzK6e_nvMaGcU1ng,9045
 apify/consts.py,sha256=eSD23HmwLKwWG8bRp5O1c7bmtlhvYE17Yw46BKs4vQQ,2263
 apify/event_manager.py,sha256=k4_f977esIOvgGshec4yUSulU10-UsEkoVEV4sZEjwg,10612
 apify/log.py,sha256=PObD-34j4GFUTLHHWDfgdd39ftfERBQBTc2DyvPJT3o,5005
@@ -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.1b4.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
-apify-1.7.1b4.dist-info/METADATA,sha256=bkt9mciHWSGJnCLoxPL1PVCe2fd8_ILVxm4wnxc7BFI,6255
-apify-1.7.1b4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-apify-1.7.1b4.dist-info/top_level.txt,sha256=2oFNsHggn5m_rCaaP7xijQg_-Va2ByOSYuvKgACsS5w,6
-apify-1.7.1b4.dist-info/RECORD,,
+apify-1.7.2.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
+apify-1.7.2.dist-info/METADATA,sha256=mBlpWItbOHFUsOD1delotf4yjW06-ARaVus6W4vzY7U,6305
+apify-1.7.2.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+apify-1.7.2.dist-info/top_level.txt,sha256=2oFNsHggn5m_rCaaP7xijQg_-Va2ByOSYuvKgACsS5w,6
+apify-1.7.2.dist-info/RECORD,,

{apify-1.7.1b4.dist-info → apify-1.7.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any