pymscada 0.1.11b10__py3-none-any.whl → 0.2.0rc2__py3-none-any.whl

pymscada/main.py

@@ -39,7 +39,7 @@ async def run():
     if not options.verbose:
         root_logger.setLevel(logging.WARNING)
     factory = ModuleFactory()
-    module = factory.create_module(options.module_name, options)
+    module = factory.create_module(options)
     if module is not None:
         if hasattr(module, 'start'):
             await module.start()

pymscada/module_config.py

@@ -75,9 +75,10 @@ def create_module_registry():
         ModuleDefinition(
             name='checkout',
             help='create example config files',
-            module_class='pymscada.checkout:checkout',
+            module_class='pymscada.checkout:Checkout',
             config=False,
             tags=False,
+            await_future=False,
             epilog=dedent("""
                 To add to systemd:
                   su -
@@ -156,12 +157,12 @@ def create_module_registry():
                 like to see correctly typed values and set values."""),
             extra_args=[
                 ModuleArgument(
-                    ('-p', '--port'),
+                    ('-p', '--bus-port'),
                     {'action': 'store', 'type': int, 'default': 1324,
                      'help': 'connect to port (default: 1324)'}
                 ),
                 ModuleArgument(
-                    ('-i', '--ip'),
+                    ('-i', '--bus-ip'),
                     {'action': 'store', 'default': 'localhost',
                      'help': 'connect to ip address (default: localhost)'}
                 )
@@ -208,9 +209,11 @@ class ModuleFactory:
                 parser.add_argument(*arg.args, **arg.kwargs)
         return parser
 
-    def create_module(self, module_name: str, options: argparse.Namespace):
+    def create_module(self, options: argparse.Namespace):
         """Create a module instance based on configuration and options."""
-        module_def = self.modules[module_name]
+        if options.module_name not in self.modules:
+            raise ValueError(f'{options.module_name} does not exist')
+        module_def = self.modules[options.module_name]
         logging.info(f'Python Mobile SCADA {version("pymscada")} '
                      f'starting {module_def.name}')
         # Import the module class only when needed
@@ -220,13 +223,14 @@ class ModuleFactory:
             actual_class = getattr(module, class_name)
         else:
             actual_class = module_def.module_class
-            
         kwargs = {}
         if module_def.config:
-            kwargs.update(Config(options.config))  
+            kwargs.update(Config(options.config))
         if module_def.tags:
             kwargs['tag_info'] = dict(Config(options.tags))
-        if module_name == 'console':
-            return Console(options.ip, options.port,
-                         kwargs.get('tag_info',{}))
+        if module_def.extra_args:
+            for arg in module_def.extra_args:
+                arg_name = arg.args[-1].lstrip('-').replace('-', '_')
+                if hasattr(options, arg_name):
+                    kwargs[arg_name] = getattr(options, arg_name)
         return actual_class(**kwargs)

pymscada/opnotes.py

@@ -1,6 +1,7 @@
 """Operator Notes."""
 import logging
 import sqlite3  # note that sqlite3 has blocking calls
+import socket
 from pymscada.bus_client import BusClient
 from pymscada.tag import Tag
 
@@ -8,36 +9,90 @@ from pymscada.tag import Tag
 class OpNotes:
     """Connect to bus_ip:bus_port, store and provide Operator Notes."""
 
-    def __init__(self, bus_ip: str = '127.0.0.1', bus_port: int = 1324,
-                 db: str = None, rta_tag: str = '__opnotes__',
-                 table: str = 'opnotes') -> None:
+    def __init__(
+        self,
+        bus_ip: str = '127.0.0.1',
+        bus_port: int = 1324,
+        db: str | None = None,
+        table: str = 'opnotes',
+        rta_tag: str = '__opnotes__'
+    ) -> None:
         """
         Connect to bus_ip:bus_port, serve and update operator notes database.
 
-        TODO
-        Write something.
+        Open an Operator notes table, creating if necessary. Provide additions,
+        updates, deletions and history requests via the rta_tag.
 
         Event loop must be running.
         """
         if db is None:
             raise SystemExit('OpNotes db must be defined')
+        try:
+            socket.gethostbyname(bus_ip)
+        except socket.gaierror as e:
+            raise ValueError(f'Cannot resolve IP/hostname: {e}')
+        if not isinstance(bus_port, int):
+            raise TypeError('bus_port must be an integer')
+        if not 1024 <= bus_port <= 65535:
+            raise ValueError('bus_port must be between 1024 and 65535')
+        if not isinstance(rta_tag, str) or not rta_tag:
+            raise ValueError('rta_tag must be a non-empty string')
+        if not isinstance(table, str) or not table:
+            raise ValueError('table must be a non-empty string')
+
         logging.warning(f'OpNotes {bus_ip} {bus_port} {db} {rta_tag}')
         self.connection = sqlite3.connect(db)
         self.table = table
         self.cursor = self.connection.cursor()
+        self._init_table()
+        self.busclient = BusClient(bus_ip, bus_port, module='OpNotes')
+        self.rta = Tag(rta_tag, dict)
+        self.rta.value = {}
+        self.busclient.add_callback_rta(rta_tag, self.rta_cb)
+
+    def _init_table(self):
+        """Initialize or upgrade the database table schema."""
         query = (
             'CREATE TABLE IF NOT EXISTS ' + self.table +
             '(id INTEGER PRIMARY KEY ASC, '
             'date_ms INTEGER, '
             'site TEXT, '
             'by TEXT, '
-            'note TEXT)'
+            'note TEXT, '
+            'abnormal INTEGER)'
         )
         self.cursor.execute(query)
-        self.busclient = BusClient(bus_ip, bus_port, module='OpNotes')
-        self.rta = Tag(rta_tag, dict)
-        self.rta.value = {}
-        self.busclient.add_callback_rta(rta_tag, self.rta_cb)
+        self.cursor.execute(f"PRAGMA table_info({self.table})")
+        columns = {col[1]: col[2] for col in self.cursor.fetchall()}
+        if 'abnormal' not in columns:
+            # Add abnormal as INTEGER from original schema
+            logging.warning(f'Upgrading {self.table} schema to include '
+                          'abnormal INTEGER, CANNOT revert automatically!')
+            self.cursor.execute(
+                f'ALTER TABLE {self.table} ADD COLUMN abnormal INTEGER')
+        elif columns['abnormal'].upper() == 'BOOLEAN':
+            # Change abnormal from BOOLEAN to INTEGER
+            logging.warning(f'Upgrading {self.table} abnormal from BOOLEAN to '
+                          'INTEGER, CANNOT revert automatically!')
+            self.cursor.execute(
+                f'CREATE TABLE {self.table}_new '
+                '(id INTEGER PRIMARY KEY ASC, '
+                'date_ms INTEGER, '
+                'site TEXT, '
+                'by TEXT, '
+                'note TEXT, '
+                'abnormal INTEGER)'
+            )
+            self.cursor.execute(
+                f'INSERT INTO {self.table}_new '
+                f'SELECT id, date_ms, site, by, note, '
+                f'CASE WHEN abnormal THEN 1 ELSE 0 END '
+                f'FROM {self.table}'
+            )
+            self.cursor.execute(f'DROP TABLE {self.table}')
+            self.cursor.execute(
+                f'ALTER TABLE {self.table}_new RENAME TO {self.table}'
+            )
 
     def rta_cb(self, request):
         """Respond to Request to Author and publish on rta_tag as needed."""
@@ -48,8 +103,10 @@ class OpNotes:
                 logging.info(f'add {request}')
                 with self.connection:
                     self.cursor.execute(
-                        f'INSERT INTO {self.table} (date_ms, site, by, note) '
-                        'VALUES(:date_ms, :site, :by, :note) RETURNING *;',
+                        f'INSERT INTO {self.table} '
+                        '(date_ms, site, by, note, abnormal) '
+                        'VALUES(:date_ms, :site, :by, :note, :abnormal) '
+                        'RETURNING *;',
                         request)
                     res = self.cursor.fetchone()
                     self.rta.value = {
@@ -57,7 +114,8 @@ class OpNotes:
                         'date_ms': res[1],
                         'site': res[2],
                         'by': res[3],
-                        'note': res[4]
+                        'note': res[4],
+                        'abnormal': res[5]
                     }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'OpNotes rta_cb {error}')
@@ -67,14 +125,15 @@ class OpNotes:
                 with self.connection:
                     self.cursor.execute(
                         f'REPLACE INTO {self.table} VALUES(:id, :date_ms, '
-                        ':site, :by, :note) RETURNING *;', request)
+                        ':site, :by, :note, :abnormal) RETURNING *;', request)
                     res = self.cursor.fetchone()
                     self.rta.value = {
                         'id': res[0],
                         'date_ms': res[1],
                         'site': res[2],
                         'by': res[3],
-                        'note': res[4]
+                        'note': res[4],
+                        'abnormal': res[5]
                     }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'OpNotes rta_cb {error}')
@@ -101,7 +160,8 @@ class OpNotes:
                             'date_ms': res[1],
                             'site': res[2],
                             'by': res[3],
-                            'note': res[4]
+                            'note': res[4],
+                            'abnormal': res[5]
                         }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'OpNotes rta_cb {error}')

pymscada/protocol_constants.py

@@ -1,44 +1,62 @@
 """
 Protocol description and protocol constants.
 
-Bus holds a tag forever, assigns a tag id forever, holds a tag value with len
-< 1000 forever, otherwise wipes periodically. So assign tagnames once, at the
-start of your program; use RTA as an update messenger, share whole structures
-rarely.
+Bus holds a tag forever, assigning a new ID for each new tagname.
 
-- version 16-bit unsigned int == 0x01
-- command 16-bit unsigned int
-- tag_id 32-bit unsigned int     0 is not a valid tag_id
-- size 32-bit unsigned int
-  - if size == 0xff  continuation mandatory
-  - size 0x00 completes an empty continuation
-- time_us 128-bit unsigned int, UTC microseconds
-- data size of 8-bit char
+Bus protocol message format:
+- version: 8-bit unsigned int == 0x01
+- command: 8-bit unsigned int
+- tag_id: 16-bit unsigned int (0 is valid for ID requests)
+- size: 16-bit unsigned int
+- time_us: 64-bit unsigned int, UTC microseconds
+- data: variable length bytes of size
 
-command
-- CMD.ID data is tagname
-  - reply: CMD_ID with tag_id and data as tagname
-- CMD.SET id, data is typed or json packed
-  - no reply
-- CMD.UNSUB id
-  - no reply
-- CMD.GET id
-- CMD.RTA id, data is request to author
-- CMD.SUB id
-  - reply: SET id and value, value may be None
-- CMD.LIST
-  - size == 0x00
-    - tags with values newer than time_us
-  - size > 0x00
-    - ^text matches start of tagname
-    - text$ matches start of tagname
-    - text matches anywhere in tagname
-  - reply: LIST data as space separated tagnames
-- CMD.LOG data to logging.warning
+Commands:
+- CMD.ID: Query/inform tag ID
+  - Request: data is tagname as bytes
+  - Reply: CMD.ID with assigned tag_id and tagname as data
+  - Error: CMD.ERR if tagname undefined
+  
+- CMD.SET: Set a tag value
+  - Data format: TYPE byte + typed value
+  - No reply
+  - Error: CMD.ERR if tag_id invalid
+  
+- CMD.GET: Get a tag value
+  - Request: empty data
+  - Reply: CMD.SET with current value
+  - Error: CMD.ERR if tag_id invalid
+  
+- CMD.RTA: Request to author
+  - Request: JSON encoded request
+  - Reply: Comes from target client, not server
+  - Error: CMD.ERR if tag_id invalid or target gone
+  
+- CMD.SUB: Subscribe to tag updates
+  - Request: empty data
+  - Reply: CMD.SET with current value
+  - Error: CMD.ERR if tag_id invalid
+  
+- CMD.UNSUB: Unsubscribe from tag
+  - No reply
+  - Error: CMD.ERR if tag_id invalid
+  
+- CMD.LIST: List tags
+  - Empty data: tags newer than time_us
+  - ^text: tags starting with text
+  - text$: tags ending with text 
+  - text: tags containing text
+  - Reply: CMD.LIST with space-separated tagnames
+  
+- CMD.LOG: Log message
+  - Data: Message to log (max 300 bytes)
+  - Updates __bus__ tag with client address and message
+
+Large messages are split into MAX_LEN chunks. Final chunk size < MAX_LEN.
 """
 
 # Tuning constants
-MAX_LEN = 65535 - 14  # TODO fix server(?) when 3
+MAX_LEN = 65535 - 14  # Maximum data size per message
 
 from enum import IntEnum
 

pymscada/tag.py

@@ -7,6 +7,7 @@ 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,
@@ -310,3 +311,20 @@ 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

@@ -4,6 +4,7 @@ from aiohttp import web, WSMsgType
 import logging
 from pathlib import Path
 from struct import pack, unpack_from
+import socket
 import time
 from pymscada.bus_client import BusClient
 import pymscada.protocol_constants as pc
@@ -34,11 +35,13 @@ class WSHandler():
     ids = set(range(1, 1000))
 
     def __init__(self, ws: web.WebSocketResponse, pages: dict,
-                 tag_info: dict[str, Tag], do_rta, interface: Interface):
+                 tag_info: dict[str, Tag], do_rta, interface: Interface,
+                 webclient: dict):
         """Create callbacks to monitor tag values."""
         self.ws = ws
         self.pages = pages
         self.tag_info = tag_info
+        self.webclient = webclient
         self.tag_by_id: dict[int, Tag] = {}
         self.tag_by_name: dict[str, Tag] = {}
         self.queue = asyncio.Queue()
@@ -168,6 +171,8 @@ class WSHandler():
     async def connection_active(self):
         """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}))
         self.queue.put_nowait(
             (False, {'type': 'pages', 'payload': self.pages}))
         async for msg in self.ws:
@@ -210,11 +215,19 @@ class WSHandler():
 class WwwServer:
     """Connect to bus on bus_ip:bus_port, serve on ip:port for webclient."""
 
-    def __init__(self, bus_ip: str = '127.0.0.1', bus_port: int = 1324,
-                 ip: str = '127.0.0.1', port: int = 8324, get_path: str = None,
-                 tag_info: dict = {}, pages: dict = {}, serve_path: str = None,
-                 www_tag: str = '__wwwserver__'
-                 ) -> None:
+    def __init__(
+        self,
+        bus_ip: str = '127.0.0.1',
+        bus_port: int = 1324,
+        ip: str = '127.0.0.1',
+        port: int = 8324,
+        get_path: str | None = None,
+        tag_info: dict = {},
+        pages: dict = {},
+        webclient: 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.
 
@@ -224,16 +237,36 @@ class WwwServer:
 
         Event loop must be running.
         """
+        try:
+            socket.gethostbyname(bus_ip)
+        except socket.gaierror as e:
+            raise ValueError(f'Cannot resolve bus IP/hostname: {e}')
+        if not isinstance(bus_port, int):
+            raise TypeError('bus_port must be an integer')
+        if not 1024 <= bus_port <= 65535:
+            raise ValueError('bus_port must be between 1024 and 65535')
+        try:
+            socket.gethostbyname(ip)
+        except socket.gaierror as e:
+            raise ValueError(f'Cannot resolve IP/hostname: {e}')
+        if not isinstance(port, int):
+            raise TypeError('port must be an integer')
+        if not 1024 <= port <= 65535:
+            raise ValueError('port must be between 1024 and 65535')
+        if not isinstance(www_tag, str) or not www_tag:
+            raise ValueError('www_tag must be a non-empty string')
+
         self.busclient = BusClient(bus_ip, bus_port, tag_info,
                                    module='WWW Server')
         self.ip = ip
         self.port = port
         self.get_path = get_path
-        self.serve_path = Path(serve_path)
+        self.serve_path = Path(serve_path) if serve_path else None
         for tagname, tag in tag_info.items():
             tag_for_web(tagname, tag)
         self.tag_info = tag_info
         self.pages = pages
+        self.webclient = webclient
         self.interface = Interface(www_tag)
 
     async def redirect_handler(self, _request: web.Request):
@@ -256,14 +289,14 @@ class WwwServer:
     async def path_handler(self, request: web.Request):
         """Plain files."""
         logging.info(f"path {request.match_info['path']}")
+        if self.serve_path is None:
+            return web.HTTPForbidden(reason='path not configured')
         path = self.serve_path.joinpath(request.match_info['path'])
         if path.is_dir():
             return web.HTTPForbidden(reason='folder not permitted')
         if not path.exists():
             return web.HTTPNotFound(reason='no such file in path')
         return web.FileResponse(path)
-        # logging.warning(f"path not configured {request.match_info['path']}")
-        # return web.HTTPForbidden(reason='path not permitted')
 
     async def websocket_handler(self, request: web.Request):
         """Wait for connections. Create a new one each time."""
@@ -272,7 +305,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).connection_active()
+                        self.interface, self.webclient).connection_active()
         await ws.close()
         logging.info(f"WS closed {peer}")
         return ws

{pymscada-0.1.11b10.dist-info → pymscada-0.2.0rc2.dist-info}/METADATA

@@ -1,25 +1,26 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.11b10
+Version: 0.2.0rc2
 Summary: Shared tag value SCADA with python backup and Angular UI
-Author-Email: Jamie Walton <jamie@walton.net.nz>
+Author-email: Jamie Walton <jamie@walton.net.nz>
 License: GPL-3.0-or-later
+Project-URL: Homepage, https://github.com/jamie0walton/pymscada
+Project-URL: Bug Tracker, https://github.com/jamie0walton/pymscada/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: JavaScript
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Console
 Classifier: Development Status :: 1 - Planning
-Project-URL: Homepage, https://github.com/jamie0walton/pymscada
-Project-URL: Bug Tracker, https://github.com/jamie0walton/pymscada/issues
 Requires-Python: >=3.9
+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.1.10b5
+Requires-Dist: pymscada-html==0.2.0rc2
 Requires-Dist: cerberus>=1.3.5
 Requires-Dist: pycomm3>=1.2.14
 Requires-Dist: pysnmplib>=5.0.24
-Description-Content-Type: text/markdown
 
 # pymscada
 #### [Docs](https://github.com/jamie0walton/pymscada/blob/main/docs/README.md)

{pymscada-0.1.11b10.dist-info → pymscada-0.2.0rc2.dist-info}/RECORD

@@ -1,14 +1,22 @@
-pymscada-0.1.11b10.dist-info/METADATA,sha256=eBGZjmCSP1HPBnfBlpacMN1Q2VdGFm0_52G2FU-TlLg,2350
-pymscada-0.1.11b10.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-pymscada-0.1.11b10.dist-info/entry_points.txt,sha256=j_UgZmqFhNquuFC2M8g5-8X9FCpp2RaDb7NrExzkj1c,72
-pymscada-0.1.11b10.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=eD4Fz4Sv4EIu2vney_d0jAryiCk5eoH5NQA-dAZRTqA,12029
-pymscada/checkout.py,sha256=1Al29nVqCebupYvMgcY5boz772PtsVp1MVbYaQajV5Q,3373
+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=b4gm7cuhYKGFNtHoxygWkrqiN42mU8DM4KUi-Q74M4U,8793
+pymscada/console.py,sha256=zM6TNXJY8ROcVzO3UBzi1qDSiit7mfLr2YprRoxv2oQ,8824
+pymscada/files.py,sha256=iouEOPfEkVI0Qbbf1p-L324Y04zSrynVypLW0-1MThA,2499
+pymscada/history.py,sha256=qXbCkHQC_j7HF9b1PvnF93d4HvW9ODJeSc9tvy63o10,11513
+pymscada/main.py,sha256=d6EnK4-tEcvM5AqMHYhvqlnSh-E_wd0Tuxk-kXYSiDw,1854
+pymscada/misc.py,sha256=0Cj6OFhQonyhyk9x0BG5MiS-6EPk_w6zvavt8o_Hlf0,622
+pymscada/module_config.py,sha256=3-15qhCLsi_xR4i0cy2XZ74w5n0ZcqW2nPcX_Qtc6fU,8720
+pymscada/opnotes.py,sha256=vHJYPlPJLLsUHPbh4eBOUUnEnj9oXrrStb9Jzz-m524,7736
+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=GINy8gE1TPLFnuJLVVSui4Ke3IQlOGRy6_ePAlGlvj4,10683
+pymscada/validate.py,sha256=fPMlP6RscYuTIgdEJjJ0ZZI0OyVSat1lpqg254wqpdE,13140
+pymscada/www_server.py,sha256=rz6Yictg_Ony8zW76An5bv_cZN5aLi-QW3B85uWMgXQ,13152
 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
@@ -19,17 +27,17 @@ 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=eFaRc7JxkEwRswCtmJiypsfR5xgQR-R-UtwvfwDHw-w,430
+pymscada/demo/openweather.yaml,sha256=n8aPc_Ar6uiM-XbrEbBydABxFYm2uv_49dGo8u7DI8Q,433
 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
 pymscada/demo/pymscada-files.service,sha256=iLOfbl4SCxAwYHT20XCGHU0BJsUVicNHjHzKS8xIdgA,326
 pymscada/demo/pymscada-history.service,sha256=61c5RqOmJ13Dl1yyRfsChKOdXp2W-xfYyCOYoJHLkh8,386
-pymscada/demo/pymscada-io-accuweather.service,sha256=M_dnPYwmvTpYGF5AbMStbYL6VCWgOFR50nRRpfqvpBo,358
 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-openweather.service,sha256=SQnZ-cq1V3qvZY7EgR_Vx36vCOw1ipfGoLoutHsxtNk,359
 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
@@ -37,8 +45,7 @@ pymscada/demo/pymscada-wwwserver.service,sha256=7Qy2wsMmFEsQn-b5mgAcsrAQZgXynkv8
 pymscada/demo/snmpclient.yaml,sha256=z8iACrFvMftYUtqGrRjPZYZTpn7aOXI-Kp675NAM8cU,2013
 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/demo/__pycache__/__init__.cpython-311.pyc,sha256=tpxZoW429YA-2mbwzOlhBmbSTcbvTJqgKCfDRMrhEJE,195
 pymscada/iodrivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymscada/iodrivers/accuweather.py,sha256=p_OYJtCrtbSQYjgf06Yk3Qc9wGpkx8ogn81XNGd19fE,3842
 pymscada/iodrivers/logix_client.py,sha256=eqmiYLYUBHbr7wTljomGIZVNvXe-5WleGKfzwcHXO8w,2829
@@ -46,24 +53,20 @@ 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=w_OSL5UG30IBTuaR6Exmao7XJae_hKo1JM04XT8Ke7M,5580
+pymscada/iodrivers/openweather.py,sha256=IVzmaEjdwm1NDhsOYpEV5vzB8HFaQEpWsnm6fhpsPCQ,8926
 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
 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=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
 pymscada/pdf/two.pdf,sha256=TAuW5yLU1_wfmTH_I5ezHwY0pxhCVuZh3ixu0kwmJwE,1516
-pymscada/periodic.py,sha256=MLlL93VLvFqBBgjO1Us1t0aLHTZ5BFdW0B__G02T1nQ,1235
-pymscada/protocol_constants.py,sha256=ooGmBM7WGWWdN10FObdjzcYieK8WN7Zy6qVxtD93LMk,1963
-pymscada/samplers.py,sha256=t0IscgsCm5YByioOZ6aOKMO_guDFS_wxnJSiOGKI4Nw,2583
-pymscada/tag.py,sha256=Oxh70q2MrPAEI94v4QsWt4gD8QP6BlfzNv9xXeeUFys,10103
+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/validate.py,sha256=fPMlP6RscYuTIgdEJjJ0ZZI0OyVSat1lpqg254wqpdE,13140
-pymscada/www_server.py,sha256=rV1Vsk3J1wBhFMBCnK33SziNuTGgVwNc5zLjQQFxJ-s,12021
-pymscada-0.1.11b10.dist-info/RECORD,,
+pymscada-0.2.0rc2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.2.0rc2.dist-info/METADATA,sha256=LQXKkPOljU9yFJccl7DrUoLjz1MsGWTnirZ-w8Xaj-U,2371
+pymscada-0.2.0rc2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pymscada-0.2.0rc2.dist-info/entry_points.txt,sha256=2UJBi8jrqujnerrcXcq4F8GHJYVDt26sacXl94t3sd8,56
+pymscada-0.2.0rc2.dist-info/top_level.txt,sha256=LxIB-zrtgObJg0fgdGZXBkmNKLDYHfaH1Hw2YP2ZMms,9
+pymscada-0.2.0rc2.dist-info/RECORD,,

{pymscada-0.1.11b10.dist-info → pymscada-0.2.0rc2.dist-info}/WHEEL

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

{pymscada-0.1.11b10.dist-info → pymscada-0.2.0rc2.dist-info}/entry_points.txt

@@ -1,5 +1,2 @@
 [console_scripts]
 pymscada = pymscada.__main__:cmd_line
-
-[gui_scripts]
-

pymscada-0.2.0rc2.dist-info/top_level.txt

@@ -0,0 +1 @@
+pymscada