Issue #298 finetune raster:bands handling a bit

Author: soxofaan

openeo_driver/constants.py

@@ -9,6 +9,8 @@ class STAC_EXTENSION:
     MLMODEL = "https://stac-extensions.github.io/ml-model/v1.0.0/schema.json"
     CARD4LOPTICAL = "https://stac-extensions.github.io/card4l/v0.1.0/optical/schema.json"
     CARD4LSAR = "https://stac-extensions.github.io/card4l/v0.1.0/sar/schema.json"
+    RASTER_V110 = "https://stac-extensions.github.io/raster/v1.1.0/schema.json"
+    RASTER_V200 = "https://stac-extensions.github.io/raster/v2.0.0/schema.json"
 
 
 class JOB_STATUS:

openeo_driver/save_result.py

@@ -306,6 +306,8 @@ def __init__(
             warnings.warn("AggregatePolygonResult: GeometryCollection or DriverVectorCube expected but got {t}".format(t=type(regions)))
         self._regions = regions
         self._metadata = metadata
+        # TODO #298 this "raster:bands" helper is old-style
+        #      and just used for "statistics" which moved to the common metadata in v2
         self.raster_bands = None
 
     def get_data(self):
@@ -662,7 +664,6 @@ class AggregatePolygonResultCSV(AggregatePolygonResult):
     def __init__(self, csv_dir, regions: Union[GeometryCollection, DriverVectorCube, DelayedVector, BaseGeometry], metadata: CollectionMetadata = None):
         super().__init__(timeseries=None, regions=regions, metadata=metadata)
         self._csv_dir = csv_dir
-        self.raster_bands = None
 
     def get_data(self):
         if self.data is None:
@@ -717,6 +718,8 @@ def stats(band):
                 stats["stddev"] = series.std()
                 stats["valid_percent"] = ((100.0 * len(series.dropna()) / len(series)) if len(series) else None)
                 return {"statistics": stats}
+
+            # TODO #298 `raster:bands>statistics` has moved to common STAC in raster extension 2.0.0
             self.raster_bands = [stats(b) for b in bands]
 
         if self.is_format('covjson', 'coveragejson'):

openeo_driver/views.py

@@ -1517,6 +1517,7 @@ def _asset_object(job_id, user_id, filename: str, asset_metadata: dict, job_info
                 ),
                 "type": asset_metadata.get("type", asset_metadata.get("media_type", "application/octet-stream")),
                 "roles": asset_metadata.get("roles", ["data"]),
+                # TODO: eliminate this legacy "raster:bands" construct at some point?
                 "raster:bands": asset_metadata.get("raster:bands"),
                 "file:size": asset_metadata.get("file:size"),
                 "alternate": asset_metadata.get("alternate"),

tests/test_save_result.py

@@ -7,6 +7,7 @@
 import numpy as np
 import pytest
 from shapely.geometry import GeometryCollection, Polygon
+import dirty_equals
 
 from openeo.metadata import CollectionMetadata
 from openeo_driver.datacube import DriverVectorCube
@@ -181,8 +182,6 @@ def test_aggregate_polygon_result_inconsistent_bands():
 
 
 def test_aggregate_polygon_result_CSV(tmp_path):
-
-
     metadata = CollectionMetadata({
         "cube:dimensions": {
             "x": {"type": "spatial"},
@@ -196,28 +195,66 @@ def test_aggregate_polygon_result_CSV(tmp_path):
         Polygon([(6, 1), (1, 7), (9, 9)])
     ])
 
-
     result = AggregatePolygonResultCSV(csv_dir=Path(__file__).parent / "data" /"aggregate_spatial_spacetime_cube", regions=regions_with_nonexistant, metadata=metadata)
     result.set_format("json")
 
     assets = result.write_assets(tmp_path / "ignored")
-    theAsset = assets.popitem()[1]
-    filename = theAsset['href']
+    [(_, asset_metadata)] = assets.items()
 
-    assert 'application/json' == theAsset['type']
-    assert ["red", "green", "blue"] == [b['name'] for b in theAsset['bands']]
-    assert 'raster:bands' in theAsset
-    assert 'file:size' in theAsset
+    assert "application/json" == asset_metadata["type"]
+    assert asset_metadata["bands"] == [
+        dirty_equals.IsPartialDict(name="red"),
+        dirty_equals.IsPartialDict(name="green"),
+        dirty_equals.IsPartialDict(name="blue"),
+    ]
+    assert asset_metadata["raster:bands"] == [
+        {
+            "statistics": {
+                "minimum": pytest.approx(4646, rel=0.1),
+                "mean": pytest.approx(4646, rel=0.1),
+                "maximum": pytest.approx(4646, rel=0.1),
+                "stddev": pytest.approx(0.31, rel=0.1),
+                "valid_percent": 100.0,
+            }
+        },
+        {
+            "statistics": {
+                "minimum": pytest.approx(4865, rel=0.1),
+                "mean": pytest.approx(4865, rel=0.1),
+                "maximum": pytest.approx(4865, rel=0.1),
+                "stddev": pytest.approx(0.265, rel=0.1),
+                "valid_percent": 100.0,
+            }
+        },
+        {
+            "statistics": {
+                "minimum": pytest.approx(5178, rel=0.1),
+                "mean": pytest.approx(5178, rel=0.1),
+                "maximum": pytest.approx(5178, rel=0.1),
+                "stddev": pytest.approx(0.41, rel=0.1),
+                "valid_percent": 100.0,
+            }
+        },
+    ]
 
-    assert 'mean' in theAsset['raster:bands'][0]["statistics"]
-    assert 'minimum' in theAsset['raster:bands'][0]["statistics"]
-    assert 100.0 == theAsset['raster:bands'][0]["statistics"]['valid_percent']
+    assert "file:size" in asset_metadata
 
-    expected = {'2017-09-05T00:00:00Z': [[4646.262612301313, 4865.926572218383, 5178.517363510712], [None, None, None], [4645.719597475695, 4865.467252259935, 5177.803342998465]], '2017-09-06T00:00:00Z': [[None, None, None], [None, None, None], [4645.719597475695, 4865.467252259935, 5177.803342998465]]}
+    filename = asset_metadata["href"]
+    expected = {
+        "2017-09-05T00:00:00Z": [
+            [4646.262612301313, 4865.926572218383, 5178.517363510712],
+            [None, None, None],
+            [4645.719597475695, 4865.467252259935, 5177.803342998465],
+        ],
+        "2017-09-06T00:00:00Z": [
+            [None, None, None],
+            [None, None, None],
+            [4645.719597475695, 4865.467252259935, 5177.803342998465],
+        ],
+    }
     with open(filename) as f:
-
         timeseries_ds = json.load(f)
-        assert expected == timeseries_ds
+    assert timeseries_ds == expected
 
 class TestAggregatePolygonSpatialResult: