ergon-framework-python 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

ergon/__init__.py

@@ -10,4 +10,4 @@ __all__ = [
     "manager",
 ]
 
-__version__ = "0.1.5"
+__version__ = "0.1.6"

ergon/task/runner.py

@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import logging as stdlib_logging
 import os
 import signal
@@ -6,6 +7,7 @@ import threading
 import time
 import traceback
 import uuid
+from collections.abc import Callable
 from concurrent.futures import ProcessPoolExecutor
 from datetime import datetime
 from enum import IntEnum
@@ -41,6 +43,8 @@ class ExitCode(IntEnum):
 
 _shutdown_event = threading.Event()
 _shutdown_signal: int | None = None
+_shutdown_callbacks: set[Callable[[], None]] = set()
+_shutdown_callbacks_lock = threading.Lock()
 _supervisor_logger = stdlib_logging.getLogger(__name__)
 
 
@@ -48,6 +52,13 @@ def _signal_handler(signum, frame):
     global _shutdown_signal
     _shutdown_signal = signum
     _shutdown_event.set()
+    with _shutdown_callbacks_lock:
+        callbacks = tuple(_shutdown_callbacks)
+    for callback in callbacks:
+        try:
+            callback()
+        except Exception:
+            _supervisor_logger.exception("Async shutdown callback failed")
 
 
 def _install_signal_handlers():
@@ -55,6 +66,27 @@ def _install_signal_handlers():
     signal.signal(signal.SIGTERM, _signal_handler)
 
 
+def _reset_shutdown_state() -> None:
+    global _shutdown_signal
+    _shutdown_event.clear()
+    _shutdown_signal = None
+    with _shutdown_callbacks_lock:
+        _shutdown_callbacks.clear()
+
+
+def _register_shutdown_callback(callback: Callable[[], None]) -> None:
+    with _shutdown_callbacks_lock:
+        _shutdown_callbacks.add(callback)
+        shutdown_requested = _shutdown_event.is_set()
+    if shutdown_requested:
+        callback()
+
+
+def _unregister_shutdown_callback(callback: Callable[[], None]) -> None:
+    with _shutdown_callbacks_lock:
+        _shutdown_callbacks.discard(callback)
+
+
 def is_shutdown_requested() -> bool:
     return _shutdown_event.is_set()
 
@@ -216,20 +248,31 @@ async def __run_task_async(
 
     instance = None
     supervisor = None
+    liveness_shutdown_requested = threading.Event()
+    connectors: dict[str, Any] = {}
+    services: dict[str, Any] = {}
+    loop = asyncio.get_running_loop()
+    runner_task = asyncio.current_task()
+
+    def request_signal_shutdown() -> None:
+        if runner_task is not None and not runner_task.done():
+            loop.call_soon_threadsafe(runner_task.cancel, "Process shutdown requested")
+
+    _register_shutdown_callback(request_signal_shutdown)
 
     try:
         with tracer.start_as_current_span(  # type: ignore[attr-defined]
             f"{config.task.__name__}.run",
             attributes={"task.execution.id": task_exec_metadata["execution_id"]},
         ):
-            connectors = {}
             for name, cfg in config.connectors.items():
                 conn = cfg.connector(*cfg.args, **cfg.kwargs)
+                connectors[name] = conn
                 if hasattr(conn, "init_async"):
                     await conn.init_async()  # type: ignore[attr-defined]
-                connectors[name] = conn
 
-            services = {name: cfg.service(*cfg.args, **cfg.kwargs) for name, cfg in config.services.items()}
+            for name, cfg in config.services.items():
+                services[name] = cfg.service(*cfg.args, **cfg.kwargs)
 
             instance = config.task(
                 connectors=connectors,
@@ -242,10 +285,9 @@ async def __run_task_async(
             )
 
             if config.supervision.enabled and isinstance(instance, LivenessProvider):
-                loop = asyncio.get_running_loop()
-                runner_task = asyncio.current_task()
 
                 def request_liveness_shutdown(reason: str) -> None:
+                    liveness_shutdown_requested.set()
                     if runner_task is not None and not runner_task.done():
                         loop.call_soon_threadsafe(runner_task.cancel, f"Task unhealthy: {reason}")
 
@@ -266,11 +308,37 @@ async def __run_task_async(
             else:
                 await instance.execute()
 
+    except asyncio.CancelledError:
+        if not is_shutdown_requested():
+            raise
     finally:
-        if supervisor is not None:
+        _unregister_shutdown_callback(request_signal_shutdown)
+        if supervisor is not None and not liveness_shutdown_requested.is_set():
             supervisor.stop()
-        if instance is not None:
-            await instance.exit()
+        try:
+            if instance is not None:
+                await instance.exit()
+        finally:
+            try:
+                resources = [*connectors.values(), *services.values()]
+                for resource in reversed(resources):
+                    close = getattr(resource, "close", None)
+                    if close is None:
+                        close = getattr(resource, "aclose", None)
+                    if not callable(close):
+                        continue
+                    try:
+                        result = close()
+                        if inspect.isawaitable(result):
+                            await result
+                    except Exception:
+                        _supervisor_logger.exception(
+                            "Failed to close async task resource %s",
+                            type(resource).__name__,
+                        )
+            finally:
+                if supervisor is not None:
+                    supervisor.stop()
 
 
 # =============================================================
@@ -424,6 +492,7 @@ def run_task(
     Returns POSIX-compatible exit code.
     """
 
+    _reset_shutdown_state()
     _install_signal_handlers()
     is_async = issubclass(config.task, BaseAsyncTask)  # type: ignore[arg-type]
 

{ergon_framework_python-0.1.5.dist-info → ergon_framework_python-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ergon-framework-python
-Version: 0.1.5
+Version: 0.1.6
 Summary: Ergon internal task-oriented project bootstrapper
 Author-email: Ergondata Technologies <anza.vossos@protonmail.com>
 License-Expression: MIT

{ergon_framework_python-0.1.5.dist-info → ergon_framework_python-0.1.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ergon/__init__.py,sha256=no__VCHvRMOkqda_d5YDcfQZ8oWnDWYMNXm3VddDf0o,218
+ergon/__init__.py,sha256=dFNLM2h6C9VhsbgBVLleuYF0uggVlq1nnrxk1KSKB3k,218
 ergon/cli.py,sha256=CF8PvOjIguR18a657aEBEyhFXUoSVtSRVXv5PfnuWtA,6021
 ergon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ergon/bootstrap/src/__project__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -78,7 +78,7 @@ ergon/task/helpers.py,sha256=Fzb2WsP--5f54VRo_oaPH3Hq9kIYoykfEDOhpd_QHXY,22879
 ergon/task/liveness.py,sha256=TsytIfmi2ua_x3KEPjTdx4WbqHk0WXTqeCSiQUBKPsE,1314
 ergon/task/manager.py,sha256=3Xr8RPRjtCEoupMeyYb19uK0TQhoVehFlBZd8ZFZ-YA,2972
 ergon/task/policies.py,sha256=mGb8iafrkVf438xiAUh0FpXqfgtNAM7RyoaF8jHNf80,7042
-ergon/task/runner.py,sha256=WmEAvkQiywPOIT03duHlFkAQhOf5XtnR2zvJlcEAp0g,16781
+ergon/task/runner.py,sha256=OPCvhfTnbpSAs7Xj7qQZVS11_jm7Vzh8GCgySzT4L6k,19328
 ergon/task/utils.py,sha256=OmlP2AhLM32V8O9OMky6DdSvxwmMNn9x2LTguf0y-M0,2501
 ergon/task/mixins/__init__.py,sha256=6A8vNgdjaQYNJvymWNF-kBN2oTaQBYRLctS3Sq1w_-Y,320
 ergon/task/mixins/consumer.py,sha256=0S_ZU27cCn74LoDZdPGH-15wmpAtZI1HcS9Iqw2h3DE,46088
@@ -91,9 +91,9 @@ ergon/telemetry/metrics.py,sha256=0T_CuNw9P5AG1U9k1-bNp1g7McyiNLUIt_zKyLOtrnA,28
 ergon/telemetry/tracing.py,sha256=_ktiZWAgB1DU-uN91Mzr0iYNXxbCN21LnKiRo5SOJxY,4454
 ergon/utils/__init__.py,sha256=M0_VCjMN7jvSPlRZLZHeFKTHAl1zu3BnAhjrzJjDfiI,57
 ergon/utils/env.py,sha256=lji4xENvfHqg2GTGnzG95VKpxxM4f3DHIKKP61xQG08,621
-ergon_framework_python-0.1.5.dist-info/licenses/LICENSE,sha256=bWCIhHzaadz_ecLdCdtwyMafeQ17s2d7_FSSuSuEcDs,1079
-ergon_framework_python-0.1.5.dist-info/METADATA,sha256=H4wELHqsOmECRPZav1U5TOl_5zfu7o1louaspojMOhI,15677
-ergon_framework_python-0.1.5.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-ergon_framework_python-0.1.5.dist-info/entry_points.txt,sha256=reZ934txb5OrtcNBgTGqCsXa1biUDQWubD2a9fGZynE,42
-ergon_framework_python-0.1.5.dist-info/top_level.txt,sha256=KSPt6N7RzsjU7PRAalWQ9Cul7YTUxbo84yAJ-y2vLm8,6
-ergon_framework_python-0.1.5.dist-info/RECORD,,
+ergon_framework_python-0.1.6.dist-info/licenses/LICENSE,sha256=bWCIhHzaadz_ecLdCdtwyMafeQ17s2d7_FSSuSuEcDs,1079
+ergon_framework_python-0.1.6.dist-info/METADATA,sha256=0ylSq7-H-BKek2GmW3dj74svbykQyIlAXJuXf9esyao,15677
+ergon_framework_python-0.1.6.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+ergon_framework_python-0.1.6.dist-info/entry_points.txt,sha256=reZ934txb5OrtcNBgTGqCsXa1biUDQWubD2a9fGZynE,42
+ergon_framework_python-0.1.6.dist-info/top_level.txt,sha256=KSPt6N7RzsjU7PRAalWQ9Cul7YTUxbo84yAJ-y2vLm8,6
+ergon_framework_python-0.1.6.dist-info/RECORD,,