simple-dwd-weatherforecast 3.0.2__tar.gz → 3.0.4__tar.gz

{simple_dwd_weatherforecast-3.0.2/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 3.0.2
+Version: 3.0.4
 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.2 → simple_dwd_weatherforecast-3.0.4}/setup.py

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

{simple_dwd_weatherforecast-3.0.2 → simple_dwd_weatherforecast-3.0.4}/simple_dwd_weatherforecast/dwdforecast.py

@@ -421,8 +421,7 @@ class Weather:
 
     def get_reported_weather(self, weatherDataType: WeatherDataType, shouldUpdate=True):
         if not self.has_measurement(self.station_id):
-            print("no report for this station available")
-            return None
+            raise ValueError("No report for this station available")
         if shouldUpdate:
             self.update(with_measurements=True)
         if self.report_data is not None:

{simple_dwd_weatherforecast-3.0.2 → simple_dwd_weatherforecast-3.0.4}/simple_dwd_weatherforecast/dwdmap.py

@@ -182,8 +182,10 @@ def get_map(
     layers = f"{','.join(special_layers)},{map_layers},{','.join(other_layers)}".lstrip(
         ","
     ).rstrip(",")
-
-    url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.3.0&request=GetMap&layers={layers}&bbox={miny},{minx},{maxy},{maxx}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
+    bgcolor = "0xFFFFFF"
+    if dark_mode:
+        bgcolor = "0x1C1C1C"
+    url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.3.0&request=GetMap&layers={layers}&bbox={miny},{minx},{maxy},{maxx}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png&bgcolor={bgcolor}"
 
     request = requests.get(url, stream=True)
     if request.status_code == 200:
@@ -193,18 +195,6 @@ def get_map(
             raise RuntimeError(
                 f"Error during image request from DWD servers: {url}"
             ) from e
-        if dark_mode:
-            new_image_data = []
-            for item in image.getdata():  # type: ignore
-                if item[0] == 255 and item[1] == 255 and item[2] == 255:
-                    new_image_data.append((28, 28, 28))
-                elif item[0] == 85 and item[1] == 85 and item[2] == 85:
-                    new_image_data.append((155, 155, 155))
-                else:
-                    new_image_data.append(item)
-
-            # update image data
-            image.putdata(new_image_data)
         image = draw_marker(image, ImageBoundaries(minx, maxx, miny, maxy), markers)
         return image
     else:
@@ -270,15 +260,7 @@ class ImageLoop:
         now = get_time_last_5_min(datetime.now(timezone.utc))
         self._last_update = now - timedelta(minutes=5) * self._steps
 
-        while now > self._last_update:
-            self._last_update += timedelta(minutes=5)
-            # Lightning in the NCEW_EU layer is only available in the last 5 minutes
-            self._images.append(
-                self._get_image(
-                    self._last_update,
-                    with_lightning=(now - self._last_update) < timedelta(minutes=5),
-                )
-            )
+        self._load_images(now)
 
     def update(self):
         now = get_time_last_5_min(datetime.now(timezone.utc))
@@ -288,11 +270,38 @@ class ImageLoop:
             self._full_reload()
         # Update the buffer and fetch only the new images
         else:
-            while now > self._last_update:
-                self._last_update += timedelta(minutes=5)
-                self._images.append(
-                    self._get_image(self._last_update, with_lightning=True)
+            self._load_images(now)
+
+    def _load_images(self, now):
+        while now > self._last_update:
+            self._last_update += timedelta(minutes=5)
+            # Lightning in the NCEW_EU layer is only available in the last 5 minutes
+            try:
+                image = self._get_image(
+                    self._last_update,
+                    with_lightning=(now - self._last_update) < timedelta(minutes=5),
                 )
+            except ConnectionError as e:
+                raise ConnectionAbortedError(
+                    f"Connection to DWD map servers failed: {e}"
+                )
+            except RuntimeError as e:
+                raise RuntimeError(f"Error: {e}") from e
+            except TypeError:
+                try:
+                    image = self._get_image(
+                        self._last_update,
+                        with_lightning=False,
+                    )
+                except ConnectionError as e:
+                    raise ConnectionAbortedError(
+                        f"Connection to DWD map servers failed: {e}"
+                    )
+                except TypeError as e:
+                    raise TypeError(
+                        f"Unexpected content type: {e}. Please check the DWD map servers."
+                    ) from e
+            self._images.append(image)
 
     def _get_image(
         self,
@@ -330,28 +339,21 @@ class ImageLoop:
                 ","
             ).rstrip(",")
         )
-        url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.3.0&request=GetMap&layers={layers}&bbox={self._miny},{self._minx},{self._maxy},{self._maxx}&width={self._image_width}&height={self._image_height}&srs=EPSG:4326&styles=&format=image/png&TIME={date.strftime('%Y-%m-%dT%H:%M:00.0Z')}"
+        bgcolor = "0xFFFFFF"
+        if self.dark_mode:
+            bgcolor = "0x1C1C1C"
+        url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.3.0&request=GetMap&layers={layers}&bbox={self._miny},{self._minx},{self._maxy},{self._maxx}&width={self._image_width}&height={self._image_height}&srs=EPSG:4326&styles=&format=image/png&TIME={date.strftime('%Y-%m-%dT%H:%M:00.0Z')}&bgcolor={bgcolor}"
         request = requests.get(url, stream=True)
-        if request.status_code != 200 or request.headers["content-type"] != "image/png":
+        if request.status_code != 200:
             raise ConnectionError(f"Error during image request from DWD servers: {url}")
+        elif request.headers["content-type"] != "image/png":
+            raise TypeError(
+                f"Unexpected content type: {request.headers['content-type']}"
+            )
         try:
             image = Image.open(BytesIO(request.content))
         except Exception as e:
-            raise RuntimeError(
-                f"Error during image request from DWD servers: {url}"
-            ) from e
-        if self.dark_mode:
-            new_image_data = []
-            for item in image.getdata():  # type: ignore
-                if item[0] == 255 and item[1] == 255 and item[2] == 255:
-                    new_image_data.append((28, 28, 28))
-                elif item[0] == 85 and item[1] == 85 and item[2] == 85:
-                    new_image_data.append((155, 155, 155))
-                else:
-                    new_image_data.append(item)
-
-            # update image data
-            image.putdata(new_image_data)
+            raise RuntimeError(f"Error during image parsing: {url}") from e
         image = draw_marker(
             image,
             ImageBoundaries(self._minx, self._maxx, self._miny, self._maxy),

{simple_dwd_weatherforecast-3.0.2 → simple_dwd_weatherforecast-3.0.4/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 3.0.2
+Version: 3.0.4
 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