update date functionality

Author: NicolasColombi

climada/hazard/tc_tracks.py

@@ -334,8 +334,8 @@ def subset_year(
         start_date: tuple
             First date to include in the selection (YYYY, MM, DD). Each element can either
             be an integer or `False`. If an element is `False`, it is ignored during the filter.
-        end_date: tuple of int
-            Last date to include in the selection, same as start_date for the corresponding field.
+        end_date: tuple
+            Last date to include in the selection, same as start_date if selecting only one day.
 
         Returns:
         --------
@@ -347,7 +347,6 @@ def subset_year(
         ValueError
             - If there's a mismatch between `start_*` and `end_*` values (e.g., one is set to `True` while the other is `False`).
             - If no tracks are found within the specified date range.
-        TypeError
             - If `start_date` or `end_date` are incorrectly ordered (start > end).
 
         Example 1 (Filter by Year Only):
@@ -382,11 +381,6 @@ def subset_year(
         start_month, end_month = start_date[1], end_date[1]
         start_day, end_day = start_date[2], end_date[2]
 
-        # Check if only one of start_* or end_* is set (True and False)
-        # if not start_day and not (1 <= start_day <= 31) or not end_day and not (1 <= end_day <= 31):
-        #     raise TypeError("Day values should be between 1 and 31.")
-        # if not start_month and not (1 <= start_month <= 12) or not end_month and not(1 <= end_month <= 12):
-        #     raise TypeError("Day values should be between 1 and 31.")
         if (start_day and not end_day) or (not start_day and end_day):
             raise ValueError(
                 "Mismatch between start_day and end_day: Both must be either True or False."
@@ -400,20 +394,16 @@ def subset_year(
                 "Mismatch between start_year and end_year: Both must be either True or False."
             )
         elif start_year and end_year and start_year > end_year:
-            raise TypeError("Start year is after end year, control your entry.")
+            raise ValueError("Start year is after end year.")
 
         # Find indices corresponding to the date range
         index: list = []
         for i, track in enumerate(self.data):
-            try:
-                date_array = track.time[0].to_numpy()
-                year = date_array.astype("datetime64[Y]").item().year
-                month = date_array.astype("datetime64[M]").item().month
-                day = date_array.astype("datetime64[D]").item().day
-            except AttributeError:
-                raise ValueError(
-                    f"Invalid date format in track {i}, could not extract date."
-                )
+
+            date_array = track.time[0].to_numpy()
+            year = date_array.astype("datetime64[Y]").item().year
+            month = date_array.astype("datetime64[M]").item().month
+            day = date_array.astype("datetime64[D]").item().day
 
             condition_year = start_year <= year <= end_year
             condition_month = start_month <= month <= end_month
@@ -431,11 +421,7 @@ def subset_year(
 
         # Raise error if no tracks found
         if not index:
-            raise ValueError(
-                f"No tracks found for the specified date range: {start_date} to \n"
-                "{end_date}."
-            )
-
+            raise ValueError("No tracks found for the specified date range")
         # Create subset with filtered tracks
         subset.data = [self.data[i] for i in index]
 

climada/hazard/test/test_tc_tracks.py

@@ -848,42 +848,31 @@ def test_subset_years(self):
         self.assertEqual(tc_subset.data[3].time[0].item().year, 2003)
         self.assertEqual(tc_subset.data[3].time[0].item().month, 4)
 
-        # improper calling
-
-        # self.assertEqual(tc_subset.data[0].time[0].item().year, 2001)
-        # self.assertEqual(tc_subset.data[1].time[0].item().year, 2002)
-        # self.assertEqual(tc_subset.data[2].time[0].item().year, 2003)
-
-        # # Invalid input: non-integer start_year
-        # with self.assertRaisesRegex(
-        #     TypeError, "Both start_year and end_year must be integers."
-        # ):
-        #     tc_test.subset_year(start_year="2000", end_year=2003)
-
-        # # Invalid input: non-integer end_year
-        # with self.assertRaisesRegex(
-        #     TypeError, "Both start_year and end_year must be integers."
-        # ):
-        #     tc_test.subset_year(start_year=2000, end_year=None)
-
-        # # Invalid range: start_year greater than end_year
-        # with self.assertRaisesRegex(
-        #     ValueError, r"start_year \(2005\) cannot be greater than end_year \(2000\)."
-        # ):
-        #     tc_test.subset_year(start_year=2005, end_year=2000)
-
-        # # No tracks match the year range
-        # with self.assertRaisesRegex(
-        #     ValueError, "No tracks found for the years between 2050 and 2060."
-        # ):
-        #     tc_test.subset_year(start_year=2050, end_year=2060)
-
-        # # Empty data case
-        # empty_tc = tc.TCTracks()
-        # with self.assertRaisesRegex(
-        #     TypeError, "self.data should be a non-empty list of tracks."
-        # ):
-        #     empty_tc.subset_year(start_year=2000, end_year=2010)
+        # Invalid input: Mismatch between start_day and end_day
+        with self.assertRaisesRegex(
+            ValueError,
+            "Mismatch between start_year and end_year: "
+            "Both must be either True or False.",
+        ):
+            tc_test.subset_year((2000, False, False), (False, False, False))
+        with self.assertRaisesRegex(
+            ValueError,
+            "Mismatch between start_month and end_month: "
+            "Both must be either True or False.",
+        ):
+            tc_test.subset_year((2000, False, False), (2000, 5, False))
+        with self.assertRaisesRegex(
+            ValueError,
+            "Mismatch between start_day and end_day: "
+            "Both must be either True or False.",
+        ):
+            tc_test.subset_year((False, False, False), (False, False, 3))
+        with self.assertRaisesRegex(ValueError, "Start year is after end year."):
+            tc_test.subset_year((2007, False, False), (2000, False, False))
+        with self.assertRaisesRegex(
+            ValueError, "No tracks found for the specified date range"
+        ):
+            tc_test.subset_year((2100, False, False), (2150, False, False))
 
     def test_get_extent(self):
         """Test extent/bounds attributes."""