python-hilo 2025.6.1__tar.gz → 2025.9.1__tar.gz

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: python-hilo
-Version: 2025.6.1
+Version: 2025.9.1
 Summary: A Python3, async interface to the Hilo API
 License: MIT
+License-File: LICENSE
 Author: David Vallee Delisle
 Author-email: me@dvd.dev
 Maintainer: David Vallee Delisle
@@ -17,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Home Automation
@@ -26,7 +28,7 @@ Requires-Dist: aiosignal (>=1.2.0)
 Requires-Dist: async-timeout (>=4.0.0)
 Requires-Dist: attrs (>=21.2.0)
 Requires-Dist: backoff (>=1.11.1)
-Requires-Dist: gql (>=3.5.2,<4.0.0)
+Requires-Dist: gql (>=3.5.2,<5.0.0)
 Requires-Dist: python-dateutil (>=2.8.2)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: voluptuous (>=0.13.1)

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/__init__.py

@@ -6,7 +6,6 @@ from pyhilo.device.switch import Switch
 from pyhilo.devices import Devices
 from pyhilo.event import Event
 from pyhilo.exceptions import HiloError, InvalidCredentialsError, WebsocketError
-from pyhilo.oauth2 import AuthCodeWithPKCEImplementation
 from pyhilo.util import from_utc_timestamp, time_diff
 from pyhilo.websocket import WebsocketEvent
 
@@ -18,7 +17,6 @@ __all__ = [
     "HiloError",
     "InvalidCredentialsError",
     "WebsocketError",
-    "AuthCodeWithPKCEImplementation",
     "from_utc_timestamp",
     "time_diff",
     "WebsocketEvent",

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/api.py

@@ -140,7 +140,7 @@ class API:
             await self._oauth_session.async_ensure_token_valid()
 
         access_token = str(self._oauth_session.token["access_token"])
-        LOG.debug(f"Websocket access token is {access_token}")
+        LOG.debug("Websocket access token is %s", access_token)
 
         return str(self._oauth_session.token["access_token"])
 
@@ -246,8 +246,9 @@ class API:
         data: dict[str, Any] = {}
         url = parse.urljoin(f"https://{host}", endpoint)
         if self.log_traces:
-            LOG.debug(f"[TRACE] Headers: {kwargs['headers']}")
-            LOG.debug(f"[TRACE] Async request: {method} {url}")
+            LOG.debug("[TRACE] Headers: %s", kwargs["headers"])
+            LOG.debug("[TRACE] Async request: %s %s", method, url)
+
         async with self.session.request(method, url, **kwargs) as resp:
             if "application/json" in resp.headers.get("content-type", ""):
                 try:
@@ -396,7 +397,7 @@ class API:
         """Retrieves and constructs WebSocket connection parameters from the negotiation endpoint."""
         uri = parse.urlparse(self.ws_url)
         LOG.debug("Getting websocket params")
-        LOG.debug(f"Getting uri {uri}")
+        LOG.debug("Getting uri %s", uri)
         resp: dict[str, Any] = await self.async_request(
             "post",
             f"{uri.path}negotiate?{uri.query}",
@@ -407,7 +408,7 @@ class API:
         )
         conn_id: str = resp.get("connectionId", "")
         self.full_ws_url = f"{self.ws_url}&id={conn_id}&access_token={self.ws_token}"
-        LOG.debug(f"Getting full ws URL {self.full_ws_url}")
+        LOG.debug("Getting full ws URL %s", self.full_ws_url)
         transport_dict: list[WebsocketTransportsDict] = resp.get(
             "availableTransports", []
         )
@@ -441,7 +442,7 @@ class API:
             if err.status in (401, 403):
                 raise InvalidCredentialsError("Invalid credentials") from err
             raise RequestError(err) from err
-        LOG.debug(f"FB Install data: {resp}")
+        LOG.debug("FB Install data: %s", resp)
         auth_token = resp.get("authToken", {})
         LOG.debug("Calling set_state from fb_install")
         await set_state(
@@ -479,7 +480,7 @@ class API:
             if err.status in (401, 403):
                 raise InvalidCredentialsError("Invalid credentials") from err
             raise RequestError(err) from err
-        LOG.debug(f"Android client register: {resp}")
+        LOG.debug("Android client register: %s", resp)
         msg: str = resp.get("message", "")
         if msg.startswith("Error="):
             LOG.error(f"Android registration error: {msg}")
@@ -497,14 +498,14 @@ class API:
     async def get_location_ids(self) -> tuple[int, str]:
         """Gets location id from an API call"""
         url = f"{API_AUTOMATION_ENDPOINT}/Locations"
-        LOG.debug(f"LocationId URL is {url}")
+        LOG.debug("LocationId URL is %s", url)
         req: list[dict[str, Any]] = await self.async_request("get", url)
         return (req[0]["id"], req[0]["locationHiloId"])
 
     async def get_devices(self, location_id: int) -> list[dict[str, Any]]:
         """Get list of all devices"""
         url = self._get_url("Devices", location_id)
-        LOG.debug(f"Devices URL is {url}")
+        LOG.debug("Devices URL is %s", url)
         devices: list[dict[str, Any]] = await self.async_request("get", url)
         devices.append(await self.get_gateway(location_id))
         # Now it's time to add devices coming from external sources like hass
@@ -521,7 +522,7 @@ class API:
     ) -> None:
         """Sets device attributes"""
         url = self._get_url(f"Devices/{device.id}/Attributes", device.location_id)
-        LOG.debug(f"Device Attribute URL is {url}")
+        LOG.debug("Device Attribute URL is %s", url)
         await self.async_request("put", url, json={key.hilo_attribute: value})
 
     async def get_event_notifications(self, location_id: int) -> dict[str, Any]:
@@ -549,7 +550,7 @@ class API:
           "viewed": false
         }"""
         url = self._get_url(None, location_id, events=True)
-        LOG.debug(f"Event Notifications URL is {url}")
+        LOG.debug("Event Notifications URL is %s", url)
         return cast(dict[str, Any], await self.async_request("get", url))
 
     async def get_gd_events(
@@ -622,7 +623,7 @@ class API:
         else:
             url += f"/{event_id}"
 
-        LOG.debug(f"get_gd_events URL is {url}")
+        LOG.debug("get_gd_events URL is %s", url)
         return cast(dict[str, Any], await self.async_request("get", url))
 
     async def get_seasons(self, location_id: int) -> dict[str, Any]:
@@ -645,13 +646,13 @@ class API:
         ]
         """
         url = self._get_url("Seasons", location_id, challenge=True)
-        LOG.debug(f"Seasons URL is {url}")
+        LOG.debug("Seasons URL is %s", url)
         return cast(dict[str, Any], await self.async_request("get", url))
 
     async def get_gateway(self, location_id: int) -> dict[str, Any]:
         """Gets info about the Hilo hub (gateway)"""
         url = self._get_url("Gateways/Info", location_id)
-        LOG.debug(f"Gateway URL is {url}")
+        LOG.debug("Gateway URL is %s", url)
         req = await self.async_request("get", url)
         saved_attrs = [
             "zigBeePairingActivated",
@@ -694,7 +695,7 @@ class API:
         ]
         """
         url = self._get_url("Weather", location_id)
-        LOG.debug(f"Weather URL is {url}")
+        LOG.debug("Weather URL is %s", url)
         response = await self.async_request("get", url)
-        LOG.debug(f"Weather API response: {response}")
+        LOG.debug("Weather API response: %s", response)
         return cast(dict[str, Any], await self.async_request("get", url))

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/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.6.01"
+PYHILO_VERSION: Final = "2025.9.01"
 # TODO: Find a way to keep previous line in sync with pyproject.toml automatically
 
 CONTENT_TYPE_FORM: Final = "application/x-www-form-urlencoded"

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/device/light.py

@@ -10,7 +10,7 @@ from pyhilo.device import HiloDevice
 class Light(HiloDevice):
     def __init__(self, api: API, **kwargs: dict[str, Union[str, int]]):
         super().__init__(api, **kwargs)  # type: ignore
-        LOG.debug(f"Setting up Light device: {self.name}")
+        LOG.debug("Setting up Light device: %s", self.name)
 
     @property
     def brightness(self) -> float:

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/device/sensor.py

@@ -10,7 +10,7 @@ from pyhilo.device import HiloDevice
 class Sensor(HiloDevice):
     def __init__(self, api: API, **kwargs: dict[str, Union[str, int]]):
         super().__init__(api, **kwargs)  # type: ignore
-        LOG.debug(f"Setting up Sensor device: {self.name}")
+        LOG.debug("Setting up Sensor device: %s", self.name)
 
     @property
     def state(self) -> str:

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/device/switch.py

@@ -10,7 +10,7 @@ from pyhilo.device import HiloDevice
 class Switch(HiloDevice):
     def __init__(self, api: API, **kwargs: dict[str, Union[str, int]]):
         super().__init__(api, **kwargs)  # type: ignore
-        LOG.debug(f"Setting up Switch device: {self.name}")
+        LOG.debug("Setting up Switch device: %s", self.name)
 
     @property
     def state(self) -> str:

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/devices.py

@@ -38,7 +38,7 @@ class Devices:
         ]
 
     def parse_values_received(self, values: list[dict[str, Any]]) -> list[HiloDevice]:
-        """Places value received in a dict while removing null attributes, 
+        """Places value received in a dict while removing null attributes,
         this returns values to be mapped to devices.
         """
         readings = []
@@ -60,7 +60,7 @@ class Devices:
                 device_identifier = reading.hilo_id
             if device := self.find_device(device_identifier):
                 device.update_readings(reading)
-                LOG.debug(f"{device} Received {reading}")
+                LOG.debug("%s Received %s", device, reading)
                 if device not in updated_devices:
                     updated_devices.append(device)
             else:
@@ -96,24 +96,24 @@ class Devices:
         fresh_devices = await self._api.get_devices(self.location_id)
         generated_devices = []
         for raw_device in fresh_devices:
-            LOG.debug(f"Generating device {raw_device}")
+            LOG.debug("Generating device %s", raw_device)
             dev = self.generate_device(raw_device)
             generated_devices.append(dev)
             if dev not in self.devices:
                 self.devices.append(dev)
         for device in self.devices:
             if device not in generated_devices:
-                LOG.debug(f"Device unpaired {device}")
+                LOG.debug("Device unpaired %s", device)
                 # Don't do anything with unpaired device for now.
                 # self.devices.remove(device)
 
     async def update_devicelist_from_signalr(
         self, values: list[dict[str, Any]]
     ) -> list[HiloDevice]:
-        #ic-dev21 not sure if this is dead code?
+        # ic-dev21 not sure if this is dead code?
         new_devices = []
         for raw_device in values:
-            LOG.debug(f"Generating device {raw_device}")
+            LOG.debug("Generating device %s", raw_device)
             dev = self.generate_device(raw_device)
             if dev not in self.devices:
                 self.devices.append(dev)

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/event.py

@@ -67,7 +67,7 @@ class Event:
 
     def update_wh(self, used_wH: float) -> None:
         """This function is used to update the used_kWh attribute during a Hilo Challenge Event"""
-        LOG.debug(f"Updating Wh: {used_wH}")
+        LOG.debug("Updating Wh: %s", used_wH)
         self.used_kWh = round(used_wH / 1000, 2)
         self.last_update = datetime.now(timezone.utc).astimezone()
 

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/graphql.py

@@ -562,23 +562,28 @@ class GraphQlHelper:
                         query, variable_values={"locationHiloId": location_hilo_id}
                     ):
                         LOG.debug(
-                            f"subscribe_to_device_updated: Received subscription result {result}"
+                            "subscribe_to_device_updated: Received subscription result %s",
+                            result,
                         )
                         device_hilo_id = self._handle_device_subscription_result(result)
                         if callback:
                             callback(device_hilo_id)
             except Exception as e:
                 LOG.debug(
-                    f"subscribe_to_device_updated: Connection lost: {e}. Reconnecting in 5 seconds..."
+                    "subscribe_to_device_updated: Connection lost: %s. Reconnecting in 5 seconds...",
+                    e,
                 )
                 await asyncio.sleep(5)
                 try:
                     await self.call_get_location_query(location_hilo_id)
-                    LOG.debug("subscribe_to_device_updated, call_get_location_query success")
+                    LOG.debug(
+                        "subscribe_to_device_updated, call_get_location_query success"
+                    )
 
                 except Exception as e2:
                     LOG.error(
-                        f"subscribe_to_device_updated, exception while reconnecting, retrying: {e2}"
+                        "subscribe_to_device_updated, exception while reconnecting, retrying: %s",
+                        e2,
                     )
 
     async def subscribe_to_location_updated(
@@ -595,7 +600,7 @@ class GraphQlHelper:
                 async for result in session.subscribe(
                     query, variable_values={"locationHiloId": location_hilo_id}
                 ):
-                    LOG.debug(f"Received subscription result {result}")
+                    LOG.debug("Received subscription result %s", result)
                     device_hilo_id = self._handle_location_subscription_result(result)
                     callback(device_hilo_id)
         except asyncio.CancelledError:
@@ -618,7 +623,7 @@ class GraphQlHelper:
         attributes = self.mapper.map_device_subscription_values(devices_values)
         updated_device = self._devices.parse_values_received(attributes)
         # callback to update the device in the UI
-        LOG.debug(f"Device updated: {updated_device}")
+        LOG.debug("Device updated: %s", updated_device)
         return devices_values.get("hiloId")
 
     def _handle_location_subscription_result(self, result: Dict[str, Any]) -> str:
@@ -626,5 +631,5 @@ class GraphQlHelper:
         attributes = self.mapper.map_location_subscription_values(devices_values)
         updated_device = self._devices.parse_values_received(attributes)
         # callback to update the device in the UI
-        LOG.debug(f"Device updated: {updated_device}")
+        LOG.debug("Device updated: %s", updated_device)
         return devices_values.get("hiloId")

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyhilo/websocket.py

@@ -214,18 +214,22 @@ class WebsocketClient:
 
         if self._api.log_traces:
             LOG.debug(
-                f"[TRACE] Sending data to websocket {self._api.endpoint} : {json.dumps(payload)}"
+                "[TRACE] Sending data to websocket %s : %s",
+                self._api.endpoint,
+                json.dumps(payload),
             )
         # Hilo added a control character (chr(30)) at the end of each payload they send.
         # They also expect this char to be there at the end of every payload we send them.
-        LOG.debug(f"WebsocketClient _async_send_json payload: {payload}")
+        LOG.debug("WebsocketClient _async_send_json payload: %s", payload)
         await self._client.send_str(json.dumps(payload) + chr(30))
 
     def _parse_message(self, msg: dict[str, Any]) -> None:
         """Parse an incoming message."""
         if self._api.log_traces:
             LOG.debug(
-                f"[TRACE] Received message on websocket(_parse_message) {self._api.endpoint}: {msg}"
+                "[TRACE] Received message on websocket(_parse_message) %s: %s",
+                self._api.endpoint,
+                msg,
             )
         if msg.get("type") == SignalRMsgType.PING:
             schedule_callback(self._async_pong)
@@ -272,7 +276,7 @@ class WebsocketClient:
 
         LOG.info("Websocket: Connecting to server %s", self._api.endpoint)
         if self._api.log_traces:
-            LOG.debug(f"[TRACE] Websocket URL: {self._api.full_ws_url}")
+            LOG.debug("[TRACE] Websocket URL: %s", self._api.full_ws_url)
         headers = {
             "Sec-WebSocket-Extensions": "permessage-deflate; client_max_window_bits",
             "Pragma": "no-cache",
@@ -396,9 +400,13 @@ class WebsocketClient:
             except asyncio.TimeoutError:
                 return
             self._ready_event.clear()
-        LOG.debug(
-            f"async_invoke invoke argument: {arg}, invocationId: {inv_id}, target: {target}, type: {type}"
-        )
+            LOG.debug(
+                "async_invoke invoke argument: %s, invocationId: %s, target: %s, type: %s",
+                arg,
+                inv_id,
+                target,
+                type,
+            )
         await self._async_send_json(
             {
                 "arguments": arg,
@@ -481,9 +489,9 @@ class WebsocketManager:
         Returns:
             Tuple containing the websocket URL and access token
         """
-        LOG.debug(f"Getting websocket url for {config.endpoint}")
+        LOG.debug("Getting websocket url for %s", config.endpoint)
         url = f"{config.endpoint}/negotiate"
-        LOG.debug(f"Negotiate URL is {url}")
+        LOG.debug("Negotiate URL is %s", url)
 
         resp = await self.async_request("post", url)
         ws_url = resp.get("url")
@@ -513,8 +521,8 @@ class WebsocketManager:
             config: The websocket configuration to get parameters for
         """
         uri = parse.urlparse(config.url)
-        LOG.debug(f"Getting websocket params for {config.endpoint}")
-        LOG.debug(f"Getting uri {uri}")
+        LOG.debug("Getting websocket params for %s", config.endpoint)
+        LOG.debug("Getting uri %s", uri)
 
         resp = await self.async_request(
             "post",
@@ -529,7 +537,7 @@ class WebsocketManager:
         config.full_ws_url = (
             f"{config.url}&id={config.connection_id}&access_token={config.token}"
         )
-        LOG.debug(f"Getting full ws URL {config.full_ws_url}")
+        LOG.debug("Getting full ws URL %s", config.full_ws_url)
 
         transport_dict = resp.get("availableTransports", [])
         websocket_dict = {
@@ -544,5 +552,5 @@ class WebsocketManager:
             if config.endpoint == AUTOMATION_DEVICEHUB_ENDPOINT
             else "websocketChallenges"
         )
-        LOG.debug(f"Calling set_state {state_key}_params")
+        LOG.debug("Calling set_state %s_params", state_key)
         await self._set_state(self._state_yaml, state_key, websocket_dict)

{python_hilo-2025.6.1 → python_hilo-2025.9.1}/pyproject.toml

@@ -40,7 +40,7 @@ exclude = ".venv/.*"
 
 [tool.poetry]
 name = "python-hilo"
-version = "2025.6.1"
+version = "2025.9.1"
 description = "A Python3, async interface to the Hilo API"
 readme = "README.md"
 authors = ["David Vallee Delisle <me@dvd.dev>"]
@@ -74,7 +74,7 @@ python-dateutil = ">=2.8.2"
 python = "^3.9.0"
 voluptuous = ">=0.13.1"
 websockets = ">=8.1,<16.0"
-gql = "^3.5.2"
+gql = ">=3.5.2,<5.0.0"
 pyyaml = "^6.0.2"
 
 [poetry.group.dev.dependencies]

python_hilo-2025.6.1/pyhilo/oauth2.py

@@ -1,51 +0,0 @@
-"""Custom OAuth2 implementation."""
-
-from typing import Any, cast
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.config_entry_oauth2_flow import LocalOAuth2Implementation
-
-from pyhilo.const import AUTH_AUTHORIZE, AUTH_CLIENT_ID, AUTH_TOKEN, DOMAIN
-from pyhilo.oauth2helper import OAuth2Helper
-
-
-class AuthCodeWithPKCEImplementation(LocalOAuth2Implementation):  # type: ignore[misc]
-    """Custom OAuth2 implementation."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-    ) -> None:
-        """Initialize AuthCodeWithPKCEImplementation."""
-        super().__init__(
-            hass,
-            DOMAIN,
-            AUTH_CLIENT_ID,
-            "",
-            AUTH_AUTHORIZE,
-            AUTH_TOKEN,
-        )
-
-        self.oauth_helper = OAuth2Helper()
-
-    # ... Override AbstractOAuth2Implementation details
-    @property
-    def name(self) -> str:
-        """Name of the implementation."""
-        return "Hilo"
-
-    @property
-    def extra_authorize_data(self) -> dict:
-        """Extra data that needs to be appended to the authorize url."""
-        return self.oauth_helper.get_authorize_parameters()
-
-    async def async_resolve_external_data(self, external_data: Any) -> dict:
-        """Resolve the authorization code to tokens."""
-        return cast(
-            dict,
-            await self._token_request(
-                self.oauth_helper.get_token_request_parameters(
-                    external_data["code"], external_data["state"]["redirect_uri"]
-                )
-            ),
-        )