simple-dwd-weatherforecast 2.0.29__tar.gz → 2.0.32__tar.gz

{simple_dwd_weatherforecast-2.0.29/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-2.0.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.29
+Version: 2.0.32
 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
@@ -127,6 +127,8 @@ class Weather:
 
     get_timeframe_sum(weatherDataType: see WeatherDataType, datetime, timeframe: hours after datetime as int, optional bool shouldUpdate) # Returns the sum of that value within the time frame
 
+    get_daily_avg(weatherDataType: see WeatherDataType, datetime, optional bool shouldUpdate) # Returns the daily average of that value
+
     get_timeframe_avg(weatherDataType: see WeatherDataType, datetime, timeframe: hours after datetime as int, optional bool shouldUpdate) # Returns the average of that value within the time frame
 
     get_forecast_condition(datetime, optional bool shouldUpdate) # Result is condition as text

{simple_dwd_weatherforecast-2.0.29 → simple_dwd_weatherforecast-2.0.32}/README.md

@@ -110,6 +110,8 @@ class Weather:
 
     get_timeframe_sum(weatherDataType: see WeatherDataType, datetime, timeframe: hours after datetime as int, optional bool shouldUpdate) # Returns the sum of that value within the time frame
 
+    get_daily_avg(weatherDataType: see WeatherDataType, datetime, optional bool shouldUpdate) # Returns the daily average of that value
+
     get_timeframe_avg(weatherDataType: see WeatherDataType, datetime, timeframe: hours after datetime as int, optional bool shouldUpdate) # Returns the average of that value within the time frame
 
     get_forecast_condition(datetime, optional bool shouldUpdate) # Result is condition as text

{simple_dwd_weatherforecast-2.0.29 → simple_dwd_weatherforecast-2.0.32}/setup.py

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

{simple_dwd_weatherforecast-2.0.29 → simple_dwd_weatherforecast-2.0.32}/simple_dwd_weatherforecast/dwdforecast.py

@@ -400,8 +400,8 @@ class Weather:
         else:
             print("no report for this station available. Have you updated first?")
 
-    def get_uv_index(self, days_from_today: int) -> int:
-        if not self.uv_reports:
+    def get_uv_index(self, days_from_today: int, shouldUpdate=True) -> int:
+        if not self.uv_reports and shouldUpdate:
             self.update(
                 force_hourly=False,
                 with_forecast=False,
@@ -418,7 +418,11 @@ class Weather:
             day = "tomorrow"
         elif days_from_today == 2:
             day = "dayafter_to"
-        return self.uv_reports[self.nearest_uv_index_station]["forecast"][day]
+        return (
+            self.uv_reports[self.nearest_uv_index_station]["forecast"][day]
+            if self.uv_reports
+            else None
+        )
 
     def get_timeframe_max(
         self,
@@ -542,6 +546,15 @@ class Weather:
             )
         return None
 
+    def get_daily_avg(
+        self, weatherDataType: WeatherDataType, timestamp: datetime, shouldUpdate=True
+    ):
+        if shouldUpdate:
+            self.update()
+        if self.is_in_timerange(timestamp):
+            return self.get_avg(self.get_day_values(timestamp), weatherDataType)
+        return None
+
     def get_avg(_, weather_data, weatherDataType):
         value_sum = 0.0
         count = len(weather_data)
@@ -582,20 +595,16 @@ class Weather:
                 time_step += timedelta(hours=1)
         else:
             time_step = first_entry_date
-            endtime = (
-                datetime(
-                    time_step.year,
-                    time_step.month,
-                    time_step.day,
-                    0,
-                    0,
-                    0,
-                    0,
-                    timezone.utc,
-                )
-                + timedelta(days=1)
-                + timedelta(hours=-1)
-            )
+            endtime = datetime(
+                time_step.year,
+                time_step.month,
+                time_step.day,
+                0,
+                0,
+                0,
+                0,
+                timezone.utc,
+            ) + 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)])
@@ -766,79 +775,92 @@ class Weather:
         self.report_data = {
             "time": row["Parameter description"],
             "date": row["surface observations"],
-            WeatherDataType.CONDITION.value[0]: int(
-                row[WeatherDataType.CONDITION.value[1]]
-            )
-            if row[WeatherDataType.CONDITION.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.TEMPERATURE.value[0]: round(
-                float(
-                    row[WeatherDataType.TEMPERATURE.value[1]]
-                    .replace(self.NOT_AVAILABLE, "0.0")
-                    .replace(",", ".")
+            WeatherDataType.CONDITION.value[0]: (
+                int(row[WeatherDataType.CONDITION.value[1]])
+                if row[WeatherDataType.CONDITION.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.TEMPERATURE.value[0]: (
+                round(
+                    float(
+                        row[WeatherDataType.TEMPERATURE.value[1]]
+                        .replace(self.NOT_AVAILABLE, "0.0")
+                        .replace(",", ".")
+                    )
+                    + 273.1,
+                    1,
                 )
-                + 273.1,
-                1,
-            )
-            if row[WeatherDataType.TEMPERATURE.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.DEWPOINT.value[0]: round(
-                float(row[WeatherDataType.DEWPOINT.value[1]].replace(",", ".")) + 273.1,
-                1,
-            )
-            if row[WeatherDataType.DEWPOINT.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.PRESSURE.value[0]: float(
-                row[WeatherDataType.PRESSURE.value[1]].replace(",", ".")
-            )
-            * 100
-            if row[WeatherDataType.PRESSURE.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.WIND_SPEED.value[0]: round(
-                float(row[WeatherDataType.WIND_SPEED.value[1]].replace(",", ".")) / 3.6,
-                1,
-            )
-            if row[WeatherDataType.WIND_SPEED.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.WIND_DIRECTION.value[0]: int(
-                row[WeatherDataType.WIND_DIRECTION.value[1]]
-            )
-            if row[WeatherDataType.WIND_DIRECTION.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.WIND_GUSTS.value[0]: round(
-                float(row[WeatherDataType.WIND_GUSTS.value[1]].replace(",", ".")) / 3.6,
-                1,
-            )
-            if row[WeatherDataType.WIND_GUSTS.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.PRECIPITATION.value[0]: float(
-                row[WeatherDataType.PRECIPITATION.value[1]].replace(",", ".")
-            )
-            if row[WeatherDataType.PRECIPITATION.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.CLOUD_COVERAGE.value[0]: float(
-                row[WeatherDataType.CLOUD_COVERAGE.value[1]].replace(",", ".")
-            )
-            if row[WeatherDataType.CLOUD_COVERAGE.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.VISIBILITY.value[0]: float(
-                row[WeatherDataType.VISIBILITY.value[1]].replace(",", ".")
-            )
-            * 1e3
-            if row[WeatherDataType.VISIBILITY.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.SUN_IRRADIANCE.value[0]: round(
-                float(row[WeatherDataType.SUN_IRRADIANCE.value[1]].replace(",", "."))
-                * 3.6,
-                1,
-            )
-            if row[WeatherDataType.SUN_IRRADIANCE.value[1]] != self.NOT_AVAILABLE
-            else None,
-            WeatherDataType.HUMIDITY.value[0]: float(
-                row[WeatherDataType.HUMIDITY.value[1]].replace(",", ".")
-            )
-            if row[WeatherDataType.HUMIDITY.value[1]] != self.NOT_AVAILABLE
-            else None,
+                if row[WeatherDataType.TEMPERATURE.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.DEWPOINT.value[0]: (
+                round(
+                    float(row[WeatherDataType.DEWPOINT.value[1]].replace(",", "."))
+                    + 273.1,
+                    1,
+                )
+                if row[WeatherDataType.DEWPOINT.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.PRESSURE.value[0]: (
+                float(row[WeatherDataType.PRESSURE.value[1]].replace(",", ".")) * 100
+                if row[WeatherDataType.PRESSURE.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.WIND_SPEED.value[0]: (
+                round(
+                    float(row[WeatherDataType.WIND_SPEED.value[1]].replace(",", "."))
+                    / 3.6,
+                    1,
+                )
+                if row[WeatherDataType.WIND_SPEED.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.WIND_DIRECTION.value[0]: (
+                int(row[WeatherDataType.WIND_DIRECTION.value[1]])
+                if row[WeatherDataType.WIND_DIRECTION.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.WIND_GUSTS.value[0]: (
+                round(
+                    float(row[WeatherDataType.WIND_GUSTS.value[1]].replace(",", "."))
+                    / 3.6,
+                    1,
+                )
+                if row[WeatherDataType.WIND_GUSTS.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.PRECIPITATION.value[0]: (
+                float(row[WeatherDataType.PRECIPITATION.value[1]].replace(",", "."))
+                if row[WeatherDataType.PRECIPITATION.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.CLOUD_COVERAGE.value[0]: (
+                float(row[WeatherDataType.CLOUD_COVERAGE.value[1]].replace(",", "."))
+                if row[WeatherDataType.CLOUD_COVERAGE.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.VISIBILITY.value[0]: (
+                float(row[WeatherDataType.VISIBILITY.value[1]].replace(",", ".")) * 1e3
+                if row[WeatherDataType.VISIBILITY.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.SUN_IRRADIANCE.value[0]: (
+                round(
+                    float(
+                        row[WeatherDataType.SUN_IRRADIANCE.value[1]].replace(",", ".")
+                    )
+                    * 3.6,
+                    1,
+                )
+                if row[WeatherDataType.SUN_IRRADIANCE.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
+            WeatherDataType.HUMIDITY.value[0]: (
+                float(row[WeatherDataType.HUMIDITY.value[1]].replace(",", "."))
+                if row[WeatherDataType.HUMIDITY.value[1]] != self.NOT_AVAILABLE
+                else None
+            ),
         }
 
     def get_weather_report(self, shouldUpdate=False):
@@ -852,21 +874,24 @@ class Weather:
             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.116 Safari/537.36"
         }
         headers["If-None-Match"] = self.etags[url] if url in self.etags else ""
-        request = requests.get(url, headers=headers)
-        # If resource has not been modified, return
-        if request.status_code == 304:
-            return
-        elif request.status_code != 200:
-            raise Exception(f"Unexpected status code {request.status_code}")
-        self.etags[url] = request.headers["ETag"]
-        uv_reports = json.loads(request.text)["content"]
-        # Match with existing stations
-        for uv_report in uv_reports:
-            station = get_station_by_name(
-                self.uv_index_stations_reference_names[uv_report["city"]]
-            )
-            # uv_report.update({"lat": station[1]["lat"], "lon": station[1]["lon"]})
-            self.uv_reports[station[0]] = uv_report
+        try:
+            request = requests.get(url, headers=headers, timeout=30)
+            # If resource has not been modified, return
+            if request.status_code == 304:
+                return
+            elif request.status_code != 200:
+                raise Exception(f"Unexpected status code {request.status_code}")
+            self.etags[url] = request.headers["ETag"]
+            uv_reports = json.loads(request.text)["content"]
+            # Match with existing stations
+            for uv_report in uv_reports:
+                station = get_station_by_name(
+                    self.uv_index_stations_reference_names[uv_report["city"]]
+                )
+                # uv_report.update({"lat": station[1]["lat"], "lon": station[1]["lon"]})
+                self.uv_reports[station[0]] = uv_report
+        except Exception as error:
+            print(f"Error in download_weather_report: {type(error)} args: {error.args}")
 
     def download_weather_report(self, region_code):
         url = f"https://www.dwd.de/DWD/wetter/wv_allg/deutschland/text/vhdl13_{region_code}.html"
@@ -874,16 +899,19 @@ class Weather:
             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.116 Safari/537.36"
         }
         headers["If-None-Match"] = self.etags[url] if url in self.etags else ""
-        request = requests.get(url, headers=headers)
-        # If resource has not been modified, return
-        if request.status_code == 304:
-            return
-        self.etags[url] = request.headers["ETag"]
-        weather_report = request.text
-        a = weather_report.find(">")
-        if a != -1:
-            weather_report = weather_report[a + 1 :]
-        self.weather_report = weather_report
+        try:
+            request = requests.get(url, headers=headers, timeout=30)
+            # If resource has not been modified, return
+            if request.status_code == 304:
+                return
+            self.etags[url] = request.headers["ETag"]
+            weather_report = request.text
+            a = weather_report.find(">")
+            if a != -1:
+                weather_report = weather_report[a + 1 :]
+            self.weather_report = weather_report
+        except Exception as error:
+            print(f"Error in download_weather_report: {type(error)} args: {error.args}")
 
     def download_latest_kml(self, stationid, force_hourly=False):
         if force_hourly:
@@ -891,15 +919,18 @@ class Weather:
         else:
             url = f"https://opendata.dwd.de/weather/local_forecasts/mos/MOSMIX_L/single_stations/{stationid}/kml/MOSMIX_L_LATEST_{stationid}.kmz"
         headers = {"If-None-Match": self.etags[url] if url in self.etags else ""}
-        request = requests.get(url, headers=headers)
-        # If resource has not been modified, return
-        if request.status_code == 304:
-            return
-        self.etags[url] = request.headers["ETag"]
-        with ZipFile(BytesIO(request.content), "r") as kmz:
-            # large RAM allocation
-            with kmz.open(kmz.namelist()[0], "r") as kml:
-                self.parse_kml(kml, force_hourly)
+        try:
+            request = requests.get(url, headers=headers, timeout=30)
+            # If resource has not been modified, return
+            if request.status_code == 304:
+                return
+            self.etags[url] = request.headers["ETag"]
+            with ZipFile(BytesIO(request.content), "r") as kmz:
+                # large RAM allocation
+                with kmz.open(kmz.namelist()[0], "r") as kml:
+                    self.parse_kml(kml, force_hourly)
+        except Exception as error:
+            print(f"Error in download_weather_report: {type(error)} args: {error.args}")
 
     def download_latest_report(self):
         station_id = self.station_id
@@ -909,38 +940,43 @@ class Weather:
             f"https://opendata.dwd.de/weather/weather_reports/poi/{station_id}-BEOB.csv"
         )
         headers = {"If-None-Match": self.etags[url] if url in self.etags else ""}
-        response = requests.get(url, headers=headers)
-        if response.status_code == 200:
-            content = response.content
-            reader = csv.DictReader(content.decode("utf-8").splitlines(), delimiter=";")
-            is_first_run = True
-            backuprows = []
-            for row in reader:
-                if is_first_run:
-                    is_first_run = False
-                    reader.__next__()
-                    continue
-                backuprows.append(reader.__next__())
-                backuprows.append(reader.__next__())
-                backuprows.append(reader.__next__())
-
-                # Some items are only reported each hour
-                for backuprow in backuprows:
-                    if row["cloud_cover_total"] == self.NOT_AVAILABLE:
-                        row["cloud_cover_total"] = backuprow["cloud_cover_total"]
-                    if row["horizontal_visibility"] == self.NOT_AVAILABLE:
-                        row["horizontal_visibility"] = backuprow[
-                            "horizontal_visibility"
-                        ]
-                    if row["present_weather"] == self.NOT_AVAILABLE:
-                        row["present_weather"] = backuprow["present_weather"]
-                self.parse_csv_row(row)
-                # We only want the latest report
-                break
-
-        elif response.status_code == 304:
-            # The report is already up to date
-            print("Report is already up to date")
-        else:
-            # Handle other status codes
-            print(f"Failed to download report. Status code: {response.status_code}")
+        try:
+            response = requests.get(url, headers=headers, timeout=30)
+            if response.status_code == 200:
+                content = response.content
+                reader = csv.DictReader(
+                    content.decode("utf-8").splitlines(), delimiter=";"
+                )
+                is_first_run = True
+                backuprows = []
+                for row in reader:
+                    if is_first_run:
+                        is_first_run = False
+                        reader.__next__()
+                        continue
+                    backuprows.append(reader.__next__())
+                    backuprows.append(reader.__next__())
+                    backuprows.append(reader.__next__())
+
+                    # Some items are only reported each hour
+                    for backuprow in backuprows:
+                        if row["cloud_cover_total"] == self.NOT_AVAILABLE:
+                            row["cloud_cover_total"] = backuprow["cloud_cover_total"]
+                        if row["horizontal_visibility"] == self.NOT_AVAILABLE:
+                            row["horizontal_visibility"] = backuprow[
+                                "horizontal_visibility"
+                            ]
+                        if row["present_weather"] == self.NOT_AVAILABLE:
+                            row["present_weather"] = backuprow["present_weather"]
+                    self.parse_csv_row(row)
+                    # We only want the latest report
+                    break
+
+            elif response.status_code == 304:
+                # The report is already up to date
+                print("Report is already up to date")
+            else:
+                # Handle other status codes
+                print(f"Failed to download report. Status code: {response.status_code}")
+        except Exception as error:
+            print(f"Error in download_weather_report: {type(error)} args: {error.args}")

{simple_dwd_weatherforecast-2.0.29 → simple_dwd_weatherforecast-2.0.32}/simple_dwd_weatherforecast/dwdmap.py

@@ -15,6 +15,7 @@ class WeatherMapType(Enum):
     WARNUNGEN_GEMEINDEN = "dwd:Warnungen_Gemeinden"
     WARNUNGEN_KREISE = "dwd:Warnungen_Landkreise"
 
+
 class WeatherBackgroundMapType(Enum):
     LAENDER = "dwd:Laender"
     BUNDESLAENDER = "dwd:Warngebiete_Bundeslaender"
@@ -23,7 +24,16 @@ class WeatherBackgroundMapType(Enum):
     SATELLIT = "dwd:bluemarble"
     GEWAESSER = "dwd:Gewaesser"
 
-def get_from_location(longitude, latitude, radius_km, map_type: WeatherMapType, background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER, image_width=520, image_height=580):
+
+def get_from_location(
+    longitude,
+    latitude,
+    radius_km,
+    map_type: WeatherMapType,
+    background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
+    image_width=520,
+    image_height=580,
+):
     if radius_km <= 0:
         raise ValueError("Radius must be greater than 0")
     if latitude < -90 or latitude > 90:
@@ -31,17 +41,46 @@ def get_from_location(longitude, latitude, radius_km, map_type: WeatherMapType,
     if longitude < -180 or longitude > 180:
         raise ValueError("Longitude must be between -180 and 180")
     radius = math.fabs(radius_km / (111.3 * math.cos(latitude)))
-    return get_map(latitude-radius, longitude-radius, latitude+radius, longitude+radius, map_type, background_type, image_width, image_height)
+    return get_map(
+        latitude - radius,
+        longitude - radius,
+        latitude + radius,
+        longitude + radius,
+        map_type,
+        background_type,
+        image_width,
+        image_height,
+    )
+
+
+def get_germany(
+    map_type: WeatherMapType,
+    background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
+    image_width=520,
+    image_height=580,
+):
+    return get_map(
+        4.4, 46.4, 16.1, 55.6, map_type, background_type, image_width, image_height
+    )
 
-def get_germany(map_type: WeatherMapType, background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER, image_width=520, image_height=580):
-    return get_map(4.4, 46.4, 16.1, 55.6, map_type, background_type, image_width, image_height)
 
-def get_map(minx,miny,maxx,maxy, map_type: WeatherMapType, background_type: WeatherBackgroundMapType, image_width=520, image_height=580):
+def get_map(
+    minx,
+    miny,
+    maxx,
+    maxy,
+    map_type: WeatherMapType,
+    background_type: WeatherBackgroundMapType,
+    image_width=520,
+    image_height=580,
+):
     if image_width > 1200 or image_height > 1400:
-        raise ValueError("Width and height must not exceed 1200 and 1400 respectively. Please be kind to the DWD servers.")
+        raise ValueError(
+            "Width and height must not exceed 1200 and 1400 respectively. Please be kind to the DWD servers."
+        )
 
-    url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&request=GetMap&layers={background_type.value},{map_type.value}&bbox={minx},{miny},{maxx},{maxy}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
+    url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&request=GetMap&layers={map_type.value},{background_type.value}&bbox={minx},{miny},{maxx},{maxy}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
     request = requests.get(url, stream=True)
     if request.status_code == 200:
         image = Image.open(BytesIO(request.content))
-        return image
+        return image

{simple_dwd_weatherforecast-2.0.29 → simple_dwd_weatherforecast-2.0.32/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.29
+Version: 2.0.32
 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
@@ -127,6 +127,8 @@ class Weather:
 
     get_timeframe_sum(weatherDataType: see WeatherDataType, datetime, timeframe: hours after datetime as int, optional bool shouldUpdate) # Returns the sum of that value within the time frame
 
+    get_daily_avg(weatherDataType: see WeatherDataType, datetime, optional bool shouldUpdate) # Returns the daily average of that value
+
     get_timeframe_avg(weatherDataType: see WeatherDataType, datetime, timeframe: hours after datetime as int, optional bool shouldUpdate) # Returns the average of that value within the time frame
 
     get_forecast_condition(datetime, optional bool shouldUpdate) # Result is condition as text

{simple_dwd_weatherforecast-2.0.29 → simple_dwd_weatherforecast-2.0.32}/simple_dwd_weatherforecast.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ tests/__init__.py
 tests/dummy_data.py
 tests/dummy_data_full.py
 tests/dummy_uv.py
+tests/test_get_daily_avg.py
 tests/test_get_daily_condition.py
 tests/test_get_daily_max.py
 tests/test_get_daily_min.py

simple_dwd_weatherforecast-2.0.32/tests/test_get_daily_avg.py

@@ -0,0 +1,48 @@
+from simple_dwd_weatherforecast.dwdforecast import WeatherDataType
+import unittest
+from unittest.mock import patch
+from datetime import datetime
+from simple_dwd_weatherforecast import dwdforecast
+from dummy_data import parsed_data
+
+
+class Weather_get_daily_avg(unittest.TestCase):
+    def setUp(self):
+        self.dwd_weather = dwdforecast.Weather("H889")
+        self.dwd_weather.forecast_data = parsed_data
+        self.dwd_weather.station_name = "BAD HOMBURG"
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_shouldupdate(self, mock_update):
+        test_time = datetime(2020, 11, 7, 3, 30)
+        self.dwd_weather.get_daily_avg(WeatherDataType.PRECIPITATION, test_time, True)
+        mock_update.assert_called()
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_shouldupdate_not(self, mock_update):
+        test_time = datetime(2020, 11, 7, 3, 30)
+        self.dwd_weather.get_daily_avg(WeatherDataType.PRECIPITATION, test_time, False)
+        mock_update.assert_not_called()
+
+    def test_not_in_timerange(self):
+        test_time = datetime(2000, 11, 7, 3, 30)
+        self.assertIsNone(
+            self.dwd_weather.get_daily_avg(WeatherDataType.PRECIPITATION, test_time)
+        )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_precipitation(self, mock_update):
+        test_time = datetime(2020, 11, 6, 12, 0)
+        print(self.dwd_weather.get_day_values(test_time))
+        self.assertEqual(
+            self.dwd_weather.get_daily_avg(WeatherDataType.PRECIPITATION, test_time),
+            1.8,
+        )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_temperature(self, mock_update):
+        test_time = datetime(2020, 11, 6, 23, 0)
+        self.assertEqual(
+            self.dwd_weather.get_daily_avg(WeatherDataType.TEMPERATURE, test_time),
+            278.09,
+        )

{simple_dwd_weatherforecast-2.0.29 → simple_dwd_weatherforecast-2.0.32}/tests/test_get_daily_sum.py

@@ -35,7 +35,7 @@ class Weather_get_daily_sum(unittest.TestCase):
         test_time = datetime(2020, 11, 6, 10, 0)
         self.assertEqual(
             self.dwd_weather.get_daily_sum(WeatherDataType.PRECIPITATION, test_time),
-            27.25,
+            36.01,
         )
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
@@ -43,5 +43,5 @@ class Weather_get_daily_sum(unittest.TestCase):
         test_time = datetime(2020, 11, 6, 10, 0)
         self.assertEqual(
             self.dwd_weather.get_daily_sum(WeatherDataType.TEMPERATURE, test_time),
-            5286.25,
+            5561.8,
         )

{simple_dwd_weatherforecast-2.0.29 → simple_dwd_weatherforecast-2.0.32}/tests/test_get_day_values.py

@@ -451,6 +451,7 @@ class Weather_get_day_values(unittest.TestCase):
             self.dwd_weather.get_day_values(test_time),
             test_data,
         )
+        self.assertEqual(len(self.dwd_weather.get_day_values(test_time)), 24)
 
     def test_day_not_last_day(self):
         test_time = datetime(2020, 11, 16, 1, 0)
@@ -1004,8 +1005,27 @@ class Weather_get_day_values(unittest.TestCase):
                 "wwM": 3.0,
                 "humidity": 81.3,
             },
+            {
+                "TTT": 275.55,
+                "Td": 273.45,
+                "condition": "51",
+                "PPPP": 103060.0,
+                "DD": 52.0,
+                "FF": 1.54,
+                "FX1": 3.09,
+                "RR1c": 8.76,
+                "wwP": 2.0,
+                "DRR1": 0.0,
+                "N": 22.0,
+                "VV": 15500.0,
+                "SunD1": 0.0,
+                "Rad1h": None,
+                "wwM": 2.0,
+                "humidity": 86.0,
+            },
         ]
         self.assertEqual(
             self.dwd_weather.get_day_values(test_time),
             test_data,
         )
+        self.assertEqual(len(self.dwd_weather.get_day_values(test_time)), 20)