pymscada 0.1.8__tar.gz → 0.1.10__tar.gz

{pymscada-0.1.8 → pymscada-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.8
+Version: 0.1.10
 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.1.8 → pymscada-0.1.10}/pyproject.toml

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

{pymscada-0.1.8 → pymscada-0.1.10}/src/pymscada/bus_client.py

@@ -109,7 +109,7 @@ class BusClient:
             self.ip, self.port)
         self.addr = self.writer.get_extra_info('sockname')
         self.write(pc.CMD_LOG, 0, 0, f'{self.module} connected'.encode())
-        logging.info(f'connected {self.addr}')
+        logging.warning(f'connected {self.addr} {self.port}')
         for tag in Tag.get_all_tags().values():
             self.add_tag(tag)
         Tag.set_notify(self.add_tag)

{pymscada-0.1.8 → pymscada-0.1.10}/src/pymscada/iodrivers/accuweather.py

@@ -29,6 +29,7 @@ class AccuWeatherClient:
                      for x in api['locations'].values()]
         self.session = aiohttp.ClientSession()
         self.queue = asyncio.Queue()
+        self.init_run = True
 
     async def handle_response(self):
         """Unpack the weather values from the json response."""
@@ -41,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 = ''
@@ -54,26 +55,32 @@ 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
 
     async def fetch_data(self, location, url, query):
         """HTTP get."""
         logging.warning(f'poll {location} {url}')
-        async with self.session.get(url, params=query,
-                                    proxy=self.proxy) as resp:
-            self.queue.put_nowait([location, await resp.json()])
+        try:
+            async with self.session.get(url, params=query,
+                                        proxy=self.proxy) as resp:
+                self.queue.put_nowait([location, await resp.json()])
+        except asyncio.TimeoutError as e:
+            logging.warning('AccuWeather {e}')
 
     async def poll(self):
         """Poll the weather site near the start of each hour."""
         now = int(time())
-        if now % 3600 != 120:
+        if now % 3600 != 120 and not self.init_run:
             return
+        self.init_run = False
         if not self.queue.empty():
             return
         # Get the weather forecasts