env-canada 0.11.2__py3-none-any.whl → 0.12.0__py3-none-any.whl

env_canada/constants.py

@@ -1 +1 @@
-USER_AGENT = "env_canada/0.11.2"
+USER_AGENT = "env_canada/0.12.0"

env_canada/ec_aqhi.py

@@ -9,9 +9,11 @@ from lxml import etree as et
 
 from .constants import USER_AGENT
 
-AQHI_SITE_LIST_URL = "https://dd.weather.gc.ca/air_quality/doc/AQHI_XML_File_List.xml"
-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"
+AQHI_SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/air_quality/doc/AQHI_XML_File_List.xml"
+)
+AQHI_OBSERVATION_URL = "https://dd.weather.gc.ca/today/air_quality/aqhi/{}/observation/realtime/xml/AQ_OBS_{}_CURRENT.xml"
+AQHI_FORECAST_URL = "https://dd.weather.gc.ca/today/air_quality/aqhi/{}/forecast/realtime/xml/AQ_FCST_{}_CURRENT.xml"
 
 CLIENT_TIMEOUT = ClientTimeout(10)
 

env_canada/ec_hydro.py

@@ -8,8 +8,10 @@ from geopy import distance
 
 from .constants import USER_AGENT
 
-SITE_LIST_URL = "https://dd.weather.gc.ca/hydrometric/doc/hydrometric_StationList.csv"
-READINGS_URL = "https://dd.weather.gc.ca/hydrometric/csv/{prov}/hourly/{prov}_{station}_hourly_hydrometric.csv"
+SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/hydrometric/doc/hydrometric_StationList.csv"
+)
+READINGS_URL = "https://dd.weather.gc.ca/today/hydrometric/csv/{prov}/hourly/{prov}_{station}_hourly_hydrometric.csv"
 
 
 __all__ = ["ECHydro"]

env_canada/ec_weather.py

@@ -21,9 +21,11 @@ from lxml.etree import _Element
 from . import ec_exc
 from .constants import USER_AGENT
 
-SITE_LIST_URL = "https://dd.weather.gc.ca/citypage_weather/docs/site_list_en.csv"
+SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/citypage_weather/docs/site_list_towns_en.csv"
+)
 
-WEATHER_BASE_URL = "https://dd.weather.gc.ca/citypage_weather/{province}/{hour}/"
+WEATHER_BASE_URL = "https://dd.weather.gc.ca/today/citypage_weather/{province}/{hour}/"
 
 CLIENT_TIMEOUT = ClientTimeout(10)
 
@@ -35,7 +37,7 @@ ATTRIBUTION = {
 }
 
 
-__all__ = ["ECWeather", "ECWeatherUpdateFailed"]
+__all__ = ["ECWeather", "ECWeatherUpdateFailed", "get_ec_sites_list"]
 
 
 @dataclass
@@ -277,6 +279,37 @@ async def get_ec_sites():
     return sites
 
 
+async def get_ec_sites_list():
+    """
+    Get list of sites formatted for selection dropdowns.
+
+    Returns a list of dictionaries with the form:
+        {"label": "Toronto, ON", "value": "458"}
+    where the value is the last three digits of the site code.
+    """
+    LOG.debug("get_ec_sites_list() started")
+    sites_list = []
+
+    async with ClientSession(raise_for_status=True) as session:
+        response = await session.get(
+            SITE_LIST_URL, headers={"User-Agent": USER_AGENT}, timeout=CLIENT_TIMEOUT
+        )
+        sites_csv_string = await response.text()
+
+    sites_reader = csv.DictReader(sites_csv_string.splitlines()[1:])
+
+    for site in sites_reader:
+        if site["Province Codes"] != "HEF":
+            # Extract last 3 digits from site code (e.g., "s0000106" -> "106")
+            site_value = site["Codes"][5:]
+            # Create label with city name and province (e.g., "Toronto, ON")
+            label = f"{site['English Names']}, {site['Province Codes']}"
+            sites_list.append({"label": label, "value": site_value})
+
+    LOG.debug("get_ec_sites_list() done, retrieved %d sites", len(sites_list))
+    return sites_list
+
+
 def find_province_for_station(site_list, station_number):
     """Find the province code for a given station number."""
     for site in site_list:

{env_canada-0.11.2.dist-info → env_canada-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: env_canada
-Version: 0.11.2
+Version: 0.12.0
 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>
@@ -17,9 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.0
 Requires-Dist: geopy>=2.3.0
-Requires-Dist: imageio>=2.28.0
 Requires-Dist: lxml>=5.3.0
-Requires-Dist: numpy>=1.22.2
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: Pillow>=10.0.1
 Requires-Dist: python-dateutil>=2.9

env_canada-0.12.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+env_canada/__init__.py,sha256=EXzGEHwon-usFzLzuJeISKHlfJdV3DBa0_rR9b_XfvE,405
+env_canada/constants.py,sha256=1OlE7zCUy4imLHpReP1va3SzbksbwGXFQNyQzwR9NCw,33
+env_canada/ec_aqhi.py,sha256=bmgzq__b8ecvPGR_PAlDBa4uyA6OTVllikBVYwOefRc,8106
+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=HxfUsx43A6KBPdzNQs1-204UVstMXAyrpyj8h2B8Hlc,4909
+env_canada/ec_map.py,sha256=HIyCZ8j9EbuLX3-YhvMKjYPiE2AH_behL6IaOXjXpaQ,15564
+env_canada/ec_radar.py,sha256=dKZqWJyb66R2EJzAy4K7pii7vPK9FxDKmuW9vA1ADbw,3330
+env_canada/ec_weather.py,sha256=VS25XdRhFiFnqd3IBemwoc8pXz29j7hyimmTKLxeoNo,24638
+env_canada-0.12.0.dist-info/licenses/LICENSE,sha256=BkgGIGgy9sv-OsI7mRi9dIQ3Su0m4IbjpZlfxv8oBbM,1073
+env_canada-0.12.0.dist-info/METADATA,sha256=33e5Bojm24UU2jY7-M7FVhZZS5PqlJaJx6HaNgmUIv4,13618
+env_canada-0.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+env_canada-0.12.0.dist-info/top_level.txt,sha256=fw7Pcl9ULBXYvqnAdyBdmwPXW8GSRFmhO0sLZWVfOCc,11
+env_canada-0.12.0.dist-info/RECORD,,

env_canada-0.11.2.dist-info/RECORD

@@ -1,17 +0,0 @@
-env_canada/10x20.pbm,sha256=ClKTs2WUmhUhTHAQzPuGwPTICGVBzCvos5l-vHRBE5M,2463
-env_canada/10x20.pil,sha256=Oki6-TD7b0xFtfm6vxCKsmpEpsZ5Jaia_0v_aDz8bfE,5143
-env_canada/__init__.py,sha256=EXzGEHwon-usFzLzuJeISKHlfJdV3DBa0_rR9b_XfvE,405
-env_canada/constants.py,sha256=pB3ld_VBSAL8c6LAUF0U2VgKhhkOmP7U6T5kLJvo938,33
-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_map.py,sha256=HIyCZ8j9EbuLX3-YhvMKjYPiE2AH_behL6IaOXjXpaQ,15564
-env_canada/ec_radar.py,sha256=dKZqWJyb66R2EJzAy4K7pii7vPK9FxDKmuW9vA1ADbw,3330
-env_canada/ec_weather.py,sha256=pFcVKBbYKLj01ocjZmy8RiQaf7YVSQOo4id_BbZ7gds,23421
-env_canada-0.11.2.dist-info/licenses/LICENSE,sha256=BkgGIGgy9sv-OsI7mRi9dIQ3Su0m4IbjpZlfxv8oBbM,1073
-env_canada-0.11.2.dist-info/METADATA,sha256=uWS4H6dImil9koOPvBxkdSJKut2gmOzsqLwjIyE2sOc,13678
-env_canada-0.11.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-env_canada-0.11.2.dist-info/top_level.txt,sha256=fw7Pcl9ULBXYvqnAdyBdmwPXW8GSRFmhO0sLZWVfOCc,11
-env_canada-0.11.2.dist-info/RECORD,,