PyMetno 0.11.0__tar.gz → 0.13.0__tar.gz

{PyMetno-0.11.0 → pymetno-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyMetno
-Version: 0.11.0
+Version: 0.13.0
 Summary: A library to communicate with the met.no api
 Home-page: https://github.com/Danielhiversen/pyMetno/
 Author: Daniel Hjelseth Høyer
@@ -13,3 +13,6 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 License-File: LICENSE
+Requires-Dist: xmltodict
+Requires-Dist: aiohttp>=3.0.6
+Requires-Dist: async_timeout>=3.0.0

{PyMetno-0.11.0 → pymetno-0.13.0}/PyMetno.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyMetno
-Version: 0.11.0
+Version: 0.13.0
 Summary: A library to communicate with the met.no api
 Home-page: https://github.com/Danielhiversen/pyMetno/
 Author: Daniel Hjelseth Høyer
@@ -13,3 +13,6 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 License-File: LICENSE
+Requires-Dist: xmltodict
+Requires-Dist: aiohttp>=3.0.6
+Requires-Dist: async_timeout>=3.0.0

{PyMetno-0.11.0 → pymetno-0.13.0}/PyMetno.egg-info/requires.txt

@@ -1,4 +1,3 @@
 xmltodict
 aiohttp>=3.0.6
 async_timeout>=3.0.0
-pytz

{PyMetno-0.11.0 → pymetno-0.13.0}/metno/__init__.py

@@ -7,7 +7,11 @@ from typing import Any, List
 
 import aiohttp
 import async_timeout
-import pytz
+
+try:
+    import ciso8601
+except ImportError:
+    ciso8601 = None
 
 # https://api.met.no/weatherapi/weathericon/_/documentation/#___top
 CONDITIONS = {
@@ -59,8 +63,15 @@ CONDITIONS = {
 # include them.
 _VARIATIONS = {}
 for key, value in CONDITIONS.items():
-    if not key.endswith(("_day", "_night")):
+    # ignore keys with values specific for night or day
+    # their values may be night or day specific
+    if key.endswith("_day") or key.endswith("_night"):
+        continue
+    
+    # don't overwrite existing day or night conditions 
+    if not key + "_day" in CONDITIONS:
         _VARIATIONS[key + "_day"] = value
+    if not key + "_night" in CONDITIONS:
         _VARIATIONS[key + "_night"] = value
 CONDITIONS.update(_VARIATIONS)
 del _VARIATIONS
@@ -117,7 +128,7 @@ class MetWeatherData:
             timeseries = self.data["properties"]["timeseries"]
             now = parse_datetime(timeseries[0]["time"])
         except (TypeError, KeyError, IndexError):
-            now = datetime.datetime.now(pytz.utc)
+            now = datetime.datetime.now(datetime.timezone.utc)
         return self.get_weather(now, hourly=True)
 
     def get_forecast(self, time_zone, hourly=False, range_start=1, range_stop=None):
@@ -156,6 +167,7 @@ class MetWeatherData:
         daily_windspeed = []
         daily_windgust = []
         daily_dew_point = []
+        daily_uv_index = []
         entries = []
 
         for time_entry in self.data["properties"]["timeseries"]:
@@ -183,6 +195,9 @@ class MetWeatherData:
             dew_point = get_data("dew_point_temperature", [time_entry])
             if dew_point is not None:
                 daily_dew_point.append(dew_point)
+            uv_index = get_data("ultraviolet_index_clear_sky", [time_entry])
+            if uv_index is not None:
+                daily_uv_index.append(uv_index)
 
             if time.astimezone() <= timestamp:
                 entries.append(time_entry)
@@ -190,7 +205,7 @@ class MetWeatherData:
         if not entries:
             return {}
         res = dict()
-        res["datetime"] = time.astimezone(tz=pytz.utc).isoformat()
+        res["datetime"] = time.astimezone(tz=datetime.timezone.utc).isoformat()
         res["condition"] = CONDITIONS.get(get_data("symbol_code", entries))
         res["pressure"] = get_data("air_pressure_at_sea_level", entries)
         res["humidity"] = get_data("relative_humidity", entries)
@@ -203,6 +218,7 @@ class MetWeatherData:
             res["wind_gust"] = get_data("wind_speed_of_gust", entries)
             res["cloudiness"] = get_data("cloud_area_fraction", entries)
             res["dew_point"] = get_data("dew_point_temperature", entries)
+            res["uv_index"] = get_data("ultraviolet_index_clear_sky", entries)
         else:
             res["temperature"] = (
                 None if daily_temperatures == [] else max(daily_temperatures)
@@ -225,6 +241,9 @@ class MetWeatherData:
             res["dew_point"] = (
                 None if daily_dew_point == [] else max(daily_dew_point)
             )
+            res["uv_index"] = (
+                None if daily_uv_index == [] else max(daily_uv_index)
+            )
 
         return res
 
@@ -272,6 +291,7 @@ def get_data(param: str, data: List[dict]) -> Any:
                     "air_pressure_at_sea_level",
                     "relative_humidity",
                     "dew_point_temperature",
+                    "ultraviolet_index_clear_sky",
             ):
                 new_state = instant_details[param]
             elif param in ("wind_speed", "wind_speed_of_gust"):
@@ -324,7 +344,7 @@ class AirQualityData:
                 _LOGGER.error("%s returned %s", self._api_url, err)
                 return False
         try:
-            forecast_time = datetime.datetime.now(pytz.utc) + datetime.timedelta(
+            forecast_time = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
                 hours=self._forecast
             )
 
@@ -393,8 +413,16 @@ class AirQualityData:
         return True
 
 
-def parse_datetime(dt_str):
+
+
+
+def parse_datetime(dt_str: str) -> datetime.datetime:
     """Parse datetime."""
+    if ciso8601:
+        try:
+            return ciso8601.parse_datetime(dt_str)
+        except ValueError:
+            pass
     date_format = "%Y-%m-%dT%H:%M:%S %z"
     dt_str = dt_str.replace("Z", " +0000")
     return datetime.datetime.strptime(dt_str, date_format)

{PyMetno-0.11.0 → pymetno-0.13.0}/setup.py

@@ -3,8 +3,8 @@ from setuptools import setup
 setup(
     name = 'PyMetno',
     packages = ['metno'],
-    install_requires=['xmltodict', "aiohttp>=3.0.6", "async_timeout>=3.0.0", 'pytz'],
-    version = '0.11.0',
+    install_requires=['xmltodict', "aiohttp>=3.0.6", "async_timeout>=3.0.0"],
+    version = '0.13.0',
     description = 'A library to communicate with the met.no api',
     author='Daniel Hjelseth Høyer',
     url='https://github.com/Danielhiversen/pyMetno/',