pymscada 0.1.11b3__py3-none-any.whl → 0.1.11b5__py3-none-any.whl

pymscada/checkout.py

@@ -58,8 +58,9 @@ def make_config(overwrite: bool):
                 continue
         print(f'{rt} {target}')
         rd_bytes = config_file.read_bytes()
-        for k, v in PATH.items():
-            rd_bytes = rd_bytes.replace(k.encode(), str(v).encode())
+        if target.name.lower() != 'readme.md':
+            for k, v in PATH.items():
+                rd_bytes = rd_bytes.replace(k.encode(), str(v).encode())
         target.write_bytes(rd_bytes)
 
 

pymscada/demo/files.yaml

@@ -1,11 +1,10 @@
 bus_ip: 127.0.0.1
 bus_port: 1324
-path: __HOME__/pymscada
+path: __HOME__
 files:
 - path: pdf/one.pdf
   desc: PDF
 - path: pdf/two.pdf
-  desc: PDF writeable
-  mode: rw
+  desc: PDF
 - path: config/*.yaml
 - path: history/*.dat

pymscada/demo/opnotes.yaml

@@ -1,5 +1,5 @@
 bus_ip: 127.0.0.1
 bus_port: 1324
 rta_tag: __opnotes__
-db: __HOME__/pymscada/pymscada.sqlite
+db: __HOME__/config/pymscada.sqlite
 table: opnotes

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/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/demo/wwwserver.yaml

@@ -51,7 +51,6 @@ pages:
   - {desc: Default tags, type: h1}
   - {tagname: localhost_ping, type: value}
   - {tagname: google_ping, type: value}
-  - {tagname: electronet_ping, type: value}
 - name: Ping Trend
   parent:
   items:
@@ -66,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/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/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):
         """

{pymscada-0.1.11b3.dist-info → pymscada-0.1.11b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.11b3
+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.11b3.dist-info → pymscada-0.1.11b5.dist-info}/RECORD

@@ -1,26 +1,26 @@
-pymscada-0.1.11b3.dist-info/METADATA,sha256=NoaJr_vTpI9iLRVzAtqAKOeBbYQ6JiroiT9_kNTfUHI,2349
-pymscada-0.1.11b3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-pymscada-0.1.11b3.dist-info/entry_points.txt,sha256=j_UgZmqFhNquuFC2M8g5-8X9FCpp2RaDb7NrExzkj1c,72
-pymscada-0.1.11b3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.1.11b5.dist-info/METADATA,sha256=sGcwgBSNTGbqI0_xvxmaFbuIpA03SC6lo34wOw8gG8o,2349
+pymscada-0.1.11b5.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+pymscada-0.1.11b5.dist-info/entry_points.txt,sha256=j_UgZmqFhNquuFC2M8g5-8X9FCpp2RaDb7NrExzkj1c,72
+pymscada-0.1.11b5.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=ZUCynJtEvmHruzLS6ZAzp-_0dv1A1u_POgemb38kHuc,8989
 pymscada/bus_server.py,sha256=8F1beP4NRCBpGJQ0u9NZI1mP6P29HSl6mm9GoGMTCJA,11795
-pymscada/checkout.py,sha256=ue40KXJlbgKCU2PMA5X7xwhjP5Q8XQOZiXAYKURtNzA,3318
+pymscada/checkout.py,sha256=1Al29nVqCebupYvMgcY5boz772PtsVp1MVbYaQajV5Q,3373
 pymscada/config.py,sha256=vwGxieaJBYXiHNQEOYVDFaPuGmnUlCnbNm_W9bugKlc,1851
 pymscada/console.py,sha256=b4gm7cuhYKGFNtHoxygWkrqiN42mU8DM4KUi-Q74M4U,8793
 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=rJIiBTUHfaxuYqLLuyKtAe5dqXVdQyEeHJgIy7z-qXo,322
 pymscada/demo/bus.yaml,sha256=zde5JDo2Yv5s7NvJ569gAEoTDvsvgBwRPxfrYhsxj3w,26
-pymscada/demo/files.yaml,sha256=pP9K2f8_DuWlF2pey72SsV74Hq5USKdDL_YguLms_LY,193
+pymscada/demo/files.yaml,sha256=XWtmGDJxtD4qdl2h7miUfJYkDKsvwNTgQjlGpR6LQNs,163
 pymscada/demo/history.yaml,sha256=c0OuYe8LbTeZqJGU2WKGgTEkOA0IYAjO3e046ddQB8E,55
 pymscada/demo/logixclient.yaml,sha256=G_NlJhBYwT1a9ceHDgO6fCNKFmBM2pVO_t9Xa1NqlRY,912
 pymscada/demo/modbus_plc.py,sha256=3zZHHbyrdxyryEHBeNIw-fpcDGcS1MaJiqEwQDr6zWI,2397
 pymscada/demo/modbusclient.yaml,sha256=geeCsUJZkkEj7jjXR_Yk6R5zA5Ta9IczrHsARz7ZgXY,1099
 pymscada/demo/modbusserver.yaml,sha256=67_mED6jXgtnzlDIky9Cg4j-nXur06iz9ve3JUwSyG8,1133
 pymscada/demo/openweather.yaml,sha256=NQ2HL_RlTQ8amYuNQhk09bC7w_rTmIeQ1RsxX1LLtKU,430
-pymscada/demo/opnotes.yaml,sha256=9z8dO_S6JErMuGQHivR584UPln-5jW8Qzq7gdhTNcxM,107
+pymscada/demo/opnotes.yaml,sha256=gdT8DKaAV4F6u9trLCPyBgf449wYaP_FF8GCbjXm9-k,105
 pymscada/demo/ping.yaml,sha256=fm3eUdR2BwnPI_lU_V07qgmDxjSoPP6lPazYB6ZgpVg,149
 pymscada/demo/pymscada-bus.service,sha256=F3ViriRXyMKdCY3tHa3wXAnv2Fo2_16-EScTLsYnSOA,261
 pymscada/demo/pymscada-demo-modbus_plc.service,sha256=EtbWDwqAs4nLNLKScUiHcUWU1b6_tRBeAAVGi9q95hY,320
@@ -30,13 +30,13 @@ pymscada/demo/pymscada-io-accuweather.service,sha256=M_dnPYwmvTpYGF5AbMStbYL6VCW
 pymscada/demo/pymscada-io-logixclient.service,sha256=mn4UzkiOfYqHvgfTFSkUeoPFQQXZboet5I0m7-L5SAY,348
 pymscada/demo/pymscada-io-modbusclient.service,sha256=eTgNdK10dJCs2lLPhmHBh-3j6Ltx2oyU_MNl2f3xnhg,348
 pymscada/demo/pymscada-io-modbusserver.service,sha256=g7Rzm6zGLq_qvTJRL_pcLl4Ps7CNIa2toeGhPNp_oEc,348
-pymscada/demo/pymscada-io-ping.service,sha256=ShNx97EORZ1CuML8reR34vnX_16S88zubCKyP6TY2w0,331
+pymscada/demo/pymscada-io-ping.service,sha256=Fm8qR4IVq0NupEvHLGONXGwjjQsx5VqaBYPewhg7-k4,329
 pymscada/demo/pymscada-io-snmpclient.service,sha256=Rsm8uiwnoGx-1MkXqYgtj4UP9-r7AEEeB9yoR0y0oVA,343
 pymscada/demo/pymscada-opnotes.service,sha256=TlrTRgP3rzrlXT8isAGT_Wy38ScDjT1VvnlgW84XiS8,354
 pymscada/demo/pymscada-wwwserver.service,sha256=7Qy2wsMmFEsQn-b5mgAcsrAQZgXynkv8SpHD6hLvRGc,370
 pymscada/demo/snmpclient.yaml,sha256=z8iACrFvMftYUtqGrRjPZYZTpn7aOXI-Kp675NAM8cU,2013
-pymscada/demo/tags.yaml,sha256=k7xe4V3_W5DhActB0Qfxb8sFlkxughamOC-bU-YKk4U,1831
-pymscada/demo/wwwserver.yaml,sha256=D17L6lgI1BZPZ5QzOjvMlQEx_heEb_14ZVkQpzKXTI4,1831
+pymscada/demo/tags.yaml,sha256=G1d6whGAg41l1meBmxJWrOA47opF-LLRbg2nqFOZzvs,1835
+pymscada/demo/wwwserver.yaml,sha256=Bx7yn2GplDsqh2hzjjuHK_aIZSoTEBTPDL6hGlUTmhQ,1789
 pymscada/files.py,sha256=MisnKoWvkffPMSj6sGVmm-4fh866x4UX3t9LJg4oCfk,2400
 pymscada/history.py,sha256=G079gHfzasmGtI5ANS8MdETD4bdZg5vHE_yTKk7atHw,9504
 pymscada/iodrivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,7 +53,7 @@ pymscada/iodrivers/snmp_client.py,sha256=66-IDzddeKcSnqOzNXIZ8wuuAqhIxZjyLNrDwDv
 pymscada/iodrivers/snmp_map.py,sha256=sDdIR5ZPAETpozDfBt_XQiZ-f4t99UCPlzj7BxFxQyM,2369
 pymscada/main.py,sha256=XtASmPZoQMuzDCHlH3P9XwgYskeLtNdl-hc1tDI7ljc,1875
 pymscada/misc.py,sha256=0Cj6OFhQonyhyk9x0BG5MiS-6EPk_w6zvavt8o_Hlf0,622
-pymscada/module_config.py,sha256=kXRvPm0tjM5xS7ak2CgIDBOjiO5-R8GZdRzUIIdz6Ls,7836
+pymscada/module_config.py,sha256=Sq9DDND0WotxwdY7mRHG8G-WNPYqWp9fxvx38--kwr0,8462
 pymscada/opnotes.py,sha256=pxjFgy4uMnAmJcfrk8BX4Gl5j0z4fFb5waXcqI6UJ_M,5133
 pymscada/pdf/__init__.py,sha256=WsDDgkWnZBJbt2-cJCdc2NvRAv_T4a7WOC1Q0k_l0gI,29
 pymscada/pdf/one.pdf,sha256=eoJ45DrAjVZrwmwdA_EAz1fwmT44eRnt_tkc2pmMrKY,1488
@@ -65,5 +65,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=fPMlP6RscYuTIgdEJjJ0ZZI0OyVSat1lpqg254wqpdE,13140
-pymscada/www_server.py,sha256=rV1Vsk3J1wBhFMBCnK33SziNuTGgVwNc5zLjQQFxJ-s,12021
-pymscada-0.1.11b3.dist-info/RECORD,,
+pymscada/www_server.py,sha256=-sAKAD_Vk8PKMb1tHVvfrhjX0Agu3fZfd_c_Wrh-xq8,12541
+pymscada-0.1.11b5.dist-info/RECORD,,