runtimepy 5.14.0__py3-none-any.whl → 5.14.1__py3-none-any.whl

runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.2.3
-# hash=c6b2bd8ab0196f119c02bcdf6807ecab
+# hash=49d1cdab220096c364c12f39a37de0aa
 # =====================================
 
 """
@@ -10,7 +10,7 @@ Useful defaults and other package metadata.
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "5.14.0"
+VERSION = "5.14.1"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

runtimepy/codec/protocol/receiver.py

@@ -5,7 +5,7 @@ A module implementing an interface for receiving struct messages.
 # built-in
 from io import BytesIO
 import os
-from typing import Callable
+from typing import Callable, Optional
 
 # third-party
 from vcorelib.logging import LoggerMixin
@@ -16,11 +16,15 @@ from runtimepy.primitives.byte_order import ByteOrder
 from runtimepy.primitives.int import UnsignedInt
 
 StructHandler = Callable[[Protocol], None]
+NonStructHandler = Callable[[BytesIO], bool]
+
+NON_STRUCT_ID = 0
 
 
 class StructReceiver(LoggerMixin):
     """A class for sending and receiving struct messages."""
 
+    non_struct_message_prefix: bytes
     id_primitive: UnsignedInt
     byte_order: ByteOrder
 
@@ -29,15 +33,22 @@ class StructReceiver(LoggerMixin):
 
         super().__init__()
 
+        self.non_struct_handler: Optional[NonStructHandler] = None
         self.handlers: dict[int, StructHandler] = {}
         self.instances: dict[int, Protocol] = {}
         for factory in factories:
             self.register(factory)
 
+    def add_non_struct_handler(self, handler: NonStructHandler) -> None:
+        """Set the non-struct handler for this instance."""
+        assert self.non_struct_handler is None
+        self.non_struct_handler = handler
+
     def add_handler(self, identifier: int, handler: StructHandler) -> None:
         """Add a struct message handler."""
 
         assert identifier not in self.handlers
+        assert identifier != NON_STRUCT_ID
         self.handlers[identifier] = handler
 
     def register(self, factory: type[ProtocolFactory]) -> None:
@@ -45,9 +56,14 @@ class StructReceiver(LoggerMixin):
 
         inst = factory.singleton()
 
+        assert inst.id != NON_STRUCT_ID
+
         if not hasattr(self, "id_primitive"):
             self.id_primitive = inst.id_primitive.copy()  # type: ignore
             self.byte_order = inst.byte_order
+            self.non_struct_message_prefix = self.id_primitive.kind.encode(
+                NON_STRUCT_ID, byte_order=self.byte_order
+            )
         else:
             assert self.id_primitive.kind == inst.id_primitive.kind
             assert self.byte_order == inst.byte_order
@@ -67,7 +83,23 @@ class StructReceiver(LoggerMixin):
                 ident = self.id_primitive.from_stream(
                     stream, byte_order=self.byte_order
                 )
-                if ident in self.instances:
+
+                # Handle non-struct messages.
+                if ident == NON_STRUCT_ID:
+                    if self.non_struct_handler is not None:
+                        if not self.non_struct_handler(stream):
+                            self.logger.error(
+                                "Parsing non-struct message failed."
+                            )
+                            stream.seek(0, os.SEEK_END)
+                    else:
+                        self.logger.error(
+                            "No handler for non-struct messages."
+                        )
+                        stream.seek(0, os.SEEK_END)
+
+                # Handle struct messages.
+                elif ident in self.instances:
                     inst = self.instances[ident]
                     inst.from_stream(stream)
                     if ident in self.handlers:
@@ -81,11 +113,5 @@ class StructReceiver(LoggerMixin):
 
                 # Can't continue reading if we don't know this identifier.
                 else:
-                    self.logger.error(
-                        "Unknown struct identifier '%d' "
-                        "@%d/%d of stream (aborting).",
-                        ident,
-                        stream.tell(),
-                        end_pos,
-                    )
+                    self.logger.error("Unknown struct identifier '%d'.", ident)
                     stream.seek(0, os.SEEK_END)

runtimepy/primitives/base.py

@@ -93,7 +93,12 @@ class Primitive(_Generic[T]):
 
     def __copy__(self) -> "Primitive[T]":
         """Make a copy of this primitive."""
-        return type(self)(value=self.value)
+
+        return type(self)(
+            value=self.value,
+            scaling=self.scaling,
+            time_source=self.time_source,
+        )
 
     def copy(self) -> "Primitive[T]":
         """A simple wrapper for copy."""

{runtimepy-5.14.0.dist-info → runtimepy-5.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtimepy
-Version: 5.14.0
+Version: 5.14.1
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/libre-embedded/runtimepy
 Author: Libre Embedded
@@ -17,11 +17,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: vcorelib>=3.5.8
-Requires-Dist: psutil
-Requires-Dist: websockets
 Requires-Dist: aiofiles
+Requires-Dist: websockets
 Requires-Dist: svgen>=0.7.12
+Requires-Dist: vcorelib>=3.5.8
+Requires-Dist: psutil
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -51,11 +51,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.2.3
-    hash=f46a9eb2c8979cc9ff0a3444077956ec
+    hash=06a038e989fda153238ee650b2f26604
     =====================================
 -->
 
-# runtimepy ([5.14.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.14.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/libre-embedded/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-5.14.0.dist-info → runtimepy-5.14.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-runtimepy/__init__.py,sha256=QTcIVQhNPp8R5ZdjWYD99HzoCmAlfUyTO-OLPwSonys,391
+runtimepy/__init__.py,sha256=wIq7AXNNH4hbtlOUrh_ZOpeVYs9my1uq06w3IeQ8EXk,391
 runtimepy/__main__.py,sha256=IKioH2xOtsXwrwb9zABDQEJvuAX--Lnh84TeSz0XSs0,332
 runtimepy/app.py,sha256=Er1ZKKrG9U0FV0gQg_GYF9xDb89HgYnVzS5SjxGa2Tg,970
 runtimepy/dev_requirements.txt,sha256=VZhW6bJ5YbwaoN4d_XxZFuN5BbDLaG7ngKrGnugVPRw,245
@@ -27,7 +27,7 @@ runtimepy/codec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runtimepy/codec/protocol/__init__.py,sha256=0mdPIb5mpkqofClqW23kslsgc3V_aSKJ1RmjEHmKfeI,1673
 runtimepy/codec/protocol/base.py,sha256=8pt8va16zHcHIgFTyhfx6tgDcsQxbqL93CfSgq0ZTBY,11796
 runtimepy/codec/protocol/json.py,sha256=pDEpHYFNYjiU2whvQemdZmH9Igx7aLEYCoS_Xpnqdcs,4483
-runtimepy/codec/protocol/receiver.py,sha256=67fH90YY3bgMzF-aqsyUvpIF77qxaMX3NJVwCC4BgKc,2976
+runtimepy/codec/protocol/receiver.py,sha256=RGfpTNiFB_ZtDXtnMYSQ6oO3HiIJKcwCSwoIgvtMsbY,4085
 runtimepy/codec/system/__init__.py,sha256=fIOUo7QhwI81YAIz9myeSo1oo94De41sK5HKJ-sAdfY,7959
 runtimepy/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runtimepy/commands/all.py,sha256=eAn52vuAgOh0jr93LROfbTjSPuJILGFRCPB9UeS3Q1c,1537
@@ -248,7 +248,7 @@ runtimepy/net/websocket/__init__.py,sha256=YjSmoxiigmsI_hcQw6nueX7bxhrRGerEERnPv
 runtimepy/net/websocket/connection.py,sha256=BMR58bLpHuulCdbLGnmMdFJOF53wVxYcUe52WbdzKEM,9025
 runtimepy/noise/__init__.py,sha256=EJM7h3t_z74wwrn6FAFQwYE2yUcOZQ1K1IQqOb8Z0AI,384
 runtimepy/primitives/__init__.py,sha256=g5IK6e_UZuGhj9QNYoCn5TbhNatWX0nEYUs-JzsOizQ,2618
-runtimepy/primitives/base.py,sha256=BaGPUTeVMnLnTPcpjqnS2lzPN74Pe5C0XaQdgrTfW7A,9185
+runtimepy/primitives/base.py,sha256=5bMNHA9LA10qg8Qpg1YDjkfRZK0XWyaQsTNkNzaR9Es,9285
 runtimepy/primitives/bool.py,sha256=lATPgb1e62rjLn5XlJX8lP3tVYR3DlxV8RT9HpOMdT0,1640
 runtimepy/primitives/byte_order.py,sha256=J2Pg3gXg8Lmu_uU2mduNJt3mnP_enwDI4Y-X8kWAUP0,1456
 runtimepy/primitives/evaluation.py,sha256=0N7mT8uoiJaY-coF2PeEXU2WO-FmbyN2Io9_EaghO9Q,4657
@@ -302,9 +302,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.14.0.dist-info/licenses/LICENSE,sha256=yKBRwbO-cOPBrlpsZmJkkSa33DfY31aE8t7lZ0DwlUo,1071
-runtimepy-5.14.0.dist-info/METADATA,sha256=7g1Ho2eto4w_nLS1GXjqyuHOlAZYXvFHXeYoOq8s194,9269
-runtimepy-5.14.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-runtimepy-5.14.0.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
-runtimepy-5.14.0.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
-runtimepy-5.14.0.dist-info/RECORD,,
+runtimepy-5.14.1.dist-info/licenses/LICENSE,sha256=yKBRwbO-cOPBrlpsZmJkkSa33DfY31aE8t7lZ0DwlUo,1071
+runtimepy-5.14.1.dist-info/METADATA,sha256=r0_VenSwssfIdr8Qd4p-yFS-h_gDAZAtba3-OGnA5hc,9269
+runtimepy-5.14.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+runtimepy-5.14.1.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
+runtimepy-5.14.1.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
+runtimepy-5.14.1.dist-info/RECORD,,