From 0844685bd6f53b67a159ef609b737dcde5bd3f60 Mon Sep 17 00:00:00 2001 From: kim Date: Thu, 2 Nov 2023 11:43:26 -0800 Subject: [PATCH 01/35] removes burst map products from S1 dataset entry --- SearchAPI/CMR/Translate/datasets.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index fef03061..8c58245d 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -36,7 +36,6 @@ "C1327985644-ASF", "C1327985571-ASF", "C1327985674-ASF", - "C2450786986-ASF", "C1205428742-ASF", "C1216244348-ASF", "C1212201032-ASF", @@ -71,7 +70,6 @@ "C1216244596-ASF", "C1216244588-ASF", "C1216244599-ASF", - "C1245953394-ASF", "C1234413245-ASFDEV", "C1234413263-ASFDEV", "C1234413229-ASFDEV", From 732048bfa8314d7250260eb325430173bce6642a Mon Sep 17 00:00:00 2001 From: kim Date: Fri, 3 Nov 2023 14:18:18 -0800 Subject: [PATCH 02/35] adds RTC/CSLC-STATIC concept ids to opera dataset collections --- SearchAPI/CMR/Translate/datasets.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 8c58245d..47684b19 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -114,6 +114,8 @@ "OPERA-S1": [ "C2777443834-ASF", "C2777436413-ASF", + "C2795135174-ASF", # RTC-STATIC + "C2795135668-ASF", # CSLC-STATIC "C1258354200-ASF", # maybe extra? "C1259982010-ASF", "C1257995185-ASF", From d00fb34c16617734d6fe4185ea0f35cfcfbde414 Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 6 Nov 2023 13:36:14 -0900 Subject: [PATCH 03/35] adds error handling when provided invalid dataset --- SearchAPI/CMR/Translate/input_fixer.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SearchAPI/CMR/Translate/input_fixer.py b/SearchAPI/CMR/Translate/input_fixer.py index 0a751532..e3545e63 100644 --- a/SearchAPI/CMR/Translate/input_fixer.py +++ b/SearchAPI/CMR/Translate/input_fixer.py @@ -111,9 +111,11 @@ def input_fixer(params, is_prod: bool = False, provider: str = "ASF"): elif k == 'datasets': fixed_params['collections'] = [] for dataset in params[k]: - logging.warn(dataset) - logging.warn(platform_datasets.get(dataset)) - fixed_params['collections'].extend(platform_datasets.get(dataset)) + if platform_datasets.get(dataset): + fixed_params['collections'].extend(platform_datasets.get(dataset)) + else: + raise ValueError(f'Could not find dataset named "{dataset}" provided for datasets keyword.') + logging.warn(fixed_params) elif k == 'beammode': beammap = { From fde4e6aeec708a2ae0b202c6d6b10e6f1404295d Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 7 Nov 2023 16:01:25 -0900 Subject: [PATCH 04/35] comments out log_subquery_time for now, adds opera calval concept-ids to dataset --- SearchAPI/CMR/SubQuery.py | 2 +- SearchAPI/CMR/Translate/datasets.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/SearchAPI/CMR/SubQuery.py b/SearchAPI/CMR/SubQuery.py index 405e61ce..d838e5dc 100644 --- a/SearchAPI/CMR/SubQuery.py +++ b/SearchAPI/CMR/SubQuery.py @@ -167,7 +167,7 @@ def get_page(self, session): query_duration = perf_counter() - q_start logging.debug(f'CMR query time: {query_duration}') - self.log_subquery_time({'time': query_duration, 'status': response.status_code}) + # self.log_subquery_time({'time': query_duration, 'status': response.status_code}) if query_duration > 10: self.log_slow_cmr_response(session, response, query_duration) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 47684b19..9f352b05 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -124,6 +124,10 @@ "C1259981910-ASF", "C1257995186-ASF", "C1259974840-ASF", + "C1260726384-ASF", + "C1260721945-ASF", + "C1260721853-ASF", + "C1260726378-ASF", ], "SLC-BURST": ["C2709161906-ASF", "C1257024016-ASF"], "ALOS PALSAR": [ From a63164bbca5aeda6aefee42f7f9a1049f4964d28 Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 7 Nov 2023 16:46:47 -0900 Subject: [PATCH 05/35] adds missing dataset collections check for should_use_asf_frame() method --- SearchAPI/CMR/SubQuery.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/SearchAPI/CMR/SubQuery.py b/SearchAPI/CMR/SubQuery.py index d838e5dc..1ac0a4e7 100644 --- a/SearchAPI/CMR/SubQuery.py +++ b/SearchAPI/CMR/SubQuery.py @@ -7,7 +7,7 @@ from flask import request from SearchAPI.asf_env import get_config -from SearchAPI.CMR.Translate import parse_cmr_response +from SearchAPI.CMR.Translate import parse_cmr_response, platform_datasets from SearchAPI.CMR.Exceptions import CMRError import boto3 @@ -58,9 +58,15 @@ def combine_params(self, params, extra_params): def should_use_asf_frame(self): asf_frame_platforms = ['SENTINEL-1A', 'SENTINEL-1B', 'ALOS'] - + asf_frame_datasets = ['SENTINEL-1', 'OPERA-S1', 'SLC-BURST', 'ALOS PALSAR', 'ALOS AVNIR-2'] + + asf_frame_collections = [] + for dataset in asf_frame_datasets: + asf_frame_collections.extend(platform_datasets.get(dataset)) + return any([ - p[0] == 'platform[]' and p[1] in asf_frame_platforms + p[0] == 'platform[]' and p[1] in asf_frame_platforms + or p[0] == 'echo_collection_id[]' and p[1] in asf_frame_collections for p in self.params ]) From e1ec96b2bc177d5b0a8af8cc9167b46e4071a333 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 8 Nov 2023 09:59:31 -0900 Subject: [PATCH 06/35] changes 'datasets' keyword to 'dataset' --- SearchAPI/CMR/Translate/input_fixer.py | 4 ++-- SearchAPI/CMR/Translate/input_map.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SearchAPI/CMR/Translate/input_fixer.py b/SearchAPI/CMR/Translate/input_fixer.py index e3545e63..602c6b1e 100644 --- a/SearchAPI/CMR/Translate/input_fixer.py +++ b/SearchAPI/CMR/Translate/input_fixer.py @@ -108,13 +108,13 @@ def input_fixer(params, is_prod: bool = False, provider: str = "ASF"): if any_processing_level: fixed_params['collections'] = collection_list - elif k == 'datasets': + elif k == 'dataset': fixed_params['collections'] = [] for dataset in params[k]: if platform_datasets.get(dataset): fixed_params['collections'].extend(platform_datasets.get(dataset)) else: - raise ValueError(f'Could not find dataset named "{dataset}" provided for datasets keyword.') + raise ValueError(f'Could not find dataset named "{dataset}" provided for dataset keyword.') logging.warn(fixed_params) elif k == 'beammode': diff --git a/SearchAPI/CMR/Translate/input_map.py b/SearchAPI/CMR/Translate/input_map.py index 4b4a50e9..b3bdfd90 100644 --- a/SearchAPI/CMR/Translate/input_map.py +++ b/SearchAPI/CMR/Translate/input_map.py @@ -56,8 +56,8 @@ def input_map(): 'relativeburstid': ['attribute[]', 'int,BURST_ID_RELATIVE,{0}', parse_int_list], 'absoluteburstid': ['attribute[]', 'int,BURST_ID_ABSOLUTE,{0}', parse_int_list], 'fullburstid': ['attribute[]', 'string,BURST_ID_FULL,{0}', parse_string_list], - 'operaburstid': ['attribute[]', 'string,OPERA_BURST_ID,{0}', parse_string_list], - 'datasets': [None, '{0}', parse_string_list] + 'operaburstid': ['attribute[]', 'string,OPERA_BURST_ID,{0}', parse_string_list], + 'dataset': [None, '{0}', parse_string_list] } return parameter_map From 10b478e945cad26640e697106678015a319dce4a Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 29 Nov 2023 08:22:50 -0900 Subject: [PATCH 07/35] adds calval products to opera s1 dataset --- SearchAPI/CMR/Translate/datasets.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 9f352b05..5eb2a1f3 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -128,6 +128,10 @@ "C1260721945-ASF", "C1260721853-ASF", "C1260726378-ASF", + "C2803502140-ASF", # OPERA_L2_CSLC-S1-STATIC_CALVAL_V1 + "C2803501758-ASF", # OPERA_L2_CSLC-S1_CALVAL_V1 + "C2803501097-ASF", # OPERA_L2_RTC-S1_CALVAL_V1 + "C2803500298-ASF" # OPERA_L2_RTC-S1-STATIC_CALVAL_V1 ], "SLC-BURST": ["C2709161906-ASF", "C1257024016-ASF"], "ALOS PALSAR": [ From d4d1b4e9165c68c4982c9c624eba95b0662fc83a Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 5 Dec 2023 11:12:18 -0900 Subject: [PATCH 08/35] adds validity start date for static opera product types --- SearchAPI/CMR/Output/jsonlite.py | 4 +++- SearchAPI/CMR/Translate/parse_cmr_response.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/SearchAPI/CMR/Output/jsonlite.py b/SearchAPI/CMR/Output/jsonlite.py index 6fabc9db..4070735a 100644 --- a/SearchAPI/CMR/Output/jsonlite.py +++ b/SearchAPI/CMR/Output/jsonlite.py @@ -181,7 +181,9 @@ def getItem(self, p): if p.get('operaBurstID') is not None or result['productID'].startswith('OPERA'): result['opera'] = { 'operaBurstID': p.get('operaBurstID'), - 'additionalUrls': p.get('additionalUrls') + 'additionalUrls': p.get('additionalUrls'), } + if p.get('ValidityStartDate'): + result['opera']['ValidityStartDate'] = p.get('ValidityStartDate') return result diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index 1a4ec8db..f59d0e41 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -212,6 +212,10 @@ def float_or_none(a): result['additionalUrls'] = list(set([*accessUrls, *OnlineResources])) result['configurationName'] = "Interferometric Wide. 250 km swath, 5 m x 20 m spatial resolution and burst synchronization for interferometry. IW is considered to be the standard mode over land masses." result['browse'] = [url for url in get_all_vals('./AssociatedBrowseImageUrls/ProviderBrowseUrl/URL') if not url.startswith('s3://')] + + if 'STATIC' in result['processingLevel']: + result['ValidityStartDate'] = get_val('./Temporal/SingleDateTime') + return result From bd5b2ecb3a6ac812d793e19efd617fb691a38b31 Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 5 Dec 2023 11:17:51 -0900 Subject: [PATCH 09/35] fixes capitalization --- SearchAPI/CMR/Output/jsonlite.py | 4 ++-- SearchAPI/CMR/Translate/parse_cmr_response.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SearchAPI/CMR/Output/jsonlite.py b/SearchAPI/CMR/Output/jsonlite.py index 4070735a..99795463 100644 --- a/SearchAPI/CMR/Output/jsonlite.py +++ b/SearchAPI/CMR/Output/jsonlite.py @@ -183,7 +183,7 @@ def getItem(self, p): 'operaBurstID': p.get('operaBurstID'), 'additionalUrls': p.get('additionalUrls'), } - if p.get('ValidityStartDate'): - result['opera']['ValidityStartDate'] = p.get('ValidityStartDate') + if p.get('validityStartDate'): + result['opera']['validityStartDate'] = p.get('validityStartDate') return result diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index f59d0e41..3868dd6e 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -214,7 +214,7 @@ def float_or_none(a): result['browse'] = [url for url in get_all_vals('./AssociatedBrowseImageUrls/ProviderBrowseUrl/URL') if not url.startswith('s3://')] if 'STATIC' in result['processingLevel']: - result['ValidityStartDate'] = get_val('./Temporal/SingleDateTime') + result['validityStartDate'] = get_val('./Temporal/SingleDateTime') return result From c4c0e5d659207c56ee6a98d31daec59f7b6f7ffd Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 5 Dec 2023 12:13:13 -0900 Subject: [PATCH 10/35] checks if providerbrowseUrls available --- SearchAPI/CMR/Translate/parse_cmr_response.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index 3868dd6e..1296c3cb 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -211,7 +211,9 @@ def float_or_none(a): OnlineResources = [url for url in get_all_vals('./OnlineResources/OnlineResource/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] result['additionalUrls'] = list(set([*accessUrls, *OnlineResources])) result['configurationName'] = "Interferometric Wide. 250 km swath, 5 m x 20 m spatial resolution and burst synchronization for interferometry. IW is considered to be the standard mode over land masses." - result['browse'] = [url for url in get_all_vals('./AssociatedBrowseImageUrls/ProviderBrowseUrl/URL') if not url.startswith('s3://')] + + if (providerbrowseUrls := get_all_vals('./AssociatedBrowseImageUrls/ProviderBrowseUrl/URL')): + result['browse'] = [url for url in providerbrowseUrls if not url.startswith('s3://')] if 'STATIC' in result['processingLevel']: result['validityStartDate'] = get_val('./Temporal/SingleDateTime') From 9496a43c322d8ff9060460679db38770fe0e83eb Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 22 Jan 2024 15:09:37 -0900 Subject: [PATCH 11/35] moves opera calibration collections into separate "calibration" datasets --- SearchAPI/CMR/Translate/datasets.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 9f352b05..8b0071b7 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -114,8 +114,8 @@ "OPERA-S1": [ "C2777443834-ASF", "C2777436413-ASF", - "C2795135174-ASF", # RTC-STATIC - "C2795135668-ASF", # CSLC-STATIC + "C2795135174-ASF", # RTC-STATIC + "C2795135668-ASF", # CSLC-STATIC "C1258354200-ASF", # maybe extra? "C1259982010-ASF", "C1257995185-ASF", @@ -124,10 +124,18 @@ "C1259981910-ASF", "C1257995186-ASF", "C1259974840-ASF", - "C1260726384-ASF", - "C1260721945-ASF", - "C1260721853-ASF", - "C1260726378-ASF", + ], + "OPERA-S1-CALIBRATION": [ + "C1260721945-ASF", # CSLC + "C2803501758-ASF", + "C1260721853-ASF", # RTC + "C2803501097-ASF", + ], + "OPERA-S1-CALIBRATION-STATIC": [ + "C1260726384-ASF", # CSLC STATIC + "C2803502140-ASF", + "C1260726378-ASF", # RTC STATIC + "C2803500298-ASF", ], "SLC-BURST": ["C2709161906-ASF", "C1257024016-ASF"], "ALOS PALSAR": [ From a2438b3f80412f7e9e0682550eca1c2a8446b568 Mon Sep 17 00:00:00 2001 From: Kim <33294735+SpicyGarlicAlbacoreRoll@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:13:12 -0900 Subject: [PATCH 12/35] Update datasets.py --- SearchAPI/CMR/Translate/datasets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 8b0071b7..e3d9205a 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -114,8 +114,8 @@ "OPERA-S1": [ "C2777443834-ASF", "C2777436413-ASF", - "C2795135174-ASF", # RTC-STATIC - "C2795135668-ASF", # CSLC-STATIC + "C2795135174-ASF", # RTC-STATIC + "C2795135668-ASF", # CSLC-STATIC "C1258354200-ASF", # maybe extra? "C1259982010-ASF", "C1257995185-ASF", From 809d1ffa463a9e838fc7cbc32e1fe70ed3bfd7fb Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 23 Jan 2024 16:26:34 -0900 Subject: [PATCH 13/35] removes static OPERA-S1 calibration dataset --- SearchAPI/CMR/Translate/datasets.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 8b0071b7..9bb88256 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -131,12 +131,6 @@ "C1260721853-ASF", # RTC "C2803501097-ASF", ], - "OPERA-S1-CALIBRATION-STATIC": [ - "C1260726384-ASF", # CSLC STATIC - "C2803502140-ASF", - "C1260726378-ASF", # RTC STATIC - "C2803500298-ASF", - ], "SLC-BURST": ["C2709161906-ASF", "C1257024016-ASF"], "ALOS PALSAR": [ "C1206487504-ASF", From 085f1280b869aef1142d9792be05f6f8eb443d8e Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 24 Jan 2024 09:29:01 -0900 Subject: [PATCH 14/35] changes SB test case to fixed time span --- yml_tests/test_URLs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yml_tests/test_URLs.yml b/yml_tests/test_URLs.yml index fccfad74..f7ab8cb3 100644 --- a/yml_tests/test_URLs.yml +++ b/yml_tests/test_URLs.yml @@ -1069,8 +1069,8 @@ tests: - platform SB: platform: SB - start: 1+year+ago - end: now + start: "2015-01-01T00:00:00Z" + end: "2016-01-02T00:00:00Z" maxResults: 200 output: csv From a01d834744c95de69a920c7c35ab0d332b29ba08 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 24 Jan 2024 16:10:22 -0900 Subject: [PATCH 15/35] changes test case date range --- yml_tests/test_URLs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yml_tests/test_URLs.yml b/yml_tests/test_URLs.yml index f7ab8cb3..334a4321 100644 --- a/yml_tests/test_URLs.yml +++ b/yml_tests/test_URLs.yml @@ -1069,8 +1069,8 @@ tests: - platform SB: platform: SB - start: "2015-01-01T00:00:00Z" - end: "2016-01-02T00:00:00Z" + start: "2016-01-01T00:00:00Z" + end: "2017-01-02T00:00:00Z" maxResults: 200 output: csv From af6ae15ff81936fa8ea481b055d63ff3bf9b360c Mon Sep 17 00:00:00 2001 From: kim Date: Thu, 1 Feb 2024 11:41:38 -0900 Subject: [PATCH 16/35] style: OPERA calibration -> calval --- SearchAPI/CMR/Translate/datasets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index cdd3659b..15ee1db3 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -125,7 +125,7 @@ "C1257995186-ASF", "C1259974840-ASF", ], - "OPERA-S1-CALIBRATION": [ + "OPERA-S1-CALVAL": [ "C1260721945-ASF", # CSLC "C2803501758-ASF", "C1260721853-ASF", # RTC From f96dbaf3e841b94ae173b02544cdbba1c600831c Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 28 Feb 2024 08:16:36 -0900 Subject: [PATCH 17/35] adds empty nisar dataset --- SearchAPI/CMR/Translate/datasets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 15ee1db3..4d2c9d4a 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -368,4 +368,5 @@ "C1206752770-ASF", "C1206144699-ASF", ], + "NISAR": [] } From 2ff40bfb890b91a1b50726ec4282af49e5de3df5 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 28 Feb 2024 08:28:13 -0900 Subject: [PATCH 18/35] adds nisar uat dataset concept-ids --- SearchAPI/CMR/Translate/datasets.py | 38 ++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 4d2c9d4a..0e640dba 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -114,8 +114,8 @@ "OPERA-S1": [ "C2777443834-ASF", "C2777436413-ASF", - "C2795135174-ASF", # RTC-STATIC - "C2795135668-ASF", # CSLC-STATIC + "C2795135174-ASF", # RTC-STATIC + "C2795135668-ASF", # CSLC-STATIC "C1258354200-ASF", # maybe extra? "C1259982010-ASF", "C1257995185-ASF", @@ -368,5 +368,37 @@ "C1206752770-ASF", "C1206144699-ASF", ], - "NISAR": [] + "NISAR": [ + "C1257349081-ASF", + "C1257349079-ASF", + "C1257349048-ASF", + "C1257349082-ASF", + "C1257349059-ASF", + "C1257349053-ASF", + "C1257349054-ASF", + "C1257349120-ASF", + "C1257349072-ASF", + "C1257349066-ASF", + "C1257349023-ASF", + "C1257349067-ASF", + "C1257349121-ASF", + "C1257349074-ASF", + "C1257349088-ASF", + "C1257349083-ASF", + "C1257349114-ASF", + "C1257349115-ASF", + "C1257349065-ASF", + "C1257349089-ASF", + "C1257349063-ASF", + "C1257349073-ASF", + "C1257349094-ASF", + "C1257349095-ASF", + "C1257349102-ASF", + "C1257349096-ASF", + "C1257349103-ASF", + "C1257349109-ASF", + "C1257349107-ASF", + "C1257349108-ASF", + "C1257349093-ASF", + ], } From 93af966c05a8d389aea4e572aa07bf375866fc8e Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 28 Feb 2024 08:36:18 -0900 Subject: [PATCH 19/35] adds check for gpolygon, returns empty wkt if no gpolygon is parsed --- SearchAPI/CMR/Translate/parse_cmr_response.py | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index 1296c3cb..29b2c0e9 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -238,16 +238,19 @@ def wkt_from_gpolygon(gpoly): # Close the shape if needed shapes[-1].append(shapes[-1][0]) - longest = shapes[0] - for shape in shapes: - if len(shape) > len(longest): - longest = shape - - wkt_shape = 'POLYGON(({0}))'.format( - ','.join(['{0} {1}'.format(x['lon'], x['lat']) for x in longest]) - ) + if len(shapes): + longest = shapes[0] + for shape in shapes: + if len(shape) > len(longest): + longest = shape + + wkt_shape = 'POLYGON(({0}))'.format( + ','.join(['{0} {1}'.format(x['lon'], x['lat']) for x in longest]) + ) - return longest, wkt_shape + return longest, wkt_shape + + return '', '' def shape_not_closed(shapes): From cec053ebcf9a74db4153bd845774b1b79d878d11 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 28 Feb 2024 08:53:26 -0900 Subject: [PATCH 20/35] comments out non-spatial collections, adds commented out spatial collection version --- SearchAPI/CMR/Translate/datasets.py | 57 +++++++++++++++++------------ 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 0e640dba..df97e4ef 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -369,28 +369,28 @@ "C1206144699-ASF", ], "NISAR": [ - "C1257349081-ASF", - "C1257349079-ASF", - "C1257349048-ASF", - "C1257349082-ASF", - "C1257349059-ASF", - "C1257349053-ASF", - "C1257349054-ASF", - "C1257349120-ASF", - "C1257349072-ASF", - "C1257349066-ASF", - "C1257349023-ASF", - "C1257349067-ASF", - "C1257349121-ASF", - "C1257349074-ASF", - "C1257349088-ASF", - "C1257349083-ASF", - "C1257349114-ASF", - "C1257349115-ASF", - "C1257349065-ASF", - "C1257349089-ASF", - "C1257349063-ASF", - "C1257349073-ASF", + # "C1257349081-ASF", # item['umm']['SpatialExtent']['GranuleSpatialRepresentation'] == 'NO_SPATIAL' + # "C1257349079-ASF", + # "C1257349048-ASF", + # "C1257349082-ASF", + # "C1257349059-ASF", + # "C1257349053-ASF", + # "C1257349054-ASF", + # "C1257349120-ASF", + # "C1257349072-ASF", + # "C1257349066-ASF", + # "C1257349023-ASF", + # "C1257349067-ASF", + # "C1257349121-ASF", + # "C1257349074-ASF", + # "C1257349088-ASF", + # "C1257349083-ASF", + # "C1257349114-ASF", + "C1257349115-ASF", # spatial + # "C1257349065-ASF", + # "C1257349089-ASF", + # "C1257349063-ASF", + # "C1257349073-ASF", "C1257349094-ASF", "C1257349095-ASF", "C1257349102-ASF", @@ -399,6 +399,17 @@ "C1257349109-ASF", "C1257349107-ASF", "C1257349108-ASF", - "C1257349093-ASF", + # "C1257349093-ASF", ], + # "NISAR-SPATIAL": [ + # "C1257349115-ASF", + # "C1257349094-ASF", + # "C1257349095-ASF", + # "C1257349102-ASF", + # "C1257349096-ASF", + # "C1257349103-ASF", + # "C1257349109-ASF", + # "C1257349107-ASF", + # "C1257349108-ASF", + # ], } From 90641cb5faf277285802bd57d5b5d0a204264104 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 28 Feb 2024 10:17:11 -0900 Subject: [PATCH 21/35] adds latest nisar collections --- SearchAPI/CMR/Translate/datasets.py | 109 +++++++++++++++++----------- 1 file changed, 66 insertions(+), 43 deletions(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index df97e4ef..cea57a6d 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -368,48 +368,71 @@ "C1206752770-ASF", "C1206144699-ASF", ], - "NISAR": [ - # "C1257349081-ASF", # item['umm']['SpatialExtent']['GranuleSpatialRepresentation'] == 'NO_SPATIAL' - # "C1257349079-ASF", - # "C1257349048-ASF", - # "C1257349082-ASF", - # "C1257349059-ASF", - # "C1257349053-ASF", - # "C1257349054-ASF", - # "C1257349120-ASF", - # "C1257349072-ASF", - # "C1257349066-ASF", - # "C1257349023-ASF", - # "C1257349067-ASF", - # "C1257349121-ASF", - # "C1257349074-ASF", - # "C1257349088-ASF", - # "C1257349083-ASF", - # "C1257349114-ASF", - "C1257349115-ASF", # spatial - # "C1257349065-ASF", - # "C1257349089-ASF", - # "C1257349063-ASF", - # "C1257349073-ASF", - "C1257349094-ASF", - "C1257349095-ASF", - "C1257349102-ASF", - "C1257349096-ASF", - "C1257349103-ASF", - "C1257349109-ASF", - "C1257349107-ASF", - "C1257349108-ASF", - # "C1257349093-ASF", + # TODO: add check for item['umm']['SpatialExtent']['GranuleSpatialRepresentation'] == 'NO_SPATIAL' + "NISAR": [ # TEST ASFDEV + "C1258125097-ASFDEV", + "C1258290319-ASFDEV", + "C1258301530-ASFDEV", + "C1256535568-ASFDEV", + "C1256574227-ASFDEV", + "C1256579794-ASFDEV", + "C1256535570-ASFDEV", + "C1256583888-ASFDEV", + "C1257088418-ASFDEV", + "C1256578011-ASFDEV", + "C1256583659-ASFDEV", + "C1256737727-ASFDEV", + "C1256729502-ASFDEV", + "C1256832018-ASFDEV", + "C1256944038-ASFDEV", + "C1256802323-ASFDEV", + "C1256938783-ASFDEV", + "C1256621478-ASFDEV", + "C1256622937-ASFDEV", + "C1256983900-ASFDEV", + "C1256984645-ASFDEV", + "C1261630276-ASFDEV", + "C1258290319-ASFDEV", + # TEST + "C1258836794-ASF", + "C1258836797-ASF", + "C1258836800-ASF", + "C1257349089-ASF", + "C1257349088-ASF", + "C1257349083-ASF", + "C1257349082-ASF", + "C1257349081-ASF", + "C1257349079-ASF", + "C1257349074-ASF", + "C1257349073-ASF", + "C1257349072-ASF", + "C1257349067-ASF", + "C1257349066-ASF", + "C1257349065-ASF", + "C1257349063-ASF", + "C1257349059-ASF", + "C1257349054-ASF", + "C1257349053-ASF", + "C1257349048-ASF", + "C1257349023-ASF", + # PROD + "C2727913056-ASF", + "C2727908375-ASF", + "C2727912431-ASF", + "C2727904608-ASF", + "C2727903976-ASF", + "C2727904134-ASF", + "C2727911748-ASF", + "C2727913362-ASF", + "C2727907155-ASF", + "C2727907520-ASF", + "C2727908129-ASF", + "C2727912739-ASF", + "C2727913160-ASF", + "C2727904769-ASF", + "C2727905298-ASF", + "C2727905020-ASF", + "C2727904288-ASF", + "C2727907902-ASF", ], - # "NISAR-SPATIAL": [ - # "C1257349115-ASF", - # "C1257349094-ASF", - # "C1257349095-ASF", - # "C1257349102-ASF", - # "C1257349096-ASF", - # "C1257349103-ASF", - # "C1257349109-ASF", - # "C1257349107-ASF", - # "C1257349108-ASF", - # ], } From 2a214fcd27b631bc03a5fc48bed1ef9c3c144658 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 6 Mar 2024 08:29:02 -0900 Subject: [PATCH 22/35] corrects nisar concept-id list --- SearchAPI/CMR/Translate/datasets.py | 186 ++++++++++++++++++---------- 1 file changed, 122 insertions(+), 64 deletions(-) diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index cea57a6d..0ac54472 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -369,70 +369,128 @@ "C1206144699-ASF", ], # TODO: add check for item['umm']['SpatialExtent']['GranuleSpatialRepresentation'] == 'NO_SPATIAL' - "NISAR": [ # TEST ASFDEV - "C1258125097-ASFDEV", - "C1258290319-ASFDEV", - "C1258301530-ASFDEV", - "C1256535568-ASFDEV", - "C1256574227-ASFDEV", - "C1256579794-ASFDEV", - "C1256535570-ASFDEV", - "C1256583888-ASFDEV", - "C1257088418-ASFDEV", - "C1256578011-ASFDEV", - "C1256583659-ASFDEV", - "C1256737727-ASFDEV", - "C1256729502-ASFDEV", - "C1256832018-ASFDEV", - "C1256944038-ASFDEV", - "C1256802323-ASFDEV", - "C1256938783-ASFDEV", - "C1256621478-ASFDEV", - "C1256622937-ASFDEV", - "C1256983900-ASFDEV", - "C1256984645-ASFDEV", - "C1261630276-ASFDEV", - "C1258290319-ASFDEV", - # TEST - "C1258836794-ASF", - "C1258836797-ASF", - "C1258836800-ASF", - "C1257349089-ASF", - "C1257349088-ASF", - "C1257349083-ASF", - "C1257349082-ASF", - "C1257349081-ASF", - "C1257349079-ASF", - "C1257349074-ASF", - "C1257349073-ASF", - "C1257349072-ASF", - "C1257349067-ASF", - "C1257349066-ASF", - "C1257349065-ASF", - "C1257349063-ASF", - "C1257349059-ASF", - "C1257349054-ASF", - "C1257349053-ASF", - "C1257349048-ASF", - "C1257349023-ASF", + "NISAR": [ # UAT ASFDEV + "C1261815181-ASFDEV", + "C1261832381-ASFDEV", + "C1256533420-ASFDEV", + "C1261813453-ASFDEV", + "C1261832466-ASFDEV", + "C1256524081-ASFDEV", + "C1261815274-ASFDEV", + "C1261832497-ASFDEV", + "C1256358262-ASFDEV", + "C1261815276-ASFDEV", + "C1261832632-ASFDEV", + "C1256358463-ASFDEV", + "C1261813489-ASFDEV", + "C1261832868-ASFDEV", + "C1256363301-ASFDEV", + "C1261819086-ASFDEV", + "C1261832940-ASFDEV", + "C1256381769-ASFDEV", + "C1261819098-ASFDEV", + "C1261832990-ASFDEV", + "C1256420738-ASFDEV", + "C1261819110-ASFDEV", + "C1261832993-ASFDEV", + "C1256411631-ASFDEV", + "C1261819167-ASFDEV", + "C1261833024-ASFDEV", + "C1256413628-ASFDEV", + "C1261819168-ASFDEV", + "C1261833025-ASFDEV", + "C1256432264-ASFDEV", + "C1261819211-ASFDEV", + "C1261833026-ASFDEV", + "C1256477304-ASFDEV", + "C1261819233-ASFDEV", + "C1261833027-ASFDEV", + "C1256479237-ASFDEV", + "C1261819245-ASFDEV", + "C1261833050-ASFDEV", + "C1256568692-ASFDEV", + "C1262134528-ASFDEV", + # UAT + "C1261815288-ASF", + "C1261832657-ASF", + "C1257349121-ASF", + "C1261815147-ASF", + "C1261832658-ASF", + "C1257349120-ASF", + "C1261815289-ASF", + "C1261832659-ASF", + "C1257349115-ASF", + "C1261815301-ASF", + "C1261832671-ASF", + "C1257349114-ASF", + "C1261815148-ASF", + "C1261833052-ASF", + "C1257349109-ASF", + "C1261819120-ASF", + "C1261833063-ASF", + "C1257349108-ASF", + "C1261819121-ASF", + "C1261833064-ASF", + "C1257349107-ASF", + "C1261819145-ASF", + "C1261833076-ASF", + "C1257349103-ASF", + "C1261819258-ASF", + "C1261833127-ASF", + "C1257349102-ASF", + "C1261819270-ASF", + "C1261846741-ASF", + "C1257349096-ASF", + "C1261819275-ASF", + "C1261846880-ASF", + "C1257349095-ASF", + "C1261819281-ASF", + "C1261846994-ASF", + "C1257349094-ASF", + "C1261819282-ASF", + "C1261847095-ASF", + "C1257349093-ASF", + "C1262135006-ASF", # PROD - "C2727913056-ASF", - "C2727908375-ASF", - "C2727912431-ASF", - "C2727904608-ASF", - "C2727903976-ASF", - "C2727904134-ASF", - "C2727911748-ASF", - "C2727913362-ASF", - "C2727907155-ASF", - "C2727907520-ASF", - "C2727908129-ASF", - "C2727912739-ASF", - "C2727913160-ASF", - "C2727904769-ASF", - "C2727905298-ASF", - "C2727905020-ASF", - "C2727904288-ASF", - "C2727907902-ASF", + "C2850220296-ASF", + "C2853068083-ASF", + "C2727902012-ASF", + "C2850223384-ASF", + "C2853086824-ASF", + "C2727901263-ASF", + "C2850224301-ASF", + "C2853089814-ASF", + "C2727901639-ASF", + "C2850225137-ASF", + "C2853091612-ASF", + "C2727901523-ASF", + "C2850225585-ASF", + "C2853145197-ASF", + "C2727900439-ASF", + "C2850234202-ASF", + "C2853147928-ASF", + "C2723110181-ASF", + "C2850235455-ASF", + "C2853153429-ASF", + "C2727900827-ASF", + "C2850237619-ASF", + "C2853156054-ASF", + "C2727900080-ASF", + "C2850259510-ASF", + "C2854332392-ASF", + "C2727896667-ASF", + "C2850261892-ASF", + "C2854335566-ASF", + "C2727897718-ASF", + "C2850262927-ASF", + "C2854338529-ASF", + "C2727896018-ASF", + "C2850263910-ASF", + "C2854341702-ASF", + "C2727896460-ASF", + "C2850265000-ASF", + "C2854344945-ASF", + "C2727894546-ASF", + "C2874824964-ASF" ], } From 2cc0e21e4277ba5a929ec5b95e7c3d054d441cb5 Mon Sep 17 00:00:00 2001 From: kim Date: Thu, 21 Mar 2024 13:17:06 -0800 Subject: [PATCH 23/35] adds shortname search keyword support --- SearchAPI/CMR/Translate/input_map.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SearchAPI/CMR/Translate/input_map.py b/SearchAPI/CMR/Translate/input_map.py index b3bdfd90..fc879799 100644 --- a/SearchAPI/CMR/Translate/input_map.py +++ b/SearchAPI/CMR/Translate/input_map.py @@ -57,7 +57,8 @@ def input_map(): 'absoluteburstid': ['attribute[]', 'int,BURST_ID_ABSOLUTE,{0}', parse_int_list], 'fullburstid': ['attribute[]', 'string,BURST_ID_FULL,{0}', parse_string_list], 'operaburstid': ['attribute[]', 'string,OPERA_BURST_ID,{0}', parse_string_list], - 'dataset': [None, '{0}', parse_string_list] + 'dataset': [None, '{0}', parse_string_list], + 'shortname': ['shortName', '{0}', parse_string_list] } return parameter_map From d01ea13020ce1772da413ff7d15a1a8c016bebd5 Mon Sep 17 00:00:00 2001 From: kim Date: Thu, 21 Mar 2024 17:15:48 -0800 Subject: [PATCH 24/35] checks length of absolute orbit before assignment in geojson output. check form data for cmr token if missing from args as fallback --- SearchAPI/CMR/Output/geojson.py | 14 ++++++++++---- SearchAPI/CMR/SubQuery.py | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/SearchAPI/CMR/Output/geojson.py b/SearchAPI/CMR/Output/geojson.py index 8178162f..981b572c 100644 --- a/SearchAPI/CMR/Output/geojson.py +++ b/SearchAPI/CMR/Output/geojson.py @@ -58,13 +58,19 @@ def getItem(self, p): except TypeError: pass + if p.get('absoluteOrbit') is not None and len(p.get('absoluteOrbit')): + p['absoluteOrbit'] = p['absoluteOrbit'][0] + + coordinates = [] + + if p.get('shape') is not None: + coordinates = [[float(c['lon']), float(c['lat'])] for c in p.get('shape')] + result = { 'type': 'Feature', 'geometry': { 'type': 'Polygon', - 'coordinates': [ - [[float(c['lon']), float(c['lat'])] for c in p['shape']] - ] + 'coordinates': coordinates }, 'properties': { 'beamModeType': p['beamModeType'], @@ -82,7 +88,7 @@ def getItem(self, p): 'insarStackId': p['insarGrouping'], 'md5sum': p['md5sum'], 'offNadirAngle': p['offNadirAngle'], - 'orbit': p['absoluteOrbit'][0], + 'orbit': p['absoluteOrbit'], 'pathNumber': p['relativeOrbit'], 'platform': p['platform'], 'pointingAngle': p['pointingAngle'], diff --git a/SearchAPI/CMR/SubQuery.py b/SearchAPI/CMR/SubQuery.py index 1ac0a4e7..00087a00 100644 --- a/SearchAPI/CMR/SubQuery.py +++ b/SearchAPI/CMR/SubQuery.py @@ -25,6 +25,9 @@ def __init__(self, req_fields, params, extra_params): self.headers = {} token = request.args.get("cmr_token") + if token is None: + token = request.form.get('cmr_token') + if token != None: self.headers['Authorization'] = f'Bearer {token}' From e520313573183c06bc278dd71315ced481aa76b3 Mon Sep 17 00:00:00 2001 From: kim Date: Fri, 22 Mar 2024 11:52:59 -0800 Subject: [PATCH 25/35] shortname will dodge the subquery system --- SearchAPI/CMR/Query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SearchAPI/CMR/Query.py b/SearchAPI/CMR/Query.py index 63d1d6bd..77b3f146 100644 --- a/SearchAPI/CMR/Query.py +++ b/SearchAPI/CMR/Query.py @@ -114,7 +114,7 @@ def chunk_list(source_list, n): if chunk_type in params: params[chunk_type] = chunk_list(list(set(params[chunk_type])), 500) # distinct and split - list_param_names = ['platform', 'collections'] # these parameters will dodge the subquery system + list_param_names = ['platform', 'collections', 'shortname'] # these parameters will dodge the subquery system for k, v in params.items(): if k in list_param_names: From 0e32a0f2cd202a4b1cae04c09af2ab0bd1003837 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 27 Mar 2024 11:02:47 -0700 Subject: [PATCH 26/35] adds s3urls to jsonlite and jsonlite2 endpoints --- SearchAPI/CMR/Output/jsonlite.py | 6 +++++- SearchAPI/CMR/Output/jsonlite2.py | 3 +++ SearchAPI/CMR/Translate/parse_cmr_response.py | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/SearchAPI/CMR/Output/jsonlite.py b/SearchAPI/CMR/Output/jsonlite.py index 99795463..e6b56117 100644 --- a/SearchAPI/CMR/Output/jsonlite.py +++ b/SearchAPI/CMR/Output/jsonlite.py @@ -42,7 +42,8 @@ def req_fields_jsonlite(): 'subswath', 'pgeVersion', 'operaBurstID', - 'additionalUrls' + 'additionalUrls', + 's3Urls' ] return fields @@ -186,4 +187,7 @@ def getItem(self, p): if p.get('validityStartDate'): result['opera']['validityStartDate'] = p.get('validityStartDate') + if p.get('platform') == 'NISAR': + result['s3Urls'] = p.get('s3Urls', []) + return result diff --git a/SearchAPI/CMR/Output/jsonlite2.py b/SearchAPI/CMR/Output/jsonlite2.py index b403e566..2758f963 100644 --- a/SearchAPI/CMR/Output/jsonlite2.py +++ b/SearchAPI/CMR/Output/jsonlite2.py @@ -61,4 +61,7 @@ def getItem(self, p): if p.get('opera') is not None: result['s1o'] = p['opera'] + if p.get('platform') == 'NISAR': + result['s3du'] = p.get('s3Urls', []) + return result diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index 29b2c0e9..c4345cf9 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -217,7 +217,14 @@ def float_or_none(a): if 'STATIC' in result['processingLevel']: result['validityStartDate'] = get_val('./Temporal/SingleDateTime') - + if result.get('platform', '') == 'NISAR': + accessUrls = [url for url in get_all_vals('./OnlineAccessURLs/OnlineAccessURL/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] + OnlineResources = [url for url in get_all_vals('./OnlineResources/OnlineResource/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] + result['additionalUrls'] = list(set([*accessUrls, *OnlineResources])) + result['s3Urls'] = list(set( + *[url for url in get_all_vals('./OnlineResources/OnlineAccessURL/URL') if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)], + *[url for url in get_all_vals('./OnlineResources/OnlineResource/URL') if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)] + )) return result From ba3bd35e7098d72cb3f05b90e3eeeacd7413be0e Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 1 Apr 2024 08:32:42 -0800 Subject: [PATCH 27/35] reveals s3urls and additionalUrls for nisar products --- SearchAPI/CMR/Output/jsonlite.py | 5 ++++- SearchAPI/CMR/Output/jsonlite2.py | 4 ++-- SearchAPI/CMR/Translate/fields.py | 1 + SearchAPI/CMR/Translate/parse_cmr_response.py | 13 +++++++++++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/SearchAPI/CMR/Output/jsonlite.py b/SearchAPI/CMR/Output/jsonlite.py index e6b56117..660440a7 100644 --- a/SearchAPI/CMR/Output/jsonlite.py +++ b/SearchAPI/CMR/Output/jsonlite.py @@ -188,6 +188,9 @@ def getItem(self, p): result['opera']['validityStartDate'] = p.get('validityStartDate') if p.get('platform') == 'NISAR': - result['s3Urls'] = p.get('s3Urls', []) + result['nisar'] = { + 'additionalUrls': p.get('additionalUrls', []), + 's3Urls': p.get('s3Urls', []) + } return result diff --git a/SearchAPI/CMR/Output/jsonlite2.py b/SearchAPI/CMR/Output/jsonlite2.py index 2758f963..5cdff707 100644 --- a/SearchAPI/CMR/Output/jsonlite2.py +++ b/SearchAPI/CMR/Output/jsonlite2.py @@ -61,7 +61,7 @@ def getItem(self, p): if p.get('opera') is not None: result['s1o'] = p['opera'] - if p.get('platform') == 'NISAR': - result['s3du'] = p.get('s3Urls', []) + if p.get('nisar') is not None: + result['nsr'] = p['nisar'] return result diff --git a/SearchAPI/CMR/Translate/fields.py b/SearchAPI/CMR/Translate/fields.py index b9f5bebe..f639ff28 100644 --- a/SearchAPI/CMR/Translate/fields.py +++ b/SearchAPI/CMR/Translate/fields.py @@ -61,6 +61,7 @@ def get_field_paths(): 'track': attr_path('PATH_NUMBER'), 'pgeVersion': "./PGEVersionClass/PGEVersion", 'additionalUrls': "./OnlineAccessURLs", + 's3Urls': "./OnlineAccessURLs", # BURST FIELDS 'absoluteBurstID': attr_path('BURST_ID_ABSOLUTE'), diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index c4345cf9..08528328 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -221,9 +221,18 @@ def float_or_none(a): accessUrls = [url for url in get_all_vals('./OnlineAccessURLs/OnlineAccessURL/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] OnlineResources = [url for url in get_all_vals('./OnlineResources/OnlineResource/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] result['additionalUrls'] = list(set([*accessUrls, *OnlineResources])) + + accessUrls = get_all_vals('./OnlineAccessURLs/OnlineAccessURL/URL') + if accessUrls is None: + accessUrls = [] + resourceUrls = get_all_vals('./OnlineResources/OnlineResource/URL') + if resourceUrls is None: + resourceUrls = [] + result['s3Urls'] = list(set( - *[url for url in get_all_vals('./OnlineResources/OnlineAccessURL/URL') if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)], - *[url for url in get_all_vals('./OnlineResources/OnlineResource/URL') if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)] + [*[url for url in accessUrls if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)], + *[url for url in resourceUrls if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)] + ] )) return result From 61f9112d67d47b5b295fe2ca78f18f09e9cb17e6 Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 2 Apr 2024 14:34:48 -0800 Subject: [PATCH 28/35] refactors some url parsing logic --- SearchAPI/CMR/Translate/parse_cmr_response.py | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index 08528328..83c93e31 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -205,11 +205,31 @@ def float_or_none(a): result['downloadUrl'] = urls[0] result['fileName'] = result['granuleName'] + '.' + urls[0].split('.')[-1] + + + def get_all_urls(): + accessPath = './OnlineAccessURLs/OnlineAccessURL/URL' + resourcesPath = './OnlineResources/OnlineResource/URL' + + access_urls = get_all_vals(accessPath) + if access_urls is None: + access_urls = [] + + resource_urls = get_all_vals(resourcesPath) + if resource_urls is None: + resource_urls = [] + + return list(set([*access_urls, *resource_urls])) + + def get_http_urls(): + return [url for url in get_all_urls() if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] + + def get_s3_urls(): + return [url for url in get_all_urls() if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)] + if result.get('product_file_id', '').startswith('OPERA'): result['beamMode'] = get_val(attr_path('BEAM_MODE')) - accessUrls = [url for url in get_all_vals('./OnlineAccessURLs/OnlineAccessURL/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] - OnlineResources = [url for url in get_all_vals('./OnlineResources/OnlineResource/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] - result['additionalUrls'] = list(set([*accessUrls, *OnlineResources])) + result['additionalUrls'] = get_http_urls() result['configurationName'] = "Interferometric Wide. 250 km swath, 5 m x 20 m spatial resolution and burst synchronization for interferometry. IW is considered to be the standard mode over land masses." if (providerbrowseUrls := get_all_vals('./AssociatedBrowseImageUrls/ProviderBrowseUrl/URL')): @@ -218,22 +238,8 @@ def float_or_none(a): if 'STATIC' in result['processingLevel']: result['validityStartDate'] = get_val('./Temporal/SingleDateTime') if result.get('platform', '') == 'NISAR': - accessUrls = [url for url in get_all_vals('./OnlineAccessURLs/OnlineAccessURL/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] - OnlineResources = [url for url in get_all_vals('./OnlineResources/OnlineResource/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url] - result['additionalUrls'] = list(set([*accessUrls, *OnlineResources])) - - accessUrls = get_all_vals('./OnlineAccessURLs/OnlineAccessURL/URL') - if accessUrls is None: - accessUrls = [] - resourceUrls = get_all_vals('./OnlineResources/OnlineResource/URL') - if resourceUrls is None: - resourceUrls = [] - - result['s3Urls'] = list(set( - [*[url for url in accessUrls if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)], - *[url for url in resourceUrls if not url.endswith('.md5') and (url.startswith('s3://') or 's3credentials' in url)] - ] - )) + result['additionalUrls'] = get_http_urls() + result['s3Urls'] = get_s3_urls() return result From 22d7c1a7eff2bd884b7c494456269d7c43d82268 Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 22 Apr 2024 15:27:35 -0800 Subject: [PATCH 29/35] use ciso8601 for date parsing in baseline calculations --- SearchAPI/Baseline/Calc.py | 13 ++++++------- SearchAPI/Baseline/Stack.py | 6 +++--- requirements.txt | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SearchAPI/Baseline/Calc.py b/SearchAPI/Baseline/Calc.py index edc10550..78d4cc7e 100644 --- a/SearchAPI/Baseline/Calc.py +++ b/SearchAPI/Baseline/Calc.py @@ -1,7 +1,6 @@ from math import sqrt, cos, sin, radians import numpy as np -import dateparser - +import ciso8601 # WGS84 constants a = 6378137 f = pow((1.0 - 1 / 298.257224), 2) @@ -15,17 +14,17 @@ def calculate_perpendicular_baselines(reference, stack): product['noStateVectors'] = True continue - asc_node_time = dateparser.parse(product['ascendingNodeTime']).timestamp() + asc_node_time = ciso8601.parse_datetime(product['ascendingNodeTime']).timestamp() - start = dateparser.parse(product['startTime']).timestamp() - end = dateparser.parse(product['stopTime']).timestamp() + start = ciso8601.parse_datetime(product['startTime']).timestamp() + end = ciso8601.parse_datetime(product['stopTime']).timestamp() center = start + ((end - start) / 2) product['relative_start_time'] = start - asc_node_time product['relative_center_time'] = center - asc_node_time product['relative_end_time'] = end - asc_node_time - t_pre = dateparser.parse(product['sv_t_pos_pre']).timestamp() - t_post = dateparser.parse(product['sv_t_pos_post']).timestamp() + t_pre = ciso8601.parse_datetime(product['sv_t_pos_pre']).timestamp() + t_post = ciso8601.parse_datetime(product['sv_t_pos_post']).timestamp() product['relative_sv_pre_time'] = t_pre - asc_node_time product['relative_sv_post_time'] = t_post - asc_node_time diff --git a/SearchAPI/Baseline/Stack.py b/SearchAPI/Baseline/Stack.py index 8d0d7559..0f20ab89 100644 --- a/SearchAPI/Baseline/Stack.py +++ b/SearchAPI/Baseline/Stack.py @@ -1,4 +1,4 @@ -import dateparser +import ciso8601 from SearchAPI.CMR.Translate import translate_params, input_fixer from SearchAPI.CMR.Query import CMRQuery from .Calc import calculate_perpendicular_baselines @@ -178,13 +178,13 @@ def get_default_product_type(reference): def calculate_temporal_baselines(reference, stack): for product in stack: if product['granuleName'] == reference: - reference_start = dateparser.parse(product['startTime']) + reference_start = ciso8601.parse_datetime(product['startTime']) break for product in stack: if product['granuleName'] == reference: product['temporalBaseline'] = 0 else: - start = dateparser.parse(product['startTime']) + start = ciso8601.parse_datetime(product['startTime']) product['temporalBaseline'] = (start.date() - reference_start.date()).days return stack diff --git a/requirements.txt b/requirements.txt index ad7ba162..525499f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -109,3 +109,4 @@ wrapt==1.13.2 zipp==3.6.0 zope.interface==4.7.2 numpy==1.21.3 +ciso8601==2.3.1 From 0fc25678a9f2779667bd9e8547ce6fca8dd72a5f Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 23 Apr 2024 16:58:11 -0800 Subject: [PATCH 30/35] update requirements.txt, updates yesterday test to check pst three days instead (otherwise fails when no new products ingested) --- requirements.txt | 46 ++++++++++++++++++++++------------------- yml_tests/test_URLs.yml | 8 +++---- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/requirements.txt b/requirements.txt index ad7ba162..132f3d07 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,20 +3,20 @@ argcomplete==1.12.3 asn1crypto==1.4.0 atomicwrites==1.4.0 attrs==21.2.0 -backports.zoneinfo==0.2.1;python_version<"3.9" # https://stackoverflow.com/questions/71712258/error-could-not-build-wheels-for-backports-zoneinfo-which-is-required-to-insta +blinker==1.7.0 boto3==1.19.0 botocore==1.22.0 Brotli==1.0.9 -certifi==2021.10.8 +certifi==2023.7.22 cffi==1.15.0 cfn-flip==1.3.0 chardet==4.0.0 charset-normalizer==2.0.7 -click==7.1.2 +ciso8601==2.3.1 +click==8.1.7 click-plugins==1.1.1 cligj==0.7.2 coverage==6.0.2 -# cryptography==3.4.7 # Version 35.0.0 breaks zappa=0.52.0 deployments. (yes, their versions went from 3.4.7, 3.4.8, then 35.0.0) dateparser==1.1.0 DateTime==4.3 defusedxml==0.7.1 @@ -24,37 +24,39 @@ Deprecated==1.2.13 docutils==0.17.1 Dumper==1.2.0 durationpy==0.5 +exceptiongroup==1.2.1 execnet==1.9.0 -Fiona==1.8.20 -Flask==2.0.2 +fiona==1.9.6 +Flask==2.3.2 Flask-Compress==1.10.1 Flask-Cors==3.0.10 flask-lambda-python36==0.1.0 flask-talisman==0.8.1 -future==0.18.2 geojson==2.5.0 geomet==0.3.0 +geopandas==0.10.0 gitdb==4.0.7 gitdb2==4.0.2 -GitPython==3.1.24 -gunicorn==20.1.0 +GitPython==3.1.41 +gunicorn==22.0.0 hjson==3.0.2 hypothesis==6.37.0 idna==3.3 importlib-metadata==4.8.1 iniconfig==1.1.1 -itsdangerous==2.0.1 -Jinja2==3.0.2 +itsdangerous==2.2.0 +Jinja2==3.1.3 jmespath==0.10.0 -joblib==1.1.0 +joblib==1.2.0 kappa==0.6.0 kml2geojson==4.0.2 lambda-packages==0.20.0 libpagure==0.22 -lxml==4.7.1 -MarkupSafe==2.0.1 +lxml==5.2.1 +MarkupSafe==2.1.5 more-itertools==8.10.0 munch==2.5.0 +numpy==1.22.4 packaging==21.0 pandas==1.3.4 pathlib2==2.3.6 @@ -69,8 +71,7 @@ pycparser==2.20 PyGithub==1.55 PyJWT==2.3.0 pykml==0.2.0 -# PyNaCl==1.4.0 # breaks zappa 0.52.0 (didn't check earlier versions, not sure if we need this) -# pyOpenSSL==21.0.0 # (Requires cryptography, which makes zappa throw) +# PyNaCl==1.5.0 pyparsing==2.4.7 pyproj==3.6.0 pyshp==2.1.3 @@ -91,21 +92,24 @@ requests-toolbelt==0.9.1 responses==0.18.0 s3transfer==0.5.0 scandir==1.10.0 -scikit-learn==1.1.3 # WARNING: 0.24.1 breaks ShorelineMask26 test +scikit-learn==1.1.3 +scipy==1.13.0 serverless-wsgi==3.0.0 Shapely==1.7.1 six==1.16.0 +# sklearn==0.0.post5 smmap==4.0.0 +sortedcontainers==2.4.0 text-unidecode==1.3 +threadpoolctl==3.4.0 toml==0.10.2 tomli==1.2.1 typing-extensions==3.10.0.2 tzdata==2021.4 -tzlocal==2.0.0 # tzlocal.get_localzone() changed it's return type after this (No 'localize' attr) +tzlocal==2.0.0 urllib3==1.26.7 -Werkzeug==2.0.2 +Werkzeug==2.3.3 WKTUtils==1.1.6 -wrapt==1.13.2 +wrapt==1.16.0 zipp==3.6.0 zope.interface==4.7.2 -numpy==1.21.3 diff --git a/yml_tests/test_URLs.yml b/yml_tests/test_URLs.yml index 334a4321..a716d802 100644 --- a/yml_tests/test_URLs.yml +++ b/yml_tests/test_URLs.yml @@ -2472,8 +2472,8 @@ tests: expected file: csv expected code: 200 -- start yesterday count: - start: yesterday +- start 3 days ago count: + start: 3 days ago output: count expected file: count @@ -2486,8 +2486,8 @@ tests: expected file: count expected code: 200 -- start 1dayago count: - start: 1+day+ago +- start 3daysago count: + start: 3+days+ago output: count expected file: count From 8ef3191a2c6a5a2a9c59ea9731d770d6451c53a2 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 24 Apr 2024 10:47:03 -0800 Subject: [PATCH 31/35] removes deprecated sklearn dependency, upgrades pytest-automation, wktutils --- .../reusable-DeployStack-SearchAPI.yml | 1 - Dockerfile | 1 - requirements.txt | 19 +++++++++---------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/reusable-DeployStack-SearchAPI.yml b/.github/workflows/reusable-DeployStack-SearchAPI.yml index b98ad650..9f2bd9a8 100644 --- a/.github/workflows/reusable-DeployStack-SearchAPI.yml +++ b/.github/workflows/reusable-DeployStack-SearchAPI.yml @@ -101,7 +101,6 @@ jobs: run: | sudo apt-get update sudo apt-get install libgdal-dev - export SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True python3 -m pip install --no-cache-dir --upgrade pip python3 -m pip install --no-cache-dir wheel Cython python3 -m pip install -r requirements.txt --use-deprecated=legacy-resolver diff --git a/Dockerfile b/Dockerfile index f822390d..9b6f5d86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,6 @@ WORKDIR "${LAMBDA_TASK_ROOT}/Discovery-SearchAPI" COPY requirements.txt . RUN mkdir "${LAMBDA_TASK_ROOT}/python-packages" ENV PYTHONPATH "${PYTHONPATH}:${LAMBDA_TASK_ROOT}/python-packages" -ENV SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True RUN python3 -m pip install --no-cache-dir -r requirements.txt --target "${LAMBDA_TASK_ROOT}/python-packages" ## Copy required files (Already inside Discovery-SearchAPI dir): diff --git a/requirements.txt b/requirements.txt index 132f3d07..cf59ca60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,7 +43,7 @@ hjson==3.0.2 hypothesis==6.37.0 idna==3.3 importlib-metadata==4.8.1 -iniconfig==1.1.1 +# iniconfig==1.2.1 itsdangerous==2.2.0 Jinja2==3.1.3 jmespath==0.10.0 @@ -57,26 +57,25 @@ MarkupSafe==2.1.5 more-itertools==8.10.0 munch==2.5.0 numpy==1.22.4 -packaging==21.0 +packaging==24.0 pandas==1.3.4 pathlib2==2.3.6 pep517==0.12.0 pexpect==4.8.0 pip-tools==6.4.0 placebo==0.10.0 -pluggy==1.0.0 +pluggy==1.5.0 ptyprocess==0.7.0 -py==1.10.0 pycparser==2.20 PyGithub==1.55 -PyJWT==2.3.0 +PyJWT==2.4.0 pykml==0.2.0 # PyNaCl==1.5.0 pyparsing==2.4.7 pyproj==3.6.0 pyshp==2.1.3 -pytest==6.2.5 -pytest-automation==1.1.2 +pytest==8.1.1 +pytest-automation==3.0.0 pytest-cov==3.0.0 pytest-forked==1.3.0 pytest-xdist==2.4.0 @@ -85,7 +84,7 @@ python-gitlab==2.10.1 python-slugify==5.0.2 pytz==2021.3 pytz-deprecation-shim==0.1.0.post0 -PyYAML==6.0 +PyYAML==6.0.1 regex==2021.10.8 requests==2.26.0 requests-toolbelt==0.9.1 @@ -103,13 +102,13 @@ sortedcontainers==2.4.0 text-unidecode==1.3 threadpoolctl==3.4.0 toml==0.10.2 -tomli==1.2.1 +tomli==2.0.1 typing-extensions==3.10.0.2 tzdata==2021.4 tzlocal==2.0.0 urllib3==1.26.7 Werkzeug==2.3.3 -WKTUtils==1.1.6 +WKTUtils==2.0.0 wrapt==1.16.0 zipp==3.6.0 zope.interface==4.7.2 From 53abc41b423a01cb703c5bba800533a89b59a2a6 Mon Sep 17 00:00:00 2001 From: kim Date: Thu, 25 Apr 2024 09:44:20 -0800 Subject: [PATCH 32/35] fixes missing bracket in geojson output --- SearchAPI/CMR/Output/geojson.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SearchAPI/CMR/Output/geojson.py b/SearchAPI/CMR/Output/geojson.py index 981b572c..9a7d71bf 100644 --- a/SearchAPI/CMR/Output/geojson.py +++ b/SearchAPI/CMR/Output/geojson.py @@ -64,7 +64,9 @@ def getItem(self, p): coordinates = [] if p.get('shape') is not None: - coordinates = [[float(c['lon']), float(c['lat'])] for c in p.get('shape')] + coordinates = [ + [[float(c['lon']), float(c['lat'])] for c in p.get('shape')] + ] result = { 'type': 'Feature', From 23b292b1e269786660f1a1aa8355704d90d36b50 Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 6 May 2024 17:18:20 -0800 Subject: [PATCH 33/35] adds aria v3 products to aria dataset, aria version to jsonlite1+2 output --- SearchAPI/CMR/Output/jsonlite.py | 9 ++++++++- SearchAPI/CMR/Output/jsonlite2.py | 3 +++ SearchAPI/CMR/Translate/datasets.py | 2 ++ SearchAPI/CMR/Translate/fields.py | 4 +++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/SearchAPI/CMR/Output/jsonlite.py b/SearchAPI/CMR/Output/jsonlite.py index 660440a7..9183f8ac 100644 --- a/SearchAPI/CMR/Output/jsonlite.py +++ b/SearchAPI/CMR/Output/jsonlite.py @@ -43,7 +43,8 @@ def req_fields_jsonlite(): 'pgeVersion', 'operaBurstID', 'additionalUrls', - 's3Urls' + 's3Urls', + 'ariaVersion', ] return fields @@ -193,4 +194,10 @@ def getItem(self, p): 's3Urls': p.get('s3Urls', []) } + + if p.get('ariaVersion') is not None: + granule_name = p.get('granuleName') + if granule_name is not None and 'gunw' in granule_name.lower(): + result['ariaVersion'] = p.get('ariaVersion') + return result diff --git a/SearchAPI/CMR/Output/jsonlite2.py b/SearchAPI/CMR/Output/jsonlite2.py index 5cdff707..397f49c0 100644 --- a/SearchAPI/CMR/Output/jsonlite2.py +++ b/SearchAPI/CMR/Output/jsonlite2.py @@ -63,5 +63,8 @@ def getItem(self, p): if p.get('nisar') is not None: result['nsr'] = p['nisar'] + + if p.get('ariaVersion') is not None: + result['ariav'] = p.get('ariaVersion') return result diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 0ac54472..7b9da157 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -205,6 +205,8 @@ "C1225776657-ASF", "C1225776658-ASF", "C1225776659-ASF", + "C2859376221-ASF", + "C1261881077-ASF", ], "SMAP": [ "C1243122884-ASF", diff --git a/SearchAPI/CMR/Translate/fields.py b/SearchAPI/CMR/Translate/fields.py index f639ff28..273c2eea 100644 --- a/SearchAPI/CMR/Translate/fields.py +++ b/SearchAPI/CMR/Translate/fields.py @@ -74,6 +74,8 @@ def get_field_paths(): 'subswath': attr_path('SUBSWATH_NAME'), # OPERA RTC FIELDS - 'operaBurstID': attr_path('OPERA_BURST_ID'), + 'operaBurstID': attr_path('OPERA_BURST_ID'), + + 'ariaVersion': attr_path('VERSION'), } return paths From 3cebea8eb3b93f451b92e4d12eec7d80000ac6be Mon Sep 17 00:00:00 2001 From: kim Date: Fri, 31 May 2024 14:41:28 -0800 Subject: [PATCH 34/35] adds fallback version number for aria s1 gunw products older than v3 --- SearchAPI/CMR/Translate/parse_cmr_response.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index 83c93e31..ff55f917 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -2,7 +2,7 @@ from defusedxml.lxml import fromstring import datetime from .fields import get_field_paths, attr_path - +import re def parse_cmr_response(r, req_fields): """ @@ -237,9 +237,14 @@ def get_s3_urls(): if 'STATIC' in result['processingLevel']: result['validityStartDate'] = get_val('./Temporal/SingleDateTime') + elif result.get('product_file_id', '').startswith('S1-GUNW') and result['ariaVersion'] is None: + version_unformatted = result.get('granuleName').split('v')[-1] + result['ariaVersion'] = re.sub(r'[^0-9\.]', '', version_unformatted.replace("_", '.')) + if result.get('platform', '') == 'NISAR': result['additionalUrls'] = get_http_urls() result['s3Urls'] = get_s3_urls() + return result From 585e206551f057d5f22d6fde024eab35a97c1de0 Mon Sep 17 00:00:00 2001 From: kim Date: Fri, 31 May 2024 15:53:22 -0800 Subject: [PATCH 35/35] fixes dict indexing bug --- SearchAPI/CMR/Translate/parse_cmr_response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index ff55f917..194fbb59 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -237,7 +237,7 @@ def get_s3_urls(): if 'STATIC' in result['processingLevel']: result['validityStartDate'] = get_val('./Temporal/SingleDateTime') - elif result.get('product_file_id', '').startswith('S1-GUNW') and result['ariaVersion'] is None: + elif result.get('product_file_id', '').startswith('S1-GUNW') and result.get('ariaVersion') is None: version_unformatted = result.get('granuleName').split('v')[-1] result['ariaVersion'] = re.sub(r'[^0-9\.]', '', version_unformatted.replace("_", '.'))