Hydro-Quebec-API-Wrapper 4.2.2__py3-none-any.whl → 4.2.3__py3-none-any.whl

{hydro_quebec_api_wrapper-4.2.2.dist-info → hydro_quebec_api_wrapper-4.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Hydro-Quebec-API-Wrapper
-Version: 4.2.2
+Version: 4.2.3
 Summary: A wrapper library to access hydro quebec API and more
 Home-page: https://hydroqc.ca
 Author-email: Hydroqc Team <info@hydroqc.ca>

{hydro_quebec_api_wrapper-4.2.2.dist-info → hydro_quebec_api_wrapper-4.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hydro_quebec_api_wrapper-4.2.2.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+hydro_quebec_api_wrapper-4.2.3.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
 hydroqc/__init__.py,sha256=sFhCh7-LWoISCQuAtdrLQOmj2x5wjHBGbAAPg4SN6Pc,40
 hydroqc/account.py,sha256=84PO2npB_VG8cEzGIbmXj9sD1whG8qynkiGd-yEYddM,3375
 hydroqc/consts.py,sha256=a9dWq5i6t5VedYosUbP8zIuG2q5TPw4ruT0jOaC8Yo8,209
@@ -15,7 +15,7 @@ hydroqc/contract/__init__.py,sha256=uqxjOgyhpKFd-n_umxdaW5FB_DkJJaettWnEFC0nRYc,
 hydroqc/contract/common.py,sha256=xVw9z_Yjqp95SGCPNAfJVABvgp_C-KM51VTBEU9wjeM,15705
 hydroqc/contract/contract_d.py,sha256=6jPYTCjFq8zonfbXPrEujDVz58n5RUEuq54VCGqph6o,856
 hydroqc/contract/contract_d_cpc.py,sha256=-Y2S4MkzAfsbf_L2jCKfU7OD-nbzgoEpyT3SWh0U0tQ,1418
-hydroqc/contract/contract_dpc.py,sha256=JNWZqpALuw1kNQhZXN4ql8KiEU3OeJteHLU4d489pdA,7579
+hydroqc/contract/contract_dpc.py,sha256=6XMj2gq4oWvfekwqHvbnivWhL5pk7HTP4F2wOfdKi3A,7271
 hydroqc/contract/contract_dt.py,sha256=TSKf2oh-MlG8A42xVUCCyf7oezlWTFoyATF9xlQn2JE,1687
 hydroqc/contract/contract_m.py,sha256=2hSSb9Tw2eZu7PV1XicfTFKLCRiffq72NfOYiVz8QMk,2108
 hydroqc/contract/contract_m_gdp.py,sha256=y8seZHmjkkul0TZ5Epxuxc4g0JVbs9o8KjL_y1gIldU,801
@@ -23,7 +23,7 @@ hydroqc/contract/contract_residential.py,sha256=v88mWvJsJP7FsY5cHmr0ZYYT_S-6xtSk
 hydroqc/contract/outage.py,sha256=K5XX0enSKMVpL-JCkWsykuKUw-5_GcSJLzcSR1SqQDk,3979
 hydroqc/hydro_api/__init__.py,sha256=bIIjTkhQcXG7kn4cQr_Q6tFSKGjAx-AXLjMMlRCjclY,32
 hydroqc/hydro_api/cache.py,sha256=mC3UO246V5zJ1p89nUb5EzQon_4tQGUgFMZKy4YY8I8,912
-hydroqc/hydro_api/client.py,sha256=8yKiAFE3-gdiXGZSuw11Cydpa8rX_39LAWr51yvtsvQ,36706
+hydroqc/hydro_api/client.py,sha256=hZLddlsN5_H-jBL7Tt5w1ASofC9Yza9_kWHL116zVXI,36958
 hydroqc/hydro_api/consts.py,sha256=XDNOjZVpC-Z7rsOL4GDgfexb7m8zc7HiafiKGiFvoUI,4607
 hydroqc/peak/__init__.py,sha256=ye2KbWXhJEHZnBDaFylWioy3W-mzJw_lDplsJNAapNs,19
 hydroqc/peak/basepeak.py,sha256=DMXjZXyNRHWnuhB0Vp3ZINGhNQngG7AU15cDLajmC7M,1954
@@ -46,8 +46,8 @@ hydroqc/types/cpc.py,sha256=ghmtBTT1FKuqVodJJ0kCtUbYNTLCOrngxgcrzjJYvok,2116
 hydroqc/types/dpc.py,sha256=mwA5T9fGcNTA-kb_f25wq2ALJCwa5lKABOS73L6znY0,1981
 hydroqc/types/dt.py,sha256=rEXDgNewhlOsRbso0Shlq69TvJFoT56EGYOAjTFZU80,693
 hydroqc/types/outage.py,sha256=XTsNyu8mmxUx44XWvOOUHKSoijp-lgbXwQroiqm9S0o,3932
-hydro_quebec_api_wrapper-4.2.2.dist-info/METADATA,sha256=pHB876NvBQYDH2R0wTvKQmTaMeyTTLmR5RLjm4InHRQ,7948
-hydro_quebec_api_wrapper-4.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hydro_quebec_api_wrapper-4.2.2.dist-info/entry_points.txt,sha256=G2YKkCH9rFt2dXbFyHINBp4bmqY2HTEIaf7F1CwbC_k,57
-hydro_quebec_api_wrapper-4.2.2.dist-info/top_level.txt,sha256=YAcYLnu5YYkbxt1psUoBfo_opl-lAZKq0A7B3IN_P6M,8
-hydro_quebec_api_wrapper-4.2.2.dist-info/RECORD,,
+hydro_quebec_api_wrapper-4.2.3.dist-info/METADATA,sha256=LlGJNtk6_0JhAKXOWd7sz8gxaUjNY_vg70EA7mho2g4,7948
+hydro_quebec_api_wrapper-4.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hydro_quebec_api_wrapper-4.2.3.dist-info/entry_points.txt,sha256=G2YKkCH9rFt2dXbFyHINBp4bmqY2HTEIaf7F1CwbC_k,57
+hydro_quebec_api_wrapper-4.2.3.dist-info/top_level.txt,sha256=YAcYLnu5YYkbxt1psUoBfo_opl-lAZKq0A7B3IN_P6M,8
+hydro_quebec_api_wrapper-4.2.3.dist-info/RECORD,,

hydroqc/contract/contract_dpc.py

@@ -21,7 +21,10 @@ class WinterState(str, Enum):
 def check_dpc_data_present(
     method: Callable[..., None | str | bool | float | int | date | WinterState],
 ) -> Callable[..., None | str | bool | float | int | date | WinterState]:
-    """Check if contractDPC's data are present."""
+    """Check if contractDPC's data are present.
+
+    Returns None if data is not available or incomplete.
+    """
 
     def wrapper(
         contract: "ContractDPC",
@@ -110,19 +113,6 @@ class ContractDPC(ContractResidential):
         )
         return self._dpc_data
 
-    def _get_dpc_field(self, field_name: str) -> str | float | int:
-        """Get DPC field from periodesHiver data.
-
-        Raises:
-            KeyError: If the required field is not present in the API response.
-        """
-        winter_period = self._dpc_data["periodesHiver"][0]
-        if field_name not in winter_period:
-            raise KeyError(
-                f"Required field '{field_name}' not found in DPC periodesHiver data"
-            )
-        return winter_period[field_name]  # type: ignore
-
     @property
     @check_period_data_present
     def cp_lower_price_consumption(self) -> float:
@@ -148,7 +138,7 @@ class ContractDPC(ContractResidential):
     @check_dpc_data_present
     def last_update_date(self) -> date:
         """DPC data last update."""
-        date_str = str(self._get_dpc_field("dateMaj"))
+        date_str = str(self._dpc_data["periodesHiver"][0]["dateMaj"])
         # Handle ISO format with timezone
         if "T" in date_str:
             return date.fromisoformat(date_str.split("T", maxsplit=1)[0])
@@ -158,13 +148,13 @@ class ContractDPC(ContractResidential):
     @check_dpc_data_present
     def critical_called_hours(self) -> int:
         """Get number of critical hours."""
-        return int(self._get_dpc_field("hrsCritiquesAppelees"))
+        return int(self._dpc_data["periodesHiver"][0]["hrsCritiquesAppelees"])
 
     @property
     @check_dpc_data_present
     def max_critical_called_hours(self) -> int:
         """Get max number of critical hours."""
-        return int(self._get_dpc_field("hrsCritiquesAppeleesMax"))
+        return int(self._dpc_data["periodesHiver"][0]["hrsCritiquesAppeleesMax"])
 
     @property
     @check_dpc_data_present
@@ -173,10 +163,12 @@ class ContractDPC(ContractResidential):
 
         Returns None if comparison data is not yet available (e.g., first year on Flex D).
         """
-        try:
-            return float(self._get_dpc_field("montantEconPerteVSTarifBase"))
-        except KeyError:
+        if (
+            self._dpc_data["periodesHiver"][0].get("montantEconPerteVSTarifBase")
+            is None
+        ):
             return None
+        return float(self._dpc_data["periodesHiver"][0]["montantEconPerteVSTarifBase"])
 
     @property
     @check_dpc_data_present

hydroqc/hydro_api/client.py

@@ -1,5 +1,6 @@
 """HydroQc Client Module."""
 
+import asyncio
 import base64
 import csv
 import json
@@ -7,7 +8,6 @@ import logging
 import os
 import platform
 import re
-import ssl
 import uuid
 from collections.abc import Iterator
 from datetime import date, datetime, timedelta
@@ -114,6 +114,8 @@ class HydroClient:
         self.guid: str = str(uuid.uuid1())
         self._logger: logging.Logger = get_logger("httpclient", log_level)
         self._logger.debug("HydroQc initialized")
+        # Cache for blocking operations (initialized lazily)
+        self._cached_version: str | None = None
         self.reset()
 
     def reset(self) -> None:
@@ -128,20 +130,27 @@ class HydroClient:
         self._selected_customer = ""
         self._selected_contract = ""
 
-    @property
-    def user_agent(self) -> str:
+    async def _get_user_agent(self) -> str:
         """Get http client user_agent."""
-        try:
-            hydroqc_version = version("Hydro_Quebec_API_Wrapper")
-        except PackageNotFoundError:
-            # package is not installed
-            self._logger.warning(
-                "Python package `Hydro_Quebec_API_Wrapper` is not installed. "
-                "Install it using pip"
-            )
-            hydroqc_version = "unkwown"
+        if self._cached_version is None:
+            # Run blocking version lookup in executor to avoid blocking event loop
+            loop = asyncio.get_event_loop()
+            try:
+                self._cached_version = await loop.run_in_executor(
+                    None, version, "Hydro_Quebec_API_Wrapper"
+                )
+            except PackageNotFoundError:
+                # package is not installed
+                self._logger.warning(
+                    "Python package `Hydro_Quebec_API_Wrapper` is not installed. "
+                    "Install it using pip"
+                )
+                self._cached_version = "unkwown"
         os_name = platform.system()
-        return f"Hydroqc/{hydroqc_version} (dev@hydroqc.ca; https://gitlab.com/hydroqc) {os_name}"
+        return (
+            f"Hydroqc/{self._cached_version} "
+            f"(dev@hydroqc.ca; https://gitlab.com/hydroqc) {os_name}"
+        )
 
     async def http_request(
         self,
@@ -163,15 +172,10 @@ class HydroClient:
             data = {}
         if headers is None:
             headers = {}
-        headers["User-Agent"] = self.user_agent
+        headers["User-Agent"] = await self._get_user_agent()
         if verify_ssl is None:
             verify_ssl = self._verify_ssl
 
-        ssl_context: ssl.SSLContext | None = None
-        if verify_ssl:
-            ssl_context = ssl.create_default_context()
-            ssl_context.set_ciphers("DEFAULT")  # Needed for python3.10
-
         # Query Diagnostic
         if self._diag_folder is not None:
             cleaned_url = url.replace("/", "_").replace(":", "").split("#", 1)[0]
@@ -205,7 +209,7 @@ class HydroClient:
             params=params,
             data=data,
             allow_redirects=allow_redirects,
-            ssl=ssl_context,
+            ssl=verify_ssl,
             headers=headers,
         )