runtimepy 5.9.2__tar.gz → 5.10.1__tar.gz

{runtimepy-5.9.2/runtimepy.egg-info → runtimepy-5.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: runtimepy
-Version: 5.9.2
+Version: 5.10.1
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/vkottler/runtimepy
 Author: Vaughn Kottler
@@ -17,11 +17,11 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: psutil
+Requires-Dist: websockets
 Requires-Dist: aiofiles
 Requires-Dist: svgen>=0.7.4
+Requires-Dist: psutil
 Requires-Dist: vcorelib>=3.5.1
-Requires-Dist: websockets
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -49,11 +49,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.1.4
-    hash=663b9a39a640cae079d35c0621ae20f9
+    hash=a8fb82d7f11d94c5c3ad4adea1026d9e
     =====================================
 -->
 
-# runtimepy ([5.9.2](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.10.1](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 → runtimepy-5.10.1}/README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.4
-    hash=663b9a39a640cae079d35c0621ae20f9
+    hash=a8fb82d7f11d94c5c3ad4adea1026d9e
     =====================================
 -->
 
-# runtimepy ([5.9.2](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.10.1](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 → runtimepy-5.10.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "runtimepy"
-version = "5.9.2"
+version = "5.10.1"
 description = "A framework for implementing Python services."
 readme = "README.md"
 requires-python = ">=3.12"

{runtimepy-5.9.2 → runtimepy-5.10.1}/runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=ba2f544d63fad56dd7605cf937fe52d8
+# hash=649474f8a3122bccd6febc4bb2156b11
 # =====================================
 
 """
@@ -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.1"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

{runtimepy-5.9.2 → runtimepy-5.10.1}/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-5.9.2 → runtimepy-5.10.1}/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-5.9.2 → runtimepy-5.10.1}/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-5.9.2 → runtimepy-5.10.1}/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-5.9.2 → runtimepy-5.10.1}/runtimepy/net/arbiter/config/__init__.py

@@ -223,7 +223,11 @@ class ConfigConnectionArbiter(_ImportConnectionArbiter):
             assert self.factory_process(
                 factory,
                 name,
-                process,
+                # Allow port information to pass through.
+                dict_resolve_env_vars(
+                    process,
+                    env=self._ports,  # type: ignore
+                ),
             ), f"Couldn't register process '{name}' ({factory})!"
 
         # Load initialization methods.

{runtimepy-5.9.2 → runtimepy-5.10.1}/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-5.9.2 → runtimepy-5.10.1}/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 → runtimepy-5.10.1/runtimepy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: runtimepy
-Version: 5.9.2
+Version: 5.10.1
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/vkottler/runtimepy
 Author: Vaughn Kottler
@@ -17,11 +17,11 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: psutil
+Requires-Dist: websockets
 Requires-Dist: aiofiles
 Requires-Dist: svgen>=0.7.4
+Requires-Dist: psutil
 Requires-Dist: vcorelib>=3.5.1
-Requires-Dist: websockets
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -49,11 +49,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.1.4
-    hash=663b9a39a640cae079d35c0621ae20f9
+    hash=a8fb82d7f11d94c5c3ad4adea1026d9e
     =====================================
 -->
 
-# runtimepy ([5.9.2](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.10.1](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)