pymscada 0.1.11b7__py3-none-any.whl → 0.1.11b9__py3-none-any.whl

pymscada/bus_server.py

@@ -265,7 +265,11 @@ class BusServer:
             if len(data) > 300:
                 logging.warning(f'process: log message too long from {bus_id}')
             else:
-                logging.warning(data.decode())
+                log_msg = data.decode()
+                logging.warning(log_msg)
+                client_addr = self.connections[bus_id].addr
+                self.bus_tag.value = f'\x03{client_addr}: {log_msg}'.encode()
+                self.bus_tag.time_us = int(time.time() * 1e6)
         else:  # consider disconnecting
             logging.warn(f'invalid message {cmd}')
 

pymscada/demo/accuweather.yaml

@@ -1,5 +1,5 @@
 bus_ip: 127.0.0.1
-bus_port: 1325
+bus_port: 1324
 proxy: 'http://127.0.0.1:3128'
 api:
   url: http://dataservice.accuweather.com/forecasts/v1/hourly/12hour/

pymscada/demo/openweather.yaml

@@ -1,5 +1,5 @@
 bus_ip: 127.0.0.1
-bus_port: 1325
+bus_port: 1324
 proxy:
 api:
   api_key: ${OPENWEATHER_API_KEY}

pymscada/demo/tags.yaml

@@ -116,4 +116,60 @@ localhost_ping:
 google_ping:
   desc: Ping time to google
   type: float
-  units: ms
+  units: ms
+Murupara_Temp:
+  desc: Murupara Temperature
+  type: float
+  units: '°C'
+  dp: 1
+  min: -50
+  max: 50
+Murupara_WindSpeed:
+  desc: Murupara Wind Speed
+  type: float
+  units: 'm/s'
+  dp: 1
+  min: 0
+  max: 200
+Murupara_WindDir:
+  desc: Murupara Wind Direction
+  type: float
+  units: '°'
+  dp: 0
+  min: 0
+  max: 360
+Murupara_Rain:
+  desc: Murupara Rainfall
+  type: float
+  units: 'mm'
+  dp: 1
+  min: 0
+  max: 1000
+Murupara_Temp_03:
+  desc: Murupara Temperature 3-Hour Forecast
+  type: float
+  units: '°C'
+  dp: 1
+  min: -50
+  max: 50
+Murupara_WindSpeed_03:
+  desc: Murupara Wind Speed 3-Hour Forecast
+  type: float
+  units: 'm/s'
+  dp: 1
+  min: 0
+  max: 200
+Murupara_WindDir_03:
+  desc: Murupara Wind Direction 3-Hour Forecast
+  type: float
+  units: '°'
+  dp: 0
+  min: 0
+  max: 360
+Murupara_Rain_03:
+  desc: Murupara Rainfall 3-Hour Forecast
+  type: float
+  units: 'mm'
+  dp: 1
+  min: 0
+  max: 1000

pymscada/demo/wwwserver.yaml

@@ -78,3 +78,49 @@ pages:
       scale: mS
       color: red
       dp: 1
+- name: Weather
+  parent:
+  items:
+  - type: uplot
+    ms:
+      desc: Weather
+      age: 172800
+      legend_pos: left
+      time_pos: left
+      time_res: m
+    axes:
+    - scale: x
+      range: [-86400, 0]  # 24 hours of data
+    - scale: temp
+      range: [-10, 40]    # Temperature in Celsius
+      dp: 1
+    - scale: wind
+      range: [0, 100]     # Wind speed in km/h
+      dp: 1
+    - scale: dir
+      range: [0, 360]     # Wind direction in degrees
+      dp: 0
+    - scale: rain
+      range: [0, 50]      # Rain in mm
+      dp: 1
+    series:
+    - tagname: Murupara_Temp
+      label: Temperature
+      scale: temp
+      color: red
+      dp: 1
+    - tagname: Murupara_WindSpeed
+      label: Wind Speed
+      scale: wind
+      color: blue
+      dp: 1
+    - tagname: Murupara_WindDir
+      label: Wind Direction
+      scale: dir
+      color: green
+      dp: 0
+    - tagname: Murupara_Rain
+      label: Rainfall
+      scale: rain
+      color: lightblue
+      dp: 1

pymscada/iodrivers/openweather.py

@@ -73,6 +73,7 @@ class OpenWeatherClient:
 
     async def fetch_current_data(self):
         """Fetch current weather data for all locations."""
+        logging.info('fetching current')
         if self.session is None:
             self.session = aiohttp.ClientSession()
         for location, coords in self.locations.items():
@@ -92,6 +93,7 @@ class OpenWeatherClient:
 
     async def fetch_forecast_data(self):
         """Fetch forecast weather data for all locations."""
+        logging.info('fetching forecast')
         if self.session is None:
             self.session = aiohttp.ClientSession()
         for location, coords in self.locations.items():
@@ -113,9 +115,9 @@ class OpenWeatherClient:
         """Poll OpenWeather APIs every 10 minutes."""
         now = int(time())
         if now % 600 == 0:  # Every 10 minutes
-            await self.fetch_current_data()
+            asyncio.create_task(self.fetch_current_data())
         if now % 10800 == 60:  # Every 3 hours, offset by 1 minute
-            await self.fetch_forecast_data()
+            asyncio.create_task(self.fetch_forecast_data())
 
     async def start(self):
         """Start bus connection and API polling."""

pymscada/www_server.py

@@ -182,8 +182,6 @@ class WSHandler():
                 if action == 'set':  # pc.CMD_SET
                     self.tag_by_name[tagname].value = value, time_us, bus
                 elif action == 'rta':  # pc.CMD_RTA
-                    if tagname not in self.tag_by_name:
-                        self.do_sub(tagname)
                     if 'File' in value:
                         file = await anext(self.ws)
                         value['_file_data'] = file.data

{pymscada-0.1.11b7.dist-info → pymscada-0.1.11b9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.11b7
+Version: 0.1.11b9
 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
@@ -15,7 +15,7 @@ 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
-Requires-Dist: pymscada-html>=0.1.10b2
+Requires-Dist: pymscada-html>=0.1.10b5
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24

{pymscada-0.1.11b7.dist-info → pymscada-0.1.11b9.dist-info}/RECORD

@@ -1,17 +1,17 @@
-pymscada-0.1.11b7.dist-info/METADATA,sha256=l0xmM3BBv29_Ko1pw7BakDuFU20zMPzoNUk2VPQ3vF8,2349
-pymscada-0.1.11b7.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-pymscada-0.1.11b7.dist-info/entry_points.txt,sha256=j_UgZmqFhNquuFC2M8g5-8X9FCpp2RaDb7NrExzkj1c,72
-pymscada-0.1.11b7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.1.11b9.dist-info/METADATA,sha256=_Vl7Sc7VlQZgKxlhqBtIRwQ6i6kuux42oMrXRmzYhZ0,2349
+pymscada-0.1.11b9.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+pymscada-0.1.11b9.dist-info/entry_points.txt,sha256=j_UgZmqFhNquuFC2M8g5-8X9FCpp2RaDb7NrExzkj1c,72
+pymscada-0.1.11b9.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/bus_server.py,sha256=eD4Fz4Sv4EIu2vney_d0jAryiCk5eoH5NQA-dAZRTqA,12029
 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/accuweather.yaml,sha256=Fk4rV0S8jCau0173QCzKW8TdUbc4crYVi0aD8fPLNgU,322
 pymscada/demo/bus.yaml,sha256=zde5JDo2Yv5s7NvJ569gAEoTDvsvgBwRPxfrYhsxj3w,26
 pymscada/demo/files.yaml,sha256=XWtmGDJxtD4qdl2h7miUfJYkDKsvwNTgQjlGpR6LQNs,163
 pymscada/demo/history.yaml,sha256=c0OuYe8LbTeZqJGU2WKGgTEkOA0IYAjO3e046ddQB8E,55
@@ -19,7 +19,7 @@ pymscada/demo/logixclient.yaml,sha256=G_NlJhBYwT1a9ceHDgO6fCNKFmBM2pVO_t9Xa1NqlR
 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/openweather.yaml,sha256=eFaRc7JxkEwRswCtmJiypsfR5xgQR-R-UtwvfwDHw-w,430
 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
@@ -35,8 +35,8 @@ pymscada/demo/pymscada-io-snmpclient.service,sha256=Rsm8uiwnoGx-1MkXqYgtj4UP9-r7
 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=G1d6whGAg41l1meBmxJWrOA47opF-LLRbg2nqFOZzvs,1835
-pymscada/demo/wwwserver.yaml,sha256=Bx7yn2GplDsqh2hzjjuHK_aIZSoTEBTPDL6hGlUTmhQ,1789
+pymscada/demo/tags.yaml,sha256=9xydsQriKT0lNAW533rz-FMVgoedn6Lwc50AnNig7-k,2733
+pymscada/demo/wwwserver.yaml,sha256=mmwvSLUXUDCIPaHeCJdCETAp9Cc4wb5CuK_aGv01KWk,2759
 pymscada/files.py,sha256=MisnKoWvkffPMSj6sGVmm-4fh866x4UX3t9LJg4oCfk,2400
 pymscada/history.py,sha256=G079gHfzasmGtI5ANS8MdETD4bdZg5vHE_yTKk7atHw,9504
 pymscada/iodrivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -46,7 +46,7 @@ pymscada/iodrivers/logix_map.py,sha256=ljjBAMJcw199v1V5u0Yfl38U6zbZzba5mdY4I3Zvd
 pymscada/iodrivers/modbus_client.py,sha256=DIGrEPz_Bwwj9CEeog5fQqiAu1UMV7xVL6KxlKgXNPs,9592
 pymscada/iodrivers/modbus_map.py,sha256=af2J3CGSeYQ4mSy8rNsERp9z7fRgRUYk3it5Mrc_IQA,7255
 pymscada/iodrivers/modbus_server.py,sha256=VqvjOJ4-LOVaD1jOK22raXhrCshJEaWlMxLvn5xMnFc,6570
-pymscada/iodrivers/openweather.py,sha256=ftFLXp5qAQ1G3dx8zKH1ZrhoW6E2kQTqBOnT7XE0wcQ,5467
+pymscada/iodrivers/openweather.py,sha256=w_OSL5UG30IBTuaR6Exmao7XJae_hKo1JM04XT8Ke7M,5580
 pymscada/iodrivers/ping_client.py,sha256=UOQgUfoIcYqy5VvKyJ8XGHHjeSRTfjmrhyWEojhIZQk,4188
 pymscada/iodrivers/ping_map.py,sha256=EbOteqfEYKIOMqPymROJ4now2If-ekEj6jnM5hthoSA,1403
 pymscada/iodrivers/snmp_client.py,sha256=66-IDzddeKcSnqOzNXIZ8wuuAqhIxZjyLNrDwDvHCvw,2708
@@ -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=A0mxgJVCDpxIFb_SBMYiw4XbsVAfOxZnaqVxo_qM6DM,12122
-pymscada-0.1.11b7.dist-info/RECORD,,
+pymscada/www_server.py,sha256=rV1Vsk3J1wBhFMBCnK33SziNuTGgVwNc5zLjQQFxJ-s,12021
+pymscada-0.1.11b9.dist-info/RECORD,,