Merge pull request #32 from vkottler/dev/0.13.1

0.13.1 - Improve schema management
vkottler · Feb 10, 2023 · 4c04d9a · 4c04d9a
2 parents 83b4914 + b2957ea
commit 4c04d9a
Show file tree

Hide file tree

Showing 13 changed files with 1,004 additions and 990 deletions.
diff --git a/README.md b/README.md
@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.0
-    hash=a8255694100a058fa4413abe0341a123
+    hash=b4ec855ceb9c1a2007cec184e29e5458
     =====================================
 -->
 
-# runtimepy ([0.13.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([0.13.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)

diff --git a/im/pydeps.svg b/im/pydeps.svg
diff --git a/local/configs/package.yaml b/local/configs/package.yaml
@@ -5,7 +5,7 @@ description: A framework for implementing Python services.
 entry: {{entry}}
 
 requirements:
-  - vcorelib>=1.1.7
+  - vcorelib>=1.2.0
   - websockets
   - "windows-curses; sys_platform == 'win32'"
 

diff --git a/local/variables/package.yaml b/local/variables/package.yaml
@@ -1,5 +1,5 @@
 ---
 major: 0
 minor: 13
-patch: 0
+patch: 1
 entry: runtimepy
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "runtimepy"
-version = "0.13.0"
+version = "0.13.1"
 description = "A framework for implementing Python services."
 readme = "README.md"
 requires-python = ">=3.7"

diff --git a/runtimepy/__init__.py b/runtimepy/__init__.py
@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.0
-# hash=1a71c8001105fcdb5a240f10db7ba967
+# hash=0c272e6a3c9844e3ceb54644218fe96e
 # =====================================
 
 """
@@ -10,4 +10,4 @@
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "0.13.0"
+VERSION = "0.13.1"
diff --git a/runtimepy/data/schemas/Channel.yaml b/runtimepy/data/schemas/Channel.yaml
@@ -0,0 +1,34 @@
+---
+type: object
+required: [id, type]
+additionalProperties: false
+
+properties:
+  id:
+    type: integer
+    minimum: 1
+
+  type:
+    enum:
+      - bool
+      - float
+      - double
+      - int8
+      - int16
+      - int32
+      - int64
+      - uint8
+      - uint16
+      - uint32
+      - uint64
+
+  commandable:
+    type: boolean
+    default: false
+
+  enum:
+    oneOf:
+      - type: integer
+        minimum: 1
+      - type: string
+        pattern: "^\\w+$"
diff --git a/runtimepy/data/schemas/ChannelRegistry.yaml b/runtimepy/data/schemas/ChannelRegistry.yaml
@@ -4,36 +4,4 @@ additionalProperties: false
 
 patternProperties:
   "^[a-z0-9-_.]+$":
-    type: object
-    required: [id, type]
-    additionalProperties: false
-
-    properties:
-      id:
-        type: integer
-        minimum: 1
-
-      type:
-        enum:
-          - bool
-          - float
-          - double
-          - int8
-          - int16
-          - int32
-          - int64
-          - uint8
-          - uint16
-          - uint32
-          - uint64
-
-      commandable:
-        type: boolean
-        default: false
-
-      enum:
-        oneOf:
-          - type: integer
-            minimum: 1
-          - type: string
-            pattern: "^\\w+$"
+    $ref: package://runtimepy/schemas/Channel.yaml
diff --git a/runtimepy/data/schemas/EnumRegistry.yaml b/runtimepy/data/schemas/EnumRegistry.yaml
@@ -4,25 +4,4 @@ additionalProperties: false
 
 patternProperties:
   "^\\w+$":
-    type: object
-    required: [id, type]
-    additionalProperties: false
-
-    properties:
-      id:
-        type: integer
-        minimum: 1
-
-      type:
-        enum: [bool, int]
-
-      items:
-        type: object
-        additionalProperties: false
-
-        patternProperties:
-          "^\\w+$":
-            oneOf:
-              - type: integer
-                minimum: 1
-              - type: boolean
+    $ref: package://runtimepy/schemas/RuntimeEnum.yaml
diff --git a/runtimepy/data/schemas/RuntimeEnum.yaml b/runtimepy/data/schemas/RuntimeEnum.yaml
@@ -0,0 +1,23 @@
+---
+type: object
+required: [id, type]
+additionalProperties: false
+
+properties:
+  id:
+    type: integer
+    minimum: 1
+
+  type:
+    enum: [bool, int]
+
+  items:
+    type: object
+    additionalProperties: false
+
+    patternProperties:
+      "^\\w+$":
+        oneOf:
+          - type: integer
+            minimum: 1
+          - type: boolean
diff --git a/runtimepy/registry/item.py b/runtimepy/registry/item.py
@@ -6,11 +6,13 @@
 from typing import cast as _cast
 
 # third-party
-from vcorelib.dict.codec import DictCodec as _DictCodec
 from vcorelib.io.types import JsonObject as _JsonObject
 
+# internal
+from runtimepy.schemas import RuntimepyDictCodec as _RuntimepyDictCodec
 
-class RegistryItem(_DictCodec):
+
+class RegistryItem(_RuntimepyDictCodec):
     """A class interface for items that can be managed via a registry."""
 
     def __hash__(self) -> int:

diff --git a/runtimepy/requirements.txt b/runtimepy/requirements.txt
@@ -1,3 +1,3 @@
-vcorelib>=1.1.7
+vcorelib>=1.2.0
 websockets
 windows-curses; sys_platform == 'win32'
diff --git a/runtimepy/schemas.py b/runtimepy/schemas.py
@@ -8,8 +8,8 @@
 
 # third-party
 from vcorelib.dict.codec import DictCodec as _DictCodec
-from vcorelib.schemas import JsonSchemaMap as _JsonSchemaMap
 from vcorelib.schemas.base import SchemaMap as _SchemaMap
+from vcorelib.schemas.json import JsonSchemaMap as _JsonSchemaMap
 
 # internal
 from runtimepy import PKG_NAME