saveRDDTemporalAllowAssetPerBand: test band IDs and asset keys #1111

Author: bossie

openeogeotrellis/geopysparkdatacube.py

@@ -2053,7 +2053,7 @@ def add_gdalinfo_objects(assets_original):
                         for java_item in java_items:
                             assets = {}
 
-                            timestamp = java_item.timestamp()
+                            stac_datetime = java_item.datetime()
                             bbox = java_item.bbox()
 
                             for asset_key, asset in java_item.assets().items():
@@ -2069,14 +2069,15 @@ def add_gdalinfo_objects(assets_original):
                                         else bands
                                     ),
                                     "nodata": nodata,
-                                    "datetime": timestamp,
+                                    "datetime": stac_datetime,
                                     "bbox": to_latlng_bbox(bbox),
                                     "geometry": mapping(Polygon.from_bounds(*to_latlng_bbox(bbox))),
                                 }
                             assets = add_gdalinfo_objects(assets)
 
                             item = {
                                 "id": java_item.id(),
+                                "properties": {"datetime": stac_datetime},
                                 "geometry": mapping(Polygon.from_bounds(*to_latlng_bbox(bbox))),
                                 "bbox": to_latlng_bbox(bbox),
                                 "assets": assets,

tests/test_batch_result.py

@@ -2607,9 +2607,9 @@ def apply_datacube(cube: XarrayDataCube, context: dict) -> XarrayDataCube:
 
 
 @pytest.mark.parametrize(
-    ["separate_asset_per_band", "expected_tiff_files"],
+    ["separate_asset_per_band", "expected_tiff_files", "expected_asset_keys"],
     [
-        (False, {"openEO_2025-04-05Z.tif", "openEO_2025-04-15Z.tif"}),
+        (False, {"openEO_2025-04-05Z.tif", "openEO_2025-04-15Z.tif"}, {"openEO"}),
         (
             True,
             {
@@ -2620,10 +2620,11 @@ def apply_datacube(cube: XarrayDataCube, context: dict) -> XarrayDataCube:
                 "openEO_2025-04-15Z_Flat:1.tif",
                 "openEO_2025-04-15Z_Flat:2.tif",
             },
+            {"openEO_Flat:0", "openEO_Flat:1", "openEO_Flat:2"},
         ),
     ],
 )
-def test_unified_asset_keys(tmp_path, separate_asset_per_band, expected_tiff_files):
+def test_unified_asset_keys(tmp_path, separate_asset_per_band, expected_tiff_files, expected_asset_keys):
     process_graph = {  # plain old spatiotemporal data cube to GeoTIFF
         "load2": {
             "process_id": "load_collection",
@@ -2679,14 +2680,7 @@ def test_unified_asset_keys(tmp_path, separate_asset_per_band, expected_tiff_fil
     print(f"items={json.dumps(items, indent=2)}")
 
     assert len(items) == 2
-    return
+    assert {item["properties"]["datetime"] for item in items} == {"2025-04-05T00:00:00Z", "2025-04-15T00:00:00Z"}
 
-    item1_assets = items[0]["assets"]
-    assert len(item1_assets) == 1
-    assert "openEO" in item1_assets
-    # TODO: add additional checks
-
-    item2_assets = items[0]["assets"]
-    assert len(item2_assets) == 1
-    assert "openEO" in item2_assets
-    # TODO: add additional checks
+    for item in items:
+        assert set(item["assets"].keys()) == expected_asset_keys