pymscada 0.2.2__tar.gz → 0.2.4__tar.gz

{pymscada-0.2.2/src/pymscada.egg-info → pymscada-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymscada
-Version: 0.2.2
+Version: 0.2.4
 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
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: aiohttp>=3.8.5
-Requires-Dist: pymscada-html==0.2.0
+Requires-Dist: pymscada-html==0.2.2
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24

{pymscada-0.2.2 → pymscada-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.2.2"
+version = "0.2.4"
 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",          # all
     "aiohttp>=3.8.5",         # www_server
-    "pymscada-html==0.2.0",   # www_server
+    "pymscada-html==0.2.2",   # www_server
     "cerberus>=1.3.5",        # validate
     "pycomm3>=1.2.14",        # logix_client
     "pysnmplib>=5.0.24",      # DON'T use pysnmp, dead

{pymscada-0.2.2 → pymscada-0.2.4}/src/pymscada/alarms.py

@@ -241,6 +241,17 @@ class Alarms:
         self.connection = sqlite3.connect(db)
         self.table = table
         self.cursor = self.connection.cursor()
+        
+        # Check SQLite version for RETURNING clause support (requires >= 3.35.0)
+        sqlite_version = sqlite3.sqlite_version_info
+        self.has_returning = sqlite_version >= (3, 35, 0)
+        if not self.has_returning:
+            logging.warning(
+                f'SQLite version {sqlite3.sqlite_version} is older than 3.35.0. '
+                f'RETURNING clause not supported, using fallback method. '
+                f'Consider upgrading SQLite for better performance.'
+            )
+        
         query = (
             'CREATE TABLE IF NOT EXISTS ' + self.table + ' '
             '(id INTEGER PRIMARY KEY ASC, '
@@ -277,13 +288,25 @@ class Alarms:
             try:
                 logging.info(f'add {request}')
                 with self.connection:
-                    self.cursor.execute(
-                        f'INSERT INTO {self.table} '
-                        '(date_ms, alarm_string, kind, desc, "group") '
-                        'VALUES(:date_ms, :alarm_string, :kind, :desc, :group) '
-                        'RETURNING *;',
-                        request)
-                    res = self.cursor.fetchone()
+                    if self.has_returning:
+                        self.cursor.execute(
+                            f'INSERT INTO {self.table} '
+                            '(date_ms, alarm_string, kind, desc, "group") '
+                            'VALUES(:date_ms, :alarm_string, :kind, :desc, :group) '
+                            'RETURNING *;',
+                            request)
+                        res = self.cursor.fetchone()
+                    else:
+                        self.cursor.execute(
+                            f'INSERT INTO {self.table} '
+                            '(date_ms, alarm_string, kind, desc, "group") '
+                            'VALUES(:date_ms, :alarm_string, :kind, :desc, :group);',
+                            request)
+                        row_id = self.cursor.lastrowid
+                        self.cursor.execute(
+                            f'SELECT * FROM {self.table} WHERE id = ?;',
+                            (row_id,))
+                        res = self.cursor.fetchone()
                     self.rta.value = {
                         '__rta_id__': 0,
                         'id': res[0],
@@ -299,21 +322,42 @@ class Alarms:
             try:
                 logging.info(f'update {request}')
                 with self.connection:
-                    self.cursor.execute(
-                        f'UPDATE {self.table} SET in_alm = :in_alm '
-                        'WHERE id = :id RETURNING *;',
-                        request)
-                    res = self.cursor.fetchone()
-                    if res:
-                        self.rta.value = {
-                            '__rta_id__': 0,
-                            'id': res[0],
-                            'date_ms': res[1],
-                            'alarm_string': res[2],
-                            'kind': res[3],
-                            'desc': res[4],
-                            'group': res[5]
-                        }
+                    if self.has_returning:
+                        self.cursor.execute(
+                            f'UPDATE {self.table} SET in_alm = :in_alm '
+                            'WHERE id = :id RETURNING *;',
+                            request)
+                        res = self.cursor.fetchone()
+                        if res:
+                            self.rta.value = {
+                                '__rta_id__': 0,
+                                'id': res[0],
+                                'date_ms': res[1],
+                                'alarm_string': res[2],
+                                'kind': res[3],
+                                'desc': res[4],
+                                'group': res[5]
+                            }
+                    else:
+                        self.cursor.execute(
+                            f'UPDATE {self.table} SET in_alm = :in_alm '
+                            'WHERE id = :id;',
+                            request)
+                        if self.cursor.rowcount > 0:
+                            self.cursor.execute(
+                                f'SELECT * FROM {self.table} WHERE id = :id;',
+                                request)
+                            res = self.cursor.fetchone()
+                            if res:
+                                self.rta.value = {
+                                    '__rta_id__': 0,
+                                    'id': res[0],
+                                    'date_ms': res[1],
+                                    'alarm_string': res[2],
+                                    'kind': res[3],
+                                    'desc': res[4],
+                                    'group': res[5]
+                                }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'Alarms rta_cb update {error}')
         elif request['action'] == 'HISTORY':

{pymscada-0.2.2 → pymscada-0.2.4}/src/pymscada/iodrivers/logix_map.py

@@ -140,5 +140,5 @@ class LogixMaps:
                 elm = int(poll.tag[arr_start_loc + 1: -1])
                 for map in self.read_var_map[plcname][var]:
                     elm_offset = map.read_elm - elm
-                    if elm_offset > 0 and elm_offset < len(poll.value):
+                    if elm_offset >= 0 and elm_offset < len(poll.value):
                         map.set_tag_value(poll.value[elm_offset], time_us)

{pymscada-0.2.2 → pymscada-0.2.4/src/pymscada.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymscada
-Version: 0.2.2
+Version: 0.2.4
 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
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: aiohttp>=3.8.5
-Requires-Dist: pymscada-html==0.2.0
+Requires-Dist: pymscada-html==0.2.2
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24

{pymscada-0.2.2 → pymscada-0.2.4}/src/pymscada.egg-info/requires.txt

@@ -1,6 +1,6 @@
 PyYAML>=6.0.1
 aiohttp>=3.8.5
-pymscada-html==0.2.0
+pymscada-html==0.2.2
 cerberus>=1.3.5
 pycomm3>=1.2.14
 pysnmplib>=5.0.24