diff --git a/AuDaGe.code-workspace b/AuDaGe.code-workspace new file mode 100644 index 0000000..876a149 --- /dev/null +++ b/AuDaGe.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": {} +} \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..9104032 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,30 @@ +[build-system] +requires = ["uv_build >= 0.11.6"] +build-backend = "uv_build" + +[project] +name = "AuDaGe" +version = "0.0.1" +dependencies = [ + "pandas", +] +authors = [ + { name="Joshua Lucas", email="j.lucas@prime-controls.com" }, +] +description = "A small example package" +readme = "readme.md" +requires-python = ">=3.12" +classifiers = [ + "Programming Language :: Python :: 3", + "Operating System :: OS Independent", +] +license = "LicenseRef-Proprietary" +license-files = ["licen[cs]e*"] + +[project.urls] +Homepage = "https://github.com/jlucas-primecontrols/AuDaGe" +Issues = "https://github.com/jlucas-primecontrols/AuDaGe/issues" + +[tool.setuptools.packages.find] +where = ["src"] +# namespaces = false \ No newline at end of file diff --git a/src/AuDaGe/AuDaGe.py b/src/AuDaGe/AuDaGe.py new file mode 100644 index 0000000..e69de29 diff --git a/src/AuDaGe/__init__.py b/src/AuDaGe/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/AuDaGe/formats/__init__.py b/src/AuDaGe/formats/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/AuDaGe/formats/controlexpert/__init__.py b/src/AuDaGe/formats/controlexpert/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/formats/controlexpert/builtins.xsy b/src/AuDaGe/formats/controlexpert/builtins.xsy similarity index 100% rename from formats/controlexpert/builtins.xsy rename to src/AuDaGe/formats/controlexpert/builtins.xsy diff --git a/formats/controlexpert/flatten_datablock.xslt b/src/AuDaGe/formats/controlexpert/flatten_datablock.xslt similarity index 100% rename from formats/controlexpert/flatten_datablock.xslt rename to src/AuDaGe/formats/controlexpert/flatten_datablock.xslt diff --git a/formats/controlexpert/flatten_ddtsource.xslt b/src/AuDaGe/formats/controlexpert/flatten_ddtsource.xslt similarity index 100% rename from formats/controlexpert/flatten_ddtsource.xslt rename to src/AuDaGe/formats/controlexpert/flatten_ddtsource.xslt diff --git a/formats/controlexpert/xsy.py b/src/AuDaGe/formats/controlexpert/xsy.py similarity index 70% rename from formats/controlexpert/xsy.py rename to src/AuDaGe/formats/controlexpert/xsy.py index 0d73dcf..1f2a6cf 100644 --- a/formats/controlexpert/xsy.py +++ b/src/AuDaGe/formats/controlexpert/xsy.py @@ -1,11 +1,13 @@ import os -import pandas as pd import sys +from collections.abc import Sequence -from collections.abc import Iterable -from iec import datatypes, ElementaryVariable, UDT +import pandas as pd from pandas import DataFrame +import AuDaGe +from AuDaGe.iec import datatypes, ElementaryVariable, UDT + class XSY(): """Schneider Electric EcoStruxure Control Expert variable exchange file (XSY). @@ -32,7 +34,7 @@ class XSY(): self, xsy_path: os.path, dir_path: os.path = '', - def_paths: Iterable[os.path] = [], + def_paths: Sequence[os.path] = [], db_ss_path: os.path = 'flatten_datablock.xslt', ddt_ss_path: os.path = 'flatten_ddtsource.xslt', ) -> None: @@ -103,44 +105,44 @@ class XSY(): pass # Run this module as a script to test. -if __name__ == '__main__': - # Argument 1: path to XSY - try: - xsy_path = sys.argv[1] - except: - xsy_path = 'test/hsps.xsy' - # Argument 2: path to dataBlock stylesheet. - try: - db_ss_path = sys.argv[2] - except: - db_ss_path = 'flatten_datablock.xslt' - # Argument 3: path to DDTSource stylesheet. - try: - ddt_ss_path = sys.argv[3] - except: - ddt_ss_path = 'flatten_ddtsource.xslt' - # Argument 4: path to other definition files - try: - def_paths = [sys.argv[3].split(',')] - except: - def_paths = ['builtins.xsy'] - # Argument 5: path to output file. - try: - out_path = sys.argv[5] - except: - out_path = 'test/test' - dir_path: os.path = ('D:/OneDrive - Prime Controls/Repositories' - '/AuDaGe/formats/controlexpert/') - xsy = XSY( - xsy_path, - dir_path, - def_paths = def_paths, - db_ss_path = db_ss_path, - ddt_ss_path = ddt_ss_path, - ) - xsy.read_datablock() - xsy.read_defs() - xsy.expand_datablock() - xsy.datablock.to_csv(out_path + '_db.csv', index=False) - xsy.defs.to_csv(out_path + '_ddt.csv', index=False) +# if __name__ == '__main__': +# # Argument 1: path to XSY +# try: +# xsy_path = sys.argv[1] +# except: +# xsy_path = 'test/hsps.xsy' +# # Argument 2: path to dataBlock stylesheet. +# try: +# db_ss_path = sys.argv[2] +# except: +# db_ss_path = 'flatten_datablock.xslt' +# # Argument 3: path to DDTSource stylesheet. +# try: +# ddt_ss_path = sys.argv[3] +# except: +# ddt_ss_path = 'flatten_ddtsource.xslt' +# # Argument 4: path to other definition files +# try: +# def_paths = [sys.argv[3].split(',')] +# except: +# def_paths = ['builtins.xsy'] +# # Argument 5: path to output file. +# try: +# out_path = sys.argv[5] +# except: +# out_path = 'test/test' +# dir_path: os.path = ('D:/OneDrive - Prime Controls/Repositories' +# '/AuDaGe/formats/controlexpert/') +# xsy = XSY( +# xsy_path, +# dir_path, +# def_paths = def_paths, +# db_ss_path = db_ss_path, +# ddt_ss_path = ddt_ss_path, +# ) +# xsy.read_datablock() +# xsy.read_defs() +# xsy.expand_datablock() +# xsy.datablock.to_csv(out_path + '_db.csv', index=False) +# xsy.defs.to_csv(out_path + '_ddt.csv', index=False) diff --git a/formats/controlexpert/xsy_structure.md b/src/AuDaGe/formats/controlexpert/xsy_structure.md similarity index 100% rename from formats/controlexpert/xsy_structure.md rename to src/AuDaGe/formats/controlexpert/xsy_structure.md diff --git a/formats/ftae/FTAE_Alarm_Export.xslt b/src/AuDaGe/formats/ftae/FTAE_Alarm_Export.xslt similarity index 100% rename from formats/ftae/FTAE_Alarm_Export.xslt rename to src/AuDaGe/formats/ftae/FTAE_Alarm_Export.xslt diff --git a/src/AuDaGe/formats/ftae/__init__.py b/src/AuDaGe/formats/ftae/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/iec.py b/src/AuDaGe/iec.py similarity index 100% rename from iec.py rename to src/AuDaGe/iec.py diff --git a/formats/controlexpert/test/filter_master.xsy b/tests/xsy/filter_master.xsy similarity index 100% rename from formats/controlexpert/test/filter_master.xsy rename to tests/xsy/filter_master.xsy diff --git a/formats/controlexpert/test/hsps.xsy b/tests/xsy/hsps.xsy similarity index 100% rename from formats/controlexpert/test/hsps.xsy rename to tests/xsy/hsps.xsy diff --git a/tests/xsy/xsy.py b/tests/xsy/xsy.py new file mode 100644 index 0000000..575dd6c --- /dev/null +++ b/tests/xsy/xsy.py @@ -0,0 +1,3 @@ +from AuDaGe.formats.controlexpert.xsy import XSY + +print(XSY("hsps.xsy")) \ No newline at end of file