simple-dwd-weatherforecast 2.0.28__tar.gz → 2.0.31__tar.gz

{simple_dwd_weatherforecast-2.0.28/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-2.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.28
+Version: 2.0.31
 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-2.0.28 → simple_dwd_weatherforecast-2.0.31}/setup.py

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

{simple_dwd_weatherforecast-2.0.28 → simple_dwd_weatherforecast-2.0.31}/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,
@@ -766,79 +770,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 +869,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 +894,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 +914,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 +935,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.28 → simple_dwd_weatherforecast-2.0.31}/simple_dwd_weatherforecast/dwdmap.py

@@ -40,7 +40,7 @@ def get_map(minx,miny,maxx,maxy, map_type: WeatherMapType, background_type: Weat
     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.")
 
-    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"
+    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"
     request = requests.get(url, stream=True)
     if request.status_code == 200:
         image = Image.open(BytesIO(request.content))

{simple_dwd_weatherforecast-2.0.28 → simple_dwd_weatherforecast-2.0.31/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.28
+Version: 2.0.31
 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