CubeMetadata: avoid in-place manipulation patterns

Author: soxofaan

openeo/metadata.py

@@ -365,22 +365,20 @@ def rename_labels(self, dimension: str, target: list, source: list = None) -> Cu
         :return: Updated metadata
         """
         self.assert_valid_dimension(dimension)
-        loc = self.dimension_names().index(dimension)
-        new_dimensions = self._dimensions.copy()
-        new_dimensions[loc] = new_dimensions[loc].rename_labels(target, source)
-
-        return self._clone_and_update(dimensions=new_dimensions)
+        return self._clone_and_update(
+            dimensions=[
+                d.rename_labels(target=target, source=source) if d.name == dimension else d for d in self._dimensions
+            ]
+        )
 
     def rename_dimension(self, source: str, target: str) -> CubeMetadata:
         """
         Rename source dimension into target, preserving other properties
         """
         self.assert_valid_dimension(source)
-        loc = self.dimension_names().index(source)
-        new_dimensions = self._dimensions.copy()
-        new_dimensions[loc] = new_dimensions[loc].rename(target)
-
-        return self._clone_and_update(dimensions=new_dimensions)
+        return self._clone_and_update(
+            dimensions=[d.rename(name=target) if d.name == source else d for d in self._dimensions]
+        )
 
     def reduce_dimension(self, dimension_name: str) -> CubeMetadata:
         """Create new CubeMetadata object by collapsing/reducing a dimension."""

tests/test_metadata.py

@@ -577,6 +577,55 @@ def test_metadata_bands_dimension(spec):
     assert metadata.band_common_names == ["F00", None]
 
 
+def test_cubemetadata_rename_labels():
+    metadata = CubeMetadata(
+        dimensions=[
+            SpatialDimension(name="x", extent=None),
+            BandDimension(name="b", bands=[Band("red"), Band("green")]),
+        ]
+    )
+    renamed = metadata.rename_labels(dimension="b", target=["raspberry", "lime"])
+    assert isinstance(renamed, CubeMetadata)
+    assert renamed.dimension_names() == ["x", "b"]
+    assert renamed.band_names == ["raspberry", "lime"]
+    assert renamed.bands == [Band("raspberry"), Band("lime")]
+
+
+def test_cubemetadata_rename_labels_invalid_dimension():
+    metadata = CubeMetadata(
+        dimensions=[
+            SpatialDimension(name="x", extent=None),
+            BandDimension(name="b", bands=[Band("red"), Band("green")]),
+        ]
+    )
+    with pytest.raises(ValueError, match=re.escape("Invalid dimension 'tempus'. Should be one of ['x', 'b']")):
+        _ = metadata.rename_labels(dimension="tempus", target=["1999"])
+
+
+def test_cubemetadata_rename_dimension():
+    metadata = CubeMetadata(
+        dimensions=[
+            SpatialDimension(name="x", extent=None),
+            BandDimension(name="b", bands=[Band("red"), Band("green")]),
+        ]
+    )
+    renamed = metadata.rename_dimension("b", "bands")
+    assert renamed.dimension_names() == ["x", "bands"]
+    assert renamed.band_dimension.name == "bands"
+    assert renamed.band_names == ["red", "green"]
+
+
+def test_cubemetadata_rename_dimension_invalid_dimension():
+    metadata = CubeMetadata(
+        dimensions=[
+            SpatialDimension(name="x", extent=None),
+            BandDimension(name="b", bands=[Band("red"), Band("green")]),
+        ]
+    )
+    with pytest.raises(ValueError, match=re.escape("Invalid dimension 'bandzz'. Should be one of ['x', 'b']")):
+        _ = metadata.rename_dimension("bandzz", "bands")
+
+
 def test_collectionmetadata_reduce_dimension():
     metadata = CollectionMetadata(
         {"cube:dimensions": {"x": {"type": "spatial"}, "b": {"type": "bands", "values": ["red", "green"]}}}