pymscada 0.1.9__tar.gz → 0.1.11__tar.gz

{pymscada-0.1.9 → pymscada-0.1.11}/PKG-INFO

@@ -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 → pymscada-0.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.1.9"
+version = "0.1.11"
 description = "Shared tag value SCADA with python backup and Angular UI"
 authors = [
     { name = "Jamie Walton", email = "jamie@walton.net.nz" },
@@ -30,6 +30,10 @@ text = "GPL-3.0-or-later"
 [project.scripts]
 pymscada = "pymscada.__main__:cmd_line"
 
+[project.urls]
+Homepage = "https://github.com/jamie0walton/pymscada"
+"Bug Tracker" = "https://github.com/jamie0walton/pymscada/issues"
+
 [build-system]
 requires = [
     "pdm-backend",

{pymscada-0.1.9 → pymscada-0.1.11}/src/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-0.1.9 → pymscada-0.1.11}/src/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-0.1.9 → pymscada-0.1.11}/src/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."""