runtimepy 5.9.2__py3-none-any.whl → 5.10.0__py3-none-any.whl

runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=ba2f544d63fad56dd7605cf937fe52d8
+# hash=a9a53fbeb974140d3611fecadbce5da4
 # =====================================
 
 """
@@ -10,7 +10,7 @@ Useful defaults and other package metadata.
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "5.9.2"
+VERSION = "5.10.0"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

runtimepy/data/dummy_load.yaml

@@ -98,10 +98,9 @@ processes:
 
     # The peer itself runs an arbiter process.
     config:
+      config: *cfg
       includes:
         - package://runtimepy/server.yaml
-
       app: runtimepy.sample.program.run
-      config: *cfg
 
     program: runtimepy.sample.program.SampleProgram

runtimepy/data/factories.yaml

@@ -45,6 +45,7 @@ factories:
 
   # Useful subprocess peer interfaces.
   - {name: runtimepy.sample.peer.SamplePeer}
+  - {name: runtimepy.subprocess.peer.RuntimepyPeer}
 
 ports:
   # Reserve ports for JSON listeners.

runtimepy/data/schemas/PeerProcessConfig.yaml

@@ -5,8 +5,7 @@ includes:
   - has_config.yaml
   - has_markdown.yaml
 
-required: [program]
-
 properties:
   program:
     type: string
+    default: runtimepy.subprocess.program.PeerProgram

runtimepy/message/__init__.py

@@ -4,7 +4,7 @@ A module implementing a message-stream processing interface.
 
 # built-in
 from io import BytesIO as _BytesIO
-from json import dumps, loads
+from json import JSONEncoder, dumps, loads
 from typing import Any
 from typing import Iterator as _Iterator
 
@@ -18,6 +18,18 @@ from runtimepy.primitives.byte_order import DEFAULT_BYTE_ORDER, ByteOrder
 JsonMessage = dict[str, Any]
 
 
+class StrFallbackJSONEncoder(JSONEncoder):
+    """Custom JSON encoder."""
+
+    def default(self, o):
+        """Use a string conversion if necessary."""
+
+        try:
+            return super().default(o)
+        except TypeError:
+            return str(o)
+
+
 class MessageProcessor:
     """A class for parsing size-delimited messages."""
 
@@ -48,7 +60,11 @@ class MessageProcessor:
 
     def encode_json(self, stream: _BytesIO, data: JsonMessage) -> None:
         """Encode a message as JSON."""
-        self.encode(stream, dumps(data, separators=(",", ":")))
+
+        self.encode(
+            stream,
+            dumps(data, cls=StrFallbackJSONEncoder, separators=(",", ":")),
+        )
 
     def messages(self, data: bytes) -> _Iterator[JsonMessage]:
         """Iterate over incoming messages."""

runtimepy/sample/program.py

@@ -9,13 +9,15 @@ import asyncio
 from vcorelib.math import RateLimiter
 
 # internal
-from runtimepy.net.arbiter.info import AppInfo
+from runtimepy.net.arbiter.info import AppInfo, SampleStruct
 from runtimepy.subprocess.program import PeerProgram
 
 
 class SampleProgram(PeerProgram):
     """A sample peer program."""
 
+    struct_type = SampleStruct
+
     stderr_task: asyncio.Task[None]
 
     async def log_message_sender(
@@ -91,4 +93,6 @@ async def run(app: AppInfo) -> int:
 
     await prog.wait_json({"a": 1, "b": 2, "c": 3})
 
+    await app.stop.wait()
+
     return 0

runtimepy/subprocess/program.py

@@ -20,7 +20,7 @@ from vcorelib.paths.context import tempfile
 from runtimepy.metrics.channel import ChannelMetrics
 from runtimepy.mixins.psutil import PsutilMixin
 from runtimepy.net.arbiter import ConnectionArbiter
-from runtimepy.net.arbiter.info import RuntimeStruct, SampleStruct
+from runtimepy.net.arbiter.info import RuntimeStruct
 from runtimepy.subprocess.interface import RuntimepyPeerInterface
 
 T = TypeVar("T", bound="PeerProgram")
@@ -34,7 +34,7 @@ class PeerProgram(RuntimepyPeerInterface, PsutilMixin):
     stream_output: BinaryIO
     stream_metrics: ChannelMetrics
 
-    struct_type: Type[RuntimeStruct] = SampleStruct
+    struct_type: Type[RuntimeStruct] = RuntimeStruct
 
     got_eof: asyncio.Event
 
@@ -71,7 +71,7 @@ class PeerProgram(RuntimepyPeerInterface, PsutilMixin):
         prev_poll_time = loop.time()
 
         with suppress(asyncio.CancelledError):
-            while True:
+            while not self.got_eof.is_set():
                 # Perform heartbeat.
                 if self._peer_env_event.is_set():
                     self.stderr_metrics.update(self.stream_metrics)
@@ -90,6 +90,8 @@ class PeerProgram(RuntimepyPeerInterface, PsutilMixin):
     async def io_task(self, buffer: BinaryIO) -> None:
         """Run this peer program's main loop."""
 
+        self.got_eof.clear()
+
         # Allow polling stdin.
         if hasattr(os, "set_blocking"):
             getattr(os, "set_blocking")(buffer.fileno(), False)
@@ -97,7 +99,7 @@ class PeerProgram(RuntimepyPeerInterface, PsutilMixin):
         accumulator = 0
 
         with suppress(asyncio.CancelledError):
-            while True:
+            while not self.got_eof.is_set():
                 data: bytes = buffer.read(1)
                 if data is None:
                     await asyncio.sleep(self.poll_period_s)
@@ -148,7 +150,7 @@ class PeerProgram(RuntimepyPeerInterface, PsutilMixin):
         with tempfile(suffix=".json") as config_path:
             arbiter = ConnectionArbiter(stop_sig=self.got_eof)
             ARBITER.encode(config_path, self.struct.config)
-            await arbiter.load_configs([config_path], wait_for_stop=True)
+            await arbiter.load_configs([config_path])
 
         await arbiter.app()
 
@@ -210,9 +212,9 @@ class PeerProgram(RuntimepyPeerInterface, PsutilMixin):
         # Don't respond to keyboard interrupt.
         signal.signal(signal.SIGINT, signal.SIG_IGN)
 
-        async with cls.running(name, config, argv) as (io_task, main_task, _):
-            await main_task
-            await io_task
+        async with cls.running(name, config, argv) as (_, main_task, peer):
+            with peer.log_time("Main task context", reminder=True):
+                await main_task
 
     async def poll_handler(self) -> None:
         """Handle a 'poll' message."""

{runtimepy-5.9.2.dist-info → runtimepy-5.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: runtimepy
-Version: 5.9.2
+Version: 5.10.0
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/vkottler/runtimepy
 Author: Vaughn Kottler
@@ -17,10 +17,10 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiofiles
-Requires-Dist: websockets
-Requires-Dist: vcorelib>=3.5.1
 Requires-Dist: svgen>=0.7.4
+Requires-Dist: vcorelib>=3.5.1
+Requires-Dist: websockets
+Requires-Dist: aiofiles
 Requires-Dist: psutil
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
@@ -49,11 +49,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.1.4
-    hash=663b9a39a640cae079d35c0621ae20f9
+    hash=cbacac02049e2f568e5ebad3cc428033
     =====================================
 -->
 
-# runtimepy ([5.9.2](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.10.0](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/vkottler/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-5.9.2.dist-info → runtimepy-5.10.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-runtimepy/__init__.py,sha256=8xWVxuWwxsXJGjNAD_wAhQl8kTAend0Cz5sjesrRoKs,390
+runtimepy/__init__.py,sha256=HxCNJsJjN2uUsJWlGzOeJVd9NXxPu4uXdaB7WmpLQ3Y,391
 runtimepy/__main__.py,sha256=OPAed6hggoQdw-6QAR62mqLC-rCkdDhOq0wyeS2vDRI,332
 runtimepy/app.py,sha256=sTvatbsGZ2Hdel36Si_WUbNMtg9CzsJyExr5xjIcxDE,970
 runtimepy/dev_requirements.txt,sha256=j0dh11ztJAzfaUL0iFheGjaZj9ppDzmTkclTT8YKO8c,230
@@ -43,8 +43,8 @@ runtimepy/control/step.py,sha256=2LdZTpMHLwHLdpPVinpC2qByTs5I5LTDt-xONn_6Fc8,549
 runtimepy/control/env/__init__.py,sha256=RHJqysY7Pv4VDs2SGk0X-qc5xp_SrQ_oxb5Deug8HEM,1339
 runtimepy/data/404.html,sha256=sn0Mcntzb1-AekukYZAQqz43xfmZtTWa2n2HD2ItqDM,4697
 runtimepy/data/browser.yaml,sha256=oc5KEV1C1uAJ4MkhNo4hyVVfJtZvHelRNqzNvD313Ow,79
-runtimepy/data/dummy_load.yaml,sha256=eCsWVfEJJ7pUl_JFAD3iDy-nFkw6cf03y9fBqZnaPUM,1986
-runtimepy/data/factories.yaml,sha256=Jm0QPwW2BQgnj1fIFQwygsWXzT78QJuf7auVRtRzWKQ,1847
+runtimepy/data/dummy_load.yaml,sha256=PfKRXXgZnENRMSd68eznSMTV8xanVH5JY4FmoZRPFGY,1985
+runtimepy/data/factories.yaml,sha256=esuoouMre8w7siZfBoZKqC-5myghJ_WwOOCDIq135zg,1899
 runtimepy/data/favicon.ico,sha256=iPOtqnqrFVr5tNBM6kTsw7nh0KullEz4TpS6CEQ2HVM,362870
 runtimepy/data/sample_telemetry.yaml,sha256=OpdFurkvtWJGaNl9LMlU2rKo15AaVVr-U_hoZfsbp-Y,695
 runtimepy/data/server.yaml,sha256=wS_Ceiu2TpkfPurpqoYoPlgzc9DAWtUd24MW7t-S5rU,97
@@ -96,7 +96,7 @@ runtimepy/data/schemas/ClientConnectionConfig.yaml,sha256=XUWkOiCOw175harOsDRV3T
 runtimepy/data/schemas/ConnectionArbiterConfig.yaml,sha256=WorY7ttxvQA78TYuFoNHw41hc9johxvgO72dusfLSqE,2133
 runtimepy/data/schemas/EnumRegistry.yaml,sha256=BfLzEEUsHj6Fg_0JyGmgbNJ7F-auuLs5tAhJjSc86uU,145
 runtimepy/data/schemas/FindFile.yaml,sha256=dSPCDQy4FQZLMgOjtbR0-o2sZECvN_tvGa3LXNd1-wc,934
-runtimepy/data/schemas/PeerProcessConfig.yaml,sha256=_YhfZ2pHCSKqcZqz8-sQAVrwPzFwfb5toWN893yNqPA,157
+runtimepy/data/schemas/PeerProcessConfig.yaml,sha256=RNVGG1NV9-Goa7aLE0ah7QNwKOTEoJj6EZDXTW-TALM,190
 runtimepy/data/schemas/RuntimeEnum.yaml,sha256=dN5bl-lOB3JON02aP1fdwAEP7BhadG1wo_oX6rn5d80,430
 runtimepy/data/schemas/ServerConnectionConfig.yaml,sha256=IqQUQB09xte4zGmM6Qi0-LTm5McDkoi2tehYspoNUXM,100
 runtimepy/data/schemas/StructConfig.yaml,sha256=3ifuvRIVzS4AzYu0c9k6TdmLs0PG5y8u25aRphTrxg0,73
@@ -120,7 +120,7 @@ runtimepy/data/static/woff2/README.md,sha256=flHwSRmDxd6OnWhzxmnXzwio1Mong5tB4d8
 runtimepy/enum/__init__.py,sha256=WIBMOaogauR1u7mK-I4Z5BZUoWANU7alIlrz82QdCmY,5820
 runtimepy/enum/registry.py,sha256=EU7oUejI60kzrhdtzgWpnFYP8h4CFLy_fxvGTwq1Uvc,2631
 runtimepy/enum/types.py,sha256=uQYGvaAJVm5tUdwxn_SLHkTZHJpEf7364rTSL27necA,1027
-runtimepy/message/__init__.py,sha256=nF9yU9SV0PxZyHt12oh6o_ENR374x1Yn72UambecGlY,2668
+runtimepy/message/__init__.py,sha256=X5PZqSPGhNT4MruaiQjN4MwJHhy8gV9W32QXyxgS9-E,3004
 runtimepy/message/handlers.py,sha256=He9NC7MCkaV2clKc8dTSZ_T8N2l3ATjaTFzBr9n1T34,3775
 runtimepy/message/interface.py,sha256=vg25Uhp7wrDFH6v2iRKUBwnCBpjc3JAFjwdu3KArrLo,11285
 runtimepy/message/types.py,sha256=vajDWKW32LjzsfH-eVCCxZTWVctj4_-tjanhnmCqUis,821
@@ -260,12 +260,12 @@ runtimepy/registry/item.py,sha256=HPqxmzuK8aOc1siHzYScgxYxSMZ4RVTmnsRW2oNcW34,85
 runtimepy/registry/name.py,sha256=uhxmijwUT7x59NUYV4hJSe7VcnAbLDUSAPaKhR6K-N0,1749
 runtimepy/sample/__init__.py,sha256=N7P6hnCLF9NwnkZA1h3LzS2C334SAO48Fu8adHxWGLU,56
 runtimepy/sample/peer.py,sha256=uNlIPAv1-wjGUWdR0AM3L9NUMjnIMJBqQ9ZsHdTLx3Q,1688
-runtimepy/sample/program.py,sha256=I8_JGjEAh-d3eEw4M9l9CxEw4KG4s8f4i8STwRei5IY,2355
+runtimepy/sample/program.py,sha256=AFqinsnsjzatgJXePAO4yXYerxmzN7ajtDmJPwWigYc,2428
 runtimepy/struct/__init__.py,sha256=Q7t1qKpuYGjtRGXdC_x8IwJyyCQ1Xy2wYriud89XJnk,2229
 runtimepy/subprocess/__init__.py,sha256=VAiFrYFCU5ETDVoWLOVlrrSsx2d1_atYXUfXYc_OQ9g,4059
 runtimepy/subprocess/interface.py,sha256=4nGVUfDThaZrfqgn2nZHMt1hfUwHezSvFjykBXGT36g,8041
 runtimepy/subprocess/peer.py,sha256=oYw9a0yKAPR18Z6Qt24wYWrcX6EizeQE64htL11WVjM,7593
-runtimepy/subprocess/program.py,sha256=UCKBvmIc4JBitWju396TA8Kxdtmko50jQ3ZPKNkBjFk,6792
+runtimepy/subprocess/program.py,sha256=exnmG6S8IZyHRr4RyET0cloBc3Wnip1KRWeegKwJZPM,6874
 runtimepy/subprocess/protocol.py,sha256=LYApfKZ0bXSj6gGqLdNfwsIjxWyrdVUK0Jz_qc33ik4,3074
 runtimepy/task/__init__.py,sha256=euLIxCl1wve-4Nr2DUms8XrWT3liUV-ihQiQlZ21nqI,348
 runtimepy/task/asynchronous.py,sha256=w4oEUCyj-X-zDVFmlsAtRL1gv66ahQ78QKE0GmLGT1w,5947
@@ -284,9 +284,9 @@ runtimepy/tui/task.py,sha256=nUZo9fuOC-k1Wpqdzkv9v1tQirCI28fZVgcC13Ijvus,1093
 runtimepy/tui/channels/__init__.py,sha256=evDaiIn-YS9uGhdo8ZGtP9VK1ek6sr_P1nJ9JuSET0o,4536
 runtimepy/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runtimepy/ui/controls.py,sha256=yvT7h3thbYaitsakcIAJ90EwKzJ4b-jnc6p3UuVf_XE,1241
-runtimepy-5.9.2.dist-info/LICENSE,sha256=yKBRwbO-cOPBrlpsZmJkkSa33DfY31aE8t7lZ0DwlUo,1071
-runtimepy-5.9.2.dist-info/METADATA,sha256=Gg-EmUL90ZpybmT4WzcVlaYKlqbo5VrBboNt2_sbq6g,9371
-runtimepy-5.9.2.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-runtimepy-5.9.2.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
-runtimepy-5.9.2.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
-runtimepy-5.9.2.dist-info/RECORD,,
+runtimepy-5.10.0.dist-info/LICENSE,sha256=yKBRwbO-cOPBrlpsZmJkkSa33DfY31aE8t7lZ0DwlUo,1071
+runtimepy-5.10.0.dist-info/METADATA,sha256=-jhaz7qH__FgJIRWZWrDpmVbb6TzfqN5ElYMgxzyi1I,9373
+runtimepy-5.10.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+runtimepy-5.10.0.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
+runtimepy-5.10.0.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
+runtimepy-5.10.0.dist-info/RECORD,,