env-canada 0.9.0__py3-none-any.whl → 0.10.1__py3-none-any.whl

env_canada/ec_aqhi.py

@@ -1,8 +1,9 @@
 import logging
+from dataclasses import dataclass
 from datetime import datetime, timezone
 
 import voluptuous as vol
-from aiohttp import ClientSession
+from aiohttp import ClientSession, ClientTimeout
 from geopy import distance
 from lxml import etree as et
 
@@ -12,6 +13,8 @@ AQHI_SITE_LIST_URL = "https://dd.weather.gc.ca/air_quality/doc/AQHI_XML_File_Lis
 AQHI_OBSERVATION_URL = "https://dd.weather.gc.ca/air_quality/aqhi/{}/observation/realtime/xml/AQ_OBS_{}_CURRENT.xml"
 AQHI_FORECAST_URL = "https://dd.weather.gc.ca/air_quality/aqhi/{}/forecast/realtime/xml/AQ_FCST_{}_CURRENT.xml"
 
+CLIENT_TIMEOUT = ClientTimeout(10)
+
 LOG = logging.getLogger(__name__)
 
 ATTRIBUTION = {
@@ -20,6 +23,16 @@ ATTRIBUTION = {
 }
 
 
+@dataclass
+class MetaData:
+    attribution: str
+    timestamp: datetime | None = None
+    location: str | None = None
+
+    # Not used; needed for compatability with ec_weather metadata
+    station: str | None = None
+
+
 __all__ = ["ECAirQuality"]
 
 
@@ -39,7 +52,9 @@ async def get_aqhi_regions(language):
     regions = []
     async with ClientSession(raise_for_status=True) as session:
         response = await session.get(
-            AQHI_SITE_LIST_URL, headers={"User-Agent": USER_AGENT}, timeout=10
+            AQHI_SITE_LIST_URL,
+            headers={"User-Agent": USER_AGENT},
+            timeout=CLIENT_TIMEOUT,
         )
         result = await response.read()
 
@@ -133,7 +148,7 @@ class ECAirQuality:
             self.region_id = None
             self.coordinates = kwargs["coordinates"]
 
-        self.metadata = {"attribution": ATTRIBUTION[self.language]}
+        self.metadata = MetaData(ATTRIBUTION[self.language])
         self.region_name = None
         self.current = None
         self.current_timestamp = None
@@ -145,7 +160,7 @@ class ECAirQuality:
                 response = await session.get(
                     url.format(self.zone_id, self.region_id),
                     headers={"User-Agent": USER_AGENT},
-                    timeout=10,
+                    timeout=CLIENT_TIMEOUT,
                 )
             except Exception:
                 LOG.debug("Retrieving AQHI failed", exc_info=True)
@@ -177,7 +192,7 @@ class ECAirQuality:
             self.region_name = element.attrib[
                 "name{lang}".format(lang=self.language.title())
             ]
-            self.metadata["location"] = self.region_name
+            self.metadata.location = self.region_name
 
             # Update AQHI current condition
             element = aqhi_current.find("airQualityHealthIndex")
@@ -191,7 +206,7 @@ class ECAirQuality:
                 self.current_timestamp = timestamp_to_datetime(element.text)
             else:
                 self.current_timestamp = None
-            self.metadata["timestamp"] = self.current_timestamp
+            self.metadata.timestamp = self.current_timestamp
             LOG.debug(
                 "update(): aqhi_current %d timestamp %s",
                 self.current,

{env_canada-0.9.0.dist-info → env_canada-0.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: env_canada
-Version: 0.9.0
+Version: 0.10.1
 Summary: A package to access meteorological data from Environment Canada
 Author-email: Michael Davie <michael.davie@gmail.com>
 Maintainer-email: Michael Davie <michael.davie@gmail.com>
@@ -36,7 +36,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.0
-Requires-Dist: geopy>=2.4.1
+Requires-Dist: geopy>=2.3.0
 Requires-Dist: imageio>=2.28.0
 Requires-Dist: lxml>=5.3.0
 Requires-Dist: numpy>=1.22.2

{env_canada-0.9.0.dist-info → env_canada-0.10.1.dist-info}/RECORD

@@ -2,15 +2,15 @@ env_canada/10x20.pbm,sha256=ClKTs2WUmhUhTHAQzPuGwPTICGVBzCvos5l-vHRBE5M,2463
 env_canada/10x20.pil,sha256=Oki6-TD7b0xFtfm6vxCKsmpEpsZ5Jaia_0v_aDz8bfE,5143
 env_canada/__init__.py,sha256=O1KVC2GAPTmxAP46FXo9jd8Tq3YMefViowGjuxJ5JJM,366
 env_canada/constants.py,sha256=RHa-Hp2H6XroFE9Z5-H0MIUPWlFXUVKmWEidwuWzakE,32
-env_canada/ec_aqhi.py,sha256=-N4XLLgApaWZvtepJvS2lvqDSNjwV2X_fkmbtKQv8rA,7741
+env_canada/ec_aqhi.py,sha256=oE52qfk-AKbHdhTSl5RP3vsWL-50eMRCCRVy9RW-pP4,8080
 env_canada/ec_cache.py,sha256=zb3n79ul7hUTE0IohDfZbRBLY-siOHPjYzWldMbuPVk,798
 env_canada/ec_exc.py,sha256=SBJwzmLf94lTx7KYVLfQYrMXYNYUoIxeVXc-BLkuXoE,67
 env_canada/ec_historical.py,sha256=qMr4RE6vfNiNa_zFolQ0PQGraok8bQtIVjs_o6sJKD4,16276
 env_canada/ec_hydro.py,sha256=JoBe-QVV8GEeZXCNFscIs2R_spgkbxCZpLt7tL6-NUI,4889
 env_canada/ec_radar.py,sha256=0SKusJWDTFODdn3D9yrhlkOS-Bv9hhBJM9EBh8TNRlk,12965
 env_canada/ec_weather.py,sha256=l-gyXePkHBLW9vidFgiPEm81xevbZCeBKzKDLiLr7Y8,19200
-env_canada-0.9.0.dist-info/licenses/LICENSE,sha256=BkgGIGgy9sv-OsI7mRi9dIQ3Su0m4IbjpZlfxv8oBbM,1073
-env_canada-0.9.0.dist-info/METADATA,sha256=divVpZpbuU3Ch7_l1hno2So0e3ePrPoDr9nLOg9_8To,12709
-env_canada-0.9.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-env_canada-0.9.0.dist-info/top_level.txt,sha256=fw7Pcl9ULBXYvqnAdyBdmwPXW8GSRFmhO0sLZWVfOCc,11
-env_canada-0.9.0.dist-info/RECORD,,
+env_canada-0.10.1.dist-info/licenses/LICENSE,sha256=BkgGIGgy9sv-OsI7mRi9dIQ3Su0m4IbjpZlfxv8oBbM,1073
+env_canada-0.10.1.dist-info/METADATA,sha256=Cq1R2bbOithdmTqgbehba3Kqm6G1f-GbKxjKQWLs6XY,12710
+env_canada-0.10.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+env_canada-0.10.1.dist-info/top_level.txt,sha256=fw7Pcl9ULBXYvqnAdyBdmwPXW8GSRFmhO0sLZWVfOCc,11
+env_canada-0.10.1.dist-info/RECORD,,