pymscada 0.2.6b1__tar.gz → 0.2.6b3__tar.gz

{pymscada-0.2.6b1/src/pymscada.egg-info → pymscada-0.2.6b3}/PKG-INFO

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

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

{pymscada-0.2.6b1 → pymscada-0.2.6b3}/src/pymscada/bus_client.py

@@ -79,7 +79,8 @@ class BusClient:
         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}')
+        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,
@@ -87,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)
@@ -97,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."""

{pymscada-0.2.6b1 → pymscada-0.2.6b3}/src/pymscada/bus_server.py

@@ -111,7 +111,8 @@ class BusConnection():
                 head = await self.reader.readexactly(14)
                 _, cmd, tag_id, size, time_us = unpack('!BBHHQ', head)
             except (ConnectionResetError, asyncio.IncompleteReadError,
-                    asyncio.CancelledError):
+                    asyncio.CancelledError) as e:
+                logging.warning(f'{self.addr} read error: {e}')
                 break
             # if the command packet indicates data, get that too
             if size == 0:
@@ -121,7 +122,8 @@ class BusConnection():
                 payload = await self.reader.readexactly(size)
                 data = unpack(f'!{size}s', payload)[0]
             except (ConnectionResetError, asyncio.IncompleteReadError,
-                    asyncio.CancelledError):
+                    asyncio.CancelledError) as e:
+                logging.warning(f'{self.addr} read payload error: {e}')
                 break
             # if MAX_LEN then a continuation packet is required
             if size == pc.MAX_LEN:
@@ -294,6 +296,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.6b1 → pymscada-0.2.6b3}/src/pymscada/opnotes.py

@@ -55,7 +55,6 @@ 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."""
@@ -105,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.6b1 → pymscada-0.2.6b3}/src/pymscada/www_server.py

@@ -132,6 +132,7 @@ class WSHandler():
         elif tag.type is bytes:
             rta_id = unpack_from('>H', tag.value)[0]
             if rta_id in [0, self.rta_id]:
+                logging.info(f'{self.rta_id}: {tag.name} bytes matches id')
                 self.queue.put_nowait((True, pack(
                     f'!HHQ{len(tag.value)}s',  # Network big-endian
                     tag.id,             # Uint16

{pymscada-0.2.6b1 → pymscada-0.2.6b3/src/pymscada.egg-info}/PKG-INFO

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