fixup! fixup! fixup! WIP attempt to shoehorn filter_temporal in TermporalDimension

Author: soxofaan

openeo/metadata/__init__.py

@@ -99,7 +99,9 @@ def rename(self, name) -> Dimension:
 
 class TemporalDimension(Dimension):
     def __init__(
-        self, name: str, extent: Tuple[str | None, str | None] | List[str | None] | _NonConcreteExtent | _EmptyExtent
+        self,
+        name: str,
+        extent: Tuple[str | None, str | None] | List[str | None] | _NonConcreteExtent | _EmptyExtent | None,
     ):
         super().__init__(type="temporal", name=name)
         # TODO: ideally we do some validation/normalization of the extent, but this is an existing public API with not much wiggle room
@@ -118,16 +120,20 @@ def filter_temporal(self, extent: Tuple[str | None, str | None] | List[str | Non
         based on given temporal extent (start, end)
         """
         if (interval1 := DateTimeInterval.try_from(self.extent)) and (interval2 := DateTimeInterval.try_from(extent)):
-            intersection = interval1.intersection(interval2)
-            if intersection:
-                intersection = intersection.as_rfc3339()
+            if intersection := interval1.intersection(interval2):
+                new_extent = intersection.as_rfc3339()
             else:
-                intersection = _EmptyExtent()
+                new_extent = _EmptyExtent()
         elif isinstance(self.extent, _EmptyExtent) or isinstance(extent, _EmptyExtent):
-            intersection = _EmptyExtent()
+            new_extent = _EmptyExtent()
+        elif extent is None:
+            new_extent = self.extent
+        elif self.extent is None:
+            new_extent = extent
         else:
-            intersection = _NonConcreteExtent()
-        return TemporalDimension(name=self.name, extent=intersection)
+            # As fallback, handle the extent as non-concrete
+            new_extent = _NonConcreteExtent()
+        return TemporalDimension(name=self.name, extent=new_extent)
 
 
 class Band(NamedTuple):
@@ -412,7 +418,9 @@ def get_band_index(self, band: Union[int, str]) -> int:
         return self.band_dimension.band_index(band)
 
     def filter_temporal(self, extent: Tuple[str | None, str | None] | List[str | None] | Any) -> CubeMetadata:
-        assert self.has_temporal_dimension()
+        if not self.has_temporal_dimension():
+            _log.warning("filter_temporal on cube metadata without temporal dimension. Returning unchanged metadata.")
+            return self
         return self._clone_and_update(
             dimensions=[
                 d.filter_temporal(extent=extent) if isinstance(d, TemporalDimension) else d for d in self._dimensions

openeo/metadata/_extents.py

@@ -17,7 +17,8 @@ class _NonConcreteExtent:
     - an empty extent
     """
 
-    pass
+    def __repr__(self) -> str:
+        return "<_NonConcreteExtent>"
 
 
 class _EmptyExtent:
@@ -33,4 +34,5 @@ class _EmptyExtent:
     - a non-concrete extent (which is known to have coverage, but the actual bounds are unknown, dynamic, etc.)
     """
 
-    pass
+    def __repr__(self) -> str:
+        return "<_EmptyExtent>"

openeo/metadata/_jupyter.py

@@ -27,7 +27,7 @@ def repr_html_dimensions(dimensions: List[Dimension]) -> str:
     header = ["Dimension", "Type", "Size", "Labels / Extent"]
     rows = []
     for dim in dimensions:
-        row = [dim.name, dim.type]
+        row = [dim.name, str(dim.type)]
         if isinstance(dim, BandDimension):
             row.extend([str(len(dim.bands)), "bands: " + ", ".join(dim.band_names)])
         elif isinstance(dim, SpatialDimension):

openeo/utils/datetime.py

@@ -4,7 +4,7 @@
 import datetime
 from typing import Any, Tuple, Union
 
-import dateutil
+import dateutil.parser
 
 from openeo.util import rfc3339