Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/chexus/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,11 @@ def validate(self, node: Dataset | Group) -> Violation | None:


def is_transformation(node: Dataset | Group) -> bool:
return "transformation_type" in node.attrs and "vector" in node.attrs
return (
node.attrs.get("NX_class") == "NXtransformation"
and "transformation_type" in node.attrs
and "vector" in node.attrs
)
Comment on lines +192 to +196

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you said yourself, this is not correct. The transformations themselves are typically just fields, not groups, so they do not have an NX_class.



class transformation_offset_units_missing(Validator):
Expand Down
15 changes: 15 additions & 0 deletions tests/validators_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,21 @@ def test_depends_on_target_missing():
attrs={"depends_on": "missing"},
)
group.children["transform"] = transform

result = chexus.validators.depends_on_target_missing().validate(depends_on)
# Still fails because 'transform' is not a transform
assert isinstance(result, chexus.Violation)
assert result.name == "x/depends_on"
transform.attrs["transformation_type"] = "translation"
transform.attrs["vector"] = [1.0, 0.0, 0.0]

result = chexus.validators.depends_on_target_missing().validate(depends_on)
# Still fails because 'transform' is not a NXtransformation
assert isinstance(result, chexus.Violation)
assert result.name == "x/depends_on"
transform.attrs["NX_class"] = "NXtransformation"
assert chexus.validators.depends_on_target_missing().validate(depends_on) is None

assert chexus.validators.depends_on_target_missing().applies_to(transform)
result = chexus.validators.depends_on_target_missing().validate(transform)
assert isinstance(result, chexus.Violation)
Expand Down Expand Up @@ -195,6 +203,7 @@ def test_transformation_depends_on_missing():
dtype=float,
parent=None,
attrs={
"NX_class": "NXtransformation",
"transformation_type": "translation",
"vector": [1.0, 0.0, 0.0],
"depends_on": ".",
Expand All @@ -209,6 +218,7 @@ def test_transformation_depends_on_missing():
dtype=float,
parent=None,
attrs={
"NX_class": "NXtransformation",
"transformation_type": "translation",
"vector": [1.0, 0.0, 0.0],
},
Expand All @@ -227,6 +237,7 @@ def test_transformation_offset_units_missing():
dtype=float,
parent=None,
attrs={
"NX_class": "NXtransformation",
"transformation_type": "translation",
"vector": [1.0, 0.0, 0.0],
"offset": 1.0,
Expand All @@ -244,6 +255,7 @@ def test_transformation_offset_units_missing():
dtype=float,
parent=None,
attrs={
"NX_class": "NXtransformation",
"transformation_type": "translation",
"vector": [1.0, 0.0, 0.0],
"offset": 1.0,
Expand All @@ -267,6 +279,7 @@ def test_transformation_offset_units_invalid_good(unit):
dtype=float,
parent=None,
attrs={
"NX_class": "NXtransformation",
"transformation_type": "translation",
"vector": [1.0, 0.0, 0.0],
"offset": 1.0,
Expand All @@ -291,6 +304,7 @@ def test_transformation_offset_units_invalid_bad(unit):
dtype=float,
parent=None,
attrs={
"NX_class": "NXtransformation",
"transformation_type": "translation",
"vector": [1.0, 0.0, 0.0],
"offset": 1.0,
Expand Down Expand Up @@ -320,6 +334,7 @@ def create_transformation(transformation_type, unit, is_log):
"name": "x",
"parent": None,
"attrs": {
"NX_class": "NXtransformation",
"transformation_type": transformation_type,
"vector": [1.0, 0.0, 0.0],
},
Expand Down
Loading