pymscada 0.2.0rc3__py3-none-any.whl → 0.2.0rc4__py3-none-any.whl

pymscada/alarms.py

@@ -5,13 +5,87 @@ import socket
 import time
 import atexit
 from pymscada.bus_client import BusClient
-from pymscada.tag import Tag, TagInfo, TYPES
+from pymscada.tag import Tag, TYPES
 
 ALM = 0
 RTN = 1
 ACT = 2
 INF = 3
 
+NORMAL = 0
+ALARM = 1
+
+
+def standardise_tag_info(tagname: str, tag: dict):
+    """Correct tag dictionary in place to be suitable for modules."""
+    tag['name'] = tagname
+    tag['id'] = None
+    if 'desc' not in tag:
+        logging.warning(f"Tag {tagname} has no description, using name")
+        tag['desc'] = tag['name']
+    if 'multi' in tag:
+        tag['type'] = int
+    else:
+        if 'type' not in tag:
+            tag['type'] = float
+        else:
+            if tag['type'] not in TYPES:
+                tag['type'] = str
+            else:
+                tag['type'] = TYPES[tag['type']]
+    if 'dp' not in tag:
+        if tag['type'] == int:
+            tag['dp'] = 0
+        else:
+            tag['dp'] = 2
+    if 'units' not in tag:
+        tag['units'] = ''
+
+
+class Alarm:
+    """Manages multiple alarm conditions for a single tag."""
+    def __init__(self, tag: Tag, conditions: str | list[str]):
+        """Initialize alarm with tag and condition(s)."""
+        if tag.type not in (int, float):
+            raise ValueError(f"Alarms only supported for numeric types, not {tag.type}")
+            
+        self.tag = tag
+        self.tests: list[tuple[str, callable, float]] = []
+        
+        # Handle both string and list conditions
+        if isinstance(conditions, str):
+            conditions = [conditions]
+            
+        for condition in conditions:
+            operator_str, value = condition.split(' ')
+            self.tests.append((
+                condition,
+                {
+                    '==': (lambda x, y: x == y),
+                    '<': (lambda x, y: x < y),
+                    '>': (lambda x, y: x > y),
+                    '<=': (lambda x, y: x <= y),
+                    '>=': (lambda x, y: x >= y)
+                }[operator_str],
+                float(value)
+            ))
+            
+    def check_conditions(self, in_alarm: set[str]) -> list[tuple[str, bool, float, int]]:
+        """Check all conditions and return list of changes.
+        Returns list of (alarm_ref, is_in_alarm, value, timestamp) for changed states."""
+        changes = []
+        for condition_str, test, value in self.tests:
+            alarm_ref = f"{self.tag.name} {condition_str}"
+            is_in_alarm = test(self.tag.value, value)
+            
+            if is_in_alarm and alarm_ref not in in_alarm:
+                changes.append((alarm_ref, True, self.tag.value, self.tag.time_us))
+                
+            elif not is_in_alarm and alarm_ref in in_alarm:
+                changes.append((alarm_ref, False, self.tag.value, self.tag.time_us))
+                
+        return changes
+
 
 class Alarms:
     """Connect to bus_ip:bus_port, store and provide Alarms."""
@@ -22,7 +96,7 @@ class Alarms:
         bus_port: int | None = 1324,
         db: str | None = None,
         table: str = 'alarms',
-        tag_info: TagInfo = {},
+        tag_info: dict[str, dict] = {},
         rta_tag: str = '__alarms__'
     ) -> None:
         """
@@ -56,59 +130,79 @@ class Alarms:
         logging.warning(f'Alarms {bus_ip} {bus_port} {db} {rta_tag}')
         self.connection = sqlite3.connect(db)
         self.tags: dict[str, Tag] = {}
-        self.alarm_test: dict[str, dict] = {}
-        self.in_alarm: set[str] = set()
+        self.alarms: dict[str, Alarm] = {}
+        self.in_alarm: dict[str, int] = {}
         for tagname, tag in tag_info.items():
-            if 'alarm' not in tag:
+            standardise_tag_info(tagname, tag)
+            if 'alarm' not in tag or tag['type'] not in (int, float):
                 continue
             self.tags[tagname] = Tag(tagname, tag['type'])
             self.tags[tagname].desc = tag['desc']
+            self.tags[tagname].dp = tag['dp']
+            self.tags[tagname].units = tag['units']
             self.tags[tagname].add_callback(self.alarm_cb)
-            operator, value = tag['alarm'].split(' ')
-            self.alarm_test[tagname] = [
-                {
-                    '==': (lambda x, y: x == y),
-                    '<': (lambda x, y: x < y),
-                    '>': (lambda x, y: x > y),
-                    '<=': (lambda x, y: x <= y),
-                    '>=': (lambda x, y: x >= y)
-                }[operator],
-                float(value)
-            ]
+            self.alarms[tagname] = Alarm(self.tags[tagname], tag['alarm'])
         self.table = table
         self.cursor = self.connection.cursor()
         self.busclient = BusClient(bus_ip, bus_port, module='Alarms')
         self.rta = Tag(rta_tag, dict)
         self.rta.value = {}
         self.busclient.add_callback_rta(rta_tag, self.rta_cb)
-        self._init_table()
         atexit.register(self.close)
 
-    def alarm_cb(self, tag):
+    def alarm_cb(self, tag: Tag):
         """Callback for alarm tags."""
-        operator, value = self.alarm_test[tag.name]
-        if operator(tag.value, value) and tag.name not in self.in_alarm:
-            logging.warning(f'Alarm {tag.name} {tag.value}')
-            alarm_record = {
-                'action': 'ADD',
-                'date_ms': int(tag.time_us / 1000),
-                'tagname': tag.name,
-                'transition': ALM,
-                'description': f'{tag.desc} {tag.value}'
-            }
-            self.rta_cb(alarm_record)
-            self.in_alarm.add(tag.name)
-        elif not operator(tag.value, value) and tag.name in self.in_alarm:
-            logging.info(f'No alarm {tag.name} {tag.value}')
+        if tag.name not in self.alarms:
+            return
+        changes = self.alarms[tag.name].check_conditions(self.in_alarm)
+        for alarm_ref, is_in_alarm, value, time_us in changes:
+            self._handle_alarm_change(
+                alarm_ref, 
+                is_in_alarm, 
+                tag, 
+                value, 
+                time_us
+            )
+
+    def _handle_alarm_change(self, alarm_ref: str, is_in_alarm: bool, 
+                           tag: Tag, value: float, time_us: int):
+        """Handle alarm state changes and database updates."""
+        if is_in_alarm:
+            logging.warning(f'Alarm {alarm_ref} {value}')
+            kind = ALM
+            state = ALARM
             alarm_record = {
                 'action': 'ADD',
-                'date_ms': int(tag.time_us / 1000),
-                'tagname': tag.name,
-                'transition': RTN,
-                'description': f'{tag.desc} {tag.value}'
+                'date_ms': int(time_us / 1000),
+                'tag_alm': alarm_ref,
+                'kind': kind,
+                'desc': f'{tag.desc} {value:.{tag.dp}f} {tag.units}',
+                'in_alm': state
             }
             self.rta_cb(alarm_record)
-            self.in_alarm.remove(tag.name)
+            self.in_alarm[alarm_ref] = self.rta.value['id']
+        else:
+            logging.info(f'No alarm {alarm_ref} {value}')
+            if alarm_ref in self.in_alarm:
+                # First update the existing alarm record to NORMAL
+                update_record = {
+                    'action': 'UPDATE',
+                    'id': self.in_alarm[alarm_ref],
+                    'in_alm': NORMAL
+                }
+                self.rta_cb(update_record)
+                
+                # Then add the RTN record
+                rtn_record = {
+                    'action': 'ADD',
+                    'date_ms': int(time_us / 1000),
+                    'tag_alm': alarm_ref,
+                    'kind': RTN,
+                    'desc': f'{tag.desc} {value:.{tag.dp}f} {tag.units}',
+                    'in_alm': NORMAL
+                }
+                self.rta_cb(rtn_record)
+                del self.in_alarm[alarm_ref]
 
     def _init_table(self):
         """Initialize the database table schema."""
@@ -116,19 +210,39 @@ class Alarms:
             'CREATE TABLE IF NOT EXISTS ' + self.table +
             '(id INTEGER PRIMARY KEY ASC, '
             'date_ms INTEGER, '
-            'tagname TEXT, '
-            'transition INTEGER, '
-            'description TEXT)'
+            'tag_alm TEXT, '
+            'kind INTEGER, '
+            'desc TEXT, '
+            'in_alm INTEGER)'
         )
         self.cursor.execute(query)
         
+        # Clear any existing ALARM states
+        try:
+            with self.connection:
+                # Update all alarm records to NORMAL
+                self.cursor.execute(
+                    f'SELECT id, tag_alm FROM {self.table} WHERE in_alm = ?',
+                    (ALARM,))
+                alarm_records = self.cursor.fetchall()
+                for record_id, tag_alm in alarm_records:
+                    update_record = {
+                        'action': 'UPDATE',
+                        'id': record_id,
+                        'in_alm': NORMAL
+                    }
+                    self.rta_cb(update_record)
+        except sqlite3.Error as e:
+            logging.error(f'Error clearing alarm states during startup: {e}')
+        
         # Add startup record using existing ADD functionality
         startup_record = {
             'action': 'ADD',
             'date_ms': int(time.time() * 1000),
-            'tagname': self.rta.name,
-            'transition': INF,
-            'description': 'Alarm logging started'
+            'tag_alm': self.rta.name,
+            'kind': INF,
+            'desc': 'Alarm logging started',
+            'in_alm': NORMAL
         }
         self.rta_cb(startup_record)
 
@@ -142,20 +256,41 @@ class Alarms:
                 with self.connection:
                     self.cursor.execute(
                         f'INSERT INTO {self.table} '
-                        '(date_ms, tagname, transition, description) '
-                        'VALUES(:date_ms, :tagname, :transition, :description) '
+                        '(date_ms, tag_alm, kind, desc, in_alm) '
+                        'VALUES(:date_ms, :tag_alm, :kind, :desc, :in_alm) '
                         'RETURNING *;',
                         request)
                     res = self.cursor.fetchone()
                     self.rta.value = {
                         'id': res[0],
                         'date_ms': res[1],
-                        'tagname': res[2],
-                        'transition': res[3],
-                        'description': res[4]
+                        'tag_alm': res[2],
+                        'kind': res[3],
+                        'desc': res[4],
+                        'in_alm': res[5]
                     }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'Alarms rta_cb {error}')
+        elif request['action'] == 'UPDATE':
+            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 = {
+                            'id': res[0],
+                            'date_ms': res[1],
+                            'tag_alm': res[2],
+                            'kind': res[3],
+                            'desc': res[4],
+                            'in_alm': res[5]
+                        }
+            except sqlite3.IntegrityError as error:
+                logging.warning(f'Alarms rta_cb update {error}')
         elif request['action'] == 'HISTORY':
             try:
                 logging.info(f'history {request}')
@@ -168,25 +303,54 @@ class Alarms:
                             '__rta_id__': request['__rta_id__'],
                             'id': res[0],
                             'date_ms': res[1],
-                            'tagname': res[2],
-                            'transition': res[3],
-                            'description': res[4]
+                            'tag_alm': res[2],
+                            'kind': res[3],
+                            'desc': res[4],
+                            'in_alm': res[5]
                         }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'Alarms rta_cb {error}')
+        elif request['action'] == 'BULK HISTORY':
+            try:
+                logging.info(f'bulk history {request}')
+                with self.connection:
+                    self.cursor.execute(
+                        f'SELECT * FROM {self.table} WHERE date_ms > :date_ms '
+                        'ORDER BY -date_ms;', request)
+                    results = list(self.cursor.fetchall())
+                    self.rta.value = {'__rta_id__': request['__rta_id__'],
+                                      'data': results}
+            except sqlite3.IntegrityError as error:
+                logging.warning(f'Alarms rta_cb {error}')
+        elif request['action'] == 'IN ALARM':
+            self.rta.value = {'__rta_id__': request['__rta_id__'],
+                              'data': {'in_alarm': list(self.in_alarm)}}
 
     async def start(self):
         """Async startup."""
         await self.busclient.start()
+        self._init_table()
 
     def close(self):
         """Clean shutdown of alarms logging."""
+        for alarm_ref, record_id in self.in_alarm.items():
+            update_record = {
+                'action': 'UPDATE',
+                'id': record_id,
+                'in_alm': NORMAL
+            }
+            try:
+                self.rta_cb(update_record)
+            except sqlite3.Error as e:
+                logging.error(f'Error clearing alarm {alarm_ref}: {e}')
+        
         shutdown_record = {
             'action': 'ADD',
             'date_ms': int(time.time() * 1000),
-            'tagname': self.rta.name,
-            'transition': INF,
-            'description': 'Alarm logging stopped'
+            'tag_alm': self.rta.name,
+            'kind': INF,
+            'desc': 'Alarm logging stopped',
+            'in_alm': NORMAL
         }
         try:
             self.rta_cb(shutdown_record)

pymscada/history.py

@@ -28,7 +28,7 @@ import time
 import socket
 from typing import TypedDict, Optional
 from pymscada.bus_client import BusClient
-from pymscada.tag import Tag, TagInfo, TYPES
+from pymscada.tag import Tag, TYPES
 
 
 ITEM_SIZE = 16  # Q + q, Q or d
@@ -37,21 +37,12 @@ CHUNK_SIZE = ITEM_COUNT * ITEM_SIZE
 FILE_CHUNKS = 64
 
 
-class Request(TypedDict, total=False):
-    """Type definition for request dictionary."""
-    tagname: str 
-    start_ms: Optional[int]  # Allow web client to use native ms
-    start_us: Optional[int]  # Native for pymscada server
-    end_ms: Optional[int]
-    end_us: Optional[int]
-    __rta_id__: Optional[int]  # Empty for a change that must be broadcast
-
-
-def tag_for_history(tagname: str, tag: dict):
-    """Correct tag dictionary in place to be suitable for web client."""
+def standardise_tag_info(tagname: str, tag: dict):
+    """Correct tag dictionary in place to be suitable for modules."""
     tag['name'] = tagname
     tag['id'] = None
     if 'desc' not in tag:
+        logging.warning(f"Tag {tagname} has no description, using name")
         tag['desc'] = tag['name']
     if 'multi' in tag:
         tag['type'] = int
@@ -71,6 +62,16 @@ def tag_for_history(tagname: str, tag: dict):
         tag['deadband'] = None
 
 
+class Request(TypedDict, total=False):
+    """Type definition for request dictionary."""
+    tagname: str 
+    start_ms: Optional[int]  # Allow web client to use native ms
+    start_us: Optional[int]  # Native for pymscada server
+    end_ms: Optional[int]
+    end_us: Optional[int]
+    __rta_id__: Optional[int]  # Empty for a change that must be broadcast
+
+
 def get_tag_hist_files(path: Path, tagname: str) -> dict[int, Path]:
     """Parse path for history files matching tagname."""
     files_us = {}
@@ -226,7 +227,7 @@ class History():
         bus_ip: str = '127.0.0.1',
         bus_port: int = 1324,
         path: str = 'history',
-        tag_info: TagInfo = {},
+        tag_info: dict[str, dict] = {},
         rta_tag: str | None = '__history__'
     ) -> None:
         """
@@ -260,7 +261,7 @@ class History():
         self.tags: dict[str, Tag] = {}
         self.hist_tags: dict[str, TagHistory] = {}
         for tagname, tag in tag_info.items():
-            tag_for_history(tagname, tag)
+            standardise_tag_info(tagname, tag)
             if tag['type'] not in [float, int]:
                 continue
             self.hist_tags[tagname] = TagHistory(

pymscada/tag.py

@@ -7,7 +7,6 @@ bus_id is python id(), 0 is null pointer in c, 0 is local bus.
 import time
 import array
 import logging
-from typing import TypedDict, Union, Optional, Type, List
 
 TYPES = {
     'int': int,
@@ -19,28 +18,6 @@ TYPES = {
 }
 
 
-def tag_for_web(tagname: str, tag: dict):
-    """Correct tag dictionary in place to be suitable for web client."""
-    tag['name'] = tagname
-    tag['id'] = None
-    if 'desc' not in tag:
-        tag['desc'] = tagname
-    if 'multi' in tag:
-        tag['type'] = 'int'
-    else:
-        if 'type' not in tag:
-            tag['type'] = 'float'
-        else:
-            if tag['type'] not in TYPES:
-                tag['type'] = 'str'
-    if tag['type'] == 'int':
-        tag['dp'] = 0
-    elif tag['type'] == 'float' and 'dp' not in tag:
-        tag['dp'] = 2
-    elif tag['type'] == 'str' and 'dp' in tag:
-        del tag['dp']
-
-
 class UniqueTag(type):
     """Super Tag class only create unique tags for unique tag names."""
 
@@ -311,20 +288,3 @@ class Tag(metaclass=UniqueTag):
                 self.values = array.array('d')
         else:
             raise TypeError(f"shard invalid {self.name} not int, float")
-
-
-class TagInfo(TypedDict, total=False):
-    """Type definition for tag information dictionary."""
-    name: str 
-    id: Optional[int]
-    desc: str
-    type: Union[str, Type[int], Type[float], Type[str], Type[list],
-                Type[dict], Type[bytes]]
-    multi: Optional[List[str]]
-    min: Optional[Union[float, int]]
-    max: Optional[Union[float, int]]
-    deadband: Optional[Union[float, int]]
-    units: Optional[str]
-    dp: Optional[int]
-    format: Optional[str]
-    init: Optional[Union[int, float, str]]

pymscada/www_server.py

@@ -8,10 +8,32 @@ import socket
 import time
 from pymscada.bus_client import BusClient
 import pymscada.protocol_constants as pc
-from pymscada.tag import Tag, tag_for_web, TYPES
+from pymscada.tag import Tag, TYPES
 from pymscada_html import get_html_file
 
 
+def standardise_tag_info(tagname: str, tag: dict):
+    """Correct tag dictionary in place to be suitable for web client."""
+    tag['name'] = tagname
+    tag['id'] = None
+    if 'desc' not in tag:
+        tag['desc'] = tagname
+    if 'multi' in tag:
+        tag['type'] = 'int'
+    else:
+        if 'type' not in tag:
+            tag['type'] = 'float'
+        else:
+            if tag['type'] not in TYPES:
+                tag['type'] = 'str'
+    if tag['type'] == 'int':
+        tag['dp'] = 0
+    elif tag['type'] == 'float' and 'dp' not in tag:
+        tag['dp'] = 2
+    elif tag['type'] == 'str' and 'dp' in tag:
+        del tag['dp']
+
+
 class Interface():
     """Provide an interface between web client rta and the action."""
 
@@ -36,12 +58,12 @@ class WSHandler():
 
     def __init__(self, ws: web.WebSocketResponse, pages: dict,
                  tag_info: dict[str, Tag], do_rta, interface: Interface,
-                 webclient: dict):
+                 config: dict):
         """Create callbacks to monitor tag values."""
         self.ws = ws
         self.pages = pages
         self.tag_info = tag_info
-        self.webclient = webclient
+        self.config = config
         self.tag_by_id: dict[int, Tag] = {}
         self.tag_by_name: dict[str, Tag] = {}
         self.queue = asyncio.Queue()
@@ -143,7 +165,7 @@ class WSHandler():
 
     def notify_id(self, tag: Tag):
         """Must be done here."""
-        logging.info(f'{self.rta_id}: send id to webclient for {tag.name}')
+        logging.info(f'{self.rta_id}: send id to browser for {tag.name}')
         self.tag_info[tag.name]['id'] = tag.id
         self.tag_by_id[tag.id] = tag
         self.tag_by_name[tag.name] = tag
@@ -172,7 +194,7 @@ class WSHandler():
         """Run while the connection is active and don't return."""
         send_queue = asyncio.create_task(self.send_queue())
         self.queue.put_nowait(
-            (False, {'type': 'webclient', 'payload': self.webclient}))
+            (False, {'type': 'config', 'payload': self.config}))
         self.queue.put_nowait(
             (False, {'type': 'pages', 'payload': self.pages}))
         async for msg in self.ws:
@@ -213,7 +235,7 @@ class WSHandler():
 
 
 class WwwServer:
-    """Connect to bus on bus_ip:bus_port, serve on ip:port for webclient."""
+    """Connect to bus on bus_ip:bus_port, serve on ip:port for webserver."""
 
     def __init__(
         self,
@@ -224,15 +246,15 @@ class WwwServer:
         get_path: str | None = None,
         tag_info: dict = {},
         pages: dict = {},
-        webclient: dict = {},
+        config: dict = {},
         serve_path: str | None = None,
         www_tag: str = '__wwwserver__'
     ) -> None:
         """
-        Connect to bus on bus_ip:bus_port, serve on ip:port for webclient.
+        Connect to bus on bus_ip:bus_port, serve on ip:port for webserver.
 
-        Serves the webclient files at /, as a relative path. The webclient uses
-        a websocket connection to request and set tag values and subscribe to
+        Serves the files at /, as a relative path. The browser uses a
+        websocket connection to request and set tag values and subscribe to
         changes.
 
         Event loop must be running.
@@ -263,10 +285,10 @@ class WwwServer:
         self.get_path = get_path
         self.serve_path = Path(serve_path) if serve_path else None
         for tagname, tag in tag_info.items():
-            tag_for_web(tagname, tag)
+            standardise_tag_info(tagname, tag)
         self.tag_info = tag_info
         self.pages = pages
-        self.webclient = webclient
+        self.config = config
         self.interface = Interface(www_tag)
 
     async def redirect_handler(self, _request: web.Request):
@@ -305,7 +327,7 @@ class WwwServer:
         ws = web.WebSocketResponse(max_msg_size=0)  # disables max message size
         await ws.prepare(request)
         await WSHandler(ws, self.pages, self.tag_info, self.busclient.rta,
-                        self.interface, self.webclient).connection_active()
+                        self.interface, self.config).connection_active()
         await ws.close()
         logging.info(f"WS closed {peer}")
         return ws

{pymscada-0.2.0rc3.dist-info → pymscada-0.2.0rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.2.0rc3
+Version: 0.2.0rc4
 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.0rc2
+Requires-Dist: pymscada-html==0.2.0rc4
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24

{pymscada-0.2.0rc3.dist-info → pymscada-0.2.0rc4.dist-info}/RECORD

@@ -1,13 +1,13 @@
 pymscada/__init__.py,sha256=NV_cIIwe66Ugp8ns426rtfJIIyskWbqwImD9p_5p0bQ,739
 pymscada/__main__.py,sha256=WcyVlrYOoDdktJhOoyubTOycMwpayksFdxwelRU5xpQ,272
-pymscada/alarms.py,sha256=BM6R-PFf7EazhGdGHJ1XeAcCoi83Ro9XvEl_9cp-iCI,7326
+pymscada/alarms.py,sha256=KiGws42xu8Bcmy_hhZkKoYhfNzUzICSV7f8xQcY7M8c,13715
 pymscada/bus_client.py,sha256=ROShMcR2-y_i5CIvPxRdCRr-NpnMANjKFdLjKjMTRwo,9117
 pymscada/bus_server.py,sha256=k7ht2SAr24Oab0hBOPeW4NRDF_RK-F46iE0cMzh7K4w,12323
 pymscada/checkout.py,sha256=RLuCMTEuUI7pp1hIRAUPbo8xYFta8TjArelx0SD4gOY,3897
 pymscada/config.py,sha256=vwGxieaJBYXiHNQEOYVDFaPuGmnUlCnbNm_W9bugKlc,1851
 pymscada/console.py,sha256=zM6TNXJY8ROcVzO3UBzi1qDSiit7mfLr2YprRoxv2oQ,8824
 pymscada/files.py,sha256=iouEOPfEkVI0Qbbf1p-L324Y04zSrynVypLW0-1MThA,2499
-pymscada/history.py,sha256=qXbCkHQC_j7HF9b1PvnF93d4HvW9ODJeSc9tvy63o10,11513
+pymscada/history.py,sha256=7UEOeMnlSMv0LoWTqLWx7QwOW1FZZ4wAvzH6v6b0_vI,11592
 pymscada/main.py,sha256=d6EnK4-tEcvM5AqMHYhvqlnSh-E_wd0Tuxk-kXYSiDw,1854
 pymscada/misc.py,sha256=0Cj6OFhQonyhyk9x0BG5MiS-6EPk_w6zvavt8o_Hlf0,622
 pymscada/module_config.py,sha256=r1JBjOXtMk7n09kvlvnmA3d_BySEmJpdefFhRNKPdAY,8824
@@ -15,9 +15,9 @@ pymscada/opnotes.py,sha256=MKM51IrB93B2-kgoTzlpOLpaMYs-7rPQHWmRLME-hQQ,7952
 pymscada/periodic.py,sha256=MLlL93VLvFqBBgjO1Us1t0aLHTZ5BFdW0B__G02T1nQ,1235
 pymscada/protocol_constants.py,sha256=lPJ4JEgFJ_puJjTym83EJIOw3UTUFbuFMwg3ohyUAGY,2414
 pymscada/samplers.py,sha256=t0IscgsCm5YByioOZ6aOKMO_guDFS_wxnJSiOGKI4Nw,2583
-pymscada/tag.py,sha256=G0P9t3G6heQ1kBWPnc0u8qN6UvjG4xtyI9w_KqGr4Q0,10682
+pymscada/tag.py,sha256=hTRxogw8BXAi1OJpM1Lhx4KKMqZ53y7D5KcCycO7fRQ,9471
 pymscada/validate.py,sha256=fPMlP6RscYuTIgdEJjJ0ZZI0OyVSat1lpqg254wqpdE,13140
-pymscada/www_server.py,sha256=rz6Yictg_Ony8zW76An5bv_cZN5aLi-QW3B85uWMgXQ,13152
+pymscada/www_server.py,sha256=NfvX9jbVWY2qxWM6TfWUcwsCY7lR-dkty1nCOXyoWTA,13747
 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=Fk4rV0S8jCau0173QCzKW8TdUbc4crYVi0aD8fPLNgU,322
@@ -67,9 +67,9 @@ pymscada/pdf/two.pdf,sha256=TAuW5yLU1_wfmTH_I5ezHwY0pxhCVuZh3ixu0kwmJwE,1516
 pymscada/pdf/__pycache__/__init__.cpython-311.pyc,sha256=4KTfXrV9bGDbTIEv-zgIj_LvzLbVTj77lEC1wzMh9e0,194
 pymscada/tools/snmp_client2.py,sha256=pdn5dYyEv4q-ubA0zQ8X-3tQDYxGC7f7Xexa7QPaL40,1675
 pymscada/tools/walk.py,sha256=OgpprUbKLhEWMvJGfU1ckUt_PFEpwZVOD8HucCgzmOc,1625
-pymscada-0.2.0rc3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymscada-0.2.0rc3.dist-info/METADATA,sha256=ezP-4JEdjL8qwHVyi0q9xrpgaft2BJNez1Ai96k1e5k,2371
-pymscada-0.2.0rc3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pymscada-0.2.0rc3.dist-info/entry_points.txt,sha256=2UJBi8jrqujnerrcXcq4F8GHJYVDt26sacXl94t3sd8,56
-pymscada-0.2.0rc3.dist-info/top_level.txt,sha256=LxIB-zrtgObJg0fgdGZXBkmNKLDYHfaH1Hw2YP2ZMms,9
-pymscada-0.2.0rc3.dist-info/RECORD,,
+pymscada-0.2.0rc4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.2.0rc4.dist-info/METADATA,sha256=F9_ab9hHNXQhJaoVfC7CtuEPKgMh5eDAaZOt8GdIr1M,2371
+pymscada-0.2.0rc4.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+pymscada-0.2.0rc4.dist-info/entry_points.txt,sha256=2UJBi8jrqujnerrcXcq4F8GHJYVDt26sacXl94t3sd8,56
+pymscada-0.2.0rc4.dist-info/top_level.txt,sha256=LxIB-zrtgObJg0fgdGZXBkmNKLDYHfaH1Hw2YP2ZMms,9
+pymscada-0.2.0rc4.dist-info/RECORD,,

{pymscada-0.2.0rc3.dist-info → pymscada-0.2.0rc4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.7.0)
 Root-Is-Purelib: true
 Tag: py3-none-any