Merge pull request #321 from libre-embedded/dev/5.14.2

vkottler · web-flow · commit c7f80e794523 · 2025-05-12T01:00:26.000-05:00
5.14.2 - Add task stopper
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -78,7 +78,7 @@ jobs:
 
       - run: |
           mk python-release owner=libre-embedded \
-                            repo=runtimepy version=5.14.1
+                            repo=runtimepy version=5.14.2
         if: |
           matrix.python-version == '3.12'
           && matrix.system == 'ubuntu-latest'
diff --git a/README.md b/README.md
@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.2.3
-    hash=06a038e989fda153238ee650b2f26604
+    hash=d3dcde1ba35cb14decfc6881b6a2d4e6
     =====================================
 -->
 
-# runtimepy ([5.14.1](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.14.2](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/libre-embedded/runtimepy/workflows/Python%20Package/badge.svg)
diff --git a/local/configs/package.yaml b/local/configs/package.yaml
@@ -8,7 +8,7 @@ time_command: true
 
 requirements:
   - aiofiles
-  - vcorelib>=3.5.8
+  - vcorelib>=3.6.0
   - svgen>=0.7.12
   - websockets
   - psutil
diff --git a/local/variables/package.yaml b/local/variables/package.yaml
@@ -1,5 +1,5 @@
 ---
 major: 5
 minor: 14
-patch: 1
+patch: 2
 entry: runtimepy
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "runtimepy"
-version = "5.14.1"
+version = "5.14.2"
 description = "A framework for implementing Python services."
 readme = "README.md"
 requires-python = ">=3.12"
diff --git a/runtimepy/__init__.py b/runtimepy/__init__.py
@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.2.3
-# hash=49d1cdab220096c364c12f39a37de0aa
+# hash=f2469e97ed5a3a48c5347357f12c3554
 # =====================================
 
 """
@@ -10,7 +10,7 @@
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "5.14.1"
+VERSION = "5.14.2"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"
diff --git a/runtimepy/commands/arbiter.py b/runtimepy/commands/arbiter.py
@@ -41,11 +41,12 @@ def app(args: _Namespace) -> int:
     if args.init_only:
         stop_sig.set()
 
-    return _run_handle_stop(
+    result = _run_handle_stop(
         stop_sig,
         entry(stop_sig, args, window=args.window),
         enable_uvloop=not getattr(args, "no_uvloop", False),
     )
+    return result if result is not None else 1
 
 
 def arbiter_cmd(args: _Namespace) -> int:
diff --git a/runtimepy/commands/tftp.py b/runtimepy/commands/tftp.py
@@ -42,9 +42,10 @@ def tftp_cmd(args: argparse.Namespace) -> int:
     else:
         task = tftp_write(addr, args.our_file, args.their_file, **kwargs)
 
-    return run_handle_stop(
+    result = run_handle_stop(
         stop_sig, task, enable_uvloop=not getattr(args, "no_uvloop", False)
     )
+    return result if result is not None else 1
 
 
 def add_tftp_cmd(parser: argparse.ArgumentParser) -> CommandFunction:
diff --git a/runtimepy/net/arbiter/base.py b/runtimepy/net/arbiter/base.py
@@ -470,7 +470,7 @@ def run(
     ) -> int:
         """Run the application until the stop signal is set."""
 
-        return run_handle_stop(
+        result = run_handle_stop(
             self.stop_sig,
             self.app(
                 app=app, check_connections=check_connections, config=config
@@ -479,3 +479,4 @@ def run(
             signals=signals,
             enable_uvloop=enable_uvloop,
         )
+        return result if result is not None else 1
diff --git a/runtimepy/requirements.txt b/runtimepy/requirements.txt
@@ -1,5 +1,5 @@
 aiofiles
-vcorelib>=3.5.8
+vcorelib>=3.6.0
 svgen>=0.7.12
 websockets
 psutil
diff --git a/runtimepy/task/basic/manager.py b/runtimepy/task/basic/manager.py
@@ -5,6 +5,7 @@
 # built-in
 import asyncio as _asyncio
 from contextlib import asynccontextmanager as _asynccontextmanager
+from contextlib import suppress as _suppress
 from typing import AsyncIterator as _AsyncIterator
 from typing import Generic as _Generic
 from typing import Iterator as _Iterator
@@ -57,8 +58,24 @@ async def running(
     ) -> _AsyncIterator[None]:
         """Run tasks as an async context."""
 
+        task = None
+        if stop_sig is not None:
+
+            async def stopper() -> None:
+                """Stop tasks when stop signal is set."""
+
+                with _suppress(_asyncio.CancelledError):
+                    await stop_sig.wait()
+                    await self.stop()
+
+            task = _asyncio.get_running_loop().create_task(stopper())
+
         await self.start(stop_sig=stop_sig)
         try:
             yield
         finally:
             await self.stop()
+
+            if task is not None:
+                task.cancel()
+                await task

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,10 @@ def tftp_cmd(args: argparse.Namespace) -> int:`
`42`	`42`	`else:`
`43`	`43`	`task = tftp_write(addr, args.our_file, args.their_file, **kwargs)`
`44`	`44`
`45`		`- return run_handle_stop(`
	`45`	`+ result = run_handle_stop(`
`46`	`46`	`stop_sig, task, enable_uvloop=not getattr(args, "no_uvloop", False)`
`47`	`47`	`)`
	`48`	`+ return result if result is not None else 1`
`48`	`49`
`49`	`50`
`50`	`51`	`def add_tftp_cmd(parser: argparse.ArgumentParser) -> CommandFunction:`