simple-dwd-weatherforecast 2.1.4__py3-none-any.whl → 2.1.6__py3-none-any.whl

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.dist-info → simple_dwd_weatherforecast-2.1.6.dist-info}/METADATA

@@ -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.dist-info → simple_dwd_weatherforecast-2.1.6.dist-info}/RECORD

@@ -1,18 +1,18 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_dwd_weatherforecast/dwdforecast.py,sha256=pMJpl7yHV_xFFdpYlpU8wYZOv4_ZBkx-JAkrXMvYOI4,38616
+simple_dwd_weatherforecast/dwdforecast.py,sha256=wYg7XC9_5rb-ITdjoT-bLaBc_AGqii8d6eNEfdbfXtY,38863
 simple_dwd_weatherforecast/dwdmap.py,sha256=cPCcL1u5qeIEDLBcL0qOH0-7dPIi3mge4-PUqfZlRQc,6737
 simple_dwd_weatherforecast/stations.json,sha256=1u8qc2CT_rVy49SAlOicGixzHln6Y0FXevuFAz2maBw,838948
 simple_dwd_weatherforecast/uv_stations.json,sha256=ADenYo-aR6qbf0UFkfYr72kkFzL9HyUKe4VQ23POGF8,2292
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/dummy_data.py,sha256=sF8pXxq8innSpRc4lW0XxGcr34dESSAoBdAf2F2D4AI,63395
-tests/dummy_data_full.py,sha256=IwYoeqVX8cpfn_gE-7arXaWV9btRm_HHqka_LfKqW-E,64053
+tests/dummy_data.py,sha256=qapeQxjh8kURf5b-9h4gUdJaqQJQDVdqfMtS2g5JReY,103406
+tests/dummy_data_full.py,sha256=3HRGAQBq4xPYs4jLzoLV_UAe1CXFzOsVBOouDL_5RHw,104062
 tests/dummy_uv.py,sha256=TM1TwvNq_ea4WgIJyYsNAEXZJTx1dXH1ZVrW_LfLBLg,4548
 tests/test_get_daily_avg.py,sha256=MNd7u9Y7_E6SIyxg59EKfdKx4QJ7R_WT5wvRgm7Gzks,2315
 tests/test_get_daily_condition.py,sha256=9Qrhv14-vLnLz0N0FWG7Mv6_iEbNPqrHDDWWNQNydU0,2298
 tests/test_get_daily_max.py,sha256=schjGJDflg1YEQSdfRndw2NT4AvrVheSDveyVZrFySM,2220
 tests/test_get_daily_min.py,sha256=GzqlOfLdwLqGLYVeAJ0fbK1JRq-_fT7z6Gea74lSY7E,2224
 tests/test_get_daily_sum.py,sha256=UEntbPwGSleHocu0587WnuC5ijptQtzVNreR1d6yoM0,2221
-tests/test_get_day_values.py,sha256=KOMkp_bh_nqZIufP8F3PNmF3WqXnPLOn6LKHrSi3SMA,29310
+tests/test_get_day_values.py,sha256=hDphH7fekfcWX7slJUF1QiH3B7te23nHiS5-Fro3HY4,31013
 tests/test_get_forecast_condition.py,sha256=YVapxXH5Svq5P7XvWn48n19hriQ1-7CSezuGc6DswJQ,2866
 tests/test_get_forecast_data.py,sha256=E1pIsgcWfQLgiVBMJ4URao3rBJgXebDWcPlV6FYZF-U,3394
 tests/test_get_station_name.py,sha256=S18TZCUrLSRUgAz7sJ66igC0X-9JX_7O3Yh9Z6-QHnQ,423
@@ -21,12 +21,12 @@ tests/test_get_timeframe_condition.py,sha256=9ED_Uyx6v4Gq6qQ5SQyWtS_fOkbbhExKzfG
 tests/test_get_timeframe_max.py,sha256=gas73o1Ferkk87M4Y3k4LZ-fXKehI2ulsxcQfIviDTs,2407
 tests/test_get_timeframe_min.py,sha256=WnFO36U_E-55TW7jR598lyLS4u-TOtXmufadJF7IWQs,2407
 tests/test_get_timeframe_sum.py,sha256=hjHY9fvJUqi4o8AdFLPSDwi8GpXtjzLqsRzVMoUVjn4,2424
-tests/test_get_timeframe_values.py,sha256=z8ozpWlyilw8-zjbk2gDExhTobNbgmcVTbZ6ZHjxAW4,6891
+tests/test_get_timeframe_values.py,sha256=D9NJ98sZykLKAW1eZgLFuy0FMb4f_jUCtr4clzg65ms,7231
 tests/test_is_in_timerange.py,sha256=3y88L3N73NxSTJ-_edx6OCnxHWKJWWFma98gjZvJDGg,1338
 tests/test_is_valid_timeframe.py,sha256=mXjeu3lUyixiBUEljirTf6qDM_FZFQGWa-Rk0NBMUDU,891
 tests/test_location_tools.py,sha256=wto_XzVnARJQ-Qc83YAn0ahfMBSaOHpfzqAeKRDsNm8,1208
 tests/test_map.py,sha256=uKxNjMXLFT3pczZKLqkfPK5xaVfmql-r5L9VPgCbS3Q,5671
-tests/test_parsekml.py,sha256=mpje7FoMIz566BLW-Fr_69cxLyS7w4qvrSOIlxVYoUU,1625
+tests/test_parsekml.py,sha256=aG98x3B409CqxKBIq50yf3_LxPROnI4CAhdKfp350uQ,1495
 tests/test_region.py,sha256=ReUB9Cy9roBemkpEkTjZZav-Mu3Ha7ADOAfa9J-gi80,877
 tests/test_reported_weather.py,sha256=ULg4ogZRxus01p2rdxiSFL75AisqtcvnLDOc7uJMBH0,767
 tests/test_station.py,sha256=Zjx-q0yxKVxVI_L1yB_bqY5pjZPoa1L94uC8Gx6shdY,1026
@@ -35,8 +35,8 @@ tests/test_update.py,sha256=AIzzHMxcjwQjeTB0l3YFgB7HkGDbuqiHofwy41mS0m4,7440
 tests/test_update_hourly.py,sha256=7Zl8ml3FTdqw3_Qwr_Tz-sWTzypvrBWmxeig2Vwp_ZQ,1781
 tests/test_uv_index.py,sha256=tr6wnOyHlXT1S3yp1oeHc4-Brmc-EMEdM4mtyrdpcHg,579
 tests/test_weather.py,sha256=ZyX4ldUoJpJp7YpiNQwU6Od-nYRay-3qcaDJdNq8fhY,780
-simple_dwd_weatherforecast-2.1.4.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
-simple_dwd_weatherforecast-2.1.4.dist-info/METADATA,sha256=AEI5eiSQsYm-_W8md8MAiG9xcPrSdT6pFSULJ4Ux1xQ,12103
-simple_dwd_weatherforecast-2.1.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-simple_dwd_weatherforecast-2.1.4.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.1.4.dist-info/RECORD,,
+simple_dwd_weatherforecast-2.1.6.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-2.1.6.dist-info/METADATA,sha256=F6Wv_Y6m1wrEFJgHlnDzMR-sx3_oUVRb9B0ocsUKhyI,12215
+simple_dwd_weatherforecast-2.1.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+simple_dwd_weatherforecast-2.1.6.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-2.1.6.dist-info/RECORD,,