Updated imagenator and net2cog tests with labels, added MUR25 test (#273)

* Updated imagenator and net2cog tests with labels, added MUR25 test to imagenator

* Updated changelog

* Removed unused line from net2cog utility.py

Author: jackiryan

CHANGELOG.md

@@ -5,6 +5,13 @@ versioning. Rather than a static releases, this repository contains of a number
 of regression tests that are each semi-independent.  This CHANGELOG file should be used
 to document pull requests to this repository.
 
+## 2026-04-21 ([#273](https://github.com/nasa/harmony-regression-tests/pull/273))
+
+### Added
+
+- Updated Imagenator notebook with a MUR25 test
+- Added labels to the Harmony requests in the net2cog and Imagenator notebooks
+
 ## 2026-04-16 ([#271](https://github.com/nasa/harmony-regression-tests/pull/271))
 
 ### Added

test/imagenator/imagenator_Regression.ipynb

@@ -160,6 +160,7 @@
     "        granule_id=[imagenator_info['granule_id']],\n",
     "        variables='product/vertical_column_stratosphere',\n",
     "        format='image/png',\n",
+    "        labels=['imagenator-l2-tempo-no2'],\n",
     "    )\n",
     "\n",
     "    job_id = harmony_client.submit(request)\n",
@@ -247,6 +248,7 @@
     "        granule_id=[imagenator_info['granule_id']],\n",
     "        variables='product/vertical_column_stratosphere',\n",
     "        format='image/png',\n",
+    "        labels=['imagenator-l3-tempo-no2'],\n",
     "    )\n",
     "\n",
     "    job_id = harmony_client.submit(request)\n",
@@ -275,6 +277,79 @@
     "else:\n",
     "    print('Skipping test: imagenator L3 not configured for environment')"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "4fc3076a",
+   "metadata": {},
+   "source": [
+    "# Test: imagenator L3 request on MUR25 L4 analysed_sst variable\n",
+    "\n",
+    "Test rules for MUR/MUR25 collections in harmony-filtering-service + net2cog + hybig"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "630e396e",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "imagenator_non_prod_information = {\n",
+    "    'collection': Collection(id='C1238621140-POCLOUD'),\n",
+    "    'granule_id': 'G1281443693-POCLOUD',\n",
+    "}\n",
+    "associated_output = '20260309090000-JPL-L4_GHRSST-SSTfnd-MUR25-GLOB-v02.0-fv04.2_filtered_analysed_sst_reformatted'\n",
+    "\n",
+    "imagenator_env = {\n",
+    "    Environment.LOCAL: imagenator_non_prod_information,\n",
+    "    Environment.SIT: imagenator_non_prod_information,\n",
+    "    Environment.UAT: imagenator_non_prod_information,\n",
+    "}\n",
+    "\n",
+    "if harmony_environment in imagenator_env:\n",
+    "    imagenator_info = imagenator_env[harmony_environment]\n",
+    "else:\n",
+    "    imagenator_info = None\n",
+    "\n",
+    "if imagenator_info is not None:\n",
+    "    request = Request(\n",
+    "        collection=imagenator_info['collection'],\n",
+    "        granule_id=[imagenator_info['granule_id']],\n",
+    "        variables=['analysed_sst'],\n",
+    "        labels=['imagenator-l3-mur25'],\n",
+    "        format='image/png',\n",
+    "    )\n",
+    "\n",
+    "    job_id = harmony_client.submit(request)\n",
+    "    harmony_client.wait_for_processing(job_id)\n",
+    "\n",
+    "    with TemporaryDirectory() as temp_dir:\n",
+    "        output_files = [\n",
+    "            Path(future.result())\n",
+    "            for future in harmony_client.download_all(job_id, directory=temp_dir)\n",
+    "        ]\n",
+    "\n",
+    "        # MUR filename contains '.' character so the suffixes trick from above has to be modified\n",
+    "        assert len(output_files) == 3\n",
+    "        assert (\n",
+    "            output_files[0].suffixes[-1] == '.png'\n",
+    "        ), f'{output_files[0].suffixes[-1]} is not PNG'\n",
+    "        assert output_files[1].suffixes[-1] == '.pgw'\n",
+    "        assert output_files[2].suffixes[-1] == '.xml'\n",
+    "\n",
+    "        reference_data = Path('reference_data')\n",
+    "        expected_png = reference_data / f'{associated_output}.png'\n",
+    "        expected_pgw = reference_data / f'{associated_output}.pgw'\n",
+    "        expected_aux = reference_data / f'{associated_output}.png.aux.xml'\n",
+    "\n",
+    "        assert output_files[0].read_bytes() == expected_png.read_bytes()\n",
+    "        assert output_files[1].read_bytes() == expected_pgw.read_bytes()\n",
+    "        assert output_files[2].read_bytes() == expected_aux.read_bytes()\n",
+    "    print_success('imagenator L3 request on MUR25 analysed_sst')\n",
+    "else:\n",
+    "    print('Skipping test: imagenator L3 not configured for environment')"
+   ]
   }
  ],
  "metadata": {

test/imagenator/reference_data/20260309090000-JPL-L4_GHRSST-SSTfnd-MUR25-GLOB-v02.0-fv04.2_filtered_analysed_sst_reformatted.pgw

@@ -0,0 +1,6 @@
+0.25
+0.0
+0.0
+-0.25
+-179.875
+89.875

test/imagenator/reference_data/20260309090000-JPL-L4_GHRSST-SSTfnd-MUR25-GLOB-v02.0-fv04.2_filtered_analysed_sst_reformatted.png

@@ -0,0 +1,4 @@
+<PAMDataset>
+  <SRS dataAxisToSRSAxisMapping="2,1">GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]</SRS>
+  <GeoTransform> -1.8000000000000000e+02,  2.5000000000000000e-01,  0.0000000000000000e+00,  9.0000000000000000e+01,  0.0000000000000000e+00, -2.5000000000000000e-01</GeoTransform>
+</PAMDataset>

test/imagenator/reference_data/20260309090000-JPL-L4_GHRSST-SSTfnd-MUR25-GLOB-v02.0-fv04.2_filtered_analysed_sst_reformatted.png.aux.xml

@@ -1 +1 @@
-0.0.3
+0.0.4

test/imagenator/version.txt

@@ -3,13 +3,13 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.10
-  - notebook=6.5.4
-  - papermill=2.3.4
-  - rasterio=1.3.7
-  - rio-cogeo=5.3.4
-  - numpy=1.24.3
-  - pip=23.1.2
-  - matplotlib=3.9.1
+  - python=3.13
+  - notebook=7.4.3
+  - papermill=2.6.0
+  - rasterio=1.5.0
+  - rio-cogeo=7.0.2
+  - numpy=2.4.3
+  - pip=25.2
+  - matplotlib=3.10.8
   - pip:
-    - harmony-py==0.4.8
+    - harmony-py==1.2.0

test/net2cog/environment.yaml

@@ -274,6 +274,7 @@
     "                granule_id=[test_config['granule_id']],\n",
     "                max_results=1,\n",
     "                format='image/tiff',\n",
+    "                labels=[f'net2cog-{collection}'],\n",
     "            )\n",
     "\n",
     "            if 'variables_to_subset' in test_config:\n",

test/net2cog/net2cog_Regression.ipynb

@@ -3,6 +3,7 @@
 from os.path import basename
 from pathlib import Path
 from tempfile import TemporaryDirectory
+from typing import Any
 
 from harmony import Client
 from numpy.testing import assert_array_almost_equal
@@ -11,18 +12,20 @@
 import matplotlib.pyplot as plt
 
 
-def print_error(error_string: str) -> str:
+def print_error(error_string: str) -> None:
     """Print an error, with formatting for red text."""
     print(f'\033[91m{error_string}\033[0m')
+    return
 
 
-def print_success(success_string: str) -> str:
+def print_success(success_string: str) -> None:
     """Print a success message, with formatting for green text."""
     print(f'\033[92mSuccess: {success_string}\033[0m')
+    return
 
 
 def validate_smap_outputs(
-    harmony_client: Client, harmony_job_id: str, expected_results: list
+    harmony_client: Client, harmony_job_id: str, expected_results: dict[str, Any]
 ):
     """Helper function to retrieve outputs from Harmony request and compare to reference
     metadata and files.
@@ -96,7 +99,7 @@ def assert_dataset_produced_correct_results(
 
 
 def validate_bounding_box_and_plot_cog_file(
-    cog_file: str, expected_results: list
+    cog_file: str, expected_results: dict[str, Any]
 ) -> None:
     """Helper function to open, validate the bounding box, and plot the COG file.
 
@@ -111,7 +114,12 @@ def validate_bounding_box_and_plot_cog_file(
         assert src.bounds in expected_results['expected_bounding_box']
         print_success(f"Correct Bounding Box: {src.bounds}")
 
-        extent = [src.bounds.left, src.bounds.right, src.bounds.bottom, src.bounds.top]
+        extent = (
+            float(src.bounds.left),
+            float(src.bounds.right),
+            float(src.bounds.bottom),
+            float(src.bounds.top),
+        )
 
         # If src.bounds.bottom > src.bounds.top, the graph will be inverted.
         # When origin='lower' is used, the vertical axis points upward,
@@ -122,6 +130,5 @@ def validate_bounding_box_and_plot_cog_file(
             plt.imshow(raster_data, extent=extent)
 
         plt.title(f'{basename(cog_file)}')
-        plt.xticks([]), plt.yticks([])
         plt.show()
         print(f'{basename(cog_file)}: {src.bounds}\n')

test/net2cog/utility.py

@@ -1 +1 @@
-0.3.2
+0.4.0