simple-dwd-weatherforecast 3.0.4__py3-none-any.whl → 3.1.6__py3-none-any.whl

simple_dwd_weatherforecast/dwdforecast.py

@@ -1,5 +1,6 @@
 import csv
 import importlib
+import importlib.resources
 import json
 import math
 from collections import OrderedDict, defaultdict
@@ -299,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:
@@ -338,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
@@ -348,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]
@@ -609,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)
@@ -625,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
 
@@ -900,7 +946,7 @@ class Weather:
         }
 
     def get_weather_report(self, shouldUpdate=False):
-        if (shouldUpdate or self.weather_report is None) and self.region is not None:
+        if shouldUpdate and self.region is not None:
             self.update(with_report=True)
         return self.weather_report
 

{simple_dwd_weatherforecast-3.0.4.dist-info → simple_dwd_weatherforecast-3.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 3.0.4
+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.4.dist-info → simple_dwd_weatherforecast-3.1.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_dwd_weatherforecast/dwdforecast.py,sha256=UJopfqrI13qV27nLgSS0GZY6_qPQ7S5ZWqiI-PGT9bo,39081
+simple_dwd_weatherforecast/dwdforecast.py,sha256=a3qePEdDOcQ3u9Yv68JW9IGYuY8FwgXlOKq6OeFd3yc,41126
 simple_dwd_weatherforecast/dwdmap.py,sha256=3R3ptBwBqTaLT2edDhkf4n7XPcvErHRbqq0U9BI41uI,14515
 simple_dwd_weatherforecast/stations.json,sha256=1u8qc2CT_rVy49SAlOicGixzHln6Y0FXevuFAz2maBw,838948
 simple_dwd_weatherforecast/uv_stations.json,sha256=ADenYo-aR6qbf0UFkfYr72kkFzL9HyUKe4VQ23POGF8,2292
-simple_dwd_weatherforecast-3.0.4.dist-info/licenses/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-3.1.6.dist-info/licenses/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/dummy_data.py,sha256=qapeQxjh8kURf5b-9h4gUdJaqQJQDVdqfMtS2g5JReY,103406
 tests/dummy_data_full.py,sha256=3HRGAQBq4xPYs4jLzoLV_UAe1CXFzOsVBOouDL_5RHw,104062
@@ -23,7 +23,7 @@ tests/test_get_timeframe_max.py,sha256=gas73o1Ferkk87M4Y3k4LZ-fXKehI2ulsxcQfIviD
 tests/test_get_timeframe_min.py,sha256=WnFO36U_E-55TW7jR598lyLS4u-TOtXmufadJF7IWQs,2407
 tests/test_get_timeframe_sum.py,sha256=hjHY9fvJUqi4o8AdFLPSDwi8GpXtjzLqsRzVMoUVjn4,2424
 tests/test_get_timeframe_values.py,sha256=D9NJ98sZykLKAW1eZgLFuy0FMb4f_jUCtr4clzg65ms,7231
-tests/test_is_in_timerange.py,sha256=3y88L3N73NxSTJ-_edx6OCnxHWKJWWFma98gjZvJDGg,1338
+tests/test_is_in_timerange.py,sha256=1D0eMJ8GVs_KuMkIbdCoItv782b0Jy7CIvmW7QFXJbE,1776
 tests/test_is_valid_timeframe.py,sha256=mXjeu3lUyixiBUEljirTf6qDM_FZFQGWa-Rk0NBMUDU,891
 tests/test_location_tools.py,sha256=wto_XzVnARJQ-Qc83YAn0ahfMBSaOHpfzqAeKRDsNm8,1208
 tests/test_map.py,sha256=X4zFmnoE7YzT6UudE0TtFmsBwhlrRP5C1p8K70_0yTg,5701
@@ -36,7 +36,7 @@ tests/test_update.py,sha256=AIzzHMxcjwQjeTB0l3YFgB7HkGDbuqiHofwy41mS0m4,7440
 tests/test_update_hourly.py,sha256=7Zl8ml3FTdqw3_Qwr_Tz-sWTzypvrBWmxeig2Vwp_ZQ,1781
 tests/test_uv_index.py,sha256=tr6wnOyHlXT1S3yp1oeHc4-Brmc-EMEdM4mtyrdpcHg,579
 tests/test_weather.py,sha256=ZyX4ldUoJpJp7YpiNQwU6Od-nYRay-3qcaDJdNq8fhY,780
-simple_dwd_weatherforecast-3.0.4.dist-info/METADATA,sha256=UinjW8wBvFNYCsBrVGP1bGBxiyXJz4cdYiXOGQlDCOc,12869
-simple_dwd_weatherforecast-3.0.4.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-simple_dwd_weatherforecast-3.0.4.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-3.0.4.dist-info/RECORD,,
+simple_dwd_weatherforecast-3.1.6.dist-info/METADATA,sha256=1ztrxCKzTc4bXhEN35kbU0d15IzWLn0sVvSj4rz8PqY,12869
+simple_dwd_weatherforecast-3.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+simple_dwd_weatherforecast-3.1.6.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-3.1.6.dist-info/RECORD,,

{simple_dwd_weatherforecast-3.0.4.dist-info → simple_dwd_weatherforecast-3.1.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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))