Merge pull request #113 from vkottler/dev/2.6.8

2.6.8 - Add metrics name symbol

.github/workflows/python-package.yml

@@ -68,7 +68,7 @@ jobs:
 
       - run: |
           mk python-release owner=vkottler \
-                            repo=runtimepy version=2.6.7
+                            repo=runtimepy version=2.6.8
         if: |
           matrix.python-version == '3.11'
           && matrix.system == 'ubuntu-latest'

README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.3
-    hash=790eb511bd706c64175f59e2d84fb0c5
+    hash=b00889b261f786062d9c52086554c0ff
     =====================================
 -->
 
-# runtimepy ([2.6.7](https://pypi.org/project/runtimepy/))
+# runtimepy ([2.6.8](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)

local/configs/package.yaml

@@ -19,3 +19,6 @@ commands:
     description: "run a connection-arbiter application from a config"
   - name: tui
     description: "run a terminal interface for the channel environment"
+
+init_local: |
+  METRICS_NAME = "metrics"

local/variables/package.yaml

@@ -1,5 +1,5 @@
 ---
 major: 2
 minor: 6
-patch: 7
+patch: 8
 entry: runtimepy

pyproject.toml

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

runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.3
-# hash=18c7312c2ee34e91a3d363293ed7202d
+# hash=cba19142d304f4387692458f31708575
 # =====================================
 
 """
@@ -10,4 +10,7 @@
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "2.6.7"
+VERSION = "2.6.8"
+
+# runtimepy-specific content.
+METRICS_NAME = "metrics"

runtimepy/channel/environment/create.py

@@ -23,6 +23,7 @@
 )
 from runtimepy.channel.environment.base import ChannelResult as _ChannelResult
 from runtimepy.enum import RuntimeEnum as _RuntimeEnum
+from runtimepy.enum.registry import DEFAULT_ENUM_PRIMITIVE
 from runtimepy.enum.type import EnumTypelike as _EnumTypelike
 from runtimepy.mapping import EnumMappingData as _EnumMappingData
 from runtimepy.primitives import Primitive
@@ -115,13 +116,15 @@ def enum(
         kind: _EnumTypelike,
         items: _EnumMappingData = None,
         namespace: _Namespace = None,
+        primitive: str = DEFAULT_ENUM_PRIMITIVE,
     ) -> _RuntimeEnum:
         """Create a new enum from the environment."""
 
         result = self.enums.enum(
             self.namespace(name=name, namespace=namespace),
             kind=kind,
             items=items,
+            primitive=primitive,
         )
         assert result is not None, f"Can't create enum '{name}'!"
         return result

runtimepy/data/schemas/EnumRegistry.yaml

@@ -3,5 +3,5 @@ type: object
 additionalProperties: false
 
 patternProperties:
-  "^[\\w\\:]+$":
+  "^[\\w\\:-_.]+$":
     $ref: package://runtimepy/schemas/RuntimeEnum.yaml

runtimepy/mixins/environment.py

@@ -3,6 +3,7 @@
 """
 
 # internal
+from runtimepy import METRICS_NAME
 from runtimepy.channel.environment import ChannelEnvironment
 from runtimepy.metrics import ConnectionMetrics, PeriodicTaskMetrics
 
@@ -20,7 +21,7 @@ def __init__(self, env: ChannelEnvironment = None, **kwargs) -> None:
         self.env = env
 
     def register_task_metrics(
-        self, metrics: PeriodicTaskMetrics, namespace: str = "metrics"
+        self, metrics: PeriodicTaskMetrics, namespace: str = METRICS_NAME
     ) -> None:
         """Register periodic task metrics."""
 
@@ -32,7 +33,7 @@ def register_task_metrics(
             self.env.channel("min_s", metrics.min_s)
 
     def register_connection_metrics(
-        self, metrics: ConnectionMetrics, namespace: str = "metrics"
+        self, metrics: ConnectionMetrics, namespace: str = METRICS_NAME
     ) -> None:
         """Register connection metrics."""
 

runtimepy/mixins/regex.py

@@ -7,7 +7,7 @@
 from re import Pattern as _Pattern
 from re import compile as _compile
 
-DEFAULT_PATTERN = _compile("^[\\w\\:]+$")
+DEFAULT_PATTERN = _compile("^[\\w\\:-_.]+$")
 CHANNEL_PATTERN = _compile("^[a-z0-9-_.]+$")
 
 

runtimepy/task/asynchronous.py

@@ -13,6 +13,7 @@
 from vcorelib.math import rate_str as _rate_str
 
 # internal
+from runtimepy import METRICS_NAME
 from runtimepy.channel.environment import (
     ChannelEnvironment as _ChannelEnvironment,
 )
@@ -51,7 +52,7 @@ def __init__(
             )[0]
             self.max_iterations.raw.value = max_iterations
 
-            with env.names_pushed("metrics"):
+            with env.names_pushed(METRICS_NAME):
                 # Track the number of times this task has been dispatched.
                 self.dispatches = env.int_channel("dispatches", kind="uint8")[
                     0