pymscada 0.2.6b0__tar.gz → 0.2.6b2__tar.gz

{pymscada-0.2.6b0/src/pymscada.egg-info → pymscada-0.2.6b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymscada
-Version: 0.2.6b0
+Version: 0.2.6b2
 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 → pymscada-0.2.6b2}/pyproject.toml

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

{pymscada-0.2.6b0 → pymscada-0.2.6b2}/src/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-0.2.6b0 → pymscada-0.2.6b2}/src/pymscada/bus_client.py

@@ -77,6 +77,10 @@ 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'
+                     f' 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,
@@ -84,6 +88,12 @@ class BusClient:
         """Write a message."""
         if data is None:
             data = b''
+        try:
+            size_total = len(data)
+        except Exception:
+            size_total = 0
+        logging.info(f'{self.module}: write cmd={command} tag_id={tag_id} '
+                     f'size_total={size_total}')
         for i in range(0, len(data) + 1, pc.MAX_LEN):
             snip = data[i:i+pc.MAX_LEN]
             size = len(snip)
@@ -94,7 +104,9 @@ class BusClient:
             except (asyncio.IncompleteReadError, ConnectionResetError):
                 self.read_task.cancel()
             except AttributeError:
-                logging.warning('Attribute Error, TO DO, fix in test')
+                logging.warning(f'{self.module}: write AttributeError '
+                                f'cmd={command} '
+                                f'tag_id={tag_id} size={size}')
 
     def add_tag(self, tag: Tag):
         """Add the new tag and get the tag's bus ID."""
@@ -209,10 +221,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-0.2.6b0 → pymscada-0.2.6b2}/src/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())
@@ -288,6 +294,8 @@ class BusServer:
     def read_callback(self, command):
         """Process read messages, delete broken connections."""
         bus_id, cmd, tag_id, time_us, data = command
+        logging.info(f'recv cmd={cmd} tag_id={tag_id} bus_id={bus_id} '
+                     f'size={(0 if data is None else len(data))}')
         if cmd is None:
             # Clean up tag subscriptions before deleting it
             for tag in BusTags._tag_by_id.values():

{pymscada-0.2.6b0 → pymscada-0.2.6b2}/src/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-0.2.6b0 → pymscada-0.2.6b2}/src/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-0.2.6b0 → pymscada-0.2.6b2}/src/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-0.2.6b0 → pymscada-0.2.6b2}/src/pymscada/opnotes.py

@@ -104,6 +104,7 @@ class OpNotes:
         """Respond to Request to Author and publish on rta_tag as needed."""
         local_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         logging.info(f'[{local_time}] RTA callback received: {request}')
+        logging.info(f'[{local_time}] DEBUG: rta_tag.id={self.rta.id}, rta_tag.name={self.rta.name}')
         
         if 'action' not in request:
             logging.warning(f'rta_cb malformed {request}')

{pymscada-0.2.6b0 → pymscada-0.2.6b2/src/pymscada.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymscada
-Version: 0.2.6b0
+Version: 0.2.6b2
 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