[2025-02-03 08:22] Timezone fix patch

Author: rflinnenbank

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "weather_provider_api"
-version = "2.62.0"
+version = "2.63.0"
 description = "Weather Provider Libraries and API"
 authors = ["Verbindingsteam", "Raoul Linnenbank <[email protected]>"]
 license = "MPL-2.0"

tests/test_knmi_daggegevens.py

@@ -35,9 +35,10 @@ def test_retrieve_weather(mock_coordinates, start, end, inseason):
     daggegevens_model = DagGegevensModel()
     ds = daggegevens_model.get_weather(coords=mock_geoposition_coordinates, begin=start, end=end, inseason=inseason)
 
+    print(ds["time"])
     assert ds is not None
     assert "TN" in ds
-    assert len(ds["TN"]) == 31
+    assert len(ds["TN"]) == 30
     assert isinstance(ds, xr.Dataset)
 
 

weather_provider_api/routers/weather/sources/knmi/models/daggegevens.py

@@ -17,6 +17,7 @@
 import xarray as xr
 from dateutil.relativedelta import relativedelta
 from loguru import logger
+from pytz import UTC
 
 from weather_provider_api.routers.weather.base_models.model import WeatherModelBase
 from weather_provider_api.routers.weather.sources.knmi.stations import stations_history
@@ -219,7 +220,7 @@ def get_weather(
         ds = self._prepare_weather_data(coords, station_id, raw_ds)
 
         # The KNMI model isn't working properly yet, so we have to cut out any overflow time-wise
-        ds = ds.sel(time=slice(begin, end))
+        ds = ds.sel(time=slice(begin.astimezone(UTC).replace(tzinfo=None), end.astimezone(UTC).replace(tzinfo=None)))
 
         return ds
 

weather_provider_api/routers/weather/sources/knmi/models/pluim.py

@@ -15,6 +15,7 @@
 import xarray as xr
 from dateutil.relativedelta import relativedelta
 from loguru import logger
+from pytz import UTC
 
 from weather_provider_api.routers.weather.base_models.model import WeatherModelBase
 from weather_provider_api.routers.weather.sources.knmi.stations import (
@@ -157,7 +158,7 @@ def _select_weather_from_given_period(ds: xr.Dataset, begin: datetime, end: date
             datetime.today().replace(hour=0, minute=0, second=0),
             datetime.today().replace(hour=0, minute=0, second=0) + relativedelta(days=15),
         )
-        ds = ds.sel(time=slice(begin, end))
+        ds = ds.sel(time=slice(begin.astimezone(UTC).replace(tzinfo=None), end.astimezone(UTC).replace(tzinfo=None)))
         return ds
 
     def is_async(self):  # pragma: no cover

weather_provider_api/routers/weather/sources/knmi/models/uurgegevens.py

@@ -17,6 +17,7 @@
 import xarray as xr
 from dateutil.relativedelta import relativedelta
 from loguru import logger
+from pytz import UTC
 
 from weather_provider_api.routers.weather.base_models.model import WeatherModelBase
 from weather_provider_api.routers.weather.sources.knmi.stations import stations_history
@@ -177,7 +178,7 @@ def get_weather(
         ds = self._prepare_weather_data(coords, station_id, raw_ds)
 
         # The KNMI model isn't working properly yet, so we have to cut out any overflow time-wise
-        ds = ds.sel(time=slice(begin, end))
+        ds = ds.sel(time=slice(begin.astimezone(UTC).replace(tzinfo=None), end.astimezone(UTC).replace(tzinfo=None)))
         return ds
 
     def is_async(self):  # pragma: no cover