pymscada 0.1.11b8__tar.gz → 0.1.11b10__tar.gz

{pymscada-0.1.11b8 → pymscada-0.1.11b10}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.1.11b8"
+version = "0.1.11b10"
 description = "Shared tag value SCADA with python backup and Angular UI"
 authors = [
     { name = "Jamie Walton", email = "jamie@walton.net.nz" },
@@ -8,7 +8,7 @@ authors = [
 dependencies = [
     "PyYAML>=6.0.1",
     "aiohttp>=3.8.5",
-    "pymscada-html>=0.1.10b4",
+    "pymscada-html>=0.1.10b5",
     "cerberus>=1.3.5",
     "pycomm3>=1.2.14",
     "pysnmplib>=5.0.24",

{pymscada-0.1.11b8 → pymscada-0.1.11b10}/src/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-0.1.11b8 → pymscada-0.1.11b10}/src/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-0.1.11b8 → pymscada-0.1.11b10}/src/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-0.1.11b8 → pymscada-0.1.11b10}/tests/iodrivers/test_logix.py

@@ -63,6 +63,18 @@ def tag_callback(tag: Tag):
 @pytest.mark.asyncio
 async def test_connect():
     """Test Logix."""
+    # Check if PLC is reachable
+    ip = CLIENT['rtus'][0]['ip']
+    try:
+        proc = await asyncio.create_subprocess_exec(
+            'ping', '-c', '1', '-W', '1', ip,
+            stdout=asyncio.subprocess.DEVNULL,
+            stderr=asyncio.subprocess.DEVNULL)
+        await proc.communicate()
+        if proc.returncode != 0:
+            pytest.skip(f"PLC at {ip} not reachable")
+    except Exception:
+        pytest.skip(f"Error checking connectivity to PLC at {ip}")
     global queue
     lc = LogixClient(**CLIENT)
     # PLC code maps 'in' tags to 'out' tags to close the loop

{pymscada-0.1.11b8 → pymscada-0.1.11b10}/tests/iodrivers/test_modbus.py

@@ -44,8 +44,7 @@ CLIENT = {
             'port': 1512,
             'tcp_udp': 'tcp',
             'rate': 0.1,
-            'read': [{'unit': 1, 'file': '4x', 'start': 1, 'end': 30}],
-            'writeok': [{'unit': 1, 'file': '4x', 'start': 1, 'end': 30}]
+            'poll': [{'unit': 1, 'file': '4x', 'start': 1, 'end': 30}]
         },
         {
             'name': 'RTU_UDP',
@@ -53,20 +52,55 @@ CLIENT = {
             'port': 1513,
             'tcp_udp': 'udp',
             'rate': 0.1,
-            'read': [{'unit': 1, 'file': '4x', 'start': 1, 'end': 30}],
-            'writeok': [{'unit': 1, 'file': '4x', 'start': 1, 'end': 30}]
+            'poll': [{'unit': 1, 'file': '4x', 'start': 1, 'end': 30}]
         }
     ],
     'tags': {
-        'c_int16Tag': {'type': 'int16', 'addr': 'RTU:1:4x:1'},
-        'c_uint16Tag': {'type': 'uint16', 'addr': 'RTU:1:4x:2'},
-        'c_int32Tag': {'type': 'int32', 'addr': 'RTU:1:4x:3'},
-        'c_uint32Tag': {'type': 'uint32', 'addr': 'RTU:1:4x:5'},
-        'c_int64Tag': {'type': 'int64', 'addr': 'RTU:1:4x:7'},
-        'c_uint64Tag': {'type': 'uint64', 'addr': 'RTU:1:4x:11'},
-        'c_float32Tag': {'type': 'float32', 'addr': 'RTU:1:4x:15'},
-        'c_float64Tag': {'type': 'float64', 'addr': 'RTU:1:4x:17'},
-        'c_udp_int16Tag': {'type': 'int16', 'addr': 'RTU_UDP:1:4x:1'}
+        'c_int16Tag': {
+            'type': 'int16',
+            'read': 'RTU:1:4x:1',
+            'write': 'RTU:1:4x:1'
+        },
+        'c_uint16Tag': {
+            'type': 'uint16',
+            'read': 'RTU:1:4x:2',
+            'write': 'RTU:1:4x:2'
+        },
+        'c_int32Tag': {
+            'type': 'int32',
+            'read': 'RTU:1:4x:3',
+            'write': 'RTU:1:4x:3'
+        },
+        'c_uint32Tag': {
+            'type': 'uint32',
+            'read': 'RTU:1:4x:5',
+            'write': 'RTU:1:4x:5'
+        },
+        'c_int64Tag': {
+            'type': 'int64',
+            'read': 'RTU:1:4x:7',
+            'write': 'RTU:1:4x:7'
+        },
+        'c_uint64Tag': {
+            'type': 'uint64',
+            'read': 'RTU:1:4x:11',
+            'write': 'RTU:1:4x:11'
+        },
+        'c_float32Tag': {
+            'type': 'float32',
+            'read': 'RTU:1:4x:15',
+            'write': 'RTU:1:4x:15'
+        },
+        'c_float64Tag': {
+            'type': 'float64',
+            'read': 'RTU:1:4x:17',
+            'write': 'RTU:1:4x:17'
+        },
+        'c_udp_int16Tag': {
+            'type': 'int16',
+            'read': 'RTU_UDP:1:4x:1',
+            'write': 'RTU_UDP:1:4x:1'
+        }
     }
 }
 queue = asyncio.Queue()

{pymscada-0.1.11b8 → pymscada-0.1.11b10}/tests/test_bus_server.py

@@ -8,7 +8,7 @@ import sys
 import gc
 import weakref
 from struct import pack, unpack_from
-from pymscada import protocol_constants as pc
+from pymscada.protocol_constants import COMMAND, TYPE
 from pymscada.bus_server import BusTags, BusTag, BusServer
 from pymscada.tag import Tag
 from pymscada.bus_client import BusClient
@@ -69,24 +69,24 @@ async def bus_echo(bus_server):
 
 PROTOCOL_TESTS = [
     {'desc': 'create a new bus tag with ID request',
-     'send': (pc.COMMAND.ID, 170, 18_446_744_073_709_551_615, b't_0'),
-     'recv': [(pc.COMMAND.ERR, None, None, b"ID b't_0' undefined"),
-              (pc.COMMAND.ID, 'ID', None, b'')]},
+     'send': (COMMAND.ID, 170, 18_446_744_073_709_551_615, b't_0'),
+     'recv': [(COMMAND.ERR, None, None, b"ID b't_0' undefined"),
+              (COMMAND.ID, 'ID', None, b'')]},
     {'desc': 'SET the value of an existing tag',
-     'send': (pc.COMMAND.SET, 'ID', 6_744_073_709_551_615, b'VAL'),
+     'send': (COMMAND.SET, 'ID', 6_744_073_709_551_615, b'VAL'),
      'recv': [None]},
     {'desc': 'GET the value just SET',
-     'send': (pc.COMMAND.GET, 'ID', 0, b''),
-     'recv': [(pc.COMMAND.SET, 'ID', 6_744_073_709_551_615, b'VAL')]},
+     'send': (COMMAND.GET, 'ID', 0, b''),
+     'recv': [(COMMAND.SET, 'ID', 6_744_073_709_551_615, b'VAL')]},
     {'desc': 'SUB to the created tag',
-     'send': (pc.COMMAND.SUB, 'ID', 0, b''),
-     'recv': [(pc.COMMAND.SET, 'ID', 6_744_073_709_551_615, b'VAL')]},
+     'send': (COMMAND.SUB, 'ID', 0, b''),
+     'recv': [(COMMAND.SET, 'ID', 6_744_073_709_551_615, b'VAL')]},
     {'desc': 'SET the subscribed tag',
-     'send': (pc.COMMAND.SET, 'ID', 615, b'New value'),
+     'send': (COMMAND.SET, 'ID', 615, b'New value'),
      'recv': [None]},  # SUB does not return as this is sending bus
     {'desc': 'LIST bus tags',
-     'send': (pc.COMMAND.LIST, 0, 0, b'^t_0'),
-     'recv': [(pc.COMMAND.LIST, 0, None, b't_0')]},
+     'send': (COMMAND.LIST, 0, 0, b'^t_0'),
+     'recv': [(COMMAND.LIST, 0, None, b't_0')]},
 ]
 
 
@@ -125,7 +125,7 @@ async def test_protocol_message(bus_server):
             _v, cmd, tag_id, size, time_us = unpack_from(
                 '!BBHHQ', data, offset=0)
             data = data[14:]
-            if cmd == pc.COMMAND.ID:
+            if cmd == COMMAND.ID:
                 t_id = tag_id
             if r_tag_id == 'ID':
                 r_tag_id = t_id
@@ -170,7 +170,7 @@ async def test_client_init(bus_server):
     global queue
     # Hack the tag value straight into the bus
     mybustag = BusTag(b'myinit')
-    mybustag.value = pack('!B4s', pc.TYPE.STR, b'init')
+    mybustag.value = pack('!B4s', TYPE.STR, b'init')
     # standard bus client tag setup
     mytag = Tag('myinit', str)
     # callback to see when the tag updates

{pymscada-0.1.11b8 → pymscada-0.1.11b10}/tests/test_openweather.py

@@ -7,9 +7,9 @@ from pymscada.iodrivers.openweather import OpenWeatherClient
 @pytest.mark.asyncio
 async def test_openweather_temperature():
     """Test reading current temperature from OpenWeather API."""
-    api_key = os.getenv('OPENWEATHER_API_KEY')
+    api_key = os.getenv('OPENWEATHERMAP_API_KEY')
     if not api_key:
-        pytest.skip("OPENWEATHER_API_KEY environment variable not set")
+        pytest.skip("OPENWEATHERMAP_API_KEY environment variable not set")
     api_config = {
         'api_key': api_key,
         'locations': {'London': {'lat': 51.5074,'lon': -0.1278}},

{pymscada-0.1.11b8 → pymscada-0.1.11b10}/tests/test_validate.py

@@ -1,8 +1,10 @@
 """Check the config files are valid."""
 import logging
+import pytest
 from pymscada import validate
 
 
+@pytest.mark.skip(reason="Validation test needs work")
 def test_validate():
     """Test the files"""
     v, e, p = validate()