runtimepy 5.14.2__py3-none-any.whl → 5.15.1__py3-none-any.whl

runtimepy/primitives/field/manager/base.py

@@ -14,6 +14,7 @@ from typing import cast as _cast
 from vcorelib.io import ARBITER as _ARBITER
 from vcorelib.io.types import EncodeResult as _EncodeResult
 from vcorelib.io.types import JsonObject as _JsonObject
+from vcorelib.namespace import Namespace
 from vcorelib.paths import Pathlike as _Pathlike
 
 # internal
@@ -86,7 +87,12 @@ class BitFieldsManagerBase:
         """Encode this bit-fields manager to a file."""
         return fields_to_file(path, self.fields, **kwargs)
 
-    def add(self, fields: _BitFields) -> int:
+    def add(
+        self,
+        fields: _BitFields,
+        namespace: Namespace = None,
+        track: bool = False,
+    ) -> int:
         """Add new bit-fields to manage."""
 
         # Ensure that new fields can't be added after the current fields
@@ -97,7 +103,12 @@ class BitFieldsManagerBase:
         self.fields.append(fields)
 
         # Register fields into the lookup structure.
+        to_add = {}
         for name, field in fields.fields.items():
+            if namespace is not None:
+                name = namespace.namespace(name=name, track=track)
+                to_add[name] = field
+
             ident = self.registry.register_name(name)
             assert ident is not None, "Couldn't register bit-field '{name}'!"
             assert name not in self.lookup, name
@@ -105,7 +116,13 @@ class BitFieldsManagerBase:
 
             # Also store the enum mapping.
             if field.is_enum:
-                self.enum_lookup[name] = self.enums[field.enum]
+                runtime = self.enums[field.enum]
+                self.enum_lookup[name] = runtime
+                if runtime.default:
+                    self.set(name, runtime.default)
+
+        # Add possible namespaced-name mappings.
+        fields.fields.update(to_add)
 
         return index
 

runtimepy/primitives/serializable/base.py

@@ -11,6 +11,7 @@ from typing import TypeVar
 
 # third-party
 from vcorelib import DEFAULT_ENCODING
+from vcorelib.io import BinaryMessage
 
 # internal
 from runtimepy.primitives.byte_order import (
@@ -133,7 +134,7 @@ class Serializable(ABC):
         )
 
     @abstractmethod
-    def update(self, data: bytes, timestamp_ns: int = None) -> int:
+    def update(self, data: BinaryMessage, timestamp_ns: int = None) -> int:
         """Update this serializable from a bytes instance."""
 
     def update_str(self, data: str, timestamp_ns: int = None) -> int:
@@ -158,7 +159,9 @@ class Serializable(ABC):
 
         return result
 
-    def update_chain(self, data: bytes, timestamp_ns: int = None) -> int:
+    def update_chain(
+        self, data: BinaryMessage, timestamp_ns: int = None
+    ) -> int:
         """Update this serializable from a bytes instance."""
 
         with _BytesIO(data) as stream:

runtimepy/primitives/serializable/fixed.py

@@ -5,6 +5,9 @@ A module implementing a fixed-size bytes serializable.
 # built-in
 from copy import copy as _copy
 
+# third-party
+from vcorelib.io import BinaryMessage
+
 # internal
 from runtimepy.primitives.serializable.base import Serializable
 
@@ -31,11 +34,11 @@ class FixedChunk(Serializable):
         """Get this serializable as a bytes instance."""
         return self.data
 
-    def update(self, data: bytes, timestamp_ns: int = None) -> int:
+    def update(self, data: BinaryMessage, timestamp_ns: int = None) -> int:
         """Update this serializable from a bytes instance."""
 
         del timestamp_ns
 
-        self.data = data
+        self.data = bytes(data)
         self.size = len(self.data)
         return self.size

runtimepy/primitives/serializable/prefixed.py

@@ -7,6 +7,9 @@ primitive prefix to determine the size of the chunk portion.
 from typing import BinaryIO as _BinaryIO
 from typing import TypeVar
 
+# third-party
+from vcorelib.io import BinaryMessage
+
 # internal
 from runtimepy.primitives import Primitivelike, UnsignedInt, create
 from runtimepy.primitives.byte_order import (
@@ -44,7 +47,7 @@ class PrefixedChunk(Serializable):
         """Get this chunk as a string."""
         return str(self.chunk)
 
-    def update(self, data: bytes, timestamp_ns: int = None) -> int:
+    def update(self, data: BinaryMessage, timestamp_ns: int = None) -> int:
         """Update this serializable from a bytes instance."""
 
         size = self.chunk.update(data, timestamp_ns=timestamp_ns)

runtimepy/primitives/types/base.py

@@ -14,6 +14,9 @@ from typing import TypeVar as _TypeVar
 from typing import Union as _Union
 from typing import cast as _cast
 
+# third-party
+from vcorelib.io import BinaryMessage
+
 # internal
 from runtimepy.primitives.byte_order import (
     DEFAULT_BYTE_ORDER as _DEFAULT_BYTE_ORDER,
@@ -134,7 +137,7 @@ class PrimitiveType(_Generic[T]):
         return _pack(byte_order.fmt + self.format, value)
 
     def decode(
-        self, data: bytes, byte_order: _ByteOrder = _DEFAULT_BYTE_ORDER
+        self, data: BinaryMessage, byte_order: _ByteOrder = _DEFAULT_BYTE_ORDER
     ) -> PythonPrimitive:
         """Decode primitive based on this type."""
         return _unpack(byte_order.fmt + self.format, data)[0]  # type: ignore

runtimepy/primitives/types/bounds.py

@@ -31,9 +31,15 @@ class IntegerBounds(NamedTuple):
         return max(self.min, min(val, self.max))
 
     @staticmethod
-    def create(byte_count: int, signed: bool) -> "IntegerBounds":
+    def create_bit(bit_count: int, signed: bool) -> "IntegerBounds":
         """Compute maximum and minimum values given size and signedness."""
 
-        min_val = 0 if not signed else -1 * (2 ** (byte_count * 8 - 1))
-        width = 8 * byte_count if not signed else 8 * byte_count - 1
-        return IntegerBounds(min_val, (2**width) - 1)
+        return IntegerBounds(
+            0 if not signed else -1 * (2 ** (bit_count - 1)),
+            (2 ** (bit_count if not signed else bit_count - 1)) - 1,
+        )
+
+    @staticmethod
+    def create(byte_count: int, signed: bool) -> "IntegerBounds":
+        """Compute maximum and minimum values given size and signedness."""
+        return IntegerBounds.create_bit(8 * byte_count, signed)

runtimepy/registry/__init__.py

@@ -20,6 +20,7 @@ from vcorelib.io.types import JsonValue as _JsonValue
 from runtimepy.registry.item import RegistryItem as _RegistryItem
 from runtimepy.registry.name import NameRegistry as _NameRegistry
 from runtimepy.registry.name import RegistryKey as _RegistryKey
+from runtimepy.registry.name import is_registry_key as _is_registry_key
 from runtimepy.schemas import RuntimepyDictCodec as _RuntimepyDictCodec
 
 T = _TypeVar("T", bound=_RegistryItem)
@@ -66,6 +67,15 @@ class Registry(_RuntimepyDictCodec, _Generic[T]):
             for name, item in self.items.items()
         }
 
+    def register_from_other(self, other: "Registry[T]") -> None:
+        """Register missing elements from another registry."""
+
+        for name, instance in other.items.items():
+            if name in self.items:
+                assert self.items[name].id == instance.id, (name, instance)
+            else:
+                assert self.register(name, instance), (name, instance)
+
     def register(self, name: str, item: T) -> bool:
         """Attempt to register a new item."""
 
@@ -100,6 +110,16 @@ class Registry(_RuntimepyDictCodec, _Generic[T]):
             result = self.items[name]
         return result
 
+    def registry_normalize(self, key: _RegistryKey | T) -> T:
+        """Attempt to get an item from a registry key."""
+
+        if _is_registry_key(key):
+            result: T = self[_cast(str, key)]
+        else:
+            result = _cast(T, key)
+
+        return result
+
     def __getitem__(self, key: _RegistryKey) -> T:
         """Get a registry item."""
 

runtimepy/registry/name.py

@@ -3,6 +3,7 @@ A simple name-to-identifier registry interface.
 """
 
 # built-in
+from typing import Any as _Any
 from typing import MutableMapping as _MutableMapping
 from typing import Optional as _Optional
 from typing import Union as _Union
@@ -15,6 +16,11 @@ KeyToName = _MutableMapping[int, str]
 NameToKey = _MutableMapping[str, int]
 
 
+def is_registry_key(data: _Any) -> bool:
+    """Determine if this data is a registry key."""
+    return isinstance(data, (int, str))
+
+
 class NameRegistry(_TwoWayNameMapping[int]):
     """A simple class for keeping track of name-to-identifier mappings."""
 

runtimepy/requirements.txt

@@ -1,6 +1,6 @@
 aiofiles
-vcorelib>=3.6.0
-svgen>=0.7.12
+vcorelib>=3.6.2
+svgen>=0.8.0
 websockets
 psutil
 windows-curses; sys_platform == 'win32' and python_version < '3.12'

runtimepy/ui/controls.py

@@ -7,8 +7,11 @@ import math
 from typing import Optional
 
 # internal
-from runtimepy.channel import Controls
+from runtimepy.primitives.types.bounds import IntegerBounds
 
+Literal = int | float | bool
+Default = Optional[Literal]
+Controls = dict[str, Literal | dict[str, Literal]]
 DEFAULT_STEPS = 64.0
 
 
@@ -30,6 +33,22 @@ def make_slider(
     return result
 
 
+def bit_slider(width: int, signed: bool) -> Controls:
+    """Make a slider for an unsigned integer width."""
+    bounds = IntegerBounds.create_bit(width, signed)
+    return make_slider(bounds.min, bounds.max, 2**width - 1)
+
+
+def signed_slider(width: int) -> Controls:
+    """Make a slider for an unsigned integer width."""
+    return bit_slider(width, True)
+
+
+def unsigned_slider(width: int) -> Controls:
+    """Make a slider for an unsigned integer width."""
+    return bit_slider(width, False)
+
+
 CANONICAL: dict[str, Controls] = {
     "phase": make_slider(-math.pi, math.pi, 90, default=0.0),
     "amplitude": make_slider(0.0, 2.0, 100.0, default=1.0),

{runtimepy-5.14.2.dist-info → runtimepy-5.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtimepy
-Version: 5.14.2
+Version: 5.15.1
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/libre-embedded/runtimepy
 Author: Libre Embedded
@@ -17,10 +17,10 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiofiles
-Requires-Dist: svgen>=0.7.12
-Requires-Dist: vcorelib>=3.6.0
+Requires-Dist: vcorelib>=3.6.2
 Requires-Dist: websockets
+Requires-Dist: svgen>=0.8.0
+Requires-Dist: aiofiles
 Requires-Dist: psutil
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
@@ -51,11 +51,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.2.3
-    hash=d3dcde1ba35cb14decfc6881b6a2d4e6
+    hash=21dc494ffe783ac9edf7769c4d5aa21e
     =====================================
 -->
 
-# runtimepy ([5.14.2](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.15.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)