pymscada 0.2.0rc8__py3-none-any.whl → 0.2.2__py3-none-any.whl

pymscada/tools/get_history.py

@@ -0,0 +1,147 @@
+"""Extract history data to CSV files.
+
+This tool lists available history tags and extracts their values to CSV files.
+It handles repeating time values as shown in the test_history.py script.
+"""
+import argparse
+import csv
+import logging
+import sys
+from pathlib import Path
+from struct import unpack_from
+from typing import Any, Optional
+
+from pymscada.config import Config
+from pymscada.history import TagHistory, ITEM_SIZE
+
+
+def list_history_tags(config_path: str) -> list[str]:
+    """List all available history tags from the config path."""
+    config = Config(config_path)
+    history_path = Path(config['path'])
+    if not history_path.exists():
+        logging.error(f'History path {history_path} does not exist')
+        return []
+    tag_names = set()
+    for file_path in history_path.glob('*_*.dat'):
+        parts = file_path.stem.split('_')
+        if len(parts) >= 2 and parts[-1].isdigit():
+            tag_name = '_'.join(parts[:-1])
+            tag_names.add(tag_name)
+    return list(tag_names)
+
+
+def get_tag_type(tag_name: str, tags_config_path: str) -> Optional[type]:
+    """Get the type of a tag from the tags configuration."""
+    try:
+        tags_config = Config(tags_config_path)
+        if tag_name in tags_config:
+            tag_info = tags_config[tag_name]
+            if 'type' in tag_info:
+                tag_type = tag_info['type']
+                if tag_type == 'int':
+                    return int
+                elif tag_type == 'float':
+                    return float
+                else:
+                    return str
+            else:
+                return float  # Default to float
+    except Exception as e:
+        logging.warning(f'Could not determine type for {tag_name}: {e}')
+
+
+def extract_tag_history(
+        tag_name: str,
+        config_path: str,
+        tags_config_path: str,
+        output_file: Optional[str] = None
+    ) -> list[tuple[int, Any]]:
+    """Extract history data for a specific tag."""
+    config = Config(config_path)
+    history_path = Path(config['path'])
+    if not history_path.exists():
+        logging.error(f'History path {history_path} does not exist')
+        return []
+    tag_type = get_tag_type(tag_name, tags_config_path)
+    if tag_type is None:
+        logging.error(f'Could not determine type for tag {tag_name}')
+        return []
+    tag_history = TagHistory(tag_name, tag_type, str(history_path))
+    data_bytes = tag_history.read_bytes()
+    records = []
+    for i in range(0, len(data_bytes), ITEM_SIZE):
+        if i + ITEM_SIZE <= len(data_bytes):
+            time_us, value = unpack_from(tag_history.packstr, data_bytes, offset=i)
+            records.append((time_us // 1000000, value))
+    if output_file:
+        with open(output_file, 'w', newline='') as csvfile:
+            writer = csv.writer(csvfile)
+            writer.writerow(['timestamp_us', 'value'])
+            prev_time = 0
+            buffer = []
+            last_buffer = []
+            for time_us, value in records:
+                if time_us < prev_time:
+                    if buffer != last_buffer:
+                        writer.writerow(buffer)
+                    last_buffer = buffer.copy()
+                    buffer = [time_us, value]
+                else:
+                    buffer.extend((time_us, value))
+                prev_time = time_us
+            if buffer:
+                writer.writerow(buffer)
+            logging.info(f'Extracted {len(records)} records to {output_file}')
+    return records
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(
+        description='Extract history data to CSV files',
+        epilog='Example: python get_history.py --config history.yaml --tags tags.yaml --list'
+    )
+    parser.add_argument('--config', required=True,
+                        help='History configuration file')
+    parser.add_argument('--tags', required=True,
+                        help='Tags configuration file')
+    parser.add_argument('--list', action='store_true',
+                        help='List available history tags')
+    parser.add_argument('--tag',
+                        help='Extract specific tag to CSV')
+    parser.add_argument('--output',
+                        help='Output CSV file (default: <tag>.csv)')
+    parser.add_argument('--verbose', action='store_true',
+                        help='Verbose logging')
+    args = parser.parse_args()
+    level = logging.INFO if args.verbose else logging.WARNING
+    logging.basicConfig(level=level, format='%(levelname)s: %(message)s')
+    if args.list:
+        tags = list_history_tags(args.config)
+        if tags:
+            print('Available history tags:')
+            for tag in tags:
+                print(f'  {tag}')
+        else:
+            print('No history tags found')
+            sys.exit(1)
+    elif args.tag:
+        if not args.output:
+            args.output = f'{args.tag}.csv'
+        records = extract_tag_history(args.tag, args.config, args.tags,
+                                      args.output)
+        if records:
+            print(f'Extracted {len(records)} records for tag "{args.tag}"')
+            print(f'Times: {records[0][0]} to {records[-1][0]}')
+            print(f'Output file: {args.output}')
+        else:
+            print(f'No data found for tag "{args.tag}"')
+            sys.exit(1)
+    else:
+        parser.print_help()
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()

pymscada/www_server.py

@@ -151,7 +151,7 @@ class WSHandler():
                 }
             }))
         elif tag.type is dict:
-            if '__rta_id__' in tag.value:
+            if '__rta_id__' in tag.value and tag.value['__rta_id__'] != 0:
                 if tag.value['__rta_id__'] != self.rta_id:
                     return
             self.queue.put_nowait((False, {

{pymscada-0.2.0rc8.dist-info → pymscada-0.2.2.dist-info}/METADATA

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

{pymscada-0.2.0rc8.dist-info → pymscada-0.2.2.dist-info}/RECORD

@@ -1,41 +1,42 @@
-pymscada/__init__.py,sha256=NV_cIIwe66Ugp8ns426rtfJIIyskWbqwImD9p_5p0bQ,739
+pymscada/__init__.py,sha256=dtn2kaj1q9cYaldrian16dWbvl17mus8-nz2WnWfdyc,882
 pymscada/__main__.py,sha256=WcyVlrYOoDdktJhOoyubTOycMwpayksFdxwelRU5xpQ,272
-pymscada/alarms.py,sha256=eo-9-DSwV825ihuHApaYkADPpLouKbNLHyh0z4bdPoU,12936
+pymscada/alarms.py,sha256=W-SsltXGZn-uZT-iFdOlLVdlp2j3SkhJYlQcueWoEQs,13055
 pymscada/bus_client.py,sha256=eRGvHQ4sFM_n3rKvKDWZQJPQJqvKMWvxbH3MjtT2WBo,9131
 pymscada/bus_server.py,sha256=k7ht2SAr24Oab0hBOPeW4NRDF_RK-F46iE0cMzh7K4w,12323
-pymscada/callout.py,sha256=o_GCB-3IFG-QIcHfrmW-N9CTTlsIu9nMLC-F1jQu1hQ,7274
+pymscada/callout.py,sha256=hHSkUE0pJjlyexJI52H_lbZjfud4QFzbIdlNyv6VtWs,9848
 pymscada/checkout.py,sha256=RLuCMTEuUI7pp1hIRAUPbo8xYFta8TjArelx0SD4gOY,3897
-pymscada/config.py,sha256=vwGxieaJBYXiHNQEOYVDFaPuGmnUlCnbNm_W9bugKlc,1851
+pymscada/config.py,sha256=yRENJPGDPLNPOn4zSCE576UO0QWx2Q0VDsaLDEehRmU,2539
 pymscada/console.py,sha256=EEsJLCvn8AFimN8qGNilX0ks6t3OFcGW5nw6OVAXfac,8850
 pymscada/files.py,sha256=iouEOPfEkVI0Qbbf1p-L324Y04zSrynVypLW0-1MThA,2499
-pymscada/history.py,sha256=7UEOeMnlSMv0LoWTqLWx7QwOW1FZZ4wAvzH6v6b0_vI,11592
+pymscada/history.py,sha256=q5hKNTcvLLl_o4FWHily-d1bKZq6j_kqtuONzRDPZCQ,11563
 pymscada/main.py,sha256=d6EnK4-tEcvM5AqMHYhvqlnSh-E_wd0Tuxk-kXYSiDw,1854
 pymscada/misc.py,sha256=0Cj6OFhQonyhyk9x0BG5MiS-6EPk_w6zvavt8o_Hlf0,622
-pymscada/module_config.py,sha256=K-ZBO-2rZTdlDbVkeQ3_4uI75EUxVMmanVzDuuDNsao,9564
-pymscada/opnotes.py,sha256=MKM51IrB93B2-kgoTzlpOLpaMYs-7rPQHWmRLME-hQQ,7952
+pymscada/module_config.py,sha256=QfLI6aOB1H5Xo6P_qaaLUKdOzXSfNBXtdHo1dFelCkA,9999
+pymscada/opnotes.py,sha256=cDqsbsT5JTTxQWPlai9EvXgJJwi1oex14URGqdtmDq8,8066
 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=hTRxogw8BXAi1OJpM1Lhx4KKMqZ53y7D5KcCycO7fRQ,9471
-pymscada/validate.py,sha256=fPMlP6RscYuTIgdEJjJ0ZZI0OyVSat1lpqg254wqpdE,13140
-pymscada/www_server.py,sha256=NfvX9jbVWY2qxWM6TfWUcwsCY7lR-dkty1nCOXyoWTA,13747
+pymscada/www_server.py,sha256=WeLGRhseXVTns5PKlA0w--byatxpEQ4PcE60qMghLuM,13780
 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
 pymscada/demo/alarms.yaml,sha256=Ea8tLZ0aEiyKM_m5MN1TF6xS-lI5ReXiz2oUPO8GvmQ,110
 pymscada/demo/bus.yaml,sha256=zde5JDo2Yv5s7NvJ569gAEoTDvsvgBwRPxfrYhsxj3w,26
-pymscada/demo/callout.yaml,sha256=ze2UfAymU05lzVp-t8wSa9hYJMGSkhT4FwL4rVJQG4o,270
+pymscada/demo/callout.yaml,sha256=WwrdY-d7k7RxCyI6oatEgP9hDY8MoSoHgmIeYASC6SM,464
 pymscada/demo/files.yaml,sha256=XWtmGDJxtD4qdl2h7miUfJYkDKsvwNTgQjlGpR6LQNs,163
 pymscada/demo/history.yaml,sha256=c0OuYe8LbTeZqJGU2WKGgTEkOA0IYAjO3e046ddQB8E,55
 pymscada/demo/logixclient.yaml,sha256=G_NlJhBYwT1a9ceHDgO6fCNKFmBM2pVO_t9Xa1NqlRY,912
 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=n8aPc_Ar6uiM-XbrEbBydABxFYm2uv_49dGo8u7DI8Q,433
+pymscada/demo/openweather.yaml,sha256=_xHb3xmf8e2BfNvwupxacXNNKLAlV5HaaMg3wuK3Za4,440
 pymscada/demo/opnotes.yaml,sha256=gdT8DKaAV4F6u9trLCPyBgf449wYaP_FF8GCbjXm9-k,105
+pymscada/demo/piapi.yaml,sha256=1Rpwx7fD-uhA8IgMuKAX6Pxc5Ma-hosMiR9F4JSq3vs,320
 pymscada/demo/ping.yaml,sha256=fm3eUdR2BwnPI_lU_V07qgmDxjSoPP6lPazYB6ZgpVg,149
 pymscada/demo/pymscada-alarms.service,sha256=nHjEMsonat-3ny0QJoY6KTZoPIt2HZiarKgW5uasY8k,383
 pymscada/demo/pymscada-bus.service,sha256=F3ViriRXyMKdCY3tHa3wXAnv2Fo2_16-EScTLsYnSOA,261
+pymscada/demo/pymscada-callout.service,sha256=XpG20TVofjEuoRnBxH1f5DQEBdGbj2tORs60IjiuQw4,386
 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
@@ -43,15 +44,18 @@ pymscada/demo/pymscada-io-logixclient.service,sha256=mn4UzkiOfYqHvgfTFSkUeoPFQQX
 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-piapi.service,sha256=82-azz0JBAHnv8nGwJx545Nj13rwsa62c4-ntbjbzw0,343
 pymscada/demo/pymscada-io-ping.service,sha256=Fm8qR4IVq0NupEvHLGONXGwjjQsx5VqaBYPewhg7-k4,329
+pymscada/demo/pymscada-io-sms.service,sha256=QKa7DEEmxhJWR2EuTIfQeqR4conMeeZS37oZGSWhbO8,460
 pymscada/demo/pymscada-io-snmpclient.service,sha256=Rsm8uiwnoGx-1MkXqYgtj4UP9-r7AEEeB9yoR0y0oVA,343
 pymscada/demo/pymscada-io-witsapi.service,sha256=ZjNwUnZg7WZsCaBFk8aNibnCbwqtbhl1i9D8tdUGXiQ,343
 pymscada/demo/pymscada-opnotes.service,sha256=TlrTRgP3rzrlXT8isAGT_Wy38ScDjT1VvnlgW84XiS8,354
 pymscada/demo/pymscada-wwwserver.service,sha256=7Qy2wsMmFEsQn-b5mgAcsrAQZgXynkv8SpHD6hLvRGc,370
+pymscada/demo/sms.yaml,sha256=nvY2d95NLWByHF2uy4STQbq4jwcZdX_q8m2FzO7CaQU,238
 pymscada/demo/snmpclient.yaml,sha256=z8iACrFvMftYUtqGrRjPZYZTpn7aOXI-Kp675NAM8cU,2013
-pymscada/demo/tags.yaml,sha256=1HH9SqevBE0P0NXHK0Slfu68gwx5iKpgyirClmAcXGY,2814
-pymscada/demo/witsapi.yaml,sha256=B8F136jvLIYU8t-pOdsEU_j97qMo3RgGQ1Rs4ExhmeE,289
-pymscada/demo/wwwserver.yaml,sha256=mmwvSLUXUDCIPaHeCJdCETAp9Cc4wb5CuK_aGv01KWk,2759
+pymscada/demo/tags.yaml,sha256=DZrMDyHVlS-zuiI_eaeSMrLl5Cz9AMMtYs5oEd7B7nE,2845
+pymscada/demo/witsapi.yaml,sha256=6nWboDmHLJOqPzZWkLoI0cCxXWxijqdH6CBy4ZnLiE4,303
+pymscada/demo/wwwserver.yaml,sha256=SBEKh5YPLO5DqTvI7xUcHn8tHwtdNkPAeFSX6ZFVI-I,3119
 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
@@ -61,21 +65,24 @@ pymscada/iodrivers/modbus_client.py,sha256=DIGrEPz_Bwwj9CEeog5fQqiAu1UMV7xVL6Kxl
 pymscada/iodrivers/modbus_map.py,sha256=af2J3CGSeYQ4mSy8rNsERp9z7fRgRUYk3it5Mrc_IQA,7255
 pymscada/iodrivers/modbus_server.py,sha256=VqvjOJ4-LOVaD1jOK22raXhrCshJEaWlMxLvn5xMnFc,6570
 pymscada/iodrivers/openweather.py,sha256=IVzmaEjdwm1NDhsOYpEV5vzB8HFaQEpWsnm6fhpsPCQ,8926
+pymscada/iodrivers/piapi.py,sha256=00f9gcPM6OXSldbPvBFqMk4Lt2fyPCvNUpNodVCWXhc,4933
 pymscada/iodrivers/ping_client.py,sha256=UOQgUfoIcYqy5VvKyJ8XGHHjeSRTfjmrhyWEojhIZQk,4188
 pymscada/iodrivers/ping_map.py,sha256=EbOteqfEYKIOMqPymROJ4now2If-ekEj6jnM5hthoSA,1403
+pymscada/iodrivers/sms.py,sha256=ltBZ1uz6-KBxomhtTP3I_YT5-n9s0DCSBUmBONL3HNQ,8309
 pymscada/iodrivers/snmp_client.py,sha256=66-IDzddeKcSnqOzNXIZ8wuuAqhIxZjyLNrDwDvHCvw,2708
 pymscada/iodrivers/snmp_map.py,sha256=sDdIR5ZPAETpozDfBt_XQiZ-f4t99UCPlzj7BxFxQyM,2369
-pymscada/iodrivers/witsapi.py,sha256=Ga6JpEQRUciT_LxWW36LsVGkUeWjModtzPoWYIzyzHs,8381
+pymscada/iodrivers/witsapi.py,sha256=soclRYQLVZpNGmxPQgxDa3xORF67p6DwGFYDaSNkRoU,7995
 pymscada/iodrivers/witsapi_POC.py,sha256=dQcR2k1wsLb_cnNqvAB4kJ7FdY0BlcnxiMoepr28Ars,10132
 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/pdf/__pycache__/__init__.cpython-311.pyc,sha256=4KTfXrV9bGDbTIEv-zgIj_LvzLbVTj77lEC1wzMh9e0,194
+pymscada/tools/get_history.py,sha256=LfUB7i0qne4lE0lk-bWRmK1B0xpex-AfIOh2paxSDCk,5409
 pymscada/tools/snmp_client2.py,sha256=pdn5dYyEv4q-ubA0zQ8X-3tQDYxGC7f7Xexa7QPaL40,1675
 pymscada/tools/walk.py,sha256=OgpprUbKLhEWMvJGfU1ckUt_PFEpwZVOD8HucCgzmOc,1625
-pymscada-0.2.0rc8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymscada-0.2.0rc8.dist-info/METADATA,sha256=vL-9rZ1w6VfZfJe6AHLdxIzQmu5ncN9q10k-GE1DfVE,2393
-pymscada-0.2.0rc8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymscada-0.2.0rc8.dist-info/entry_points.txt,sha256=2UJBi8jrqujnerrcXcq4F8GHJYVDt26sacXl94t3sd8,56
-pymscada-0.2.0rc8.dist-info/top_level.txt,sha256=LxIB-zrtgObJg0fgdGZXBkmNKLDYHfaH1Hw2YP2ZMms,9
-pymscada-0.2.0rc8.dist-info/RECORD,,
+pymscada-0.2.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.2.2.dist-info/METADATA,sha256=yO9K8mwxTWL8Qpl-QckvC4s3A8XrVN974YmspyFQKoE,2387
+pymscada-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymscada-0.2.2.dist-info/entry_points.txt,sha256=2UJBi8jrqujnerrcXcq4F8GHJYVDt26sacXl94t3sd8,56
+pymscada-0.2.2.dist-info/top_level.txt,sha256=LxIB-zrtgObJg0fgdGZXBkmNKLDYHfaH1Hw2YP2ZMms,9
+pymscada-0.2.2.dist-info/RECORD,,