From 1f2a6adb831ff5ada8ee6e2845da679f5dd3dc49 Mon Sep 17 00:00:00 2001 From: Joshua Date: Tue, 17 Nov 2026 12:31:47 -0600 Subject: [PATCH] Rename AuDaGeFrame "type" column to "datatype". --- extensions/aveva_historian/ftld.yaml | 2 +- extensions/controlexpert/xsy.yaml | 8 ++--- extensions/csv.yaml | 30 +++++++++++++++++++ extensions/factorytalk/hmi_tags/string.yaml | 2 +- .../factorytalk/macro/alarm_severity.yaml | 2 +- extensions/factorytalk/macro/caption.yaml | 2 +- extensions/factorytalk/macro/desc.yaml | 2 +- extensions/factorytalk/macro/message.yaml | 2 +- extensions/factorytalk/macro/tagname.yaml | 2 +- extensions/factorytalk/macro/unit.yaml | 2 +- extensions/kepserver/modbus/csv.yaml | 10 +++---- extensions/kepserver/strings/caption.yaml | 2 +- extensions/kepserver/strings/desc.yaml | 2 +- extensions/kepserver/strings/message.yaml | 2 +- extensions/kepserver/strings/tagname.yaml | 2 +- extensions/kepserver/strings/unit.yaml | 2 +- extensions/schema.yaml | 2 +- src/AuDaGe/frame.py | 2 +- src/AuDaGe/iec/iec_type.py | 4 +-- tests/test_frame.py | 8 ++--- 20 files changed, 59 insertions(+), 31 deletions(-) create mode 100644 extensions/csv.yaml diff --git a/extensions/aveva_historian/ftld.yaml b/extensions/aveva_historian/ftld.yaml index 7d69a50..6c62b2b 100644 --- a/extensions/aveva_historian/ftld.yaml +++ b/extensions/aveva_historian/ftld.yaml @@ -91,7 +91,7 @@ export: tagname: translate: columns: Name - type: + datatype: const: REAL address: const: "" diff --git a/extensions/controlexpert/xsy.yaml b/extensions/controlexpert/xsy.yaml index a396493..d9c805c 100644 --- a/extensions/controlexpert/xsy.yaml +++ b/extensions/controlexpert/xsy.yaml @@ -13,10 +13,10 @@ import: type: str translate: columns: tagname - type: + datatype: type: str translate: - columns: type + columns: datatype address: type: str translate: @@ -29,9 +29,9 @@ export: tagname: translate: columns: tagname - type: + datatype: translate: - columns: type + columns: datatype address: translate: columns: address diff --git a/extensions/csv.yaml b/extensions/csv.yaml new file mode 100644 index 0000000..76e9f7e --- /dev/null +++ b/extensions/csv.yaml @@ -0,0 +1,30 @@ +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml +format: csv +import: + columns: + tagname: + translate: + columns: tagname + datatype: + translate: + columns: type + address: + translate: + columns: address + comment: + translate: + columns: comment +export: + tagname: + translate: + columns: tagname + datatype: + translate: + columns: datatype + address: + translate: + columns: address + comment: + translate: + columns: comment diff --git a/extensions/factorytalk/hmi_tags/string.yaml b/extensions/factorytalk/hmi_tags/string.yaml index c45e57b..f20d800 100644 --- a/extensions/factorytalk/hmi_tags/string.yaml +++ b/extensions/factorytalk/hmi_tags/string.yaml @@ -99,7 +99,7 @@ export: tagname: translate: columns: Tag Name - type: + datatype: const: "String[82]" address: const: "" diff --git a/extensions/factorytalk/macro/alarm_severity.yaml b/extensions/factorytalk/macro/alarm_severity.yaml index 1e8f0d1..9564565 100644 --- a/extensions/factorytalk/macro/alarm_severity.yaml +++ b/extensions/factorytalk/macro/alarm_severity.yaml @@ -99,7 +99,7 @@ export: tagname: translate: columns: tagname - type: + datatype: const: "" address: const: "" diff --git a/extensions/factorytalk/macro/caption.yaml b/extensions/factorytalk/macro/caption.yaml index ca69035..bf2e961 100644 --- a/extensions/factorytalk/macro/caption.yaml +++ b/extensions/factorytalk/macro/caption.yaml @@ -132,7 +132,7 @@ export: tagname: translate: columns: tagname - type: + datatype: const: "" address: const: "" diff --git a/extensions/factorytalk/macro/desc.yaml b/extensions/factorytalk/macro/desc.yaml index d9193f4..95161ce 100644 --- a/extensions/factorytalk/macro/desc.yaml +++ b/extensions/factorytalk/macro/desc.yaml @@ -33,7 +33,7 @@ export: tagname: translate: columns: tagname - type: + datatype: const: "" address: const: "" diff --git a/extensions/factorytalk/macro/message.yaml b/extensions/factorytalk/macro/message.yaml index 5b35924..bb7e704 100644 --- a/extensions/factorytalk/macro/message.yaml +++ b/extensions/factorytalk/macro/message.yaml @@ -42,7 +42,7 @@ export: tagname: translate: columns: tagname - type: + datatype: const: "" address: const: "" diff --git a/extensions/factorytalk/macro/tagname.yaml b/extensions/factorytalk/macro/tagname.yaml index 77a9b81..aa45ac1 100644 --- a/extensions/factorytalk/macro/tagname.yaml +++ b/extensions/factorytalk/macro/tagname.yaml @@ -33,7 +33,7 @@ export: tagname: translate: columns: tagname - type: + datatype: const: "" address: const: "" diff --git a/extensions/factorytalk/macro/unit.yaml b/extensions/factorytalk/macro/unit.yaml index bdbcc94..69a2777 100644 --- a/extensions/factorytalk/macro/unit.yaml +++ b/extensions/factorytalk/macro/unit.yaml @@ -59,7 +59,7 @@ export: tagname: translate: columns: tagname - type: + datatype: const: "" address: const: "" diff --git a/extensions/kepserver/modbus/csv.yaml b/extensions/kepserver/modbus/csv.yaml index 96a0ee8..bafe12a 100644 --- a/extensions/kepserver/modbus/csv.yaml +++ b/extensions/kepserver/modbus/csv.yaml @@ -1,7 +1,5 @@ -$schema: "\ - https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/\ - main/extensions/schema.yaml - " +$schema: >- + https://primegit.primecontrols-dev.com/j.lucas/AuDaGe/raw/branch/main/extensions/schema.yaml format: csv import: filter: @@ -48,7 +46,7 @@ import: - Double - String translate: - columns: type + columns: datatype operations: operation: type_iec_to_opcua Respect Data Type: @@ -122,7 +120,7 @@ export: tagname: translate: columns: Tag Name - type: + datatype: translate: columns: Data Type operations: diff --git a/extensions/kepserver/strings/caption.yaml b/extensions/kepserver/strings/caption.yaml index ae0efc1..14fae90 100644 --- a/extensions/kepserver/strings/caption.yaml +++ b/extensions/kepserver/strings/caption.yaml @@ -122,7 +122,7 @@ export: tagname: translate: columns: Tag Name - type: + datatype: translate: columns: Data Type operations: diff --git a/extensions/kepserver/strings/desc.yaml b/extensions/kepserver/strings/desc.yaml index ae0efc1..14fae90 100644 --- a/extensions/kepserver/strings/desc.yaml +++ b/extensions/kepserver/strings/desc.yaml @@ -122,7 +122,7 @@ export: tagname: translate: columns: Tag Name - type: + datatype: translate: columns: Data Type operations: diff --git a/extensions/kepserver/strings/message.yaml b/extensions/kepserver/strings/message.yaml index 73a9016..fffdc68 100644 --- a/extensions/kepserver/strings/message.yaml +++ b/extensions/kepserver/strings/message.yaml @@ -122,7 +122,7 @@ export: tagname: translate: columns: Tag Name - type: + datatype: translate: columns: Data Type operations: diff --git a/extensions/kepserver/strings/tagname.yaml b/extensions/kepserver/strings/tagname.yaml index ae0efc1..14fae90 100644 --- a/extensions/kepserver/strings/tagname.yaml +++ b/extensions/kepserver/strings/tagname.yaml @@ -122,7 +122,7 @@ export: tagname: translate: columns: Tag Name - type: + datatype: translate: columns: Data Type operations: diff --git a/extensions/kepserver/strings/unit.yaml b/extensions/kepserver/strings/unit.yaml index 8072a44..b99c944 100644 --- a/extensions/kepserver/strings/unit.yaml +++ b/extensions/kepserver/strings/unit.yaml @@ -122,7 +122,7 @@ export: tagname: translate: columns: Tag Name - type: + datatype: translate: columns: Data Type operations: diff --git a/extensions/schema.yaml b/extensions/schema.yaml index 402011e..5d8af90 100644 --- a/extensions/schema.yaml +++ b/extensions/schema.yaml @@ -371,7 +371,7 @@ properties: properties: tagname: $ref: "#/$defs/exportColumn" - type: + datatype: $ref: "#/$defs/exportColumn" address: $ref: "#/$defs/exportColumn" diff --git a/src/AuDaGe/frame.py b/src/AuDaGe/frame.py index 14284c5..301cc63 100644 --- a/src/AuDaGe/frame.py +++ b/src/AuDaGe/frame.py @@ -211,7 +211,7 @@ class AuDaGeMandatoryColumns(BetterStrEnum): """Enum of columns required by AuDaGeFrame.""" TAGNAME = "tagname" - TYPE = "type" + DATATYPE = "datatype" ADDRESS = "address" COMMENT = "comment" diff --git a/src/AuDaGe/iec/iec_type.py b/src/AuDaGe/iec/iec_type.py index 57cc29b..98c2937 100644 --- a/src/AuDaGe/iec/iec_type.py +++ b/src/AuDaGe/iec/iec_type.py @@ -217,7 +217,7 @@ class IECType: lambda row: f"{name}[{','.join(str(dim) for dim in row)}]", axis=1, ), - AC.M.TYPE: str(self.array_type), + AC.M.DATATYPE: str(self.array_type), AC.M.ADDRESS: [ self.array_type.length * i for i in range(len(all_indices)) ], @@ -312,7 +312,7 @@ class IECType: match = re.match(STRING_SPEC_PATTERN, spec, re.IGNORECASE) try: # Unresolved attribute is handled by `except AttributeError` below. - # ty: ignore[unresolved-attribute] + # ty: ignore[missing-union-attribute] length = int(match.group(1)) * DataUnit.BYTE if length <= 0: raise InvalidSpecError( diff --git a/tests/test_frame.py b/tests/test_frame.py index b5f46d8..270037c 100644 --- a/tests/test_frame.py +++ b/tests/test_frame.py @@ -6,15 +6,15 @@ from AuDaGe.frame import AuDaGeFrame class TestAuDaGeFrame(unittest.TestCase): def test_init(self): valid_af = { - "name": ["a", "b", "c"], - "type": ["d", "e", "f"], + "tagname": ["a", "b", "c"], + "datatype": ["d", "e", "f"], "address": [1, 2, 3], "comment": ["g", "h", "i"], } self.assertTrue(AuDaGeFrame(valid_af).is_valid()) invalid_af = { - "name": ["a", "b", "c"], - # "type": ["d", "e", "f"], + "tagname": ["a", "b", "c"], + # "datatype": ["d", "e", "f"], "address": [1, 2, 3], "comment": ["g", "h", "i"], }