diff --git a/extensions/aveva_historian/ftld.yaml b/extensions/aveva_historian/ftld.yaml index 7989624..7d69a50 100644 --- a/extensions/aveva_historian/ftld.yaml +++ b/extensions/aveva_historian/ftld.yaml @@ -1,12 +1,9 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: xlsx import: filter: - columns: - - name + columns: name columns: Selected(x): const: x diff --git a/src/AuDaGe/formats/controlexpert/assets/builtins.xsy b/extensions/controlexpert/assets/builtins.xsy similarity index 100% rename from src/AuDaGe/formats/controlexpert/assets/builtins.xsy rename to extensions/controlexpert/assets/builtins.xsy diff --git a/src/AuDaGe/formats/controlexpert/assets/flatten_datablock.xslt b/extensions/controlexpert/assets/flatten_datablock.xslt similarity index 100% rename from src/AuDaGe/formats/controlexpert/assets/flatten_datablock.xslt rename to extensions/controlexpert/assets/flatten_datablock.xslt diff --git a/src/AuDaGe/formats/controlexpert/assets/flatten_ddtsource.xslt b/extensions/controlexpert/assets/flatten_ddtsource.xslt similarity index 100% rename from src/AuDaGe/formats/controlexpert/assets/flatten_ddtsource.xslt rename to extensions/controlexpert/assets/flatten_ddtsource.xslt diff --git a/extensions/controlexpert/xsy.yaml b/extensions/controlexpert/xsy.yaml index 34e7d53..8aae652 100644 --- a/extensions/controlexpert/xsy.yaml +++ b/extensions/controlexpert/xsy.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: xsy import: diff --git a/src/AuDaGe/formats/ftae/assets/FTAE_Alarm_Export.xslt b/extensions/factorytalk/alarms_events/assets/FTAE_Alarm_Export.xslt similarity index 100% rename from src/AuDaGe/formats/ftae/assets/FTAE_Alarm_Export.xslt rename to extensions/factorytalk/alarms_events/assets/FTAE_Alarm_Export.xslt diff --git a/src/AuDaGe/formats/ftae/assets/FTLDDAlarms.xsd b/extensions/factorytalk/alarms_events/assets/FTLDDAlarms.xsd similarity index 100% rename from src/AuDaGe/formats/ftae/assets/FTLDDAlarms.xsd rename to extensions/factorytalk/alarms_events/assets/FTLDDAlarms.xsd diff --git a/src/AuDaGe/formats/ftae/assets/FTLLDDXml.xsd b/extensions/factorytalk/alarms_events/assets/FTLLDDXml.xsd similarity index 100% rename from src/AuDaGe/formats/ftae/assets/FTLLDDXml.xsd rename to extensions/factorytalk/alarms_events/assets/FTLLDDXml.xsd diff --git a/src/AuDaGe/formats/ftae/assets/LWTP_Alarms_All_AlarmExport.xml b/extensions/factorytalk/alarms_events/assets/LWTP_Alarms_All_AlarmExport.xml similarity index 100% rename from src/AuDaGe/formats/ftae/assets/LWTP_Alarms_All_AlarmExport.xml rename to extensions/factorytalk/alarms_events/assets/LWTP_Alarms_All_AlarmExport.xml diff --git a/src/AuDaGe/formats/ftae/assets/LWTP_Alarms_Automatically_Generated_AlarmExport.xml b/extensions/factorytalk/alarms_events/assets/LWTP_Alarms_Automatically_Generated_AlarmExport.xml similarity index 100% rename from src/AuDaGe/formats/ftae/assets/LWTP_Alarms_Automatically_Generated_AlarmExport.xml rename to extensions/factorytalk/alarms_events/assets/LWTP_Alarms_Automatically_Generated_AlarmExport.xml diff --git a/src/AuDaGe/formats/ftae/assets/ftae.xslt b/extensions/factorytalk/alarms_events/assets/ftae.xslt similarity index 100% rename from src/AuDaGe/formats/ftae/assets/ftae.xslt rename to extensions/factorytalk/alarms_events/assets/ftae.xslt diff --git a/src/AuDaGe/formats/ftae/assets/groups.yaml b/extensions/factorytalk/alarms_events/assets/groups.yaml similarity index 100% rename from src/AuDaGe/formats/ftae/assets/groups.yaml rename to extensions/factorytalk/alarms_events/assets/groups.yaml diff --git a/extensions/factorytalk/alarms_events/ftae.yaml b/extensions/factorytalk/alarms_events/ftae.yaml index b2bb72a..20f88b8 100644 --- a/extensions/factorytalk/alarms_events/ftae.yaml +++ b/extensions/factorytalk/alarms_events/ftae.yaml @@ -1,4 +1,2 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " \ No newline at end of file +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml diff --git a/extensions/factorytalk/macro/alarm_severity.yaml b/extensions/factorytalk/macro/alarm_severity.yaml index 75110c7..1e8f0d1 100644 --- a/extensions/factorytalk/macro/alarm_severity.yaml +++ b/extensions/factorytalk/macro/alarm_severity.yaml @@ -1,9 +1,7 @@ # Leonard WTP Alarm Severity Tag Set Macro -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv sep: " " diff --git a/extensions/factorytalk/macro/caption.yaml b/extensions/factorytalk/macro/caption.yaml index 45caa4b..ca69035 100644 --- a/extensions/factorytalk/macro/caption.yaml +++ b/extensions/factorytalk/macro/caption.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv sep: " " diff --git a/extensions/factorytalk/macro/desc.yaml b/extensions/factorytalk/macro/desc.yaml index 7c17792..d9193f4 100644 --- a/extensions/factorytalk/macro/desc.yaml +++ b/extensions/factorytalk/macro/desc.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv sep: " " diff --git a/extensions/factorytalk/macro/message.yaml b/extensions/factorytalk/macro/message.yaml index ae4833d..5b35924 100644 --- a/extensions/factorytalk/macro/message.yaml +++ b/extensions/factorytalk/macro/message.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv sep: " " diff --git a/extensions/factorytalk/macro/tagname.yaml b/extensions/factorytalk/macro/tagname.yaml index 8cafcab..77a9b81 100644 --- a/extensions/factorytalk/macro/tagname.yaml +++ b/extensions/factorytalk/macro/tagname.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv sep: " " diff --git a/extensions/factorytalk/macro/unit.yaml b/extensions/factorytalk/macro/unit.yaml index 00c988e..bdbcc94 100644 --- a/extensions/factorytalk/macro/unit.yaml +++ b/extensions/factorytalk/macro/unit.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv sep: " " diff --git a/extensions/kepserver/modbus/csv.yaml b/extensions/kepserver/modbus/csv.yaml index f0b8a91..e84c8e5 100644 --- a/extensions/kepserver/modbus/csv.yaml +++ b/extensions/kepserver/modbus/csv.yaml @@ -1,6 +1,6 @@ $schema: "\ https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml + main/extensions/schema.yaml " format: csv import: diff --git a/extensions/kepserver/strings/caption_csv.yaml b/extensions/kepserver/strings/caption_csv.yaml index 98f3b0f..af60a00 100644 --- a/extensions/kepserver/strings/caption_csv.yaml +++ b/extensions/kepserver/strings/caption_csv.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv export: diff --git a/extensions/kepserver/strings/desc_csv.yaml b/extensions/kepserver/strings/desc_csv.yaml index 98f3b0f..af60a00 100644 --- a/extensions/kepserver/strings/desc_csv.yaml +++ b/extensions/kepserver/strings/desc_csv.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv export: diff --git a/extensions/kepserver/strings/message_csv.yaml b/extensions/kepserver/strings/message_csv.yaml index 9ca5160..c419413 100644 --- a/extensions/kepserver/strings/message_csv.yaml +++ b/extensions/kepserver/strings/message_csv.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv export: diff --git a/extensions/kepserver/strings/tagname_csv.yaml b/extensions/kepserver/strings/tagname_csv.yaml index 98f3b0f..af60a00 100644 --- a/extensions/kepserver/strings/tagname_csv.yaml +++ b/extensions/kepserver/strings/tagname_csv.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv export: diff --git a/extensions/kepserver/strings/unit_csv.yaml b/extensions/kepserver/strings/unit_csv.yaml index 1e5f935..8072a44 100644 --- a/extensions/kepserver/strings/unit_csv.yaml +++ b/extensions/kepserver/strings/unit_csv.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/src/AuDaGe/assets/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: name: csv export: diff --git a/src/AuDaGe/assets/schema.yaml b/extensions/schema.yaml similarity index 100% rename from src/AuDaGe/assets/schema.yaml rename to extensions/schema.yaml diff --git a/src/AuDaGe/assets/__init__.py b/src/AuDaGe/assets/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/AuDaGe/converter.py b/src/AuDaGe/converter.py index db483c5..9ffa75c 100644 --- a/src/AuDaGe/converter.py +++ b/src/AuDaGe/converter.py @@ -26,7 +26,7 @@ import yaml from numpy import nan import AuDaGe -from AuDaGe import assets, iec +from AuDaGe import iec from AuDaGe.formats.controlexpert.xsy import XSYReader from AuDaGe.frame import AuDaGeFrame, Frame @@ -199,7 +199,7 @@ class Translator: class Converter: """Class for converting databases based on an AuDaGe YAML file.""" - SCHEMA_PATH = "schema.yaml" + SCHEMA_PATH = "../../extensions/schema.yaml" def __init__( self, @@ -208,7 +208,7 @@ class Converter: ): substitutions = {} if substitutions is None else substitutions with ( - resources.files(assets) + resources.files(AuDaGe) .joinpath(self.SCHEMA_PATH) .open() as schema_file ): diff --git a/src/AuDaGe/formats/controlexpert/assets/__init__.py b/src/AuDaGe/formats/controlexpert/assets/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/AuDaGe/formats/ftae/assets/__init__.py b/src/AuDaGe/formats/ftae/assets/__init__.py deleted file mode 100644 index e69de29..0000000