cuemsutils 0.0.8__tar.gz → 0.0.9__tar.gz

{cuemsutils-0.0.8 → cuemsutils-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuemsutils
-Version: 0.0.8
+Version: 0.0.9
 Summary: Reusable classes and methods for CueMS system
 Project-URL: Documentation, https://github.com/stagesoft/cuems-utils#readme
 Project-URL: Issues, https://github.com/stagesoft/cuems-utils/issues
@@ -27,6 +27,8 @@ Requires-Dist: pynng==0.8.1
 Requires-Dist: timecode
 Requires-Dist: websockets==14.1
 Requires-Dist: xmlschema==3.4.3
+Provides-Extra: systemd
+Requires-Dist: systemd==235; extra == 'systemd'
 Description-Content-Type: text/markdown
 
 # cuems-utils
@@ -51,6 +53,16 @@ pip install cuemsutils
 
 ## Release notes
 
+### v0.0.9
+ - New `HubServices` for multiple dialers communication
+ - Extended `Settings` parameters class
+ - New `tools` submodule for clarity with documentation
+ - Added class `SignalEngine` and `run_daemon` method for running daemons
+ - Improved `ProjectMappings` and `NetworkMap` content processing
+ - Added class `Timeoutloop` for running methods with timeout
+ - `get_media` methods return extended information
+ - Conditional load of xml files at `ConfigManager` initialization, all class methods made public
+
 ### v0.0.8
  - `Settings` class added to xml module. Allows for easy access to configuration files.
  - Child classes `NetworkMap` and `ProjectMappings` inherit from `Settings` class.

{cuemsutils-0.0.8 → cuemsutils-0.0.9}/README.md

@@ -20,6 +20,16 @@ pip install cuemsutils
 
 ## Release notes
 
+### v0.0.9
+ - New `HubServices` for multiple dialers communication
+ - Extended `Settings` parameters class
+ - New `tools` submodule for clarity with documentation
+ - Added class `SignalEngine` and `run_daemon` method for running daemons
+ - Improved `ProjectMappings` and `NetworkMap` content processing
+ - Added class `Timeoutloop` for running methods with timeout
+ - `get_media` methods return extended information
+ - Conditional load of xml files at `ConfigManager` initialization, all class methods made public
+
 ### v0.0.8
  - `Settings` class added to xml module. Allows for easy access to configuration files.
  - Child classes `NetworkMap` and `ProjectMappings` inherit from `Settings` class.

{cuemsutils-0.0.8 → cuemsutils-0.0.9}/pyproject.toml

@@ -34,8 +34,12 @@ dependencies = [
     "xmlschema==3.4.3",
     "websockets==14.1",
     "peewee==3.17.8",
-    "aiofiles==24.1.0"
+    "aiofiles==24.1.0",
+]
 
+[project.optional-dependencies]
+systemd = [
+    "systemd==235",
 ]
 
 [project.urls]
@@ -52,6 +56,9 @@ include = ["src/cuemsutils/xml/schemas"]
 [tool.hatch.build.targets.wheel]
 packages = ["src/cuemsutils"]
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [[tool.hatch.envs.hatch-test.matrix]]
 python = ["3.11"]
 
@@ -60,7 +67,7 @@ dependencies = [
   "pytest",
   "pytest-cov",
   "pytest-mock",
-  "coverage[toml]"
+  "coverage[toml]",
 ]
 
 [tool.coverage.run]

{cuemsutils-0.0.8 → cuemsutils-0.0.9}/src/cuemsutils/xml/schemas/network_map.xsd

@@ -22,10 +22,18 @@
             <xs:element name="name" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"/>
             <xs:element name="node_type" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"/>
             <xs:element name="ip" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"/>
-            <xs:element name="port" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"/>
+            <xs:element name="port" minOccurs="1" maxOccurs="1" type="cms:NonPrivilegedPort"/>
+            <xs:element name="online" minOccurs="1" maxOccurs="1" type="cms:BoolType"/>
         </xs:sequence>
     </xs:complexType>
 
+    <xs:simpleType name="BoolType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="True" />
+            <xs:enumeration value="False" />
+        </xs:restriction>
+    </xs:simpleType>
+
     <xs:complexType name="PutType">
         <xs:sequence>
             <xs:element name="name" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"></xs:element>
@@ -45,4 +53,11 @@
             <xs:pattern value=".*[^\s].*" />
         </xs:restriction>
     </xs:simpleType>
+
+    <xs:simpleType name="NonPrivilegedPort">
+        <xs:restriction base="xs:int">
+            <xs:minInclusive value="1024" />
+            <xs:maxInclusive value="65535" />
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>

{cuemsutils-0.0.8 → cuemsutils-0.0.9}/src/cuemsutils/xml/schemas/script.xsd

@@ -272,10 +272,9 @@
     <xs:complexContent>
       <xs:extension base="cms:CueType">
         <xs:sequence>
-          <!-- A dmx media file path which can be none -->
-          <xs:element name="Media" type="cms:MediaType" />
-          <xs:element name="fadein_time" type="xs:integer" />
-          <xs:element name="fadeout_time" type="xs:integer" />
+          <xs:element name="fadein_time" type="xs:float" />
+          <xs:element name="fadeout_time" type="xs:float" />
+          <xs:element name="DmxScene" type="cms:DmxSceneType" />
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -283,10 +282,8 @@
 
   <!-- Dmx scene type -->
   <xs:complexType name="DmxSceneType">
-    <xs:sequence>
-      <xs:element name="uuid" type="xs:string" />
-      <xs:element name="name" type="cms:NameStringType" />
-      <xs:element name="description" type="cms:DescriptionStringType" />
+    <xs:all>
+      <xs:element name="id" type="xs:string" />
       <!-- We allow a max of 10 universes un a scene by now -->
       <xs:element name="DmxUniverse" type="cms:DmxUniverseType">
         <!-- They must be unique id's specs for the channels -->
@@ -295,38 +292,37 @@
           <xs:field xpath="@id" />
         </xs:unique>
       </xs:element>
-    </xs:sequence>
+    </xs:all>
   </xs:complexType>
 
   <!-- Dmx universe type -->
   <xs:complexType name="DmxUniverseType">
     <xs:sequence>
-      <xs:element name="id" type="xs:positiveInteger"></xs:element>
       <!-- List contents (to make it a list in python) -->
       <xs:element name="dmx_channels" type="cms:DmxUniverseContentsType">
         <xs:unique name="unique_channel_number">
           <xs:selector xpath="dmx_channel" />
-          <xs:field xpath="@id" />
+          <xs:field xpath="@universe_num" />
         </xs:unique>
       </xs:element>
+      <xs:element name="universe_num" type="xs:nonNegativeInteger"></xs:element>
     </xs:sequence>
-    <xs:attribute name="id" type="xs:byte" />
+    <xs:attribute name="universe_num" type="xs:byte" />
   </xs:complexType>
 
   <!-- DMX allows a max of 512 different channels in a universe -->
   <xs:complexType name="DmxUniverseContentsType">
     <xs:sequence>
-      <xs:element name="dmx_channel" type="cms:DmxChannelType" minOccurs="0" maxOccurs="512" />
+      <xs:element name="DmxChannel" type="cms:DmxChannelType" minOccurs="0" maxOccurs="512" />
     </xs:sequence>
   </xs:complexType>
 
   <!-- Dmx basic channel type -->
   <xs:complexType name="DmxChannelType">
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedByte">
-        <xs:attribute name="id" type="cms:ChannelNumberType" />
-      </xs:extension>
-    </xs:simpleContent>
+        <xs:sequence>
+          <xs:element name="channel" type="cms:ChannelNumberType" />
+          <xs:element name="value" type="cms:ChannelValueType" />
+        </xs:sequence>
   </xs:complexType>
 
   <!-- SIMPLE DATA TYPES -->
@@ -338,12 +334,19 @@
   </xs:simpleType>
 
   <xs:simpleType name="ChannelNumberType">
-    <xs:restriction base="xs:integer">
+    <xs:restriction base="xs:nonNegativeInteger">
       <xs:minInclusive value="0" />
       <xs:maxInclusive value="511" />
     </xs:restriction>
   </xs:simpleType>
 
+    <xs:simpleType name="ChannelValueType">
+    <xs:restriction base="xs:nonNegativeInteger">
+      <xs:minInclusive value="0" />
+      <xs:maxInclusive value="255" />
+    </xs:restriction>
+  </xs:simpleType>
+
   <xs:simpleType name="DateType">
     <xs:restriction base="xs:dateTime">
       <xs:minInclusive value="2020-01-01T00:00:00"></xs:minInclusive>

{cuemsutils-0.0.8 → cuemsutils-0.0.9}/src/cuemsutils/xml/schemas/settings.xsd

@@ -6,10 +6,17 @@
                 <xs:element name="Settings">
                     <xs:complexType>
                         <xs:sequence>
+                            <xs:element name="conf_path" type="xs:string" minOccurs="1" maxOccurs="1" />
                             <xs:element name="library_path" type="xs:string" minOccurs="1" maxOccurs="1" />
                             <xs:element name="tmp_path" type="xs:string" minOccurs="1" maxOccurs="1" />
                             <xs:element name="database_name" type="xs:string" minOccurs="1" maxOccurs="1" />
                             <xs:element name="show_lock_file" type="xs:string" minOccurs="1" maxOccurs="1" />
+                            <xs:element name="editor_url" type="xs:string" minOccurs="1" maxOccurs="1" />
+                            <xs:element name="controller_url" type="xs:string" minOccurs="1" maxOccurs="1" />
+                            <xs:element name="templates_path" type="xs:string" minOccurs="1" maxOccurs="1" />
+                            <xs:element name="controller_interfaces_template" type="xs:string" minOccurs="1" maxOccurs="1" />
+                            <xs:element name="node_interfaces_template" type="xs:string" minOccurs="1" maxOccurs="1" />
+                            <xs:element name="controller_lock_file" type="xs:string" minOccurs="1" maxOccurs="1" />
                             <!-- Node settings -->
                             <xs:element name="node" type="cms:NodeConfType" minOccurs="1" maxOccurs="1"></xs:element>
                         </xs:sequence>
@@ -26,14 +33,14 @@
             <xs:element name="uuid" type="cms:NonEmptyString" />
             <xs:element name="mac" type="cms:NonEmptyString" />
             <xs:element name="osc_dest_host" type="cms:NonEmptyString" />
-            <xs:element name="oscquery_ws_port" type="xs:positiveInteger" />
-            <xs:element name="oscquery_osc_port" type="xs:positiveInteger" />
-            <xs:element name="websocket_port" type="xs:positiveInteger" />
+            <xs:element name="oscquery_ws_port" type="cms:NonPrivilegedPort" />
+            <xs:element name="oscquery_osc_port" type="cms:NonPrivilegedPort" />
+            <xs:element name="websocket_port" type="cms:NonPrivilegedPort" />
             <xs:element name="load_timeout" type="xs:positiveInteger" />
             <xs:element name="nodeconf_timeout" type="xs:positiveInteger" />
             <xs:element name="discovery_timeout" type="xs:positiveInteger" />
             <xs:element name="mtc_port" type="xs:string" />
-            <xs:element name="osc_in_port_base" type="xs:positiveInteger" />
+            <xs:element name="osc_in_port_base" type="cms:NonPrivilegedPort" />
             <xs:element name="videoplayer" type="cms:VideoPlayerType" minOccurs="0" maxOccurs="1" />
             <xs:element name="audioplayer" type="cms:AudioPlayerType" minOccurs="0" maxOccurs="1" />
             <xs:element name="dmxplayer" type="cms:DmxPlayerType" minOccurs="0" maxOccurs="1" />
@@ -110,4 +117,10 @@
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:simpleType name="NonPrivilegedPort">
+        <xs:restriction base="xs:int">
+            <xs:minInclusive value="1024" />
+            <xs:maxInclusive value="65535" />
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>