saveStitched: handle item instead of file #1111

Author: bossie

openeogeotrellis/geopysparkdatacube.py

@@ -1937,18 +1937,31 @@ def add_gdalinfo_objects(assets_original):
                         )
                     else:
                         _log.info("save_result save_stitched")
-                        bbox = self._save_stitched(max_level, save_filename, crop_bounds, zlevel=zlevel)
-                        return add_gdalinfo_objects(
-                            {
-                                str(pathlib.Path(filename).name): {
-                                    "href": save_filename,
-                                    "bbox": to_latlng_bbox(bbox),
-                                    "geometry": mapping(Polygon.from_bounds(*to_latlng_bbox(bbox))),
-                                    "type": "image/tiff; application=geotiff",
-                                    "roles": ["data"],
-                                }
+                        java_item = self._save_stitched(max_level, save_filename, crop_bounds, zlevel=zlevel)
+
+                        bbox = java_item.bbox()
+                        assets = {}
+
+                        for asset_key, asset in java_item.assets().items():
+                            assets[asset_key] = {
+                                "href": save_filename,
+                                "bbox": to_latlng_bbox(bbox),
+                                "geometry": mapping(Polygon.from_bounds(*to_latlng_bbox(bbox))),
+                                "type": "image/tiff; application=geotiff",
+                                "roles": ["data"],
                             }
-                        )
+
+                        assets = add_gdalinfo_objects(assets)
+
+                        item = {
+                            "id": java_item.id(),
+                            "properties": {"datetime": java_item.datetime()},
+                            "geometry": mapping(Polygon.from_bounds(*to_latlng_bbox(bbox))),
+                            "bbox": to_latlng_bbox(bbox),
+                            "assets": assets,
+                        }
+
+                        return {java_item.id(): item}
                 else:
                     _log.info("save_result: saveRDD")
                     gtiff_options = get_jvm().org.openeo.geotrellis.geotiff.GTiffOptions()

tests/test_batch_result.py

@@ -2941,3 +2941,66 @@ def test_unified_asset_keys_spatial_geotiff(
     assert job_metadata["end_datetime"] == "2025-04-21T00:00:00Z"  # ditto
 
     assert set(items[0]["assets"].keys()) == expected_asset_keys
+
+
+def test_unified_asset_keys_stitch_geotiff(tmp_path):
+    process_graph = {
+        "load2": {
+            "process_id": "load_collection",
+            "arguments": {
+                "bands": [
+                    "Flat:0",
+                    "Flat:1",
+                    "Flat:2",
+                ],
+                "id": "TestCollection-LonLat16x16",
+                "spatial_extent": {
+                    "west": 0,
+                    "south": 50,
+                    "east": 5,
+                    "north": 55,
+                },
+                "temporal_extent": ["2025-04-01", "2025-04-21"],
+            },
+        },
+        "save1": {
+            "process_id": "save_result",
+            "arguments": {
+                "data": {"from_node": "load2"},
+                "format": "GTIFF",
+                "options": {"stitch": True},
+            },
+            "result": True,
+        },
+    }
+
+    process = {
+        "process_graph": process_graph,
+    }
+
+    job_dir = tmp_path
+    metadata_file = job_dir / "job_metadata.json"
+
+    run_job(
+        process,
+        output_file=job_dir / "out",
+        metadata_file=metadata_file,
+        api_version="2.0.0",
+        job_dir=job_dir,
+        dependencies=[],
+    )
+
+    assert "out" in os.listdir(job_dir)
+
+    with open(metadata_file) as f:
+        job_metadata = json.load(f)
+
+    items = job_metadata["items"]
+    print(f"items={json.dumps(items, indent=2)}")
+
+    assert len(items) == 1
+    # single item ID can be anything (no spatial or temporal references)
+    assert job_metadata["start_datetime"] == "2025-04-01T00:00:00Z"  # top-level rather than on Item
+    assert job_metadata["end_datetime"] == "2025-04-21T00:00:00Z"  # ditto
+
+    assert set(items[0]["assets"].keys()) == {"openEO"}