simple-dwd-weatherforecast 3.0.5__tar.gz → 3.1.6__tar.gz

{simple_dwd_weatherforecast-3.0.5/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-3.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 3.0.5
+Version: 3.1.6
 Summary: A simple tool to retrieve a weather forecast from DWD OpenData
 Home-page: https://github.com/FL550/simple_dwd_weatherforecast.git
 Author: Max Fermor

{simple_dwd_weatherforecast-3.0.5 → simple_dwd_weatherforecast-3.1.6}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="simple_dwd_weatherforecast",
-    version="v3.0.5",
+    version="v3.1.6",
     author="Max Fermor",
     description="A simple tool to retrieve a weather forecast from DWD OpenData",
     long_description=long_description,

{simple_dwd_weatherforecast-3.0.5 → simple_dwd_weatherforecast-3.1.6}/simple_dwd_weatherforecast/dwdforecast.py

@@ -300,27 +300,44 @@ class Weather:
         return self.station["name"]  # type: ignore
 
     def is_in_timerange(self, timestamp: datetime):
+        # Convert timestamp to UTC for comparison with forecast data keys
+        timestamp_utc = (
+            timestamp.astimezone(timezone.utc)
+            if timestamp.tzinfo
+            else timestamp.replace(tzinfo=timezone.utc)
+        )
         return (
             list(self.forecast_data.keys())[0]  # type: ignore
-            <= self.strip_to_hour_str(timestamp)
+            <= self.strip_to_hour_str(timestamp_utc)
             <= list(self.forecast_data.keys())[-1]  # type: ignore
         )
 
     def is_in_timerange_day(self, timestamp: datetime):
+        # Get the caller's timezone
+        caller_tz = timestamp.tzinfo or timezone.utc
+
+        # Convert forecast data boundaries to caller's timezone for comparison
+        first_entry_utc = arrow.get(
+            list(self.forecast_data.keys())[0],  # type: ignore
+            "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
+        ).datetime
+        last_entry_utc = arrow.get(
+            list(self.forecast_data.keys())[-1],  # type: ignore
+            "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
+        ).datetime
+
+        first_entry_local = first_entry_utc.astimezone(caller_tz)
+        last_entry_local = last_entry_utc.astimezone(caller_tz)
+        timestamp_local = (
+            timestamp.astimezone(caller_tz)
+            if timestamp.tzinfo
+            else timestamp.replace(tzinfo=caller_tz)
+        )
+
         return (
-            self.strip_to_day(
-                arrow.get(
-                    list(self.forecast_data.keys())[0],  # type: ignore
-                    "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
-                ).datetime
-            )
-            <= self.strip_to_day(timestamp)
-            <= self.strip_to_day(
-                arrow.get(
-                    list(self.forecast_data.keys())[-1],  # type: ignore
-                    "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
-                ).datetime
-            )
+            self.strip_to_day(first_entry_local)
+            <= self.strip_to_day(timestamp_local)
+            <= self.strip_to_day(last_entry_local)
         )
 
     def is_valid_timeframe(self, timeframe: int) -> bool:
@@ -339,7 +356,12 @@ class Weather:
         if shouldUpdate:
             self.update()
         if self.is_in_timerange(timestamp):
-            return self.forecast_data[self.strip_to_hour_str(timestamp)][  # type: ignore
+            timestamp_utc = (
+                timestamp.astimezone(timezone.utc)
+                if timestamp.tzinfo
+                else timestamp.replace(tzinfo=timezone.utc)
+            )
+            return self.forecast_data[self.strip_to_hour_str(timestamp_utc)][  # type: ignore
                 weatherDataType.value[0]
             ]
         return None
@@ -349,9 +371,14 @@ class Weather:
             self.update()
 
         if self.is_in_timerange(timestamp):
+            timestamp_utc = (
+                timestamp.astimezone(timezone.utc)
+                if timestamp.tzinfo
+                else timestamp.replace(tzinfo=timezone.utc)
+            )
             return str(
                 self.weather_codes[
-                    self.forecast_data[self.strip_to_hour_str(timestamp)][  # type: ignore
+                    self.forecast_data[self.strip_to_hour_str(timestamp_utc)][  # type: ignore
                         WeatherDataType.CONDITION.value[0]
                     ]
                 ][0]
@@ -610,7 +637,13 @@ class Weather:
     def get_timeframe_values(self, timestamp: datetime, timeframe: int):
         "timestamp has to be checked prior to be in timerange"
         result = []
-        time_step = self.strip_to_hour(timestamp)
+        # Convert to UTC for internal operations since forecast data is stored in UTC
+        timestamp_utc = (
+            timestamp.astimezone(timezone.utc)
+            if timestamp.tzinfo
+            else timestamp.replace(tzinfo=timezone.utc)
+        )
+        time_step = self.strip_to_hour(timestamp_utc)
         for _ in range(timeframe):
             hour_str = self.strip_to_hour_str(time_step)
             time_step += timedelta(hours=1)
@@ -626,29 +659,41 @@ class Weather:
             next(iter(self.forecast_data)),  # type: ignore
             "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
         ).datetime  # type: ignore
-        if timestamp.day != first_entry_date.day:
-            time_step = self.strip_to_day(timestamp)
+
+        # Convert to caller's timezone for comparison
+        caller_tz = timestamp.tzinfo or timezone.utc
+        first_entry_local = first_entry_date.astimezone(caller_tz)
+        timestamp_local = (
+            timestamp.astimezone(caller_tz)
+            if timestamp.tzinfo
+            else timestamp.replace(tzinfo=caller_tz)
+        )
+
+        if timestamp_local.date() != first_entry_local.date():
+            # Start from midnight in caller's timezone and convert to UTC for lookup
+            time_step_local = timestamp_local.replace(
+                hour=0, minute=0, second=0, microsecond=0
+            )
             for _ in range(24):
-                hour_str = self.strip_to_hour_str(time_step)
+                time_step_utc = time_step_local.astimezone(timezone.utc)
+                hour_str = self.strip_to_hour_str(time_step_utc)
                 if hour_str not in self.forecast_data:  # type: ignore
                     break
                 result.append(self.forecast_data[hour_str])  # type: ignore
-                time_step += timedelta(hours=1)
+                time_step_local += timedelta(hours=1)
         else:
+            # Use the first entry date and calculate until end of day in caller's timezone
             time_step = first_entry_date
-            endtime = datetime(
-                time_step.year,
-                time_step.month,
-                time_step.day,
-                0,
-                0,
-                0,
-                0,
-                timezone.utc,
+            endtime_local = first_entry_local.replace(
+                hour=0, minute=0, second=0, microsecond=0
             ) + timedelta(days=1)
-            timediff = endtime - time_step
-            for _ in range(round(timediff.total_seconds() / 3600)):
-                result.append(self.forecast_data[self.strip_to_hour_str(time_step)])  # type: ignore
+            endtime_utc = endtime_local.astimezone(timezone.utc)
+
+            while time_step < endtime_utc:
+                hour_str = self.strip_to_hour_str(time_step)
+                if hour_str not in self.forecast_data:  # type: ignore
+                    break
+                result.append(self.forecast_data[hour_str])  # type: ignore
                 time_step += timedelta(hours=1)
         return result
 

{simple_dwd_weatherforecast-3.0.5 → simple_dwd_weatherforecast-3.1.6/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 3.0.5
+Version: 3.1.6
 Summary: A simple tool to retrieve a weather forecast from DWD OpenData
 Home-page: https://github.com/FL550/simple_dwd_weatherforecast.git
 Author: Max Fermor

{simple_dwd_weatherforecast-3.0.5 → simple_dwd_weatherforecast-3.1.6}/tests/test_is_in_timerange.py

@@ -1,5 +1,6 @@
 import unittest
 from datetime import datetime
+from zoneinfo import ZoneInfo
 from simple_dwd_weatherforecast import dwdforecast
 from dummy_data import parsed_data
 
@@ -32,3 +33,11 @@ class Weather_is_in_timerange(unittest.TestCase):
     def test_is_in_timerange_day_future(self):
         test_time = datetime(2102, 11, 5, 7, 30)
         self.assertFalse(self.dwd_weather.is_in_timerange(test_time))
+
+    def test_is_in_timerange_timezone(self):
+        test_time = datetime(2020, 11, 6, 5, 0, tzinfo=ZoneInfo("Europe/Berlin"))
+        self.assertTrue(self.dwd_weather.is_in_timerange(test_time))
+
+    def test_is_not_in_timerange_timezone(self):
+        test_time = datetime(2020, 11, 6, 4, 0, tzinfo=ZoneInfo("Europe/Berlin"))
+        self.assertFalse(self.dwd_weather.is_in_timerange(test_time))