simple-dwd-weatherforecast 2.1.3__tar.gz → 2.1.5__tar.gz

{simple_dwd_weatherforecast-2.1.3/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.1.3
+Version: 2.1.5
 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
@@ -110,6 +110,7 @@ class WeatherDataType(Enum):
     SUN_IRRADIANCE = "Rad1h" # Unit: W/m2
     FOG_PROBABILITY = "wwM" # Unit: % (0..100)
     HUMIDITY = "humidity"  # Unit: %
+    EVAPORATION = ("PEvap", "evaporation")  # In the last 24h Unit: kg/m2
 
 class Weather:
 

{simple_dwd_weatherforecast-2.1.3 → simple_dwd_weatherforecast-2.1.5}/README.md

@@ -91,6 +91,7 @@ class WeatherDataType(Enum):
     SUN_IRRADIANCE = "Rad1h" # Unit: W/m2
     FOG_PROBABILITY = "wwM" # Unit: % (0..100)
     HUMIDITY = "humidity"  # Unit: %
+    EVAPORATION = ("PEvap", "evaporation")  # In the last 24h Unit: kg/m2
 
 class Weather:
 

{simple_dwd_weatherforecast-2.1.3 → simple_dwd_weatherforecast-2.1.5}/setup.py

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

{simple_dwd_weatherforecast-2.1.3 → simple_dwd_weatherforecast-2.1.5}/simple_dwd_weatherforecast/dwdforecast.py

@@ -111,6 +111,7 @@ class WeatherDataType(Enum):
     SUN_IRRADIANCE = ("Rad1h", "global_radiation_last_hour")  # Unit: kJ/m^2
     FOG_PROBABILITY = ("wwM", "")  # Unit: % (0..100)
     HUMIDITY = ("humidity", "relative_humidity")  # Unit: %
+    EVAPORATION = ("PEvap", "evaporation")  # Unit: kg/m2
 
 
 class Weather:
@@ -725,6 +726,7 @@ class Weather:
                 WeatherDataType.SUN_DURATION,
                 WeatherDataType.SUN_IRRADIANCE,
                 WeatherDataType.FOG_PROBABILITY,
+                WeatherDataType.EVAPORATION,
             )
         ]
         values.extend(
@@ -951,21 +953,31 @@ class Weather:
         except Exception as error:
             print(f"Error in download_latest_kml: {type(error)} args: {error.args}")
 
-    def get_chunks(self):
-        def zipped_chunks():
+    def get_chunks(self, url):
+        def zipped_chunks(url):
             # Iterable that yields the bytes of a zip file
             with httpx.stream(
                 "GET",
-                "https://opendata.dwd.de/weather/local_forecasts/mos/MOSMIX_S/all_stations/kml/MOSMIX_S_LATEST_240.kmz",
+                url,
             ) as r:
-                yield from r.iter_bytes(chunk_size=131072)
+                self.etags[url] = r.headers["etag"]  # type: ignore
+                yield from r.iter_bytes(chunk_size=171072)
 
-        return stream_unzip(zipped_chunks())
+        return stream_unzip(zipped_chunks(url))
 
     def download_large_kml(self, stationid):
         placemark = b""
+        url = "https://opendata.dwd.de/weather/local_forecasts/mos/MOSMIX_S/all_stations/kml/MOSMIX_S_LATEST_240.kmz"
+        # Check if content has updated
+        headers = {"If-None-Match": self.etags[url] if url in self.etags else ""}  # type: ignore
+        r = httpx.head(
+            url,
+            headers=headers,
+        )
+        if r.status_code == 304:
+            return
 
-        for file_name, file_size, unzipped_chunks in self.get_chunks():
+        for file_name, file_size, unzipped_chunks in self.get_chunks(url):
             chunk1 = b""
             chunk2 = b""
             first_chunk = None
@@ -988,9 +1000,12 @@ class Weather:
                     save_next_next = True
                     save_next = False
 
-                if stationid.encode() in chunk:
+                if f"<kml:name>{stationid}</kml:name>".encode() in chunk:
                     chunk1 = chunk
                     save_next = True
+
+            if not chunk1:
+                raise BufferError("Station not found")
             if first_chunk:
                 start = placemark.find(b"<kml:Placemark>\n")
 

{simple_dwd_weatherforecast-2.1.3 → simple_dwd_weatherforecast-2.1.5/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.1.3
+Version: 2.1.5
 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
@@ -110,6 +110,7 @@ class WeatherDataType(Enum):
     SUN_IRRADIANCE = "Rad1h" # Unit: W/m2
     FOG_PROBABILITY = "wwM" # Unit: % (0..100)
     HUMIDITY = "humidity"  # Unit: %
+    EVAPORATION = ("PEvap", "evaporation")  # In the last 24h Unit: kg/m2
 
 class Weather: