[AMDA]Handles cases where timeRestriction is after stop_date

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
SciQLop · Mar 12, 2024 · d94785e · d94785e
1 parent 8ea94c5
commit d94785e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/speasy/webservices/amda/ws.py b/speasy/webservices/amda/ws.py
@@ -161,8 +161,11 @@ def has_time_restriction(self, product_id: str or SpeasyIndex, start_time: str o
         if dataset:
             dataset = self.flat_inventory.datasets[dataset]
             if hasattr(dataset, 'timeRestriction'):
-                return DateTimeRange(dataset.timeRestriction, dataset.stop_date).intersect(
-                    DateTimeRange(start_time, stop_time))
+                lower = make_utc_datetime(dataset.timeRestriction)
+                upper = make_utc_datetime(dataset.stop_date)
+                if lower < upper:
+                    return DateTimeRange(lower, upper).intersect(
+                        DateTimeRange(start_time, stop_time))
         return False
 
     def product_version(self, parameter_id: str or ParameterIndex):

diff --git a/tests/test_amda_parameter.py b/tests/test_amda_parameter.py
@@ -10,6 +10,7 @@
 import numpy as np
 
 import speasy as spz
+from speasy.core import make_utc_datetime
 
 
 class ParameterRequests(unittest.TestCase):
@@ -78,6 +79,16 @@ def test_restricted_time_range(self):
                 spz.amda.get_dataset(dataset, make_utc_datetime(dataset.timeRestriction),
                                      make_utc_datetime(dataset.timeRestriction) + timedelta(minutes=1))
 
+    def test_restricted_time_range_after_stop_date(self):
+        dataset = None
+        for dataset in spz.inventories.flat_inventories.amda.datasets.values():
+            if hasattr(dataset, 'timeRestriction'):
+                if make_utc_datetime(dataset.timeRestriction) > make_utc_datetime(dataset.stop_date):
+                    break
+        if dataset is not None:
+            spz.amda.get_dataset(dataset, make_utc_datetime(dataset.timeRestriction) - timedelta(days=10),
+                                 make_utc_datetime(dataset.timeRestriction) - timedelta(days=10) + timedelta(minutes=1), disable_proxy=True, disable_cache=True)
+
 
 @ddt
 class AMDAParametersPlots(unittest.TestCase):