simple-dwd-weatherforecast 2.1.3__py3-none-any.whl → 2.1.5__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(
@@ -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.dist-info → simple_dwd_weatherforecast-2.1.5.dist-info}/METADATA

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

@@ -1,18 +1,18 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_dwd_weatherforecast/dwdforecast.py,sha256=te_MIe6GzZ32UWrDTpbqJdHk0hFhs9dqN4h2rS3J-yA,38247
+simple_dwd_weatherforecast/dwdforecast.py,sha256=klhL-Bd8u3Ybsq5JQTifMwlV67dF3foRTMGMfwVj5oE,38828
 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,7 +21,7 @@ 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
@@ -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.3.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
-simple_dwd_weatherforecast-2.1.3.dist-info/METADATA,sha256=4OMLkaOyhaXOtfPDgoJa7viSn9JkCOxIdDwO6gr3DGg,12103
-simple_dwd_weatherforecast-2.1.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-simple_dwd_weatherforecast-2.1.3.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.1.3.dist-info/RECORD,,
+simple_dwd_weatherforecast-2.1.5.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-2.1.5.dist-info/METADATA,sha256=YAtr_r5aouZhkOGqfPYqbILWGKQIrZRAxORt0tUOc0s,12177
+simple_dwd_weatherforecast-2.1.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+simple_dwd_weatherforecast-2.1.5.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-2.1.5.dist-info/RECORD,,

{simple_dwd_weatherforecast-2.1.3.dist-info → simple_dwd_weatherforecast-2.1.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any