pymscada 0.1.11b2__tar.gz → 0.1.11b3__tar.gz

{pymscada-0.1.11b2 → pymscada-0.1.11b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.11b2
+Version: 0.1.11b3
 Summary: Shared tag value SCADA with python backup and Angular UI
 Author-Email: Jamie Walton <jamie@walton.net.nz>
 License: GPL-3.0-or-later

{pymscada-0.1.11b2 → pymscada-0.1.11b3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.1.11b2"
+version = "0.1.11b3"
 description = "Shared tag value SCADA with python backup and Angular UI"
 authors = [
     { name = "Jamie Walton", email = "jamie@walton.net.nz" },

{pymscada-0.1.11b2 → pymscada-0.1.11b3}/src/pymscada/checkout.py

@@ -57,21 +57,17 @@ def make_config(overwrite: bool):
             else:
                 continue
         print(f'{rt} {target}')
-        if str(target).endswith('service'):
-            rd_bytes = config_file.read_bytes()
-            for k, v in PATH.items():
-                rd_bytes = rd_bytes.replace(k.encode(),str(v).encode())
-            target.write_bytes(rd_bytes)
-        else:
-            target.write_bytes(config_file.read_bytes())
+        rd_bytes = config_file.read_bytes()
+        for k, v in PATH.items():
+            rd_bytes = rd_bytes.replace(k.encode(), str(v).encode())
+        target.write_bytes(rd_bytes)
 
 
 def read_with_subst(file: Path):
     """Read the file and replace DIR markers."""
     rd = file.read_bytes().decode()
-    if str(file).endswith('service'):
-        for k, v in PATH.items():
-            rd = rd.replace(k, str(v))
+    for k, v in PATH.items():
+        rd = rd.replace(k, str(v))
     lines = rd.splitlines()
     return lines
 

{pymscada-0.1.11b2 → pymscada-0.1.11b3}/src/pymscada/demo/ping.yaml

@@ -4,9 +4,6 @@ tags:
   localhost_ping:
     type: ping
     addr: '127.0.0.1'
-  electronet_ping:
-    type: ping
-    addr: electronet.co.nz
   google_ping:
     type: ping
     addr: www.google.com

pymscada-0.1.11b3/src/pymscada/demo/tags.yaml

@@ -0,0 +1,119 @@
+__bus__:
+  desc: Bus Server Info
+  type: str
+__files__:
+  desc: File Server
+  type: dict
+__history__:
+  desc: History
+  type: bytes
+__opnotes__:
+  desc: Operator Notes
+  type: dict
+__alarms__:
+  desc: Alarms
+  type: dict
+IntSet:
+  desc: Integer Setpoint
+  type: int
+  min: -100
+  max: 100
+  init: 1
+IntVal:
+  desc: Integer Value
+  type: int
+  min: -100
+  max: 100
+  init: 1
+FloatSet:
+  desc: Float Setpoint
+  type: float
+  min: -1.e+100
+  max: 1.e+100
+  units: 'm'
+  dp: 1
+  init: 2
+FloatVal:
+  desc: Float Value
+  type: float
+  min: -1.e+100
+  max: 1.e+100
+  units: 'm'
+  dp: 1
+  init: 2
+MultiSet:
+  desc: Multi Setpoint
+  multi:
+   - zero
+   - one
+   - two
+   - three
+  init: 0
+MultiVal:
+  desc: Multi Value
+  multi:
+   - zero
+   - one
+   - two
+   - three
+  init: 0
+StringSet:
+  desc: String Setpoint
+  type: str
+  init: a string
+StringVal:
+  desc: String Value
+  type: str
+  init: a string
+TimeSet:
+  desc: Time Setpoint
+  type: int
+  init: 1234567890
+  format: time
+TimeVal:
+  desc: Time Value
+  type: int
+  init: 1234567890
+  format: time
+DateSet:
+  desc: Date Setpoint
+  type: int
+  init: 1234567890
+  format: date
+DateVal:
+  desc: Date Value
+  type: int
+  init: 1234567890
+  format: date
+DateTimeSet:
+  desc: Date Time Setpoint
+  type: int
+  init: 1234567890
+  format: datetime
+DateTimeVal:
+  desc: Date Time Value
+  type: int
+  init: 1234567890
+  format: datetime
+MultiSelect:
+  desc: Select Dict Multi
+  type: dict
+  init:
+    labels: [A, B, C, D, E, F, G, H]
+    values: [0, 1, 2, 3, 3, 4, 4, 3]
+    locks: [1, 0, 0, 0, 0, 0, 0, 1]
+FloatSelect:
+  desc: Select Dict Float
+  type: dict
+  init:
+    labels: [Floats, For, This, Tag]
+    values: [0.1, 0.1, 0.2, 0.3]
+    locks: [0, 1, 0, 0]
+localhost_ping:
+  desc: Ping time to localhost
+  type: int
+  units: ms
+google_ping:
+  desc: Ping time to google
+  type: int
+  units: ms

pymscada-0.1.11b3/src/pymscada/demo/wwwserver.yaml

@@ -0,0 +1,81 @@
+bus_ip: 127.0.0.1
+bus_port: 1324
+ip: 0.0.0.0
+port: 8324
+get_path:
+serve_path: __HOME__
+pages:
+- name: Notes
+  parent:
+  items:
+  - type: opnotes
+    site: [Site 1, Site 2]
+    by: [B1, B2]
+- name: Default Main
+  parent:
+  items:
+  - {desc: Default tags, type: h1}
+  - {tagname: IntSet, type: setpoint}
+  - {tagname: IntVal, type: value}
+  - {tagname: FloatSet, type: setpoint}
+  - {tagname: FloatVal, type: value}
+  - {tagname: MultiSet, type: setpoint}
+  - {tagname: MultiVal, type: value}
+  - {tagname: StringSet, type: setpoint}
+  - {tagname: StringVal, type: value}
+  - {tagname: TimeSet, type: setpoint}
+  - {tagname: TimeVal, type: value}
+  - {tagname: DateSet, type: setpoint}
+  - {tagname: DateVal, type: value}
+  - {tagname: DateTimeSet, type: setpoint}
+  - {tagname: DateTimeVal, type: value}
+  - type: selectdict
+    tagname: MultiSelect
+    opts:
+      type: multi
+      multi:
+      - Zero
+      - One
+      - Two
+      - Three
+      - Four
+      - Five
+  - {tagname: FloatSelect, type: selectdict, opts: {type: float, dp: 2}}
+- name: Files
+  parent:
+  items:
+  - type: files
+- name: Ping Values
+  parent:
+  items:
+  - {desc: Default tags, type: h1}
+  - {tagname: localhost_ping, type: value}
+  - {tagname: google_ping, type: value}
+  - {tagname: electronet_ping, type: value}
+- name: Ping Trend
+  parent:
+  items:
+  - type: uplot  # Do all times in seconds, which uplot uses.
+    ms:
+      desc: Ping Trend
+      age: 172800
+      legend_pos: left
+      time_pos: left
+      time_res: m
+    axes:
+    - scale: x
+      range: [-86400, 0]  # 86400 172800 1209600
+    - scale: mS
+      range: [0.0, 1.0]
+      dp: 1
+    series:
+    - tagname: localhost_ping
+      label: localhost
+      scale: mS
+      color: black
+      dp: 1
+    - tagname: google_ping
+      label: google
+      scale: mS
+      color: red
+      dp: 1

{pymscada-0.1.11b2 → pymscada-0.1.11b3}/src/pymscada/module_config.py

@@ -49,12 +49,14 @@ def create_module_registry():
         ModuleDefinition(
             name='files',
             help='serve files',
-            module_class='pymscada.files:Files'
+            module_class='pymscada.files:Files',
+            tags=False
         ),
         ModuleDefinition(
             name='opnotes',
             help='operator notes',
-            module_class='pymscada.opnotes:OpNotes'
+            module_class='pymscada.opnotes:OpNotes',
+            tags=False
         ),
         ModuleDefinition(
             name='validate',
@@ -93,37 +95,44 @@ def create_module_registry():
         ModuleDefinition(
             name='accuweatherclient',
             help='poll weather information',
-            module_class='pymscada.iodrivers.accuweather:AccuWeatherClient'
+            module_class='pymscada.iodrivers.accuweather:AccuWeatherClient',
+            tags=False
         ),
         ModuleDefinition(
             name='logixclient',
             help='poll/write to logix devices',
-            module_class='pymscada.iodrivers.logix_client:LogixClient'
+            module_class='pymscada.iodrivers.logix_client:LogixClient',
+            tags=False
         ),
         ModuleDefinition(
             name='modbusclient',
             help='poll/write modbus devices',
-            module_class='pymscada.iodrivers.modbus_client:ModbusClient'
+            module_class='pymscada.iodrivers.modbus_client:ModbusClient',
+            tags=False
         ),
         ModuleDefinition(
             name='modbusserver',
             help='serve modbus devices',
-            module_class='pymscada.iodrivers.modbus_server:ModbusServer'
+            module_class='pymscada.iodrivers.modbus_server:ModbusServer',
+            tags=False
         ),
         ModuleDefinition(
             name='openweatherclient',
             help='poll OpenWeather current and forecast data',
-            module_class='pymscada.iodrivers.openweather:OpenWeatherClient'
+            module_class='pymscada.iodrivers.openweather:OpenWeatherClient',
+            tags=False
         ),
         ModuleDefinition(
             name='pingclient',
             help='ping network devices',
-            module_class='pymscada.iodrivers.ping_client:PingClient'
+            module_class='pymscada.iodrivers.ping_client:PingClient',
+            tags=False
         ),
         ModuleDefinition(
             name='snmpclient',
             help='poll SNMP devices',
-            module_class='pymscada.iodrivers.snmp_client:SnmpClient'
+            module_class='pymscada.iodrivers.snmp_client:SnmpClient',
+            tags=False
         ),
         ModuleDefinition(
             name='console',

pymscada-0.1.11b2/src/pymscada/demo/tags.yaml

@@ -1,268 +0,0 @@
-__bus__:
-  desc: Bus Server Info
-  type: str
-__files__:
-  desc: File Server
-  type: dict
-__history__:
-  desc: History
-  type: bytes
-__opnotes__:
-  desc: Operator Notes
-  type: dict
-__alarms__:
-  desc: Alarms
-  type: dict
-IntSet:
-  desc: Integer Setpoint
-  type: int
-  min: -100
-  max: 100
-  init: 1
-IntVal:
-  desc: Integer Value
-  type: int
-  min: -100
-  max: 100
-  init: 1
-FloatSet:
-  desc: Float Setpoint
-  type: float
-  min: -1.e+100
-  max: 1.e+100
-  units: 'm'
-  dp: 1
-  init: 2
-FloatVal:
-  desc: Float Value
-  type: float
-  min: -1.e+100
-  max: 1.e+100
-  units: 'm'
-  dp: 1
-  init: 2
-MultiSet:
-  desc: Multi Setpoint
-  multi:
-   - zero
-   - one
-   - two
-   - three
-  init: 0
-MultiVal:
-  desc: Multi Value
-  multi:
-   - zero
-   - one
-   - two
-   - three
-  init: 0
-StringSet:
-  desc: String Setpoint
-  type: str
-  init: a string
-StringVal:
-  desc: String Value
-  type: str
-  init: a string
-TimeSet:
-  desc: Time Setpoint
-  type: int
-  init: 1234567890
-  format: time
-TimeVal:
-  desc: Time Value
-  type: int
-  init: 1234567890
-  format: time
-DateSet:
-  desc: Date Setpoint
-  type: int
-  init: 1234567890
-  format: date
-DateVal:
-  desc: Date Value
-  type: int
-  init: 1234567890
-  format: date
-DateTimeSet:
-  desc: Date Time Setpoint
-  type: int
-  init: 1234567890
-  format: datetime
-DateTimeVal:
-  desc: Date Time Value
-  type: int
-  init: 1234567890
-  format: datetime
-MultiSelect:
-  desc: Select Dict Multi
-  type: dict
-  init:
-    labels: [A, B, C, D, E, F, G, H]
-    values: [0, 1, 2, 3, 3, 4, 4, 3]
-    locks: [1, 0, 0, 0, 0, 0, 0, 1]
-FloatSelect:
-  desc: Select Dict Float
-  type: dict
-  init:
-    labels: [Floats, For, This, Tag]
-    values: [0.1, 0.1, 0.2, 0.3]
-    locks: [0, 1, 0, 0]
-cpu_temp:
-  desc: CPU Load
-  type: float
-  min: 0
-  max: 100
-  units: '°C'
-  dp: 1
-cpu_load:
-  desc: Float Value
-  type: float
-  min: 0
-  max: 100
-  units: '%'
-  dp: 1
-disk_use:
-  desc: Float Value
-  type: float
-  min: 0
-  max: 100
-  units: '%'
-  dp: 1
-sim_IntSet:  # for the demo PLC sim_ tags not required
-  desc: Simulation tag
-  type: int
-sim_IntVal:
-  desc: Simulation tag
-  type: int
-sim_FloatSet:
-  desc: Simulation tag
-  type: float
-sim_FloatVal:
-  desc: Simulation tag
-  type: float
-sim_MultiSet:
-  desc: Simulation tag
-  type: int
-sim_MultiVal:
-  desc: Simulation tag
-  type: int
-sim_TimeSet:
-  desc: Simulation tag
-  type: int
-sim_TimeVal:
-  desc: Simulation tag
-  type: int
-sim_DateSet:
-  desc: Simulation tag
-  type: int
-sim_DateVal:
-  desc: Simulation tag
-  type: int
-sim_DateTimeSet:
-  desc: Simulation tag
-  type: int
-sim_DateTimeVal:
-  desc: Simulation tag
-  type: int
-Ani_Fin_20:
-  desc: 'Logix Fin[20]'
-  type: float
-  dp: 2
-Ani_Fout_20:
-  desc: 'Logix Fout[20]'
-  type: float
-  dp: 2
-Ani_Iin_20:
-  desc: 'Logix Iin[20]'
-  type: int
-Ani_Iout_20:
-  desc: 'Logix Iout[20]'
-  type: int
-Ani_Iout_21_0:
-  desc: 'Logix Iout[21].0'
-  multi:
-  - 'Off'
-  - 'On'
-Ani_Iout_21_1:
-  desc: 'Logix Iout[21].1'
-  multi:
-  - 'Off'
-  - 'On'
-Ani_Iin_21_0:
-  desc: 'Logix Iin[21].0'
-  multi:
-  - 'Off'
-  - 'On'
-Ani_Iin_21_1:
-  desc: 'Logix Iin[21].1'
-  multi:
-  - 'Off'
-  - 'On'
-InVar:
-  desc: InVar
-  type: float
-OutVar:
-  desc: OutVar
-  type: float
-Router_eth1_bytes_in:
-  desc: eth1 bytes in
-  type: int
-Router_eth1_bytes_out:
-  desc: eth1 bytes out
-  type: int
-Router_eth2_bytes_in:
-  desc: eth2 bytes in
-  type: int
-Router_eth2_bytes_out:
-  desc: eth2 bytes out
-  type: int
-Router_eth3_bytes_in:
-  desc: eth3 bytes in
-  type: int
-Router_eth3_bytes_out:
-  desc: eth3 bytes out
-  type: int
-Router_eth4_bytes_in:
-  desc: eth4 bytes in
-  type: int
-Router_eth4_bytes_out:
-  desc: eth4 bytes out
-  type: int
-Router_eth5_bytes_in:
-  desc: eth5 bytes in
-  type: int
-Router_eth5_bytes_out:
-  desc: eth5 bytes out
-  type: int
-Router_eth6_bytes_in:
-  desc: eth6 bytes in
-  type: int
-Router_eth6_bytes_out:
-  desc: eth6 bytes out
-  type: int
-Router_eth7_bytes_in:
-  desc: eth7 bytes in
-  type: int
-Router_eth7_bytes_out:
-  desc: eth7 bytes out
-  type: int
-Router_eth8_bytes_in:
-  desc: eth8 bytes in
-  type: int
-Router_eth8_bytes_out:
-  desc: eth8 bytes out
-  type: int
-localhost_ping:
-  desc: Ping time to localhost
-  type: int
-  units: ms
-google_ping:
-  desc: Ping time to google
-  type: int
-  units: ms
-electronet_ping:
-  desc: Ping time to electronet
-  type: int
-  units: ms

pymscada-0.1.11b2/src/pymscada/demo/wwwserver.yaml

@@ -1,273 +0,0 @@
-bus_ip: 127.0.0.1
-bus_port: 1324
-ip: 0.0.0.0
-port: 8324
-get_path: __HOME__/angmscada/dist/angmscada
-serve_path: __HOME__/pymscada
-pages:
-- name: Notes
-  parent:
-  items:
-  - type: opnote
-    site: [Site 1, Site 2]
-    by: [B1, B2]
-- name: Default Main
-  parent:
-  items:
-  - {desc: Default tags, type: h1}
-  - {tagname: IntSet, type: setpoint}
-  - {tagname: IntVal, type: value}
-  - {tagname: FloatSet, type: setpoint}
-  - {tagname: FloatVal, type: value}
-  - {tagname: MultiSet, type: setpoint}
-  - {tagname: MultiVal, type: value}
-  - {tagname: StringSet, type: setpoint}
-  - {tagname: StringVal, type: value}
-  - {tagname: TimeSet, type: setpoint}
-  - {tagname: TimeVal, type: value}
-  - {tagname: DateSet, type: setpoint}
-  - {tagname: DateVal, type: value}
-  - {tagname: DateTimeSet, type: setpoint}
-  - {tagname: DateTimeVal, type: value}
-  - type: selectdict
-    tagname: MultiSelect
-    opts:
-      type: multi
-      multi:
-      - Zero
-      - One
-      - Two
-      - Three
-      - Four
-      - Five
-  - {tagname: FloatSelect, type: selectdict, opts: {type: float, dp: 2}}
-- name: Trends
-  parent: Dropdown
-  items:
-  - type: uplot  # Do all times in seconds, which uplot uses.
-    ms:
-      desc: Sample Trend
-      age: 172800
-      legend_pos: left
-      time_pos: left
-      time_res: m
-    axes:
-    - scale: x
-      range: [-86400, 0]  # 86400 172800 1209600
-    - scale: '°C'
-      range: [0.0, 100.0]
-      dp: 1
-    - scale: '%'
-      range: [0.0, 100.0]
-      dp: 1
-      # side: 1
-    # bands:  # TODO
-    # - series: [I_Transpower_Limit_Hi, I_Transpower_Limit_Lo]
-    #   fill: [red, 0.2]
-    #   dir: -1
-    series:
-    - tagname: cpu_load
-      label: CPU Load
-      scale: '%'
-      color: black
-      width: 1.5
-      dp: 1
-    - tagname: disk_use
-      label: Disk Use
-      scale: '%'
-      color: blue
-      width: 1
-      dp: 1
-    - tagname: cpu_temp
-      label: CPU Temp
-      scale: '°C'
-      color: red
-      width: 1
-      dp: 1
-- name: Files
-  parent: Dropdown
-  items:
-  - type: files
-- name: Logix
-  items:
-  - {tagname: Ani_Fin_20, type: setpoint}
-  - {tagname: Ani_Fout_20, type: value}
-  - {tagname: Ani_Iin_20, type: setpoint}
-  - {tagname: Ani_Iout_20, type: value}
-  - {tagname: InVar, type: setpoint}
-  - {tagname: OutVar, type: value}
-  - {tagname: Ani_Iin_21_0, type: setpoint}
-  - {tagname: Ani_Iout_21_0, type: value}
-  - {tagname: Ani_Iin_21_1, type: setpoint}
-  - {tagname: Ani_Iout_21_1, type: value}
-- name: Values
-  parent: SNMP
-  items:
-  - {tagname: Router_eth1_bytes_in, type: value}
-  - {tagname: Router_eth1_bytes_out, type: value}
-  - {tagname: Router_eth2_bytes_in, type: value}
-  - {tagname: Router_eth2_bytes_out, type: value}
-  - {tagname: Router_eth3_bytes_in, type: value}
-  - {tagname: Router_eth3_bytes_out, type: value}
-  - {tagname: Router_eth4_bytes_in, type: value}
-  - {tagname: Router_eth4_bytes_out, type: value}
-  - {tagname: Router_eth5_bytes_in, type: value}
-  - {tagname: Router_eth5_bytes_out, type: value}
-  - {tagname: Router_eth6_bytes_in, type: value}
-  - {tagname: Router_eth6_bytes_out, type: value}
-  - {tagname: Router_eth7_bytes_in, type: value}
-  - {tagname: Router_eth7_bytes_out, type: value}
-  - {tagname: Router_eth8_bytes_in, type: value}
-  - {tagname: Router_eth8_bytes_out, type: value}
-- name: Trend
-  parent: SNMP
-  items:
-  - type: uplot  # Do all times in seconds, which uplot uses.
-    ms:
-      desc: Bytes
-      age: 172800
-      legend_pos: left
-      time_pos: left
-      time_res: m
-    axes:
-    - scale: x
-      range: [-86400, 0]
-    - scale: 'bytes'
-      range: [0, 100000]
-      dp: 0
-    series:
-    - tagname: Router_eth1_bytes_in
-      label: eth1 in
-      scale: 'bytes'
-      color: violet
-      width: 1
-      dp: 0
-    - tagname: Router_eth1_bytes_out
-      label: eth1 out
-      scale: 'bytes'
-      color: violet
-      width: 0.5
-      dp: 0
-    - tagname: Router_eth2_bytes_in
-      label: eth2 in
-      scale: 'bytes'
-      color: blue
-      width: 1
-      dp: 0
-    - tagname: Router_eth2_bytes_out
-      label: eth2 out
-      scale: 'bytes'
-      color: blue
-      width: 0.5
-      dp: 0
-    - tagname: Router_eth3_bytes_in
-      label: eth3 in
-      scale: 'bytes'
-      color: green
-      width: 1
-      dp: 0
-    - tagname: Router_eth3_bytes_out
-      label: eth3 out
-      scale: 'bytes'
-      color: green
-      width: 0.5
-      dp: 0
-    - tagname: Router_eth4_bytes_in
-      label: eth4 in
-      scale: 'bytes'
-      color: gray
-      width: 1
-      dp: 0
-    - tagname: Router_eth4_bytes_out
-      label: eth4 out
-      scale: 'bytes'
-      color: gray
-      width: 0.5
-      dp: 0
-    - tagname: Router_eth5_bytes_in
-      label: eth5 in
-      scale: 'bytes'
-      color: goldenrod
-      width: 1
-      dp: 0
-    - tagname: Router_eth5_bytes_out
-      label: eth5 out
-      scale: 'bytes'
-      color: goldenrod
-      width: 0.5
-      dp: 0
-    - tagname: Router_eth6_bytes_in
-      label: eth6 in
-      scale: 'bytes'
-      color: brown
-      width: 1
-      dp: 0
-    - tagname: Router_eth6_bytes_out
-      label: eth6 out
-      scale: 'bytes'
-      color: brown
-      width: 0.5
-      dp: 0
-    - tagname: Router_eth7_bytes_in
-      label: eth7 in
-      scale: 'bytes'
-      color: orange
-      width: 1
-      dp: 0
-    - tagname: Router_eth7_bytes_out
-      label: eth7 out
-      scale: 'bytes'
-      color: orange
-      width: 0.5
-      dp: 0
-    - tagname: Router_eth8_bytes_in
-      label: eth8 in
-      scale: 'bytes'
-      color: aqua
-      width: 1
-      dp: 0
-    - tagname: Router_eth8_bytes_out
-      label: eth8 out
-      scale: 'bytes'
-      color: aqua
-      width: 0.5
-      dp: 0
-- name: Ping Values
-  parent: Ping
-  items:
-  - {desc: Default tags, type: h1}
-  - {tagname: localhost_ping, type: value}
-  - {tagname: google_ping, type: value}
-  - {tagname: electronet_ping, type: value}
-- name: Ping Trend
-  parent: Ping
-  items:
-  - type: uplot  # Do all times in seconds, which uplot uses.
-    ms:
-      desc: Ping Trend
-      age: 172800
-      legend_pos: left
-      time_pos: left
-      time_res: m
-    axes:
-    - scale: x
-      range: [-86400, 0]  # 86400 172800 1209600
-    - scale: mS
-      range: [0.0, 1.0]
-      dp: 1
-    series:
-    - tagname: localhost_ping
-      label: localhost
-      scale: mS
-      color: black
-      dp: 1
-    - tagname: electronet_ping
-      label: electronet
-      scale: mS
-      color: blue
-      dp: 1
-    - tagname: google_ping
-      label: google
-      scale: mS
-      color: red
-      dp: 1