Changes to RFC4

src/ome_zarr_models/_v06/axes.py

@@ -1,5 +1,7 @@
 from collections.abc import Sequence
-from typing import Literal
+from typing import Literal, Self
+
+from pydantic import model_validator
 
 from ome_zarr_models.common.axes import Axis as BaseAxis
 from ome_zarr_models.common.axes import AxisType
@@ -31,10 +33,19 @@
 
 class Axis(BaseAxis):
     """
-    Model for an element of multiscale axes.
+    Model for an element of `Multiscale.axes`.
     """
 
     orientation: Orientation | None = None
 
+    @model_validator(mode="after")
+    def _check_orientation_only_on_spatial(self) -> Self:
+        if self.type != "space" and self.orientation is not None:
+            raise ValueError(
+                f"Orientation can only be set on a spatial axis "
+                f"(got Axis type='{self.type}')"
+            )
+        return self
+
 
 Axes = Sequence[Axis]

tests/_v06/test_axes.py

@@ -0,0 +1,11 @@
+import pytest
+from pydantic import ValidationError
+
+from ome_zarr_models._v06.axes import Axis
+
+
+def test_orientation_only_spatial() -> None:
+    with pytest.raises(
+        ValidationError, match="Orientation can only be set on a spatial axis"
+    ):
+        Axis(name="my_axis", type="time", orientation="anterior-to-posterior")

tests/_v06/test_image.py

@@ -43,7 +43,6 @@ def test_image(store: Store) -> None:
                         name="t",
                         type="time",
                         unit="millisecond",
-                        orientation="left-to-right",
                     ),
                     Axis(name="c", type="channel", unit=None, orientation=None),
                     Axis(
@@ -62,7 +61,7 @@ def test_image(store: Store) -> None:
                         name="x",
                         type="space",
                         unit="micrometer",
-                        orientation=None,
+                        orientation="left-to-right",
                     ),
                 ],
                 datasets=(

tests/data/examples/v06/image_example.json

@@ -8,13 +8,17 @@
           {
             "name": "t",
             "type": "time",
-            "unit": "millisecond",
-            "orientation": "left-to-right"
+            "unit": "millisecond"
           },
           { "name": "c", "type": "channel" },
           { "name": "z", "type": "space", "unit": "micrometer" },
           { "name": "y", "type": "space", "unit": "micrometer" },
-          { "name": "x", "type": "space", "unit": "micrometer" }
+          {
+            "name": "x",
+            "type": "space",
+            "unit": "micrometer",
+            "orientation": "left-to-right"
+          }
         ],
         "datasets": [
           {