Sync with main

.github/workflows/constraints.txt

@@ -1,5 +1,5 @@
-pip==23.3.2
-black==23.12.1
-pre-commit==3.6.0
-flake8==6.1.0
+pip==24.0
+black==24.2.0
+pre-commit==3.6.2
+flake8==7.0.0
 reorder-python-imports==3.12.0

.github/workflows/labeler.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - master
 
 jobs:
   labeler:

.github/workflows/release-drafter.yml

@@ -3,13 +3,12 @@ on:
   push:
     branches:
       - main
-      - master
 jobs:
   draft_release:
     name: Release Drafter
     runs-on: ubuntu-latest
     steps:
       - name: Run release-drafter
-        uses: release-drafter/release-drafter@v5.25.0
+        uses: release-drafter/release-drafter@v6.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - master
       - dev
   pull_request:
   schedule:

.pre-commit-config.yaml

@@ -57,7 +57,7 @@ repos:
       - id: no-commit-to-branch
         args:
           - --branch=dev
-          - --branch=master
+          - --branch=main
 #  - repo: https://github.com/PyCQA/pydocstyle
 #    rev: 5.0.2
 #    hooks:

pyhilo/api.py

@@ -20,6 +20,7 @@
     ANDROID_CLIENT_HOSTNAME,
     ANDROID_CLIENT_POST,
     API_AUTOMATION_ENDPOINT,
+    API_CHALLENGE_ENDPOINT,
     API_EVENTS_ENDPOINT,
     API_GD_SERVICE_ENDPOINT,
     API_HOSTNAME,
@@ -252,6 +253,7 @@ def _get_url(
         gd: bool = False,
         drms: bool = False,
         events: bool = False,
+        challenge: bool = False,
     ) -> str:
         """Generate a path to the requested endpoint.
 
@@ -263,6 +265,8 @@ def _get_url(
         :type gd: bool, optional
         :param drms: Whether or not we should prepend the path with DRMS path, defaults to False
         :type drms: bool, optional
+        :param challenge: Whether or not we should prepend the path with challenge path, defaults to False
+        :type challenge: bool, optional
         :return: Path to the requested endpoint
         :rtype: str
         """
@@ -273,6 +277,8 @@ def _get_url(
             base += "/DRMS"
         if events:
             base = API_EVENTS_ENDPOINT + API_NOTIFICATIONS_ENDPOINT
+        if challenge:
+            base = API_CHALLENGE_ENDPOINT
         url = base + "/Locations/" + str(location_id)
         if endpoint:
             url += "/" + str(endpoint)
@@ -590,7 +596,7 @@ async def get_gd_events(
 
     async def get_seasons(self, location_id: int) -> dict[str, Any]:
         """This will return the rewards and current season total
-        https://apim.hiloenergie.com/Automation/v1/api/DRMS/Locations/XXXX/Seasons
+        https://api.hiloenergie.com/challenge/v1/api/Locations/XXXX/Seasons
         [
           {
             "season": 2021,
@@ -607,7 +613,7 @@ async def get_seasons(self, location_id: int) -> dict[str, Any]:
           }
         ]
         """
-        url = self._get_url("Seasons", location_id, drms=True)
+        url = self._get_url("Seasons", location_id, challenge=True)
         return cast(dict[str, Any], await self.async_request("get", url))
 
     async def get_gateway(self, location_id: int) -> dict[str, Any]:

pyhilo/const.py

@@ -28,6 +28,7 @@
 API_HOSTNAME: Final = "api.hiloenergie.com"
 API_END: Final = "v1/api"
 API_AUTOMATION_ENDPOINT: Final = f"/Automation/{API_END}"
+API_CHALLENGE_ENDPOINT: Final = f"/challenge/{API_END}"
 API_GD_SERVICE_ENDPOINT: Final = f"/GDService/{API_END}"
 API_NOTIFICATIONS_ENDPOINT: Final = "/Notifications"
 API_EVENTS_ENDPOINT: Final = "/Notifications"
@@ -239,6 +240,7 @@
 
 JASCO_MODELS: Final = [
     "43082",
+    "43076",
     "43078",
     "43100",
     "46199",
@@ -255,3 +257,8 @@
     "43100",
     "45853",
 ]
+
+UNMONITORED_DEVICES: Final = [
+    "43076",
+    "43100",
+]

pyhilo/device/__init__.py

@@ -5,6 +5,8 @@
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, Dict, Union, cast
 
+from homeassistant.const import STATE_UNKNOWN
+
 from pyhilo.const import (
     HILO_DEVICE_ATTRIBUTES,
     HILO_LIST_ATTRIBUTES,
@@ -150,7 +152,7 @@ def has_attribute(self, attr: str) -> bool:
         return next((True for k in self.supported_attributes if k.attr == attr), False)
 
     def get_value(
-        self, attribute: str, default: Union[str, int, float, None] = None
+        self, attribute: str, default: Union[str, int, float, None] = STATE_UNKNOWN
     ) -> Any:
         attr = self.get_attribute(attribute)
         return attr.value if attr else default

pyhilo/event.py

@@ -1,5 +1,5 @@
 """Event object """
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import re
 from typing import Any, cast
 
@@ -38,8 +38,12 @@ def __init__(self, **event: dict[str, Any]):
         self.allowed_kWh: float = round(allowed_wH / 1000, 2)
         self.used_kWh: float = round(used_wH / 1000, 2)
         self.used_percentage: float = 0
+        self.last_update = datetime.now(timezone.utc).astimezone()
         if allowed_wH > 0:
             self.used_percentage = round(used_wH / allowed_wH * 100, 2)
+        self._phase_time_mapping = {
+            "pre_heat": "preheat",
+        }
         self.dict_items = [
             "event_id",
             "participating",
@@ -52,6 +56,7 @@ def __init__(self, **event: dict[str, Any]):
             "allowed_kWh",
             "used_kWh",
             "used_percentage",
+            "last_update",
         ]
 
     def as_dict(self) -> dict[str, Any]:
@@ -96,6 +101,28 @@ def appreciation(self, hours: int) -> datetime:
     def pre_cold(self, hours: int) -> datetime:
         return self._create_phases(hours, "pre_cold", "appreciation")
 
+    @property
+    def invalid(self) -> bool:
+        return cast(
+            bool,
+            (
+                self.current_phase_times
+                and self.last_update < self.current_phase_times["start"]
+            ),
+        )
+
+    @property
+    def current_phase_times(self) -> dict[str, datetime]:
+        if self.state in ["completed", "off", "scheduled", "unknown"]:
+            return {}
+        phase_timestamp = self._phase_time_mapping.get(self.state, self.state)
+        phase_start = f"{phase_timestamp}_start"
+        phase_end = f"{phase_timestamp}_end"
+        return {
+            "start": getattr(self, phase_start),
+            "end": getattr(self, phase_end),
+        }
+
     @property
     def state(self) -> str:
         now = datetime.now(self.preheat_start.tzinfo)
@@ -111,7 +138,7 @@ def state(self) -> str:
             return "reduction"
         elif self.recovery_start <= now < self.recovery_end:
             return "recovery"
-        elif now <= self.recovery_end:
+        elif now >= self.recovery_end:
             return "completed"
         elif self.progress:
             return self.progress

pyproject.toml

@@ -40,7 +40,7 @@ exclude = ".venv/.*"
 
 [tool.poetry]
 name = "python-hilo"
-version = "2023.12.02"
+version = "2024.2.2"
 description = "A Python3, async interface to the Hilo API"
 readme = "README.md"
 authors = ["David Vallee Delisle <[email protected]>"]
@@ -77,14 +77,14 @@ websockets = ">=8.1,<12.0"
 
 [tool.poetry.dev-dependencies]
 Sphinx = "^7.1.2"
-aresponses = "^2.1.4"
+aresponses = "^3.0.0"
 asynctest = "^0.13.0"
 pre-commit = "^3.2.2"
-pytest = "^7.2.0"
+pytest = "^8.0.0"
 pytest-aiohttp = "^1.0.4"
 pytest-cov = "^4.0.0"
 sphinx-rtd-theme = "^2.0.0"
-types-pytz = "^2023.3.0"
+types-pytz = "^2024.1.0"
 
 [tool.pylint.BASIC]
 expected-line-ending-format = "LF"