Skip to content

Conversation

sudha-murthy
Copy link
Contributor

@sudha-murthy sudha-murthy commented May 22, 2025

Description

Metadata Annotator requires EASE_row_index and EASE_column_index to be part of the request to compute the dimension scales for SPL2SMAP_S granules. They need to be added as required fields in the output of HOSS which precedes the Metadata Annotator in the service chain.

Jira Issue ID

DAS-2339

Local Test Steps

The request should succeed and the output file should contain the following variables
/Soil_Moisture_Retrieval_Data_1km/albedo_1km, /Soil_Moisture_Retrieval_Data_1km/EASE_column_index_1km, /Soil_Moisture_Retrieval_Data_1km/EASE_row_index_1km, /Soil_Moisture_Retrieval_Data_1km/longitude_1km, /Soil_Moisture_Retrieval_Data_1km/latitude_1km

PR Acceptance Checklist

  • [ X] Jira ticket acceptance criteria met.
  • CHANGELOG.md updated to include high level summary of PR changes.
  • docker/service_version.txt updated if publishing a release.
  • [X ] Tests added/updated and passing.
  • Documentation updated (if needed).

@sudha-murthy sudha-murthy requested a review from joeyschultz May 22, 2025 00:16
CHANGELOG.md Outdated
### 2025-05-21

This version of HOSS updates the hoss configuration file to include
EASE_column_index and EASE_row_index as ancillary variables for SPL2SMAP_S
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DAS-2339 AC says SMAP L3. Is it both SPL2SMAP and SPL3SMAP?

AC:
'The requested output from HOSS should contain EASE_row_index and EASE_col_index for SMAP L3 collections and the regression tests should be successful'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do it for all collections. But we decided to only implement it this way for SPL2SMAP_S. The other collections uses the index ranges from the history attribute to determine the subset index.

all_variables,
)
with self.subTest('Variables configured as ancillary for a single group'):
spl2smap_s_varinfo = VarInfoFromDmr(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 1322-1333 is similar to Line 1347-1357. Declare on line 1259 and reuse the code?

@vutrannasa
Copy link
Contributor

Test harmony-opendap-subsetter: PASS

Test Steps:

  • Local MAC M1 and Harmony in Box

Build harmony-opendap-subsetter

% cd /Users/vtran11/Documents/workspace/
% git clone -b DAS-2339 https://github.com/nasa/harmony-opendap-subsetter
% cd harmony-opendap-subsetter
% ./bin/build-image
% ./bin/build-test
% ./bin/run-test

Run harmony in a box

% cd /Users/vtran11/Documents/workspace/harmony
% vim .env (Add hoss)
% bin/bootstrap-harmony

Open browser and verify below url process correctly

http://localhost:3000/C1268429762-EEDTEST/ogc-api-coverages/1.0.0/collections/parameter_vars/coverage/rangeset?forceAsync=true&granuleId=G1268612499-EEDTEST&variable=Soil_Moisture_Retrieval_Data_1km%2Falbedo_1km&skipPreview=true&

Verify (http://localhost:3000/logs/91cabacb-93a5-43b7-998f-dffbc7a4f0eb/2)

[INFO] [harmony-service.download_url:122] POST request data: \"dap4.ce: %2FSoil_Moisture_Retrieval_Data_1km%2Flongitude_1km%3B%2FSoil_Moisture_Retrieval_Data_1km%2FEASE_row_index_1km%3B%2FSoil_Moisture_Retrieval_Data_1km%2FEASE_column_index_1km%3B%2FSoil_Moisture_Retrieval_Data_1km%2Flatitude_1km%3B%2FSoil_Moisture_Retrieval_Data_1km%2Falbedo_1km\"\r\n",
"2025-05-22 14:17:26,142 [INFO] [harmony-service.download:400] timing.download.start https://opendap.uat.earthdata.nasa.gov/collections/C1268429762-EEDTEST/granules/SC:SPL2SMAP_S.003:241398946.dap.nc4?A-api-request-uuid=91cabacb-93a5-43b7-998f-dffbc7a4f0eb\r\n",

Copy link
Contributor

@joeyschultz joeyschultz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have some very minor comments but it looks good overall.
Unit tests ran successfully.
My harmony-in-a-box is broken right now so I wasn't able to run the request in the test instructions, but I'm satisfied with Vu's testing of it.

@joeyschultz
Copy link
Contributor

Thanks for the updates Sudha. I reran the unit tests after the dmr file update and they still pass. Marking as approved.

@sudha-murthy sudha-murthy merged commit 30844d5 into main May 22, 2025
4 checks passed
@sudha-murthy sudha-murthy deleted the DAS-2339 branch May 22, 2025 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants