DAS-2326 Update comments

Author: sudha-murthy

CHANGELOG.md

@@ -3,7 +3,9 @@
 ### Changed
 
 - Change HOSS behavior to return NoDataException warning instead of a failed
-  exception when the variable, spatial, temporal request does not return any data.
+  exception when the variable, spatial, temporal request does not return any
+  data. Also fix a bug where the out of range subset requests were reported
+  with a default output.
 
 ## [v1.1.16] - 2025-11-17
 

hoss/dimension_utilities.py

@@ -347,17 +347,12 @@ def get_dimension_indices_from_values(
         dimension_values = np.flip(dimension)
         dimension_indices = np.flip(dimension_indices)
 
-    # np.interp does not throw an exception if the extents are outside dimension range
-    # It just returns the lowest index or highest index
-    if (minimum_extent < dimension_values[0]) and (
-        maximum_extent < dimension_values[0]
-    ):
-        raise InvalidRequestedRange()
-    if (minimum_extent > dimension_values[-1]) and (
-        maximum_extent > dimension_values[-1]
-    ):
+    # Check if the minimum and maximum extents are out of range of the dimension values.
+    if minimum_extent < dimension_values[0] or maximum_extent > dimension_values[-1]:
         raise InvalidRequestedRange()
 
+    # np.interp does not throw an exception if the extents are outside dimension range
+    # It just returns the lowest index or highest index.
     raw_indices = np.interp(dimension_range, dimension_values, dimension_indices)
 
     if (raw_indices[0] == raw_indices[1]) and (raw_indices[0] % 1 == 0.5):
@@ -558,7 +553,7 @@ def get_requested_index_ranges(
     required_dimensions = varinfo.get_required_dimensions(required_variables)
 
     dim_index_ranges = {}
-    failed_dim_variables = set()
+    out_of_range_dim_variables = set()
     with Dataset(dimensions_path, 'r') as dimensions_file:
         for dim in harmony_message.subset.dimensions:
             try:
@@ -589,11 +584,11 @@ def get_requested_index_ranges(
             # processing the other dimensions and raise exception for all the
             # dimensions that are invalid.
             except InvalidRequestedRange:
-                failed_dim_variables.add(dim.name)
+                out_of_range_dim_variables.add(dim.name)
 
-        if failed_dim_variables:
+        if out_of_range_dim_variables:
             raise NoDataException(
-                f'Input request outside supported dimension range for {failed_dim_variables}'
+                f'Input request outside supported dimension range for {out_of_range_dim_variables}'
             )
 
     return dim_index_ranges

hoss/subset.py

@@ -221,7 +221,6 @@ def get_required_variables(
     # If request includes variable subsetting, check that all requested
     # variables exist in the granule.
     if requested_variables:
-        # check if the requested variables are in the granule.
         check_requested_variables_in_granule(varinfo, requested_variables)
 
     # Otherwise, if request is an index subset and no variables are requested,
@@ -245,7 +244,6 @@ def check_requested_variables_in_granule(
     if any of the requested variables are not in the granule.
 
     """
-
     invalid_requested_variables = {
         variable_name
         for variable_name in requested_variables

tests/unit/test_spatial.py

@@ -59,7 +59,7 @@ def test_get_spatial_index_ranges_projected(self):
                 {'/x': (37, 56), '/y': (7, 26)},
             )
         with self.subTest('Spatial request outside granule'):
-            harmony_message = Message({'subset': {'bbox': [120, -68, 140, -70]}})
+            harmony_message = Message({'subset': {'bbox': [120, -70, 140, -68]}})
             with self.assertRaises(NoDataException) as context:
                 get_spatial_index_ranges(
                     {'/NEE', '/x', '/y', '/time'},
@@ -150,6 +150,7 @@ def test_get_spatial_index_ranges_projected_from_coordinates(self):
                 ),
                 expected_index_ranges,
             )
+
         with self.subTest('projection gridded with coordinates NoDataException'):
             harmony_message = Message(
                 {'subset': {'bbox': [-179.9, -89.8, -179.8, -89.5]}}
@@ -363,7 +364,7 @@ def test_get_spatial_index_ranges_geographic(self):
                     )
                 self.assertEqual(
                     context.exception.message,
-                    "Spatial subset request outside supported dimension range for {'/latitude'}",
+                    "Spatial subset request outside supported dimension range for {'/latitude', '/longitude'}",
                 )
 
     @patch('hoss.spatial.get_dimension_index_range')