DAS-2456 Improves edge detection during grid perimeter determination. (#57)

sudha-murthy · web-flow · commit d0bdccdf4cdd · 2025-11-20T14:21:27.000-05:00
* DAS-2456 Add tolerance level when comparing floats

* DAS-2456 update changelog with release links

* DAS-2456 Remove trailing whitespaces

* DAS-2456 Remove unused imports

* DAS-2456 Add comments to clrify the updates to the function

* DAS-2456 Remove trailing spaces

* DAS-2456 Simplify function and add asserts

* DAS-2456 Add rtol in the isClose checks

* DAS-2456 update and format for a test array

* DAS-2456 Update CHANGELOG comments
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [v1.1.16] - 2025-10-17
+
+### Fixed
+
+- Add tolerance when comparing grid extent float values in the function
+  `remove_points_outside_grid_extents` to prevent inaccurate spatial subset
+  results. Some issues caused by DAS-2424 updates are being resolved in this
+  release as part of DAS-2456.
+
 ## [v1.1.15] - 2025-10-24
 
 ### Changed
@@ -198,7 +207,9 @@ Repository structure changes include:
 
 For more information on internal releases prior to NASA open-source approval,
 see legacy-CHANGELOG.md.
-
+[v1.1.16]: https://github.com/nasa/harmony-opendap-subsetter/releases/tag/1.1.16
+[v1.1.15]: https://github.com/nasa/harmony-opendap-subsetter/releases/tag/1.1.15
+[v1.1.14]: https://github.com/nasa/harmony-opendap-subsetter/releases/tag/1.1.14
 [v1.1.13]: https://github.com/nasa/harmony-opendap-subsetter/releases/tag/1.1.13
 [v1.1.12]: https://github.com/nasa/harmony-opendap-subsetter/releases/tag/1.1.12
 [v1.1.11]: https://github.com/nasa/harmony-opendap-subsetter/releases/tag/1.1.11
diff --git a/docker/service_version.txt b/docker/service_version.txt
@@ -1 +1 @@
-1.1.15
+1.1.16
diff --git a/hoss/adapter.py b/hoss/adapter.py
@@ -132,15 +132,16 @@ def process_item(self, item: Item, source: Source):
                 url, title=staged_filename, media_type=mime, roles=['data']
             )
 
-            # Return the STAC record
-            return result
         except Exception as exception:
             self.logger.exception(exception)
             raise_from_hoss_exception(exception)
         finally:
             # Clean up any intermediate resources
             shutil.rmtree(workdir)
 
+        # Return the STAC record
+        return result
+
     def validate_message(self):
         """Check the service was triggered by a valid message containing
         the expected number of granules.
diff --git a/hoss/bbox_utilities.py b/hoss/bbox_utilities.py
@@ -16,7 +16,6 @@
 
 import json
 from collections import namedtuple
-from logging import Logger
 from typing import Dict, List, Optional, Tuple, Union
 
 import numpy as np
diff --git a/hoss/dimension_utilities.py b/hoss/dimension_utilities.py
@@ -10,7 +10,6 @@
 
 """
 
-from logging import Logger
 from pathlib import PurePosixPath
 from typing import Dict, Set, Tuple
 
diff --git a/hoss/exceptions.py b/hoss/exceptions.py
@@ -312,5 +312,6 @@ class InvalidVariableRequest(CustomNoRetryError):
     def __init__(self, variable_names):
         super().__init__(
             'InvalidVariableRequest',
-            f'Some variables requested are not supported and could not be processed: "{variable_names}".',
+            f'Some variables requested are not supported and could not be processed: '
+            f'"{variable_names}".',
         )
diff --git a/hoss/projection_utilities.py b/hoss/projection_utilities.py
@@ -554,12 +554,16 @@ def remove_points_outside_grid_extents(
     exception if the resulting grid is empty.
 
     """
+    tolerance = 1e-9
+    # This gets the mask of points within the granule extent.
+    # The points are checked to make sure they are within
+    # all 4 extents
 
     mask = (
-        (finite_x >= granule_extent["x_min"])
-        & (finite_x <= granule_extent["x_max"])
-        & (finite_y >= granule_extent["y_min"])
-        & (finite_y <= granule_extent["y_max"])
+        (finite_x >= granule_extent['x_min'] - tolerance)
+        & (finite_x <= granule_extent['x_max'] + tolerance)
+        & (finite_y >= granule_extent['y_min'] - tolerance)
+        & (finite_y <= granule_extent['y_max'] + tolerance)
     )
 
     finite_x = finite_x[mask]
diff --git a/hoss/subset.py b/hoss/subset.py
@@ -5,7 +5,6 @@
 
 """
 
-from logging import Logger
 from typing import List, Set
 
 from harmony_service_lib.message import Message, Source
diff --git a/hoss/utilities.py b/hoss/utilities.py
@@ -5,7 +5,6 @@
 """
 
 import mimetypes
-from logging import Logger
 from os import sep
 from os.path import splitext
 from shutil import move
diff --git a/hoss/variable_utilities.py b/hoss/variable_utilities.py
@@ -34,7 +34,8 @@ def check_invalid_variable_request(
     # varinfo exclusions will automatically be applied.
     if not requested_variables:
         get_logger().info(
-            f'All variables are requested. The following variables will be excluded: {unprocessable_variables}'
+            f'All variables are requested. The following variables will be excluded:'
+            f'{unprocessable_variables}'
         )
         return
 
diff --git a/tests/unit/test_projection_utilities.py b/tests/unit/test_projection_utilities.py
@@ -1284,8 +1284,8 @@ def test_remove_non_finite_projected_values(self):
         expected_x_values = np.array([-800.2, -700.1, 500.0, 600.9, 700.0])
         expected_y_values = np.array([69.1, 40.5, 50.9, 70.2, 80.4])
         valid_x, valid_y = remove_non_finite_projected_values(points_x, points_y)
-        np.array_equal(valid_x, expected_x_values)
-        np.array_equal(valid_y, expected_y_values)
+        assert np.array_equal(valid_x, expected_x_values)
+        assert np.array_equal(valid_y, expected_y_values)
 
     def test_check_perimeter_exceeds_grid_extents(self):
         """Ensure that True value is returned when the input perimeter array exceeds grid
@@ -1330,54 +1330,67 @@ def test_remove_points_outside_grid_extents(self):
         """
         points_x = np.array(
             [
-                -1100.1,
-                -1000.0,
-                -800.3,
-                -700.4,
-                -700.5,
-                -700.6,
-                -700.7,
-                -800.8,
-                -900.9,
-                -1000.0,
-                -1100.1,
+                -1100.1,  # 1 should exclude this < x_min
+                -1000.0123456783,  # 2 should include this - edge case ~ xmin
+                1000.0123456798,  # 3 should exclude this - edge case > xmax,
+                1000.0123456781,  # 4 should include this - edge case ~ xmax
+                -700.5,  # 5
+                -700.6,  # 6
+                -700.7,  # 7
+                -800.8,  # 8
+                -900.9,  # 9
+                -950.1,  # 10
+                -1000.0123456797,  # 11 should exclude this - edge case < xmin
+                1100.1,  # 12 should exclude this > x_max
             ]
         )
         points_y = np.array(
             [
-                600.1,
-                700.2,
-                800.3,
-                900.4,
-                1000.0,
-                1100.6,
-                1000.0,
-                900.8,
-                800.9,
-                700.0,
-                600.1,
+                600.1,  # 1
+                700.2,  # 2
+                800.3,  # 3
+                900.4,  # 4
+                1000.0123456781,  # 5 should include this < y_max edge case
+                1100.6,  # 6 exclude this > y_max
+                1000.0123456799,  # 7 should exclude this > y_max edge case
+                -1000.0123456785,  # 8 should include this ~ y_min
+                -1000.0123456796,  # 9 should exclude this < y_min edge case
+                -1002.1,  # 10 exclude < y_min
+                700.0,  # 11
+                600.1,  # 12
             ]
         )
         expected_x = np.array(
-            [-1000.0, -800.3, -700.4, -700.5, -700.7, -800.8, -900.9, -1000.0]
+            [
+                -1000.012345678,  # 2
+                1000.0123456781,  # 4
+                -700.5,  # 5
+                -800.8,  # 8
+            ]
         )
         expected_y = np.array(
-            [700.2, 800.3, 900.4, 1000.0, 1000.0, 900.8, 800.9, 700.0]
+            [
+                700.2,  # 2
+                900.4,  # 4
+                1000.012345678,  # 5
+                -1000.012345678,  # 8
+            ]
         )
 
         granule_extent = {
-            "x_min": -1000.0,
-            "x_max": 1000.0,
-            "y_min": -1000.0,
-            "y_max": 1000.0,
+            "x_min": -1000.012345678,
+            "x_max": 1000.012345678,
+            "y_min": -1000.012345678,
+            "y_max": 1000.012345678,
         }
 
         with self.subTest("Perimeter contains some valid points within grid extent"):
             x, y = remove_points_outside_grid_extents(
                 points_x, points_y, granule_extent
             )
-            np.array_equal(expected_x, x)
-            np.array_equal(expected_y, y)
+
+            assert np.allclose(expected_x, x, atol=1e-9, rtol=0)
+            assert np.allclose(expected_y, y, atol=1e-9, rtol=0)
 
         with self.subTest("Perimeter has no valid points within the grid extent"):
             with self.assertRaises(InvalidRequestedRange):

Original file line number	Diff line number	Diff line change
`@@ -312,5 +312,6 @@ class InvalidVariableRequest(CustomNoRetryError):`
`312`	`312`	`def __init__(self, variable_names):`
`313`	`313`	`super().__init__(`
`314`	`314`	`'InvalidVariableRequest',`
`315`		`- f'Some variables requested are not supported and could not be processed: "{variable_names}".',`
	`315`	`+ f'Some variables requested are not supported and could not be processed: '`
	`316`	`+ f'"{variable_names}".',`
`316`	`317`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ def check_invalid_variable_request(`
`34`	`34`	`# varinfo exclusions will automatically be applied.`
`35`	`35`	`if not requested_variables:`
`36`	`36`	`get_logger().info(`
`37`		`- f'All variables are requested. The following variables will be excluded: {unprocessable_variables}'`
	`37`	`+ f'All variables are requested. The following variables will be excluded:'`
	`38`	`+ f'{unprocessable_variables}'`
`38`	`39`	`)`
`39`	`40`	`return`
`40`	`41`