simple-dwd-weatherforecast 2.1.4__tar.gz → 2.1.6__tar.gz

{simple_dwd_weatherforecast-2.1.4/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.1.4
+Version: 2.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
@@ -14,6 +14,7 @@ Requires-Dist: lxml
 Requires-Dist: requests
 Requires-Dist: Pillow
 Requires-Dist: arrow
+Requires-Dist: stream-inflate==0.0.14
 Requires-Dist: stream-unzip
 Requires-Dist: httpx
 
@@ -110,6 +111,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.4 → simple_dwd_weatherforecast-2.1.6}/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.4 → simple_dwd_weatherforecast-2.1.6}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="simple_dwd_weatherforecast",
-    version="2.1.4",
+    version="2.1.6",
     author="Max Fermor",
     description="A simple tool to retrieve a weather forecast from DWD OpenData",
     long_description=long_description,
@@ -20,5 +20,13 @@ setuptools.setup(
         "Operating System :: OS Independent",
     ],
     python_requires=">=3.6",
-    install_requires=["lxml", "requests", "Pillow", "arrow", "stream-unzip", "httpx"],
+    install_requires=[
+        "lxml",
+        "requests",
+        "Pillow",
+        "arrow",
+        "stream-inflate==0.0.14",
+        "stream-unzip",
+        "httpx",
+    ],
 )

{simple_dwd_weatherforecast-2.1.4 → simple_dwd_weatherforecast-2.1.6}/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(
@@ -952,16 +954,13 @@ class Weather:
             print(f"Error in download_latest_kml: {type(error)} args: {error.args}")
 
     def get_chunks(self, url):
-        def zipped_chunks(url):
-            # Iterable that yields the bytes of a zip file
-            with httpx.stream(
-                "GET",
-                url,
-            ) as r:
-                self.etags[url] = r.headers["etag"]  # type: ignore
-                yield from r.iter_bytes(chunk_size=171072)
-
-        return stream_unzip(zipped_chunks(url))
+        # Iterable that yields the bytes of a zip file
+        with httpx.stream(
+            "GET",
+            url,
+        ) as r:
+            self.etags[url] = r.headers["etag"]  # type: ignore
+            yield from r.iter_bytes(chunk_size=65536)
 
     def download_large_kml(self, stationid):
         placemark = b""
@@ -975,37 +974,42 @@ class Weather:
         if r.status_code == 304:
             return
 
-        for file_name, file_size, unzipped_chunks in self.get_chunks(url):
-            chunk1 = b""
-            chunk2 = b""
-            first_chunk = None
+        for file_name, file_size, unzipped_chunks in stream_unzip(self.get_chunks(url)):
+            header = b""
+            placemark = b""
 
-            save_next = False
-            save_next_next = False
+            found_header = False
+            found_stationid = False
             stop = False
             # unzipped_chunks must be iterated to completion or UnfinishedIterationError will be raised
             for chunk in unzipped_chunks:
                 if stop:
                     continue
-                if not first_chunk:
-                    first_chunk = chunk
-                if save_next_next:
-                    placemark = chunk1 + chunk2 + chunk
-                    save_next_next = False
-                    stop = True
-                if save_next:
-                    chunk2 = chunk
-                    save_next_next = True
-                    save_next = False
-
-                if stationid.encode() in chunk:
-                    chunk1 = chunk
-                    save_next = True
-            if first_chunk:
-                start = placemark.find(b"<kml:Placemark>\n")
 
+                if not found_header:
+                    header += chunk
+                    if "<kml:Placemark>".encode() in chunk:
+                        found_header = True
+
+                if found_stationid:
+                    placemark += chunk
+                    if "</kml:Placemark>\n".encode() in chunk:
+                        stop = True
+
+                if f"<kml:name>{stationid}</kml:name>".encode() in chunk:
+                    placemark = chunk
+                    found_stationid = True
+
+            if not placemark:
+                raise BufferError("Station not found")
+            if header and placemark:
+                start = placemark.find(b"<kml:Placemark>\n")
+                if start == -1:
+                    raise BufferError(
+                        "Error during stream parsing of station {}".format(stationid)
+                    )
                 result = (
-                    first_chunk[: first_chunk.find(b"<kml:Placemark>")]
+                    header[: header.find(b"<kml:Placemark>")]
                     + placemark[
                         start : placemark.find(b"</kml:Placemark>\n", start) + 17
                     ]

{simple_dwd_weatherforecast-2.1.4 → simple_dwd_weatherforecast-2.1.6/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.1.4
+Version: 2.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
@@ -14,6 +14,7 @@ Requires-Dist: lxml
 Requires-Dist: requests
 Requires-Dist: Pillow
 Requires-Dist: arrow
+Requires-Dist: stream-inflate==0.0.14
 Requires-Dist: stream-unzip
 Requires-Dist: httpx
 
@@ -110,6 +111,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.4 → simple_dwd_weatherforecast-2.1.6}/simple_dwd_weatherforecast.egg-info/requires.txt

@@ -2,5 +2,6 @@ lxml
 requests
 Pillow
 arrow
+stream-inflate==0.0.14
 stream-unzip
 httpx