Merge branch 'develop' of github.com:unity-sds/unity-data-services into collection-delete

Author: wphyojpl

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [9.13.0] - 2025-05-29
+### Changed
+- [#589](https://github.com/unity-sds/unity-data-services/pull/589) feat: daac product.name = granule id
+
 ## [9.12.0] - 2025-05-24
 ### Changed
 - [#585](https://github.com/unity-sds/unity-data-services/pull/585) feat: add ram size in lambdas

cumulus_lambda_functions/daac_archiver/daac_archiver_logic.py

@@ -98,7 +98,7 @@ def __extract_files(self, uds_cnm_json: dict, daac_config: dict):
 
     def send_to_daac_internal(self, uds_cnm_json: dict):
         LOGGER.debug(f'uds_cnm_json: {uds_cnm_json}')
-        granule_identifier = UdsCollections.decode_identifier(uds_cnm_json['identifier'])  # This is normally meant to be for collection. Since our granule ID also has collection id prefix. we can use this.
+        granule_identifier = UdsCollections.decode_granule_identifier(uds_cnm_json['identifier'])  # This is normally meant to be for collection. Since our granule ID also has collection id prefix. we can use this.
         self.__archive_index_logic.set_tenant_venue(granule_identifier.tenant, granule_identifier.venue)
         daac_config = self.__archive_index_logic.percolate_document(uds_cnm_json['identifier'])
         if daac_config is None or len(daac_config) < 1:
@@ -120,7 +120,7 @@ def send_to_daac_internal(self, uds_cnm_json: dict):
                 "provider": granule_identifier.tenant,
                 "version": "1.6.0",  # TODO this is hardcoded?
                 "product": {
-                    "name": granule_identifier.id,
+                    "name": granule_identifier.granule,
                     # "dataVersion": daac_config['daac_data_version'],
                     'files': self.__extract_files(uds_cnm_json, daac_config),
                 }

cumulus_lambda_functions/lib/uds_db/uds_collections.py

@@ -12,6 +12,7 @@
 
 
 CollectionIdentifier = namedtuple('CollectionIdentifier', ['urn', 'nasa', 'project', 'tenant', 'venue', 'id'])
+GranuleIdentifier = namedtuple('CollectionIdentifier', ['urn', 'nasa', 'project', 'tenant', 'venue', 'id', 'granule'])
 
 
 class UdsCollections:
@@ -35,6 +36,14 @@ def decode_identifier(incoming_identifier: str) -> CollectionIdentifier:
             raise ValueError(f'invalid collection: {collection_identifier_parts}')
         return CollectionIdentifier._make(collection_identifier_parts[0:6])
 
+    @staticmethod
+    def decode_granule_identifier(incoming_identifier: str) -> GranuleIdentifier:
+        collection_identifier_parts = incoming_identifier.split(':')
+        if len(collection_identifier_parts) < 7:
+            raise ValueError(f'invalid collection: {collection_identifier_parts}')
+        return GranuleIdentifier._make(collection_identifier_parts[0:6] + [':'.join(collection_identifier_parts[6:])])
+
+
     def __bbox_to_polygon(self, bbox: list):
         if len(bbox) != 4:
             raise ValueError(f'not bounding box: {bbox}')

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="cumulus_lambda_functions",
-    version="9.12.0",
+    version="9.13.0",
     packages=find_packages(),
     install_requires=install_requires,
     package_data={

tests/cumulus_lambda_functions/lib/uds_db/test_uds_collections.py

@@ -26,5 +26,18 @@ def test_02(self):
         self.assertEqual(aa.venue, 'DEV', f'wrong venue')
         self.assertEqual(aa.tenant, 'UDS_LOCAL', f'wrong tenant')
         print(aa)
+
+        granule_id = 'URN:NASA:UNITY:unity:test:TRPSDL2ALLCRS1MGLOS___2:TROPESS_CrIS-JPSS1_L2_Standard_H2O_20250108_MUSES_R1p23_megacity_los_angeles_MGLOS_F2p5_J0'
+        aa = UdsCollections.decode_granule_identifier(granule_id)
+        self.assertEqual(aa.venue, 'test', f'wrong venue')
+        self.assertEqual(aa.tenant, 'unity', f'wrong tenant')
+        self.assertEqual(aa.granule, 'TROPESS_CrIS-JPSS1_L2_Standard_H2O_20250108_MUSES_R1p23_megacity_los_angeles_MGLOS_F2p5_J0')
+        print(aa)
+        granule_id = 'URN:NASA:UNITY:unity:test:TRPSDL2ALLCRS1MGLOS___2:TROPESS_CrIS-JPSS1_L2_Standard_H2O_20250108_MUSES_R1p23_megacity_los_angeles_MGLOS_F2p5_J0:1:2:3:4'
+        aa = UdsCollections.decode_granule_identifier(granule_id)
+        self.assertEqual(aa.venue, 'test', f'wrong venue')
+        self.assertEqual(aa.tenant, 'unity', f'wrong tenant')
+        self.assertEqual(aa.granule, 'TROPESS_CrIS-JPSS1_L2_Standard_H2O_20250108_MUSES_R1p23_megacity_los_angeles_MGLOS_F2p5_J0:1:2:3:4')
+
         return