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

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/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/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/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.dist-info → pymscada-0.2.6b3.dist-info}/METADATA

@@ -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.dist-info → pymscada-0.2.6b3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pymscada/__init__.py,sha256=EyGwdE-vvQmAOFhtiD0XWflRd8pJiByio20eSHr9AXE,978
 pymscada/__main__.py,sha256=WcyVlrYOoDdktJhOoyubTOycMwpayksFdxwelRU5xpQ,272
 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/bus_client.py,sha256=BD-6mtSs3L1EUdjkFPZI4w2_iVTSNGlb65qgH3zvQ40,9875
+pymscada/bus_server.py,sha256=ZSJUtfpWxaTqeIfu-nEHr2rVZAY9ITm1BsfItCeST7k,12978
 pymscada/callout.py,sha256=dVhQrg1MycPzVF42RGPVfUNCdCwYOM-e_Xg_BpaqG2w,9889
 pymscada/checkout.py,sha256=RLuCMTEuUI7pp1hIRAUPbo8xYFta8TjArelx0SD4gOY,3897
 pymscada/config.py,sha256=yRENJPGDPLNPOn4zSCE576UO0QWx2Q0VDsaLDEehRmU,2539
@@ -12,12 +12,12 @@ 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=A6W-oOIIrjxK30nGOIgSp4t9b1jYiatxDFfLOypb01c,8667
+pymscada/opnotes.py,sha256=lERFyl00TDDscaHrUikt82A1uy28lKidxgoRm0PaKrg,8728
 pymscada/periodic.py,sha256=MLlL93VLvFqBBgjO1Us1t0aLHTZ5BFdW0B__G02T1nQ,1235
 pymscada/protocol_constants.py,sha256=lPJ4JEgFJ_puJjTym83EJIOw3UTUFbuFMwg3ohyUAGY,2414
 pymscada/samplers.py,sha256=t0IscgsCm5YByioOZ6aOKMO_guDFS_wxnJSiOGKI4Nw,2583
 pymscada/tag.py,sha256=hTRxogw8BXAi1OJpM1Lhx4KKMqZ53y7D5KcCycO7fRQ,9471
-pymscada/www_server.py,sha256=WeLGRhseXVTns5PKlA0w--byatxpEQ4PcE60qMghLuM,13780
+pymscada/www_server.py,sha256=Xglfh_Ny0TkML6oiTg8opFFTrTpjQr-rFX_5a_D_9y0,13856
 pymscada/demo/README.md,sha256=iNcVbCTkq-d4agLV-979lNRaqf_hbJCn3OFzY-6qfU8,880
 pymscada/demo/__init__.py,sha256=WsDDgkWnZBJbt2-cJCdc2NvRAv_T4a7WOC1Q0k_l0gI,29
 pymscada/demo/accuweather.yaml,sha256=Fk4rV0S8jCau0173QCzKW8TdUbc4crYVi0aD8fPLNgU,322
@@ -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.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,,
+pymscada-0.2.6b3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.2.6b3.dist-info/METADATA,sha256=6NOPR1IbVMuYCKczsfPydqinRF3qBrzTnS1aZRX9fuQ,2389
+pymscada-0.2.6b3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymscada-0.2.6b3.dist-info/entry_points.txt,sha256=2UJBi8jrqujnerrcXcq4F8GHJYVDt26sacXl94t3sd8,56
+pymscada-0.2.6b3.dist-info/top_level.txt,sha256=LxIB-zrtgObJg0fgdGZXBkmNKLDYHfaH1Hw2YP2ZMms,9
+pymscada-0.2.6b3.dist-info/RECORD,,