pymscada 0.2.0rc7__tar.gz → 0.2.1__tar.gz

{pymscada-0.2.0rc7/src/pymscada.egg-info → pymscada-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymscada
-Version: 0.2.0rc7
+Version: 0.2.1
 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
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: aiohttp>=3.8.5
-Requires-Dist: pymscada-html==0.2.0rc4
+Requires-Dist: pymscada-html==0.2.0
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24

{pymscada-0.2.0rc7 → pymscada-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.2.0rc7"
+version = "0.2.1"
 description = "Shared tag value SCADA with python backup and Angular UI"
 authors = [
     {name = "Jamie Walton", email = "jamie@walton.net.nz"},
@@ -8,7 +8,7 @@ authors = [
 dependencies = [
     "PyYAML>=6.0.1",          # all
     "aiohttp>=3.8.5",         # www_server
-    "pymscada-html==0.2.0rc4",   # www_server
+    "pymscada-html==0.2.0",   # www_server
     "cerberus>=1.3.5",        # validate
     "pycomm3>=1.2.14",        # logix_client
     "pysnmplib>=5.0.24",      # DON'T use pysnmp, dead

{pymscada-0.2.0rc7 → pymscada-0.2.1}/src/pymscada/callout.py

@@ -159,8 +159,11 @@ class Callout:
 
     def rta_cb(self, request):
         """Handle RTA requests for callout configuration."""
+        logging.info(f'rta_cb {request}')
         if 'action' not in request:
             logging.warning(f'rta_cb malformed {request}')
+        elif request['action'] == 'ALL':
+            self.rta.value = {'callees': self.callees, 'groups': self.groups}
         elif request['action'] == 'MODIFY':
             for callee in self.callees:
                 if callee['name'] == request['name']:

{pymscada-0.2.0rc7 → pymscada-0.2.1}/src/pymscada/demo/callout.yaml

@@ -1,12 +1,13 @@
 bus_ip: 127.0.0.1
 bus_port: 1324
 rta_tag: __callout__
-alarms: __alarms__
-ack: SI_Alarm_Ack
-status: SO_Alarm_Status
+alarms_tag: __alarms__
+ack_tag: SI_Alarm_Ack
+status_tag: SO_Alarm_Status
 callees:
 - name: A name
   sms: A number
+  group: System
 - name: B name
   sms: B number
 groups:

pymscada-0.2.1/src/pymscada/demo/pymscada-callout.service

@@ -0,0 +1,16 @@
+[Unit]
+    Description=pymscada - callout
+    BindsTo=pymscada-bus.service
+    After=pymscada-bus.service
+
+[Service]
+    WorkingDirectory=__DIR__
+    ExecStart=__PYMSCADA__ callout --config __DIR__/config/callout.yaml --tags __DIR__/config/tags.yaml
+    Restart=always
+    RestartSec=5
+    User=__USER__
+    Group=__USER__
+    KillSignal=SIGINT
+
+[Install]
+    WantedBy=multi-user.target

{pymscada-0.2.0rc7 → pymscada-0.2.1}/src/pymscada/module_config.py

@@ -9,14 +9,14 @@ from pymscada.config import Config
 class ModuleArgument:
     def __init__(self, args: tuple[str, ...], kwargs: dict[str, Any]):
         self.args = args
-        self.kwargs = kwargs
+        self.kwargs = kwargs 
 
 class ModuleDefinition:
     """Defines a module's configuration and behavior."""
-    def __init__(self, name: str, help: str, module_class: Type[Any], *,
+    def __init__(self, name: str, help: str, module_class: Any, *,
                  config: bool = True, tags: bool = True,
                  epilog: Optional[str] = None,
-                 extra_args: list[ModuleArgument] = None,
+                 extra_args: Optional[list[ModuleArgument]] = None,
                  await_future: bool = True):
         self.name = name
         self.help = help
@@ -63,6 +63,12 @@ def create_module_registry():
             help='alarms',
             module_class='pymscada.alarms:Alarms'
         ),
+        ModuleDefinition(
+            name='callout',
+            help='alarm callout notifications',
+            module_class='pymscada.callout:Callout',
+            tags=False
+        ),
         ModuleDefinition(
             name='validate',
             help='validate config files',

{pymscada-0.2.0rc7 → pymscada-0.2.1/src/pymscada.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymscada
-Version: 0.2.0rc7
+Version: 0.2.1
 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
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: aiohttp>=3.8.5
-Requires-Dist: pymscada-html==0.2.0rc4
+Requires-Dist: pymscada-html==0.2.0
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24

{pymscada-0.2.0rc7 → pymscada-0.2.1}/src/pymscada.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ src/pymscada/demo/opnotes.yaml
 src/pymscada/demo/ping.yaml
 src/pymscada/demo/pymscada-alarms.service
 src/pymscada/demo/pymscada-bus.service
+src/pymscada/demo/pymscada-callout.service
 src/pymscada/demo/pymscada-demo-modbus_plc.service
 src/pymscada/demo/pymscada-files.service
 src/pymscada/demo/pymscada-history.service

{pymscada-0.2.0rc7 → pymscada-0.2.1}/src/pymscada.egg-info/requires.txt

@@ -1,6 +1,6 @@
 PyYAML>=6.0.1
 aiohttp>=3.8.5
-pymscada-html==0.2.0rc4
+pymscada-html==0.2.0
 cerberus>=1.3.5
 pycomm3>=1.2.14
 pysnmplib>=5.0.24

{pymscada-0.2.0rc7 → pymscada-0.2.1}/tests/test_callout.py

@@ -1,7 +1,6 @@
 """Test Callout."""
 import pytest
 from pymscada.callout import Callout, alarm_in_callee_group, ALM
-import time
 
 
 BUS_ID = 123