pymscada 0.2.6b0__py3-none-any.whl → 0.2.6b1__py3-none-any.whl

pymscada/alarms.py

@@ -211,6 +211,7 @@ class Alarms:
         self.rta = Tag(rta_tag, dict)
         self.rta.value = {'__rta_id__': 0}
         self.busclient.add_callback_rta(rta_tag, self.rta_cb)
+        self.busclient.add_tag(self.rta)
         self._init_db(db, table)
         self.periodic = Periodic(self.periodic_cb, 1.0)
 

pymscada/bus_client.py

@@ -77,6 +77,9 @@ class BusClient:
         jsonstr = json.dumps(request).encode()
         size = len(jsonstr)
         data = struct.pack(f'>B{size}s', pc.TYPE.JSON, jsonstr)
+        action = request.get("action", "unknown")
+        tag_id = self.tag_by_name[tagname].id
+        logging.info(f'{self.module}: RTA sending {tagname} {action} to tag_id {tag_id}')
         self.write(pc.COMMAND.RTA, self.tag_by_name[tagname].id, time_us, data)
 
     def write(self, command: pc.COMMAND, tag_id: int, time_us: int,
@@ -209,10 +212,13 @@ class BusClient:
             data = struct.unpack_from(f'!{len(value) - 1}s', value, offset=1
                                       )[0].decode()
             data = json.loads(data)
+            action = data.get("action", "unknown")
+            logging.info(f'{self.module}: RTA received {tag.name} {action} '
+                        f'from tag_id {tag_id}')
             try:
                 self.rta_handlers[tag.name](data)
             except KeyError:
-                logging.warning(f'unhandled RTA for {tag.name} {data}')
+                logging.warning(f'{self.module}: unhandled RTA for {tag.name} {data}')
         else:
             raise SystemExit(f'Invalid message {cmd}')
 

pymscada/bus_server.py

@@ -201,15 +201,21 @@ class BusServer:
             try:
                 tag = BusTags._tag_by_id[tag_id]
             except KeyError:
+                logging.warning(f'RTA KeyError {tag_id}')
                 self.connections[bus_id].write(
                     pc.COMMAND.ERR, tag_id, time_us,
                     f"RTA KeyError {tag_id}".encode())
+                return
             try:
+                logging.info(f'RTA forwarding {tag.name} from_bus={tag.from_bus} '
+                            f'to bus_id={tag.from_bus}')
                 self.connections[tag.from_bus].write(
                     pc.COMMAND.RTA, tag_id, tag.time_us, data)
             except KeyError:
-                logging.warning(f'likely busclient for {tag.name} is gone')
+                logging.warning(f'RTA forwarding failed: busclient for '
+                              f'{tag.name} (from_bus={tag.from_bus}) is gone')
             except Exception as e:
+                logging.warning(f'RTA forwarding error {tag.name}: {e}')
                 self.connections[bus_id].write(
                     pc.COMMAND.ERR, tag_id, time_us,
                     f"RTA {tag_id} {e}".encode())

pymscada/callout.py

@@ -145,6 +145,7 @@ class Callout:
                           'groups': self.groups,
                           'escalation': self.escalation}
         self.busclient.add_callback_rta(rta_tag, self.rta_cb)
+        self.busclient.add_tag(self.rta)
         self.periodic = Periodic(self.periodic_cb, 1.0)
 
     def alarms_cb(self, alm_tag):

pymscada/files.py

@@ -33,6 +33,7 @@ class Files():
         self.rta = Tag(rta_tag, dict)
         self.rta.value = {}
         self.busclient.add_callback_rta(rta_tag, self.rta_cb)
+        self.busclient.add_tag(self.rta)
 
     def rta_cb(self, request):
         """Respond to Request to Author and publish on rta_tag as needed."""

pymscada/history.py

@@ -272,6 +272,7 @@ class History():
         self.rta = Tag(rta_tag, bytes)
         self.rta.value = b'\x00\x00\x00\x00\x00\x00'  # rta_id is 0
         self.busclient.add_callback_rta(rta_tag, self.rta_cb)
+        self.busclient.add_tag(self.rta)
 
     def rta_cb(self, request: Request):
         """Respond to bus requests for data to publish on rta."""

pymscada/opnotes.py

@@ -55,6 +55,7 @@ class OpNotes:
         self.rta = Tag(rta_tag, dict)
         self.rta.value = {'__rta_id__': 0}
         self.busclient.add_callback_rta(rta_tag, self.rta_cb)
+        self.busclient.add_tag(self.rta)
 
     def _init_table(self):
         """Initialize or upgrade the database table schema."""

{pymscada-0.2.6b0.dist-info → pymscada-0.2.6b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymscada
-Version: 0.2.6b0
+Version: 0.2.6b1
 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.2.6b0.dist-info → pymscada-0.2.6b1.dist-info}/RECORD

@@ -1,18 +1,18 @@
 pymscada/__init__.py,sha256=EyGwdE-vvQmAOFhtiD0XWflRd8pJiByio20eSHr9AXE,978
 pymscada/__main__.py,sha256=WcyVlrYOoDdktJhOoyubTOycMwpayksFdxwelRU5xpQ,272
-pymscada/alarms.py,sha256=JtA3aj0dKhzXGsTNzyClR7I8H_GpjIasfg0DpJwulAE,18211
-pymscada/bus_client.py,sha256=eRGvHQ4sFM_n3rKvKDWZQJPQJqvKMWvxbH3MjtT2WBo,9131
-pymscada/bus_server.py,sha256=k7ht2SAr24Oab0hBOPeW4NRDF_RK-F46iE0cMzh7K4w,12323
-pymscada/callout.py,sha256=hHSkUE0pJjlyexJI52H_lbZjfud4QFzbIdlNyv6VtWs,9848
+pymscada/alarms.py,sha256=sWpZ__V0RbcBZV5Zx_WNb6knvAki-HD8pdNxnYoPebM,18252
+pymscada/bus_client.py,sha256=gFJA2ACHGKhy01W8yExbL7jjEb9ZzQHyKKw3jCb8wEI,9509
+pymscada/bus_server.py,sha256=yP_3s_lIpGNeanFQAAx3dHxLugNe2IIGhuDWjaipv5U,12693
+pymscada/callout.py,sha256=dVhQrg1MycPzVF42RGPVfUNCdCwYOM-e_Xg_BpaqG2w,9889
 pymscada/checkout.py,sha256=RLuCMTEuUI7pp1hIRAUPbo8xYFta8TjArelx0SD4gOY,3897
 pymscada/config.py,sha256=yRENJPGDPLNPOn4zSCE576UO0QWx2Q0VDsaLDEehRmU,2539
 pymscada/console.py,sha256=UkpbXZXHYuExUXoHabxqA178jISIZo1O64K8yjuaM-U,9392
-pymscada/files.py,sha256=iouEOPfEkVI0Qbbf1p-L324Y04zSrynVypLW0-1MThA,2499
-pymscada/history.py,sha256=q5hKNTcvLLl_o4FWHily-d1bKZq6j_kqtuONzRDPZCQ,11563
+pymscada/files.py,sha256=m6IIUufWrLHtWGCH0DdONAsYL6R9mE4mwwre1owagnY,2540
+pymscada/history.py,sha256=myyldKWSIRLofFY_ybpKpQVbYok0vMwAti-KACV5rk8,11604
 pymscada/main.py,sha256=d6EnK4-tEcvM5AqMHYhvqlnSh-E_wd0Tuxk-kXYSiDw,1854
 pymscada/misc.py,sha256=0Cj6OFhQonyhyk9x0BG5MiS-6EPk_w6zvavt8o_Hlf0,622
 pymscada/module_config.py,sha256=QfLI6aOB1H5Xo6P_qaaLUKdOzXSfNBXtdHo1dFelCkA,9999
-pymscada/opnotes.py,sha256=nScGQwSFSnLhNZRRNOPCbmjBLCamdErbyabdLA-ylNo,8626
+pymscada/opnotes.py,sha256=A6W-oOIIrjxK30nGOIgSp4t9b1jYiatxDFfLOypb01c,8667
 pymscada/periodic.py,sha256=MLlL93VLvFqBBgjO1Us1t0aLHTZ5BFdW0B__G02T1nQ,1235
 pymscada/protocol_constants.py,sha256=lPJ4JEgFJ_puJjTym83EJIOw3UTUFbuFMwg3ohyUAGY,2414
 pymscada/samplers.py,sha256=t0IscgsCm5YByioOZ6aOKMO_guDFS_wxnJSiOGKI4Nw,2583
@@ -80,9 +80,9 @@ pymscada/pdf/__pycache__/__init__.cpython-311.pyc,sha256=4KTfXrV9bGDbTIEv-zgIj_L
 pymscada/tools/get_history.py,sha256=LfUB7i0qne4lE0lk-bWRmK1B0xpex-AfIOh2paxSDCk,5409
 pymscada/tools/snmp_client2.py,sha256=pdn5dYyEv4q-ubA0zQ8X-3tQDYxGC7f7Xexa7QPaL40,1675
 pymscada/tools/walk.py,sha256=OgpprUbKLhEWMvJGfU1ckUt_PFEpwZVOD8HucCgzmOc,1625
-pymscada-0.2.6b0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymscada-0.2.6b0.dist-info/METADATA,sha256=2eXXvXcIHHqeumvWALP2ubQNqjmPlQ8k3gLBxQ5ZC70,2389
-pymscada-0.2.6b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymscada-0.2.6b0.dist-info/entry_points.txt,sha256=2UJBi8jrqujnerrcXcq4F8GHJYVDt26sacXl94t3sd8,56
-pymscada-0.2.6b0.dist-info/top_level.txt,sha256=LxIB-zrtgObJg0fgdGZXBkmNKLDYHfaH1Hw2YP2ZMms,9
-pymscada-0.2.6b0.dist-info/RECORD,,
+pymscada-0.2.6b1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.2.6b1.dist-info/METADATA,sha256=XYlTJRl-I_bOqvpscLKqWIPA9S3uZiyU8YYpap7bkqY,2389
+pymscada-0.2.6b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymscada-0.2.6b1.dist-info/entry_points.txt,sha256=2UJBi8jrqujnerrcXcq4F8GHJYVDt26sacXl94t3sd8,56
+pymscada-0.2.6b1.dist-info/top_level.txt,sha256=LxIB-zrtgObJg0fgdGZXBkmNKLDYHfaH1Hw2YP2ZMms,9
+pymscada-0.2.6b1.dist-info/RECORD,,