pymscada 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

pymscada/files.py

@@ -6,9 +6,6 @@ from pymscada.periodic import Periodic
 from pymscada.tag import Tag
 
 
-RATE = 10
-
-
 class Files():
     """Connect to bus_ip:bus_port, store and provide a value history."""
 
@@ -23,7 +20,6 @@ class Files():
 
         Event loop must be running.
         """
-        self.busclient = BusClient(bus_ip, bus_port, module='Files')
         self.path = Path(path)
         self.files = files
         for file in self.files:
@@ -33,11 +29,19 @@ class Files():
                 file['mode'] = 'ro'
             file['_path'] = self.path.joinpath(file['path'])
             file['st_mtime_ns'] = 0
+        self.busclient = BusClient(bus_ip, bus_port, module='Files')
         self.rta = Tag(rta_tag, dict)
+        self.rta.value = {}
         self.busclient.add_callback_rta(rta_tag, self.rta_cb)
-        self.scan_files()
 
-    def scan_files(self):
+    def rta_cb(self, request):
+        """Respond to Request to Author and publish on rta_tag as needed."""
+        if 'action' not in request:
+            logging.warning(f'rta_cb malformed {request}')
+        logging.info(f'files rta_cb {request}')
+        pass
+
+    async def scan_files(self):
         """Scan folders for files."""
         update = False
         for file in self.files:
@@ -57,19 +61,10 @@ class Files():
                              'name': fn.name,
                              'desc': file['desc'],
                              'mode': file['mode']})
-        self.rta.value = {'__rta_id__': 0, 'dat': info}
-
-    def rta_cb(self, tag):
-        """Respond to bus requests for data to publish on rta."""
-        logging.info(f'files rta_cb {tag.name} {tag.value}')
-        pass
-
-    async def check_files(self):
-        """Check to see if any files have changed."""
-        self.scan_files()
+        self.rta.value = {'dat': info}
 
     async def start(self):
         """Async startup."""
         await self.busclient.start()
-        self.periodic = Periodic(self.check_files, RATE)
+        self.periodic = Periodic(self.scan_files, 10.0)
         await self.periodic.start()

pymscada/iodrivers/accuweather.py

@@ -42,7 +42,7 @@ class AccuWeatherClient:
             for record in json:
                 epoch = record['EpochDateTime']
                 hour = int((epoch - time_mod) / 3600)
-                logging.warning(f'epoch {epoch} time_s {time_s} hour {hour}')
+                logging.info(f'epoch {epoch} time_s {time_s} hour {hour}')
                 if hour not in self.api['times']:
                     continue
                 suffix = ''
@@ -55,11 +55,13 @@ class AccuWeatherClient:
                     ['Rain', 'Rain', None, 'Value'],
                     ['Snow', 'Snow', None, 'Value']
                 ]:
-                    tag = self.tags[f'{site}{parm}{suffix}']
+                    tagname = f'{site}{parm}{suffix}'
+                    tag = self.tags[tagname]
                     if key2 is None:
                         value = record[key1][key]
                     else:
                         value = record[key1][key2][key]
+                    logging.info(f'{tagname} was {tag.value} new {value}')
                     if tag.value != value:
                         tag.value = value, int(epoch * 1e6), self.map_bus
 

pymscada/www_server.py

@@ -63,9 +63,8 @@ class WSHandler():
                     # logging.debug(f'{self.rta_id} as json {message}')
                     await self.ws.send_json(message)
         except asyncio.CancelledError:
-            logging.warn(f'{self.rta_id}: send queue error, close '
-                         f'{self.ws.exception()}')
-            return
+            logging.warning(f'{self.rta_id}: send queue error, close '
+                            f'{self.ws.exception()}')
 
     def publish(self, tag: Tag):
         """
@@ -200,8 +199,8 @@ class WSHandler():
             elif msg.type == WSMsgType.BINARY:
                 logging.info(f'{msg.data}')
             elif msg.type == WSMsgType.ERROR:
-                logging.warn(f'{self.rta_id}: ws closing error '
-                             f'{self.ws.exception()}')
+                logging.warning(f'{self.rta_id}: ws closing error '
+                                f'{self.ws.exception()}')
         send_queue.cancel()
         for tag in self.tag_by_id.values():
             tag.del_callback_id(self.notify_id)
@@ -263,8 +262,8 @@ class WwwServer:
         if not path.exists():
             return web.HTTPNotFound(reason='no such file in path')
         return web.FileResponse(path)
-        logging.warning(f"path not configured {request.match_info['path']}")
-        return web.HTTPForbidden(reason='path not permitted')
+        # logging.warning(f"path not configured {request.match_info['path']}")
+        # return web.HTTPForbidden(reason='path not permitted')
 
     async def websocket_handler(self, request: web.Request):
         """Wait for connections. Create a new one each time."""

{pymscada-0.1.9.dist-info → pymscada-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.9
+Version: 0.1.11
 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
@@ -10,6 +10,8 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Console
 Classifier: Development Status :: 1 - Planning
+Project-URL: Homepage, https://github.com/jamie0walton/pymscada
+Project-URL: Bug tracker, https://github.com/jamie0walton/pymscada/issues
 Requires-Python: >=3.9
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: aiohttp>=3.8.5

{pymscada-0.1.9.dist-info → pymscada-0.1.11.dist-info}/RECORD

@@ -1,7 +1,7 @@
-pymscada-0.1.9.dist-info/METADATA,sha256=3D696ZoCkzbsYGjCUULLVPhuZLcWjBikuzCa2BvrtUs,2205
-pymscada-0.1.9.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
-pymscada-0.1.9.dist-info/entry_points.txt,sha256=AcZZ7HFj8k1ztP6ge-5bdRinYF8glW2s6lFEQG3esN4,57
-pymscada-0.1.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.1.11.dist-info/METADATA,sha256=itDYWXs3JwiNNw8EJCAtxZ6tjVmQyrnO4ufYA-xgFLw,2344
+pymscada-0.1.11.dist-info/WHEEL,sha256=pM0IBB6ZwH3nkEPhtcp50KvKNX-07jYtnb1g1m6Z4Co,90
+pymscada-0.1.11.dist-info/entry_points.txt,sha256=j_UgZmqFhNquuFC2M8g5-8X9FCpp2RaDb7NrExzkj1c,72
+pymscada-0.1.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 pymscada/__init__.py,sha256=NV_cIIwe66Ugp8ns426rtfJIIyskWbqwImD9p_5p0bQ,739
 pymscada/__main__.py,sha256=WcyVlrYOoDdktJhOoyubTOycMwpayksFdxwelRU5xpQ,272
 pymscada/bus_client.py,sha256=NWumdtLNy4-_LdTumHy687q0ebQX7fdynSp13dZgpYo,8899
@@ -36,10 +36,10 @@ pymscada/demo/pymscada-wwwserver.service,sha256=7Qy2wsMmFEsQn-b5mgAcsrAQZgXynkv8
 pymscada/demo/snmpclient.yaml,sha256=z8iACrFvMftYUtqGrRjPZYZTpn7aOXI-Kp675NAM8cU,2013
 pymscada/demo/tags.yaml,sha256=GH90X3QRBANUhvd2E9OuyIoiZD25OBihHHlDBw1uzlw,4231
 pymscada/demo/wwwserver.yaml,sha256=MhZbvnxAfkc3OutXyZVaVKif4ZD9VSch5NfBbO0T_-E,12597
-pymscada/files.py,sha256=FSEvFs6gNgErx_B7mtWkt6EsGNSc-TlxEbDW59NxIZs,2439
+pymscada/files.py,sha256=MisnKoWvkffPMSj6sGVmm-4fh866x4UX3t9LJg4oCfk,2400
 pymscada/history.py,sha256=G079gHfzasmGtI5ANS8MdETD4bdZg5vHE_yTKk7atHw,9504
 pymscada/iodrivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymscada/iodrivers/accuweather.py,sha256=XS7s-E-TCnAOlWYKPZd6WTs0BCmKUiiEQDJxrCTglaY,3732
+pymscada/iodrivers/accuweather.py,sha256=p_OYJtCrtbSQYjgf06Yk3Qc9wGpkx8ogn81XNGd19fE,3842
 pymscada/iodrivers/logix_client.py,sha256=eqmiYLYUBHbr7wTljomGIZVNvXe-5WleGKfzwcHXO8w,2829
 pymscada/iodrivers/logix_map.py,sha256=ljjBAMJcw199v1V5u0Yfl38U6zbZzba5mdY4I3ZvdIM,5401
 pymscada/iodrivers/modbus_client.py,sha256=DIGrEPz_Bwwj9CEeog5fQqiAu1UMV7xVL6KxlKgXNPs,9592
@@ -62,5 +62,5 @@ pymscada/tag.py,sha256=Oxh70q2MrPAEI94v4QsWt4gD8QP6BlfzNv9xXeeUFys,10103
 pymscada/tools/snmp_client2.py,sha256=pdn5dYyEv4q-ubA0zQ8X-3tQDYxGC7f7Xexa7QPaL40,1675
 pymscada/tools/walk.py,sha256=OgpprUbKLhEWMvJGfU1ckUt_PFEpwZVOD8HucCgzmOc,1625
 pymscada/validate.py,sha256=VPpAVEwfgori5OREEwWlbPoPxz5Tfqr6dw-O5pINHyI,13125
-pymscada/www_server.py,sha256=LzkT1DiKq6ql66MPncHefYU3qgoi9HxoYLETjjTMNvY,12024
-pymscada-0.1.9.dist-info/RECORD,,
+pymscada/www_server.py,sha256=bDa3Mh1Dcjk67yk3nPd6HadWF8GjoDYY1t_1g8mfmdk,12021
+pymscada-0.1.11.dist-info/RECORD,,

{pymscada-0.1.9.dist-info → pymscada-0.1.11.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.3.3)
+Generator: pdm-backend (2.4.2)
 Root-Is-Purelib: true
 Tag: py3-none-any

{pymscada-0.1.9.dist-info → pymscada-0.1.11.dist-info}/entry_points.txt

@@ -1,3 +1,5 @@
 [console_scripts]
 pymscada = pymscada.__main__:cmd_line
 
+[gui_scripts]
+