simple-dwd-weatherforecast 2.0.21__py3-none-any.whl → 2.0.23__py3-none-any.whl

simple_dwd_weatherforecast/dwdforecast.py

@@ -5,7 +5,7 @@ from zipfile import ZipFile
 from enum import Enum
 from lxml import etree
 from datetime import datetime, timedelta, timezone
-import time
+import arrow
 import math
 import json
 import csv
@@ -97,7 +97,6 @@ class Weather:
     NOT_AVAILABLE = "---"
 
     station_id = ""
-    station_name = ""
     issue_time = None
     forecast_data = None
     report_data = None
@@ -176,36 +175,35 @@ class Weather:
     }
 
     region_codes = {
-        "NW": "dweh",
-        "NI": "dwhg",
-        "HB": "dwhg",
-        "SH": "dwhh",
-        "HH": "dwhh",
-        "SN": "dwlg",
-        "ST": "dwlh",
-        "TH": "dwli",
-        "BY": "dwmg",
-        "DW": "dwsg",
-        "HE": "dwoh",
-        "RP": "dwoi",
-        "SL": "dwoi",
-        "BB": "dwpg",
-        "BE": "dwpg",
-        "MV": "dwph",
+        "NW": "dweh",  # Nordrhein-Westfalen
+        "NI": "dwhg",  # Niedersachsen
+        "HB": "dwhg",  # Bremen
+        "SH": "dwhh",  # Schleswig-Holstein
+        "HH": "dwhh",  # Hamburg
+        "SN": "dwlg",  # Sachsen
+        "ST": "dwlh",  # Sachsen-Anhalt
+        "TH": "dwli",  # Thueringen
+        "BY": "dwmg",  # Bayern
+        "BW": "dwsg",  # Baden-Württemberg
+        "HE": "dwoh",  # Hessen
+        "RP": "dwoi",  # Rheinland-Pfalz
+        "SL": "dwoi",  # Saarland
+        "BB": "dwpg",  # Brandenburg
+        "BE": "dwpg",  # Berlin
+        "MV": "dwph",  # Mecklenburg-Vorpommern
     }
 
     def __init__(self, station_id):
         self.etags = {}
-        station = load_station_id(station_id)
-        if station:
+        self.station = load_station_id(station_id)
+        if self.station:
             self.station_id = station_id
-            self.station_name = station["name"]
             self.region = get_region(station_id)
         else:
             raise ValueError("Not a valid station_id")
 
     def get_station_name(self):
-        return self.station_name
+        return self.station["name"]
 
     def is_in_timerange(self, timestamp: datetime):
         return (
@@ -480,15 +478,9 @@ class Weather:
     def get_day_values(self, timestamp: datetime):
         "timestamp has to be checked prior to be in timerange"
         result = []
-        first_entry_date = datetime(
-            *(
-                time.strptime(next(iter(self.forecast_data)), "%Y-%m-%dT%H:%M:%S.%fZ")[
-                    0:6
-                ]
-            ),
-            0,
-            timezone.utc,
-        )
+        first_entry_date = arrow.get(
+            next(iter(self.forecast_data)), "YYYY-MM-DDTHH:mm:ss.SSSZ"
+        ).datetime
         if timestamp.day != first_entry_date.day:
             time_step = self.strip_to_day(timestamp)
             for _ in range(24):
@@ -635,17 +627,10 @@ class Weather:
                 placemark.clear()
 
     def parse_issue_time(self, tree):
-        issue_time_new = datetime(
-            *(
-                time.strptime(
-                    tree.xpath("//dwd:IssueTime", namespaces=self.namespaces)[0].text,
-                    "%Y-%m-%dT%H:%M:%S.%fZ",
-                )[0:6]
-            ),
-            0,
-            timezone.utc,
-        )
-
+        issue_time_new = arrow.get(
+            tree.xpath("//dwd:IssueTime", namespaces=self.namespaces)[0].text,
+            "YYYY-MM-DDTHH:mm:ss.SSSZ",
+        ).datetime
         return issue_time_new
 
     def parse_station_name(self, tree):
@@ -748,8 +733,10 @@ class Weather:
             * 1e3
             if row[WeatherDataType.VISIBILITY.value[1]] != self.NOT_AVAILABLE
             else None,
-            WeatherDataType.SUN_IRRADIANCE.value[0]: float(
-                row[WeatherDataType.SUN_IRRADIANCE.value[1]].replace(",", ".")
+            WeatherDataType.SUN_IRRADIANCE.value[0]: round(
+                float(row[WeatherDataType.SUN_IRRADIANCE.value[1]].replace(",", "."))
+                * 3.6,
+                1,
             )
             if row[WeatherDataType.SUN_IRRADIANCE.value[1]] != self.NOT_AVAILABLE
             else None,

{simple_dwd_weatherforecast-2.0.21.dist-info → simple_dwd_weatherforecast-2.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-dwd-weatherforecast
-Version: 2.0.21
+Version: 2.0.23
 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-2.0.21.dist-info → simple_dwd_weatherforecast-2.0.23.dist-info}/RECORD

@@ -1,5 +1,5 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_dwd_weatherforecast/dwdforecast.py,sha256=9dvEzIZ1_gGombKDONK2C3sGn9QnrJRWMZNhYBob_Vc,29642
+simple_dwd_weatherforecast/dwdforecast.py,sha256=wWXUDgG_QCsBXsQevJCUgAiiUNap465jl1jH3XXNR04,29636
 simple_dwd_weatherforecast/dwdmap.py,sha256=lf9TtO9Hs70tVnAUrAEDc42GdAkCSfMK5B0HQn1inJk,2457
 simple_dwd_weatherforecast/stations.json,sha256=HJVtV-06ToIeJ0mzjlxqM8GAjIEdai5cVazhfaYiU1c,838460
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,16 +23,16 @@ tests/test_is_in_timerange.py,sha256=Zy8YwO_O272IwjdrGKfqARw5EPnIdhZM5e648bBXaWQ
 tests/test_is_valid_timeframe.py,sha256=lmQTapM6BztqFEgei-JTuuETq5ZhscPzxqT2Y2_u3Ak,928
 tests/test_location_tools.py,sha256=wto_XzVnARJQ-Qc83YAn0ahfMBSaOHpfzqAeKRDsNm8,1208
 tests/test_map.py,sha256=Bnf7XSap7xAfozE5U9aB0GjjMiHmXrpyJPE79VmEvFg,830
-tests/test_parsekml.py,sha256=FZE1GHuEJfGfKDZlyhkBytsqEFl6HhYrPhS7MjVsSHo,917
+tests/test_parsekml.py,sha256=Y0EHJi5e8lqFUS8N9yfA5ByQkKV4-iyrwUaIipQpM7w,1065
 tests/test_region.py,sha256=KJeRkQ5bcaJOjj7MvGuTPhSp2luXxE1aVx3AMN9OOLM,615
 tests/test_reported_weather.py,sha256=ULg4ogZRxus01p2rdxiSFL75AisqtcvnLDOc7uJMBH0,767
 tests/test_station.py,sha256=LhiiBov0vL0dWDGCJlspWKREmjBtek3XTnX5j3rGURY,887
 tests/test_stationsfile.py,sha256=slRH5N4Gznr6tkN2oMFWJbVCw3Xrma7Hvzn1lG5E-Qg,1401
-tests/test_update.py,sha256=sVJVoj1M0sz754t9CDzXpx1yaNe_CIRjV9SmIBxS3LE,6805
+tests/test_update.py,sha256=JMdlN_lc9Zb58yU4GNrO_sOaKN9pZEx8nt4E2UeKBi0,7254
 tests/test_update_hourly.py,sha256=Zx0e_E2n2Wi1yGMDN6TURzIbk_xVYaMc-7IDK1sC5UY,1668
 tests/test_weather.py,sha256=X0YABiIvKJzysLhiPv3bLiuhGRf_O3e92OQW8qSU7es,695
-simple_dwd_weatherforecast-2.0.21.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
-simple_dwd_weatherforecast-2.0.21.dist-info/METADATA,sha256=0fbsmn_i5NoRbDxRVNARSnA_px56TpruNJpxhT9bFe8,10490
-simple_dwd_weatherforecast-2.0.21.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-simple_dwd_weatherforecast-2.0.21.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.0.21.dist-info/RECORD,,
+simple_dwd_weatherforecast-2.0.23.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-2.0.23.dist-info/METADATA,sha256=LmrduyelA2jzS5Zjc5r7xeEwG6A0kw8SbJDSwKidUO8,10490
+simple_dwd_weatherforecast-2.0.23.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+simple_dwd_weatherforecast-2.0.23.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-2.0.23.dist-info/RECORD,,

{simple_dwd_weatherforecast-2.0.21.dist-info → simple_dwd_weatherforecast-2.0.23.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.41.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_parsekml.py

@@ -1,3 +1,4 @@
+from datetime import datetime, timezone
 import unittest
 
 from simple_dwd_weatherforecast import dwdforecast
@@ -15,6 +16,7 @@ class KMLParseTestCase(unittest.TestCase):
         with open(self.FILE_NAME, "rb") as kml:
             self.dwd_weather.parse_kml(kml)
             self.assertEqual(self.dwd_weather.forecast_data, dummy_data.parsed_data)
+            self.assertEqual(self.dwd_weather.issue_time, datetime(2020, 11, 6, 3, 0, tzinfo=timezone.utc))
 
 
 class KMLParseFullTestCase(unittest.TestCase):

tests/test_update.py

@@ -13,35 +13,44 @@ class WeatherUpdate(unittest.TestCase):
         self.dwd_weather.station_name = "BAD HOMBURG"
 
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report", return_value=None,
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report",
+        return_value=None,
     )
     def test_download(self, _1, _2):
         self.dwd_weather.update()
         self.assertIsNotNone(self.dwd_weather.forecast_data)
 
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report", return_value=None,
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml",
+        return_value=None,
     )
     def test_issue_time_none(self, mock_function, _1, _2):
         self.dwd_weather.update()
         mock_function.assert_called()
+
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report", return_value=None,
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml",
+        return_value=None,
     )
     def test_issue_time_old(self, mock_function, _1, _2):
         self.dwd_weather.issue_time = datetime(
@@ -53,13 +62,16 @@ class WeatherUpdate(unittest.TestCase):
         mock_function.assert_called()
 
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report", return_value=None,
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml",
+        return_value=None,
     )
     @patch(
         "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
@@ -72,7 +84,7 @@ class WeatherUpdate(unittest.TestCase):
 
 class WeatherDownload(unittest.TestCase):
     @patch(
-    "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
     )
     def test_etag_valid(self, mock_function):
         stationid = "H889"
@@ -83,18 +95,20 @@ class WeatherDownload(unittest.TestCase):
         mock_function.assert_called_once()
 
     @patch(
-    "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
     )
     def test_etag_invalid(self, mock_function):
         stationid = "H889"
         self.dwd_weather = dwdforecast.Weather(stationid)
         self.dwd_weather.etags = {}
-        self.dwd_weather.etags["https://opendata.dwd.de/weather/local_forecasts/mos/MOSMIX_L/single_stations/{stationid}/kml/MOSMIX_L_LATEST_{stationid}.kmz"] = "invalid_etag"
+        self.dwd_weather.etags[
+            "https://opendata.dwd.de/weather/local_forecasts/mos/MOSMIX_L/single_stations/{stationid}/kml/MOSMIX_L_LATEST_{stationid}.kmz"
+        ] = "invalid_etag"
         self.dwd_weather.download_latest_kml(stationid)
         mock_function.assert_called()
 
     @patch(
-    "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
     )
     def test_etag_missing(self, mock_function):
         stationid = "H889"
@@ -104,13 +118,16 @@ class WeatherDownload(unittest.TestCase):
         mock_function.assert_called()
 
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report", return_value=None,
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml",
+        return_value=None,
     )
     @patch(
         "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
@@ -121,13 +138,16 @@ class WeatherDownload(unittest.TestCase):
         mock_download_latest_report.assert_not_called()
 
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report", return_value=None,
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml",
+        return_value=None,
     )
     @patch(
         "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
@@ -138,13 +158,16 @@ class WeatherDownload(unittest.TestCase):
         mock_download_latest_report.assert_called()
 
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report", return_value=None,
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml",
+        return_value=None,
     )
     @patch(
         "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
@@ -156,13 +179,16 @@ class WeatherDownload(unittest.TestCase):
         mock_download_weather_report.assert_called()
 
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report", return_value=None,
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_weather_report",
+        return_value=None,
     )
     @patch(
-        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml", return_value=None
+        "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_kml",
+        return_value=None,
     )
     @patch(
         "simple_dwd_weatherforecast.dwdforecast.Weather.parse_kml", return_value=None
@@ -171,4 +197,9 @@ class WeatherDownload(unittest.TestCase):
         self.dwd_weather = dwdforecast.Weather("01008")
         self.dwd_weather.region = None
         self.dwd_weather.update()
-        mock_download_weather_report.assert_not_called()
+        mock_download_weather_report.assert_not_called()
+
+    def test_weather_report_available(self):
+        self.dwd_weather = dwdforecast.Weather("10739")
+        self.dwd_weather.update(with_report=True)
+        self.assertIsNotNone(self.dwd_weather.weather_report)