python-hilo 2023.3.1__tar.gz → 2023.4.2__tar.gz

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-hilo
-Version: 2023.3.1
+Version: 2023.4.2
 Summary: A Python3, async interface to the Hilo API
 Home-page: https://github.com/dvd-dev/python-hilo
 License: MIT

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyhilo/api.py

@@ -53,7 +53,6 @@ from pyhilo.device import DeviceAttribute, HiloDevice, get_device_attributes
 from pyhilo.exceptions import InvalidCredentialsError, RequestError
 from pyhilo.util import schedule_callback
 from pyhilo.util.state import (
-    RegistrationDict,
     TokenDict,
     WebsocketDict,
     WebsocketTransportsDict,

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyhilo/const.py

@@ -1,8 +1,9 @@
 import logging
 import platform
+from typing import Final
+
 import aiohttp
 import homeassistant.core
-from typing import Final
 
 LOG: Final = logging.getLogger(__package__)
 DEFAULT_STATE_FILE: Final = "hilo_state.yaml"
@@ -29,7 +30,7 @@ AUTH_SCOPE: Final = "openid 9870f087-25f8-43b6-9cad-d4b74ce512e1 offline_access"
 SUBSCRIPTION_KEY: Final = "20eeaedcb86945afa3fe792cea89b8bf"
 
 # API constants
-API_HOSTNAME: Final = "apim.hiloenergie.com"
+API_HOSTNAME: Final = "api.hiloenergie.com"
 API_END: Final = "v1/api"
 API_AUTOMATION_ENDPOINT: Final = f"/Automation/{API_END}"
 API_GD_SERVICE_ENDPOINT: Final = f"/GDService/{API_END}"
@@ -48,15 +49,13 @@ AUTOMATION_HOSTNAME: Final = "automation.hiloenergie.com"
 AUTOMATION_DEVICEHUB_ENDPOINT: Final = "/DeviceHub"
 
 # Request constants
-DEFAULT_USER_AGENT: Final = (
-    f"HomeAssistantHilo/{HILO_APP_VERSION} HomeAssistant/{homeassistant.core.__version__} aiohttp/{aiohttp.__version__} Python/{platform.python_version()}"
-)
+DEFAULT_USER_AGENT: Final = f"HomeAssistantHilo/{HILO_APP_VERSION} HomeAssistant/{homeassistant.core.__version__} aiohttp/{aiohttp.__version__} Python/{platform.python_version()}"
 
 
 # NOTE(dvd): Not sure how to get new ones so I'm using the ones from my emulator
 # We can't unfortunately randomize this device id, I believe it's generated when
 # an android device registers to the play store, but I'm no android dev.
-#ANDROID_DEVICE_ID: Final = 3530136576518667218
+# ANDROID_DEVICE_ID: Final = 3530136576518667218
 # NOTE(dvd): Based on issue #113, this can be set to 0
 ANDROID_DEVICE_ID: Final = 3530136576518667218
 

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyhilo/device/climate.py

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

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyhilo/device/light.py

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

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyhilo/device/sensor.py

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

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyhilo/device/switch.py

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

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyhilo/devices.py

@@ -78,11 +78,24 @@ class Devices:
         return dev
 
     async def update(self) -> None:
-        for device in await self._api.get_devices(self.location_id):
-            LOG.debug(f"Generating device {device}")
-            dev = self.generate_device(device)
+        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}")
+            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}")
+                # Don't do anything with unpaired device for now.
+                # self.devices.remove(device)
+
+    async def update_gateway(self) -> None:
+        gateway = await self._api.get_gateway(self.location_id)
+        LOG.debug(f"Generating device (gateway) {gateway}")
+        self.generate_device(gateway)
 
     async def async_init(self) -> None:
         """Initialize the Hilo "manager" class."""

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyhilo/websocket.py

@@ -181,6 +181,7 @@ class WebsocketClient:
             raise InvalidMessageError("Received invalid JSON") from v_exc
         except json.decoder.JSONDecodeError as j_exc:
             LOG.error(f"Received invalid JSON: {msg.data}")
+            LOG.exception(j_exc)
             data = {}
 
         self._watchdog.trigger()
@@ -280,7 +281,7 @@ class WebsocketClient:
             )
         except (ClientError, ServerDisconnectedError, WSServerHandshakeError) as err:
             LOG.error(f"Unable to connect to WS server {err}")
-            if hasattr(err, "status") and err.status in (401, 403, 404, 409):  # type: ignore
+            if hasattr(err, "status") and err.status in (401, 403, 404, 409):
                 raise InvalidCredentialsError("Invalid credentials") from err
         except Exception as err:
             LOG.error(f"Unable to connect to WS server {err}")

{python_hilo-2023.3.1 → python_hilo-2023.4.2}/pyproject.toml

@@ -40,7 +40,7 @@ exclude = ".venv/.*"
 
 [tool.poetry]
 name = "python-hilo"
-version = "2023.03.01"
+version = "2023.04.02"
 description = "A Python3, async interface to the Hilo API"
 readme = "README.md"
 authors = ["David Vallee Delisle <me@dvd.dev>"]
@@ -75,15 +75,15 @@ voluptuous = ">=0.13.1"
 websockets = ">=8.1,<11.0"
 
 [tool.poetry.dev-dependencies]
-Sphinx = "^5.3.0"
+Sphinx = "^6.1.3"
 aresponses = "^2.1.4"
 asynctest = "^0.13.0"
-pre-commit = "^2.0.1"
+pre-commit = "^3.2.2"
 pytest = "^7.2.0"
 pytest-aiohttp = "^1.0.4"
-pytest-cov = "^3.0.0"
+pytest-cov = "^4.0.0"
 sphinx-rtd-theme = "^1.0.0"
-types-pytz = "^2022.7.0"
+types-pytz = "^2023.3.0"
 
 [tool.pylint.BASIC]
 expected-line-ending-format = "LF"