pymscada 0.1.11b4__tar.gz → 0.1.11b5__tar.gz

{pymscada-0.1.11b4 → pymscada-0.1.11b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.11b4
+Version: 0.1.11b5
 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.11b4 → pymscada-0.1.11b5}/pyproject.toml

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

{pymscada-0.1.11b4 → pymscada-0.1.11b5}/src/pymscada/demo/pymscada-io-ping.service

@@ -5,11 +5,11 @@
 
 [Service]
     WorkingDirectory=__DIR__
-    ExecStart=__PYMSCADA__ ping --config __DIR__/config/ping.yaml
+    ExecStart=__PYMSCADA__ pingclient --config __DIR__/config/ping.yaml
     Restart=always
     RestartSec=5
-    User=__USER__
-    Group=__USER__
+    User=root
+    Group=root
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.11b4 → pymscada-0.1.11b5}/src/pymscada/demo/tags.yaml

@@ -111,9 +111,9 @@ FloatSelect:
     locks: [0, 1, 0, 0]
 localhost_ping:
   desc: Ping time to localhost
-  type: int
+  type: float
   units: ms
 google_ping:
   desc: Ping time to google
-  type: int
+  type: float
   units: ms

{pymscada-0.1.11b4 → pymscada-0.1.11b5}/src/pymscada/demo/wwwserver.yaml

@@ -65,7 +65,7 @@ pages:
     - scale: x
       range: [-86400, 0]  # 86400 172800 1209600
     - scale: mS
-      range: [0.0, 1.0]
+      range: [0.0, 100.0]
       dp: 1
     series:
     - tagname: localhost_ping

{pymscada-0.1.11b4 → pymscada-0.1.11b5}/src/pymscada/module_config.py

@@ -1,6 +1,7 @@
 """Module configuration and factory system."""
 from typing import Any, Optional, Type
 import argparse
+from textwrap import dedent
 from importlib.metadata import version
 import logging
 from pymscada.config import Config
@@ -77,8 +78,13 @@ def create_module_registry():
             module_class='pymscada.checkout:checkout',
             config=False,
             tags=False,
-            epilog="""To add to systemd `f="pymscada-bus" && cp config/$f.service
-                     /lib/systemd/system && systemctl enable $f && systemctl start $f`""",
+            epilog=dedent("""
+                To add to systemd:
+                  su -
+                  cd /lib/systemd/system
+                  cp config/pymscada-bus.service .
+                  systemctl enable pymscada-bus
+                  systemctl start pymscada-bus"""),
             extra_args=[
                 ModuleArgument(
                     ('--overwrite',),
@@ -120,7 +126,12 @@ def create_module_registry():
             name='openweatherclient',
             help='poll OpenWeather current and forecast data',
             module_class='pymscada.iodrivers.openweather:OpenWeatherClient',
-            tags=False
+            tags=False,
+            epilog=dedent("""
+                OPENWEATHERMAP_API_KEY can be set in the openweathermap.yaml
+                or as an environment variable:
+                  vi ~/.bashrc
+                  export OPENWEATHERMAP_API_KEY='1234567890'""")
         ),
         ModuleDefinition(
             name='pingclient',
@@ -140,6 +151,9 @@ def create_module_registry():
             module_class='pymscada.console:Console',
             config=False,
             await_future=False,
+            epilog=dedent("""
+                --tags tag.yaml is not strictly necessary, unless you'd
+                like to see correctly typed values and set values."""),
             extra_args=[
                 ModuleArgument(
                     ('-p', '--port'),
@@ -167,7 +181,8 @@ class ModuleFactory:
         parser = subparser.add_parser(
             module_def.name,
             help=module_def.help,
-            epilog=module_def.epilog
+            epilog=module_def.epilog,
+            formatter_class=argparse.RawDescriptionHelpFormatter
         )
         if module_def.config:
             parser.add_argument(

{pymscada-0.1.11b4 → pymscada-0.1.11b5}/src/pymscada/www_server.py

@@ -56,15 +56,27 @@ class WSHandler():
         try:
             while True:
                 as_bytes, message = await self.queue.get()
-                if as_bytes:
-                    # logging.debug(f'{self.rta_id} as bytes {message}')
-                    await self.ws.send_bytes(message)
-                else:
-                    # logging.debug(f'{self.rta_id} as json {message}')
-                    await self.ws.send_json(message)
+                if self.ws.closed:
+                    logging.debug(f'{self.rta_id}: WebSocket closed, stopping send_queue')
+                    break
+                try:
+                    if as_bytes:
+                        await self.ws.send_bytes(message)
+                    else:
+                        await self.ws.send_json(message)
+                except ConnectionResetError:
+                    logging.debug(f'{self.rta_id}: Connection reset, stopping send_queue')
+                    break
+                except Exception as e:
+                    logging.warning(f'{self.rta_id}: Error sending message: {e}')
+                    break
         except asyncio.CancelledError:
-            logging.warning(f'{self.rta_id}: send queue error, close '
-                            f'{self.ws.exception()}')
+            logging.debug(f'{self.rta_id}: Send queue cancelled')
+        finally:
+            # Clean up subscriptions when the connection ends
+            for tag in self.tag_by_id.values():
+                tag.del_callback_id(self.notify_id)
+                tag.del_callback(self.publish)
 
     def publish(self, tag: Tag):
         """