pymscada 0.1.2__tar.gz → 0.1.4__tar.gz

pymscada-0.1.4/PKG-INFO

@@ -0,0 +1,59 @@
+Metadata-Version: 2.1
+Name: pymscada
+Version: 0.1.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
+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
+Requires-Python: >=3.9
+Requires-Dist: PyYAML>=6.0.1
+Requires-Dist: aiohttp>=3.8.5
+Requires-Dist: pymscada-html==0.1.0
+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)
+
+#### [@Github](https://github.com/jamie0walton/pymscada/blob/main/README.md)
+
+<span style='color:aqua'>WIP: Presently updating documentation and deployment.</span>
+
+## Python Mobile SCADA
+
+```pymscada``` read / write to Modbus and Logix PLCs. Read SNMP OIDs.
+Collect history values and provide the ability to set values and trends
+and issue commands.
+
+User interface is via a web client embedded in this package. Examples included
+for securing with Apache as a proxy.
+
+Configuration with text yaml files, including the web page which are
+procedurally built.
+
+# See also
+
+- The angular project [angmscada](https://github.com/jamie0walton/angmscada)
+- Python container for the compiled angular pages [pymscada-html](https://github.com/jamie0walton/pymscada-html)
+
+# Licence
+
+```pymscada``` is distributed under the GPLv3 [license](./LICENSE).
+
+# Running
+
+While many parts of ```pymscada``` will run in windows, this is not intentional.
+
+Running a useful subset requires quite a lot of steps, you have to choose the services
+you want and providing meaningful configuation. ```pymscada checkout``` will create
+templates of all of these for you that allows
+[Debian Quickstart](./docs/debian_quickstart.md) to get you to a working web page,
+however to connect to a PLC, trend data, read data and write setpoints, requires
+knowledge of typical SCADA and PLC functionality.

pymscada-0.1.4/README.md

@@ -0,0 +1,38 @@
+# pymscada
+#### [Docs](https://github.com/jamie0walton/pymscada/blob/main/docs/README.md)
+
+#### [@Github](https://github.com/jamie0walton/pymscada/blob/main/README.md)
+
+<span style='color:aqua'>WIP: Presently updating documentation and deployment.</span>
+
+## Python Mobile SCADA
+
+```pymscada``` read / write to Modbus and Logix PLCs. Read SNMP OIDs.
+Collect history values and provide the ability to set values and trends
+and issue commands.
+
+User interface is via a web client embedded in this package. Examples included
+for securing with Apache as a proxy.
+
+Configuration with text yaml files, including the web page which are
+procedurally built.
+
+# See also
+
+- The angular project [angmscada](https://github.com/jamie0walton/angmscada)
+- Python container for the compiled angular pages [pymscada-html](https://github.com/jamie0walton/pymscada-html)
+
+# Licence
+
+```pymscada``` is distributed under the GPLv3 [license](./LICENSE).
+
+# Running
+
+While many parts of ```pymscada``` will run in windows, this is not intentional.
+
+Running a useful subset requires quite a lot of steps, you have to choose the services
+you want and providing meaningful configuation. ```pymscada checkout``` will create
+templates of all of these for you that allows
+[Debian Quickstart](./docs/debian_quickstart.md) to get you to a working web page,
+however to connect to a PLC, trend data, read data and write setpoints, requires
+knowledge of typical SCADA and PLC functionality.

{pymscada-0.1.2 → pymscada-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.1.2"
+version = "0.1.4"
 description = "Shared tag value SCADA with python backup and Angular UI"
 authors = [
     { name = "Jamie Walton", email = "jamie@walton.net.nz" },

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/checkout.py

@@ -1,5 +1,6 @@
 """Create base config folder and check out demo files."""
 import difflib
+import getpass
 from pathlib import Path
 import sys
 from pymscada.config import get_demo_files, get_pdf_files
@@ -8,16 +9,19 @@ from pymscada.config import get_demo_files, get_pdf_files
 PATH = {
     '__PYTHON__': Path(f'{sys.exec_prefix}/bin/python').absolute(),
     '__PYMSCADA__': Path(sys.argv[0]).absolute(),
-    '__DIR__': Path('.').absolute()
+    '__DIR__': Path('.').absolute(),
+    '__HOME__': Path.home().absolute(),
+    '__USER__': getpass.getuser()
 }
 if sys.platform == "win32":
     PATH = {
         '__PYTHON__': Path(f'{sys.exec_prefix}/python.exe').absolute(),
         '__PYMSCADA__': Path(sys.argv[0]).absolute(),
-        '__DIR__': Path('.').absolute()
+        '__DIR__': Path('.').absolute(),
+        '__HOME__': Path.home(),
+        '__USER__': getpass.getuser()
     }
 
-
 def make_history():
     """Make the history folder if missing."""
     history_dir = PATH['__DIR__'].joinpath('history')
@@ -56,8 +60,7 @@ def make_config(overwrite: bool):
         if str(target).endswith('service'):
             rd_bytes = config_file.read_bytes()
             for k, v in PATH.items():
-                rd_bytes = rd_bytes.replace(k.encode(),
-                                            str(v.absolute()).encode())
+                rd_bytes = rd_bytes.replace(k.encode(),str(v).encode())
             target.write_bytes(rd_bytes)
         else:
             target.write_bytes(config_file.read_bytes())
@@ -68,7 +71,7 @@ def read_with_subst(file: Path):
     rd = file.read_bytes().decode()
     if str(file).endswith('service'):
         for k, v in PATH.items():
-            rd = rd.replace(k, str(v.absolute()))
+            rd = rd.replace(k, str(v))
     lines = rd.splitlines()
     return lines
 
@@ -94,7 +97,7 @@ def compare_config():
 
 def checkout(overwrite=False, diff=False):
     """Do it."""
-    for name in PATH:
+    for name in ['__PYTHON__', '__PYMSCADA__', '__DIR__', '__HOME__']:
         if not PATH[name].exists():
             raise SystemExit(f'{PATH[name]} is missing')
     if diff:

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/console.py

@@ -8,7 +8,7 @@ try:
     import termios
     import tty
 except ModuleNotFoundError:
-    logging.warning("no termios, don't use console")
+    logging.error('console not available')
 
 
 class EC:

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/files.yaml

@@ -1,6 +1,6 @@
 bus_ip: 127.0.0.1
 bus_port: 1324
-path: /home/mscada/pymscada
+path: __HOME__/pymscada
 files:
 - path: pdf/one.pdf
   desc: PDF

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/history.yaml

@@ -1,3 +1,3 @@
 bus_ip: 127.0.0.1
 bus_port: 1324
-path: history
+path: __HOME__/history

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/opnotes.yaml

@@ -1,5 +1,5 @@
 bus_ip: 127.0.0.1
 bus_port: 1324
 rta_tag: __opnotes__
-db: /home/mscada/pymscada/pymscada.sqlite
+db: __HOME__/pymscada/pymscada.sqlite
 table: opnotes

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-bus.service

@@ -6,8 +6,8 @@
     ExecStart=__PYMSCADA__ bus --config __DIR__/config/bus.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-demo-modbus_plc.service

@@ -8,8 +8,8 @@
     ExecStart=__PYTHON__ __DIR__/config/modbus_plc.py
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-files.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ files --config __DIR__/config/files.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-history.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ history --config __DIR__/config/history.yaml --tags __DIR__/config/tags.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
     KillSignal=SIGINT
 
 [Install]

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-io-logixclient.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ logixclient --config __DIR__/config/logixclient.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-io-modbusclient.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ modbusclient --config __DIR__/config/modbusclient.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-io-modbusserver.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ modbusserver --config __DIR__/config/modbusserver.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-io-ping.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ ping --config __DIR__/config/ping.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-io-snmpclient.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ snmpclient --config __DIR__/config/snmpclient.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-opnotes.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ opnotes --config __DIR__/config/opnotes.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
     KillSignal=SIGINT
 
 [Install]

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/pymscada-wwwserver.service

@@ -8,8 +8,8 @@
     ExecStart=__PYMSCADA__ wwwserver --config __DIR__/config/wwwserver.yaml --tags __DIR__/config/tags.yaml
     Restart=always
     RestartSec=5
-    User=mscada
-    Group=mscada
+    User=__USER__
+    Group=__USER__
 
 [Install]
     WantedBy=multi-user.target

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/demo/wwwserver.yaml

@@ -2,8 +2,8 @@ bus_ip: 127.0.0.1
 bus_port: 1324
 ip: 0.0.0.0
 port: 8324
-get_path: /home/mscada/Documents/angmscada/dist/angmscada
-serve_path: /home/mscada/pymscada
+get_path: __HOME__/angmscada/dist/angmscada
+serve_path: __HOME__/pymscada
 pages:
 - name: Default Main
   parent:
@@ -35,6 +35,12 @@ pages:
       - Four
       - Five
   - {tagname: FloatSelect, type: selectdict, opts: {type: float, dp: 2}}
+- name: Notes
+  parent:
+  items:
+  - type: opnote
+    site: [Site 1, Site 2]
+    by: [B1, B2]
 - name: Trends
   parent: Dropdown
   items:
@@ -81,7 +87,7 @@ pages:
 - name: Files
   parent: Dropdown
   items:
-  - {tagname: __files__, type: files}
+  - type: files
 - name: Temperature
   parent: Weather
   items:

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/iodrivers/snmp_client.py

@@ -1,9 +1,12 @@
 """Poll SNMP OIDs from devices."""
 import logging
-import pysnmp.hlapi.asyncio as snmp
 from pymscada.bus_client import BusClient
 from pymscada.periodic import Periodic
 from pymscada.iodrivers.snmp_map import SnmpMaps
+try:
+    import pysnmp.hlapi.asyncio as snmp
+except ModuleNotFoundError:
+    logging.error('snmp_client not available.')
 
 
 class SnmpClientConnector:

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/opnotes.py

@@ -27,15 +27,16 @@ class OpNotes:
         self.cursor = self.connection.cursor()
         query = (
             'CREATE TABLE IF NOT EXISTS ' + self.table +
-            '(oid INTEGER PRIMARY KEY ASC, '
-            'datetime INTEGER, '
+            '(id INTEGER PRIMARY KEY ASC, '
+            'date_ms INTEGER, '
             'site TEXT, '
-            'operator TEXT, '
+            'by TEXT, '
             'note TEXT)'
         )
         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)
 
     def rta_cb(self, request):
@@ -44,64 +45,78 @@ class OpNotes:
             logging.warning(f'rta_cb malformed {request}')
         elif request['action'] == 'ADD':
             try:
+                logging.info(f'add {request}')
                 with self.connection:
                     self.cursor.execute(
-                        f'INSERT INTO {self.table} (datetime, site, operator, '
-                        'note) VALUES(:datetime, :site, :operator, :note) '
-                        'RETURNING *;',
+                        f'INSERT INTO {self.table} (date_ms, site, by, note) '
+                        'VALUES(:date_ms, :site, :by, :note) RETURNING *;',
                         request)
                     res = self.cursor.fetchone()
                     self.rta.value = {
-                        'oid': res[0],
-                        'datetime': res[1],
+                        'id': res[0],
+                        'date_ms': res[1],
                         'site': res[2],
-                        'operator': res[3],
+                        'by': res[3],
                         'note': res[4]
                     }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'OpNotes rta_cb {error}')
         elif request['action'] == 'MODIFY':
             try:
+                logging.info(f'modify {request}')
                 with self.connection:
                     self.cursor.execute(
-                        f'REPLACE INTO {self.table} VALUES(:oid, :datetime, '
-                        ':site, :operator, :note) RETURNING *;', request)
+                        f'REPLACE INTO {self.table} VALUES(:id, :date_ms, '
+                        ':site, :by, :note) RETURNING *;', request)
                     res = self.cursor.fetchone()
                     self.rta.value = {
-                        'oid': res[0],
-                        'datetime': res[1],
+                        'id': res[0],
+                        'date_ms': res[1],
                         'site': res[2],
-                        'operator': res[3],
+                        'by': res[3],
                         'note': res[4]
                     }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'OpNotes rta_cb {error}')
         elif request['action'] == 'DELETE':
             try:
+                logging.info(f'delete {request}')
                 with self.connection:
                     self.cursor.execute(
-                        f'DELETE FROM {self.table} WHERE oid = :oid;', request)
-                    self.rta.value = {'oid': request['oid']}
+                        f'DELETE FROM {self.table} WHERE id = :id;', request)
+                    self.rta.value = {'id': request['id']}
             except sqlite3.IntegrityError as error:
                 logging.warning(f'OpNotes rta_cb {error}')
         elif request['action'] == 'HISTORY':
-            tag = Tag(request['reply_tag'], dict)
             try:
+                logging.info(f'history {request}')
                 with self.connection:
                     self.cursor.execute(
-                        f'SELECT * FROM {self.table} WHERE datetime < '
-                        ':datetime ORDER BY ABS(datetime - :datetime) '
-                        'LIMIT 2;', request)
+                        f'SELECT * FROM {self.table} WHERE date_ms > :date_ms '
+                        'ORDER BY (date_ms - :date_ms);', request)
                     for res in self.cursor.fetchall():
-                        tag.value = {
-                            'oid': res[0],
-                            'datetime': res[1],
+                        self.rta.value = {
+                            '__rta_id__': request['__rta_id__'],
+                            'id': res[0],
+                            'date_ms': res[1],
                             'site': res[2],
-                            'operator': res[3],
+                            'by': res[3],
                             'note': res[4]
                         }
             except sqlite3.IntegrityError as error:
                 logging.warning(f'OpNotes 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'OpNotes rta_cb {error}')
 
     async def start(self):
         """Async startup."""

{pymscada-0.1.2 → pymscada-0.1.4}/src/pymscada/www_server.py

@@ -31,7 +31,7 @@ class WSHandler():
     This are transitory, lasting for a given web browser client.
     """
 
-    ids = set(range(1, 100))
+    ids = set(range(1, 1000))
 
     def __init__(self, ws: web.WebSocketResponse, pages: dict,
                  tag_info: dict[str, Tag], do_rta, interface: Interface):
@@ -57,8 +57,10 @@ class WSHandler():
             while True:
                 as_bytes, message = await self.queue.get()
                 if as_bytes:
+                    # logging.debug(f'{self.rta_id} as bytes {message}')
                     await self.ws.send_bytes(message)
                 else:
+                    # logging.debug(f'{self.rta_id} as json {message}')
                     await self.ws.send_json(message)
         except asyncio.CancelledError:
             logging.warn(f'{self.rta_id}: send queue error, close '
@@ -103,7 +105,7 @@ class WSHandler():
                 tag.time_us,        # Uint64
                 asbytes             # Char as needed
             )))
-        elif tag.type == bytes:
+        elif tag.type is bytes:
             rta_id = unpack_from('>H', tag.value)[0]
             if rta_id in [0, self.rta_id]:
                 self.queue.put_nowait((True, pack(
@@ -115,7 +117,19 @@ class WSHandler():
                 )))
             else:
                 logging.info(f'{self.rta_id}: {tag.name} bytes mismatch id')
-        elif tag.type in [dict, list]:
+        elif tag.type is list:
+            self.queue.put_nowait((False, {
+                'type': 'tag',
+                'payload': {
+                    'tagid': tag.id,
+                    'time_us': tag.time_us,
+                    'value': tag.value
+                }
+            }))
+        elif tag.type is dict:
+            if '__rta_id__' in tag.value:
+                if tag.value['__rta_id__'] != self.rta_id:
+                    return
             self.queue.put_nowait((False, {
                 'type': 'tag',
                 'payload': {
@@ -174,8 +188,8 @@ class WSHandler():
                         value['_file_data'] = file.data
                     value['__rta_id__'] = self.rta_id
                     self.do_rta(tagname, value)
-                elif action == 'request_to_author':
-                    self.interface.ask(command)
+                # elif action == 'request_to_author':
+                #     self.interface.ask(command)
                 elif action == 'sub':  # pc.CMD_SUB
                     self.do_sub(tagname)
                 elif action == 'get':  # pc.CMD_GET

{pymscada-0.1.2 → pymscada-0.1.4}/tests/test_opnotes.py

@@ -33,24 +33,24 @@ def test_db_and_tag(opnotes_db, opnotes_tag):
     tag = opnotes_tag  # OpNotes sets the tag value for www clients.
     record = {
         'action': 'ADD',
-        'oid': 15,
+        'id': 15,
         'site': 'Aniwhenua',
-        'operator': 'Jamie Walton',
-        'datetime': 1234567890123,
+        'by': 'Jamie Walton',
+        'date': 1234567890123,
         'note': 'Note °±²³😖.'
     }
     db.rta_cb(record)
-    assert tag.value['oid'] == 1
+    assert tag.value['id'] == 1
     assert tag.value['note'] == 'Note °±²³😖.'
-    record['oid'] = tag.value['oid']
+    record['id'] = tag.value['id']
     record['action'] = 'MODIFY'
     record['note'] = 'hi'
     db.rta_cb(record)
-    assert tag.value['oid'] == 1
+    assert tag.value['id'] == 1
     assert tag.value['note'] == 'hi'
     record['action'] = 'DELETE'
     db.rta_cb(record)
-    assert tag.value == {'oid': 1}
+    assert tag.value == {'id': 1}
 
 
 def test_history_queries(opnotes_db, opnotes_tag, reply_tag):
@@ -70,20 +70,20 @@ def test_history_queries(opnotes_db, opnotes_tag, reply_tag):
     o_tag.add_callback(o_cb, 999)
     r_tag.add_callback(r_cb, 999)
     record = {'action': 'ADD',
-              'datetime': 12345,
+              'date': 12345,
               'site': 'Site',
-              'operator': 'Me',
+              'by': 'Me',
               'note': 'hi'}
     for i in range(10):
-        record['datetime'] -= 1
-        db.rta_cb(record)  # oid 1-10
-    assert o_values[9]['oid'] == 10
+        record['date'] -= 1
+        db.rta_cb(record)  # id 1-10
+    assert o_values[9]['id'] == 10
     rq = {'action': 'HISTORY',
-          'datetime': 12345 - 3,
+          'date': 12345 - 3,
           'reply_tag': '__wwwserver__'}
     db.rta_cb(rq)
-    assert r_values[1]['datetime'] == 12340
-    for i in range(1, 11):  # sqlite3 oid counts from 1
-        rq = {'action': 'DELETE', 'oid': i}
+    assert r_values[1]['date'] == 12340
+    for i in range(1, 11):  # sqlite3 id counts from 1
+        rq = {'action': 'DELETE', 'id': i}
         db.rta_cb(rq)
-    o_values[19] == {'oid': 10}
+    o_values[19] == {'id': 10}

pymscada-0.1.2/PKG-INFO

@@ -1,88 +0,0 @@
-Metadata-Version: 2.1
-Name: pymscada
-Version: 0.1.2
-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
-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
-Requires-Python: >=3.9
-Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: aiohttp>=3.8.5
-Requires-Dist: pymscada-html==0.1.0
-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)
-
-#### [@Github](https://github.com/jamie0walton/pymscada/blob/main/README.md)
-
-## Python Mobile SCADA
-
-```pymscada``` read / write to Modbus and Logix PLCs. Read SNMP OIDs.
-Collect history values and provide the ability to set values and trends
-and issue commands.
-
-User interface is via a web client embedded in this package. Examples included
-for securing with Apache as a proxy.
-
-Configuration with text yaml files, including the web page which are
-procedurally built.
-
-# See also
-
-- The angular project [angmscada](https://github.com/jamie0walton/angmscada)
-- Python container for the compiled angular pages [pymscada-html](https://github.com/jamie0walton/pymscada-html)
-
-# Licence
-
-```pymscada``` is distributed under the GPLv3 [license](./LICENSE).
-
-# Use
-Checkout the example files.
-```bash
-mscada@raspberrypi:~/test $ pymscada checkout
-making 'history' folder
-making pdf dir
-making config dir
-Creating  /home/mscada/test/config/modbusclient.yaml
-Creating  /home/mscada/test/config/pymscada-history.service
-Creating  /home/mscada/test/config/wwwserver.yaml
-Creating  /home/mscada/test/config/pymscada-demo-modbus_plc.service
-Creating  /home/mscada/test/config/files.yaml
-Creating  /home/mscada/test/config/pymscada-modbusserver.service
-Creating  /home/mscada/test/config/pymscada-wwwserver.service
-Creating  /home/mscada/test/config/simulate.yaml
-Creating  /home/mscada/test/config/tags.yaml
-Creating  /home/mscada/test/config/history.yaml
-Creating  /home/mscada/test/config/pymscada-files.service
-Creating  /home/mscada/test/config/bus.yaml
-Creating  /home/mscada/test/config/modbusserver.yaml
-Creating  /home/mscada/test/config/modbus_plc.py
-Creating  /home/mscada/test/config/pymscada-modbusclient.service
-Creating  /home/mscada/test/config/pymscada-bus.service
-Creating  /home/mscada/test/config/README.md
-mscada@raspberrypi:~/test $ pymscada validate
-WARNING:root:pymscada 0.1.0 starting
-Config files in ./ valid.
-``` 
-
-Runs on a Raspberry Pi and includes preconfigured systemd files to
-automate running the services. Mostly works on Windows, works better
-on linux.
-
-Modules can be run from the command line, although you need
-a terminal for each running module (better with systemd).
-```bash
-pymscada bus --config bus.yaml
-pymscada wwwserver --config wwwserver.yaml --tags tags.yaml
-pymscada history --config history.yaml --tags tags.yaml
-python weather.py
-```

pymscada-0.1.2/README.md

@@ -1,67 +0,0 @@
-# pymscada
-#### [Docs](https://github.com/jamie0walton/pymscada/blob/main/docs/README.md)
-
-#### [@Github](https://github.com/jamie0walton/pymscada/blob/main/README.md)
-
-## Python Mobile SCADA
-
-```pymscada``` read / write to Modbus and Logix PLCs. Read SNMP OIDs.
-Collect history values and provide the ability to set values and trends
-and issue commands.
-
-User interface is via a web client embedded in this package. Examples included
-for securing with Apache as a proxy.
-
-Configuration with text yaml files, including the web page which are
-procedurally built.
-
-# See also
-
-- The angular project [angmscada](https://github.com/jamie0walton/angmscada)
-- Python container for the compiled angular pages [pymscada-html](https://github.com/jamie0walton/pymscada-html)
-
-# Licence
-
-```pymscada``` is distributed under the GPLv3 [license](./LICENSE).
-
-# Use
-Checkout the example files.
-```bash
-mscada@raspberrypi:~/test $ pymscada checkout
-making 'history' folder
-making pdf dir
-making config dir
-Creating  /home/mscada/test/config/modbusclient.yaml
-Creating  /home/mscada/test/config/pymscada-history.service
-Creating  /home/mscada/test/config/wwwserver.yaml
-Creating  /home/mscada/test/config/pymscada-demo-modbus_plc.service
-Creating  /home/mscada/test/config/files.yaml
-Creating  /home/mscada/test/config/pymscada-modbusserver.service
-Creating  /home/mscada/test/config/pymscada-wwwserver.service
-Creating  /home/mscada/test/config/simulate.yaml
-Creating  /home/mscada/test/config/tags.yaml
-Creating  /home/mscada/test/config/history.yaml
-Creating  /home/mscada/test/config/pymscada-files.service
-Creating  /home/mscada/test/config/bus.yaml
-Creating  /home/mscada/test/config/modbusserver.yaml
-Creating  /home/mscada/test/config/modbus_plc.py
-Creating  /home/mscada/test/config/pymscada-modbusclient.service
-Creating  /home/mscada/test/config/pymscada-bus.service
-Creating  /home/mscada/test/config/README.md
-mscada@raspberrypi:~/test $ pymscada validate
-WARNING:root:pymscada 0.1.0 starting
-Config files in ./ valid.
-``` 
-
-Runs on a Raspberry Pi and includes preconfigured systemd files to
-automate running the services. Mostly works on Windows, works better
-on linux.
-
-Modules can be run from the command line, although you need
-a terminal for each running module (better with systemd).
-```bash
-pymscada bus --config bus.yaml
-pymscada wwwserver --config wwwserver.yaml --tags tags.yaml
-pymscada history --config history.yaml --tags tags.yaml
-python weather.py
-```