Merge pull request #351 from podaac/release/3.1.0

Release/3.1.0

Author: jamesfwood

.github/workflows/build-pipeline.yml

@@ -172,7 +172,7 @@ jobs:
           aws-region: us-west-2
 
       - name: Get Lauchpad Token
-        id: lambda
+        id: launchpad_token_generator
         if: |
           github.ref == 'refs/heads/main'    ||
           startsWith(github.ref, 'refs/heads/release')
@@ -186,6 +186,12 @@ jobs:
             --payload "$PAYLOAD" \
             $OUTPUT_FILE > /dev/null 2>&1
 
+          if jq -e 'has("errorMessage")' "$OUTPUT_FILE" > /dev/null; then
+            echo "Error detected in Lambda response:"
+            cat "$OUTPUT_FILE"
+            exit 1
+          fi
+
           RESULT=$(jq -r '.sm_token' < "$OUTPUT_FILE")
           echo "::add-mask::$RESULT"
           echo "result=$RESULT" >> $GITHUB_OUTPUT
@@ -206,9 +212,9 @@ jobs:
           umm_type: 'umm-s'
           use_associations: 'false'        
         env:
-          LAUNCHPAD_TOKEN_SIT: ${{ steps.lambda.outputs.result }}
-          LAUNCHPAD_TOKEN_UAT: ${{ steps.lambda.outputs.result }}
-          LAUNCHPAD_TOKEN_OPS: ${{ steps.lambda.outputs.result }}
+          LAUNCHPAD_TOKEN_SIT: ${{ steps.launchpad_token_generator.outputs.result }}
+          LAUNCHPAD_TOKEN_UAT: ${{ steps.launchpad_token_generator.outputs.result }}
+          LAUNCHPAD_TOKEN_OPS: ${{ steps.launchpad_token_generator.outputs.result }}
 
         continue-on-error: true
       - name: Wait to retry publishing umm-s
@@ -230,9 +236,9 @@ jobs:
           umm_type: 'umm-s'
           use_associations: 'false'        
         env:
-          LAUNCHPAD_TOKEN_SIT: ${{ steps.lambda.outputs.result }}
-          LAUNCHPAD_TOKEN_UAT: ${{ steps.lambda.outputs.result }}
-          LAUNCHPAD_TOKEN_OPS: ${{ steps.lambda.outputs.result }}
+          LAUNCHPAD_TOKEN_SIT: ${{ steps.launchpad_token_generator.outputs.result }}
+          LAUNCHPAD_TOKEN_UAT: ${{ steps.launchpad_token_generator.outputs.result }}
+          LAUNCHPAD_TOKEN_OPS: ${{ steps.launchpad_token_generator.outputs.result }}
       - name: Build Python Artifact
         run: |
           poetry build

CHANGELOG.md

@@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 
 
+## [3.1.0]
+### Added
+### Changed
+### Deprecated 
+### Removed
+### Fixed
+- [issue/347](https://github.com/podaac/l2ss-py/pull/347): Fixed bug causing jobs resulting in no data to be marked as failure instead of warning by allowing HarmonyExceptions to be raised instead of wrapped in a custom exception.
+- Fix for getting time variable when not in same subtree as lon and lat variable
+### Security
+
+
 ## [3.0.1]
 ### Added
 ### Changed

podaac/subsetter/subset.py

@@ -894,6 +894,8 @@ def subset_with_bbox(dataset: xr.Dataset,  # pylint: disable=too-many-branches
             or (lon_path == lat_path and time_var_name is None)
            ):
             subset_dictionary[lat_path] = operation
+        elif lat_path == lon_path and len(time_var_names) == 1:
+            subset_dictionary[lat_path] = operation
 
     return_dataset = datatree_subset.where_tree(dataset, subset_dictionary, cut, pixel_subset)
     return return_dataset
@@ -1009,16 +1011,23 @@ def get_coordinate_variable_names(dataset: xr.Dataset,
         for lat_var_name in lat_var_names:
 
             parent_path = '/'.join(lat_var_name.split('/')[:-1])  # gives "data_20/c"
-
             subtree = dataset[parent_path]  # Gets the subtree at data_20/c
             variable = dataset[lat_var_name]  # Gets the latitude variable
             time_name = datatree_subset.compute_time_variable_name_tree(subtree,
                                                                         variable,
                                                                         time_var_names)
+
             if time_name:
                 time_var = f"{parent_path}/{time_name}"
                 time_var_names.append(time_var)
 
+            if time_name is None:
+                global_time_name = datatree_subset.compute_time_variable_name_tree(dataset,
+                                                                                   variable,
+                                                                                   time_var_names)
+                if global_time_name:
+                    time_var_names.append(global_time_name)
+
         if not time_var_names:
             time_var_names.append(compute_utc_name(dataset))
 

podaac/subsetter/subset_harmony.py

@@ -33,7 +33,7 @@
 import numpy as np
 from harmony_service_lib import BaseHarmonyAdapter
 from harmony_service_lib.util import download, stage, generate_output_filename, bbox_to_geometry
-from harmony_service_lib.exceptions import HarmonyException
+from harmony_service_lib.exceptions import HarmonyException, NoDataException
 
 from podaac.subsetter import subset
 from podaac.subsetter.subset import SERVICE_NAME
@@ -260,10 +260,19 @@ def filter_by_subtype(variables, subtype):
                     if not np.all(np.isnan(bounding_box_array)):
                         result.bbox = podaac_to_harmony_bbox(result_bbox)
                         result.geometry = bbox_to_geometry(result.bbox)
+                    else:
+                        raise NoDataException("No data found after subset operation - all bounding box values are NaN.")
+            else:
+                raise NoDataException("No data found after subset operation - result_bbox is None.")
 
             # Return the STAC record
             return result
+        except HarmonyException as he:
+            # HarmonyExceptions should be allowed to propagate up so that Harmony can handle them
+            raise he
         except Exception as ex:
+            # Catch all other exceptions, log them, and raise a custom exception
+            self.logger.error("An error occurred while processing the item: %s", str(ex), exc_info=True)
             raise L2SSException(ex) from ex
         finally:
             # Clean up any intermediate resources