python-hilo 2025.11.1__tar.gz → 2025.12.2__tar.gz

{python_hilo-2025.11.1 → python_hilo-2025.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-hilo
-Version: 2025.11.1
+Version: 2025.12.2
 Summary: A Python3, async interface to the Hilo API
 License: MIT
 License-File: LICENSE

{python_hilo-2025.11.1 → python_hilo-2025.12.2}/pyhilo/api.py

@@ -12,6 +12,7 @@ from urllib import parse
 from aiohttp import ClientSession
 from aiohttp.client_exceptions import ClientResponseError
 import backoff
+from homeassistant.helpers.config_entry_oauth2_flow import OAuth2Session
 
 from pyhilo.const import (
     ANDROID_CLIENT_ENDPOINT,
@@ -66,7 +67,7 @@ class API:
         self,
         *,
         session: ClientSession,
-        oauth_session,
+        oauth_session: OAuth2Session,
         request_retries: int = REQUEST_RETRY,
         log_traces: bool = False,
     ) -> None:
@@ -97,7 +98,7 @@ class API:
         cls,
         *,
         session: ClientSession,
-        oauth_session,
+        oauth_session: OAuth2Session,
         request_retries: int = REQUEST_RETRY,
         log_traces: bool = False,
     ) -> API:
@@ -382,11 +383,12 @@ class API:
         # Create both websocket clients
         # ic-dev21 need to work on this as it can't lint as is, may need to
         # instantiate differently
-        self.websocket_devices = WebsocketClient(self.websocket_manager.devicehub)
+        # TODO: fix type ignore after refactor
+        self.websocket_devices = WebsocketClient(self.websocket_manager.devicehub)  # type: ignore
 
         # For backward compatibility during the transition to challengehub websocket
         self.websocket = self.websocket_devices
-        self.websocket_challenges = WebsocketClient(self.websocket_manager.challengehub)
+        self.websocket_challenges = WebsocketClient(self.websocket_manager.challengehub)  # type: ignore
 
     async def refresh_ws_token(self) -> None:
         """Refresh the websocket token."""

{python_hilo-2025.11.1 → python_hilo-2025.12.2}/pyhilo/const.py

@@ -7,7 +7,7 @@ import aiohttp
 LOG: Final = logging.getLogger(__package__)
 DEFAULT_STATE_FILE: Final = "hilo_state.yaml"
 REQUEST_RETRY: Final = 9
-PYHILO_VERSION: Final = "2025.11.01"
+PYHILO_VERSION: Final = "2025.12.02"
 # TODO: Find a way to keep previous line in sync with pyproject.toml automatically
 
 CONTENT_TYPE_FORM: Final = "application/x-www-form-urlencoded"
@@ -32,6 +32,7 @@ API_GD_SERVICE_ENDPOINT: Final = f"/GDService/{API_END}"
 API_NOTIFICATIONS_ENDPOINT: Final = "/Notifications"
 API_EVENTS_ENDPOINT: Final = "/Notifications"
 API_REGISTRATION_ENDPOINT: Final = f"{API_NOTIFICATIONS_ENDPOINT}/Registrations"
+PLATFORM_HOST: Final = "platform.hiloenergie.com"
 
 API_REGISTRATION_HEADERS: Final = {
     "AppId": ANDROID_PKG_NAME,

{python_hilo-2025.11.1 → python_hilo-2025.12.2}/pyhilo/devices.py

@@ -55,7 +55,7 @@ class Devices:
         """Uses the dict from parse_values_received to map the values to devices."""
         updated_devices = []
         for reading in readings:
-            device_identifier = reading.device_id
+            device_identifier: Union[int, str] = reading.device_id
             if device_identifier == 0:
                 device_identifier = reading.hilo_id
             if device := self.find_device(device_identifier):
@@ -69,7 +69,7 @@ class Devices:
                 )
         return updated_devices
 
-    def find_device(self, device_identifier: int | str) -> HiloDevice:
+    def find_device(self, device_identifier: int | str) -> HiloDevice | None:
         """Makes sure the devices received have an identifier, this means some need to be hardcoded
         like the unknown power meter.
         """

{python_hilo-2025.11.1 → python_hilo-2025.12.2}/pyhilo/event.py

@@ -27,7 +27,7 @@ class Event:
     def __init__(self, **event: dict[str, Any]):
         """Initialize."""
         self._convert_phases(cast(dict[str, Any], event.get("phases")))
-        params: dict[str, Any] = event.get("parameters", {})
+        params: dict[str, Any] = event.get("parameters") or {}
         devices: list[dict[str, Any]] = params.get("devices", [])
         consumption: dict[str, Any] = event.get("consumption", {})
         allowed_wH: int = consumption.get("baselineWh", 0) or 0
@@ -71,6 +71,12 @@ class Event:
         self.used_kWh = round(used_wH / 1000, 2)
         self.last_update = datetime.now(timezone.utc).astimezone()
 
+    def update_allowed_wh(self, allowed_wH: float) -> None:
+        """This function is used to update the allowed_kWh attribute during a Hilo Challenge Event"""
+        LOG.debug("Updating allowed Wh: %s", allowed_wH)
+        self.allowed_kWh = round(allowed_wH / 1000, 2)
+        self.last_update = datetime.now(timezone.utc).astimezone()
+
     def should_check_for_allowed_wh(self) -> bool:
         """This function is used to authorize subscribing to a specific event in Hilo to receive the allowed_kWh
         that is made available in the pre_heat phase"""
@@ -102,8 +108,9 @@ class Event:
             self.phases_list.append(phase)
         for phase in self.__annotations__:
             if phase not in self.phases_list:
+                now_with_tz = datetime.now(timezone.utc).astimezone()
                 # On t'aime Carl
-                setattr(self, phase, from_utc_timestamp("2023-11-15T20:00:00+00:00"))
+                setattr(self, phase, now_with_tz)
 
     def _create_phases(
         self, hours: int, phase_name: str, parent_phase: str

{python_hilo-2025.11.1 → python_hilo-2025.12.2}/pyhilo/graphql.py

@@ -8,7 +8,7 @@ from gql.transport.aiohttp import AIOHTTPTransport
 from gql.transport.websockets import WebsocketsTransport
 
 from pyhilo import API
-from pyhilo.const import LOG
+from pyhilo.const import LOG, PLATFORM_HOST
 from pyhilo.device.graphql_value_mapper import GraphqlValueMapper
 from pyhilo.devices import Devices
 
@@ -534,7 +534,7 @@ class GraphQlHelper:
         """This functions calls the digital-twin and requests location id"""
         access_token = await self._get_access_token()
         transport = AIOHTTPTransport(
-            url="https://platform.hiloenergie.com/api/digital-twin/v3/graphql",
+            url=f"https://{PLATFORM_HOST}/api/digital-twin/v3/graphql",
             headers={"Authorization": f"Bearer {access_token}"},
         )
         client = Client(transport=transport, fetch_schema_from_transport=True)
@@ -562,7 +562,7 @@ class GraphQlHelper:
             LOG.debug("subscribe_to_device_updated while true")
             access_token = await self._get_access_token()
             transport = WebsocketsTransport(
-                url=f"wss://platform.hiloenergie.com/api/digital-twin/v3/graphql?access_token={access_token}",
+                url=f"wss://{PLATFORM_HOST}/api/digital-twin/v3/graphql?access_token={access_token}",
                 ssl=ssl_context,
             )
             client = Client(transport=transport, fetch_schema_from_transport=True)
@@ -602,7 +602,7 @@ class GraphQlHelper:
     ) -> None:
         access_token = await self._get_access_token()
         transport = WebsocketsTransport(
-            url=f"wss://platform.hiloenergie.com/api/digital-twin/v3/graphql?access_token={access_token}"
+            url=f"wss://{PLATFORM_HOST}/api/digital-twin/v3/graphql?access_token={access_token}"
         )
         client = Client(transport=transport, fetch_schema_from_transport=True)
         query = gql(self.SUBSCRIPTION_LOCATION_UPDATED)

{python_hilo-2025.11.1 → python_hilo-2025.12.2}/pyhilo/websocket.py

@@ -274,6 +274,10 @@ class WebsocketClient:
             LOG.debug("Websocket: async_connect() called but already connected")
             return
 
+        if self._api.session.closed:
+            LOG.error("Websocket: Cannot connect, session is closed")
+            raise CannotConnectError("Session is closed")
+
         LOG.info("Websocket: Connecting to server %s", self._api.endpoint)
         if self._api.log_traces:
             LOG.debug("[TRACE] Websocket URL: %s", self._api.full_ws_url)
@@ -310,6 +314,10 @@ class WebsocketClient:
             raise CannotConnectError(err) from err
 
         LOG.info(f"Connected to websocket server {self._api.endpoint}")
+
+        # Quick pause to prevent race condition
+        await asyncio.sleep(0.05)
+
         self._watchdog.trigger()
         for callback in self._connect_callbacks:
             schedule_callback(callback)
@@ -340,6 +348,9 @@ class WebsocketClient:
                 messages = await self._async_receive_json()
                 for msg in messages:
                     self._parse_message(msg)
+        except asyncio.CancelledError:
+            LOG.info("Websocket: Listen cancelled.")
+            raise
         except ConnectionClosedError as err:
             LOG.error(f"Websocket: Closed while listening: {err}")
             LOG.exception(err)

{python_hilo-2025.11.1 → python_hilo-2025.12.2}/pyproject.toml

@@ -40,7 +40,7 @@ exclude = ".venv/.*"
 
 [tool.poetry]
 name = "python-hilo"
-version = "2025.11.1"
+version = "2025.12.2"
 description = "A Python3, async interface to the Hilo API"
 readme = "README.md"
 authors = ["David Vallee Delisle <me@dvd.dev>"]