Merge branch 'main' into annable/update-version

BrendanAnnable · web-flow · commit 61823dc29eaa · 2026-01-30T22:50:50.000+11:00
diff --git a/.cursor/commands/coverage.md b/.cursor/commands/coverage.md
@@ -0,0 +1 @@
+../../.github/prompts/coverage.prompt.md
diff --git a/.cursor/commands/lint.md b/.cursor/commands/lint.md
@@ -0,0 +1 @@
+../../.github/prompts/lint.prompt.md
diff --git a/.cursor/commands/update-docs.md b/.cursor/commands/update-docs.md
@@ -0,0 +1 @@
+../../.github/prompts/update-docs.prompt.md
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,9 +30,9 @@ jobs:
       REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Install python dependencies
         run: uv sync --locked --all-extras --dev
@@ -60,9 +60,9 @@ jobs:
       REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Install python dependencies
         run: uv sync --locked --all-extras --dev
@@ -90,9 +90,9 @@ jobs:
       REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Install python dependencies
         run: uv sync --locked --all-extras --dev
@@ -137,9 +137,9 @@ jobs:
       REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
 
       - name: Setup reviewdog
         if: github.event_name == 'pull_request'
@@ -168,9 +168,9 @@ jobs:
       REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Install python dependencies
         run: uv sync --locked --all-extras --dev
@@ -203,12 +203,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Install the project
         run: uv sync --locked --all-extras --dev
@@ -241,20 +241,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Run hassfest validation
-        uses: home-assistant/actions/hassfest@87c064c607f3c5cc673a24258d0c98d23033bfc3 # master
+        uses: home-assistant/actions/hassfest@55b4a5d23e09d627c2773c2ef82afa98904d65b4 # master
 
   version-check:
     name: Version consistency
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Check HAFO version consistency
         run: |
@@ -286,12 +286,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Install dependencies
         run: uv sync
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
@@ -26,10 +26,10 @@ jobs:
     # If you do not check out your code, Copilot will do this for you.
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
 
       - name: Install python dependencies
         run: uv sync --locked --all-extras --dev
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -26,12 +26,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
         with:
           version: "latest"
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
 
       - name: Extract and validate version from release tag
         run: |
@@ -60,15 +60,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Create release package
         run: |
           cd custom_components
           zip -r ../hafo.zip hafo
 
       - name: Upload release assets
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
         with:
           files: |
             hafo.zip
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,18 @@
+{
+  "[python]": {
+    "editor.defaultFormatter": "charliermarsh.ruff"
+  },
+  "editor.detectIndentation": true,
+  "editor.formatOnSave": true,
+  "editor.insertSpaces": true,
+  "files.associations": {
+    "*.yaml": "home-assistant"
+  },
+  "files.eol": "\n",
+  "files.insertFinalNewline": true,
+  "files.trimFinalNewlines": true,
+  "files.trimTrailingWhitespace": true,
+  "python.testing.pytestArgs": ["tests"],
+  "python.testing.pytestEnabled": true,
+  "python.testing.unittestEnabled": false
+}
diff --git a/custom_components/hafo/forecasters/historical_shift.py b/custom_components/hafo/forecasters/historical_shift.py
@@ -8,18 +8,17 @@
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
+from homeassistant.components.recorder.statistics import StatisticsRow, statistics_during_period
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.helpers.recorder import get_instance
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util import dt as dt_util
 
 from custom_components.hafo.const import CONF_HISTORY_DAYS, CONF_SOURCE_ENTITY, DEFAULT_HISTORY_DAYS, DOMAIN
 
-if TYPE_CHECKING:
-    from homeassistant.components.recorder.statistics import StatisticsRow
-
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -62,42 +61,19 @@ async def get_statistics_for_sensor(
     Returns:
         List of statistics rows with 'start' and 'mean' fields.
 
-    Raises:
-        ValueError: If the recorder is not available or not set up.
-
     """
-    if "recorder" not in hass.config.components:
-        msg = "Recorder component not loaded"
-        raise ValueError(msg)
-
-    try:
-        # Recorder is an optional after_dependency, so we import inline after checking it's loaded
-        from homeassistant.components.recorder.statistics import statistics_during_period  # noqa: PLC0415
-        from homeassistant.helpers.recorder import DATA_INSTANCE  # noqa: PLC0415
-
-        if DATA_INSTANCE not in hass.data:
-            msg = "Recorder not initialized"
-            raise ValueError(msg)
-    except ImportError:
-        msg = "Recorder component not available"
-        raise ValueError(msg) from None
-
-    try:
-        statistics: dict[str, list[StatisticsRow]] = await hass.async_add_executor_job(
-            lambda: statistics_during_period(
-                hass,
-                start_time,
-                end_time,
-                {entity_id},
-                "hour",
-                None,
-                {"mean"},
-            )
+    recorder = get_instance(hass)
+    statistics: dict[str, list[StatisticsRow]] = await recorder.async_add_executor_job(
+        lambda: statistics_during_period(
+            hass,
+            start_time,
+            end_time,
+            {entity_id},
+            "hour",
+            None,
+            {"mean"},
         )
-    except Exception as e:
-        msg = f"Failed to fetch statistics: {e}"
-        raise ValueError(msg) from e
-
+    )
     return statistics.get(entity_id, [])
 
 
@@ -198,33 +174,22 @@ def entry(self) -> ConfigEntry:
         """Return the config entry."""
         return self._entry
 
-    async def _async_update_data(self) -> ForecastResult | None:
+    async def _async_update_data(self) -> ForecastResult:
         """Fetch and update forecast data.
 
         Returns:
-            ForecastResult with the latest forecast, or None if unavailable.
-
-        Raises:
-            UpdateFailed: If the forecast cannot be generated.
+            ForecastResult with the latest forecast.
 
         """
-        try:
-            result = await self._generate_forecast()
+        result = await self._generate_forecast()
 
-            _LOGGER.debug(
-                "Generated forecast for %s with %d points",
-                self._source_entity,
-                len(result.forecast),
-            )
-
-            return result
+        _LOGGER.debug(
+            "Generated forecast for %s with %d points",
+            self._source_entity,
+            len(result.forecast),
+        )
 
-        except ValueError as err:
-            _LOGGER.warning("Failed to generate forecast: %s", err)
-            return None
-        except Exception as err:
-            msg = f"Error generating forecast: {err}"
-            raise UpdateFailed(msg) from err
+        return result
 
     async def _generate_forecast(self) -> ForecastResult:
         """Generate a forecast by shifting historical data forward.
@@ -241,11 +206,7 @@ async def _generate_forecast(self) -> ForecastResult:
         end_time = now
 
         # Fetch historical statistics
-        try:
-            statistics = await get_statistics_for_sensor(self.hass, self._source_entity, start_time, end_time)
-        except ValueError:
-            _LOGGER.warning("Failed to get statistics for %s", self._source_entity)
-            raise
+        statistics = await get_statistics_for_sensor(self.hass, self._source_entity, start_time, end_time)
 
         if not statistics:
             msg = f"No historical data available for {self._source_entity}"
diff --git a/custom_components/hafo/manifest.json b/custom_components/hafo/manifest.json
@@ -1,10 +1,9 @@
 {
   "domain": "hafo",
   "name": "HAFO Forecast",
-  "after_dependencies": ["recorder"],
   "codeowners": ["@TrentHouliston"],
   "config_flow": true,
-  "dependencies": [],
+  "dependencies": ["recorder"],
   "documentation": "https://github.com/hass-energy/hafo",
   "integration_type": "helper",
   "iot_class": "calculated",
diff --git a/tests/forecasters/test_historical_shift.py b/tests/forecasters/test_historical_shift.py
diff --git a/tests/scenarios/test_scenarios.py b/tests/scenarios/test_scenarios.py
diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py
diff --git a/tests/test_init.py b/tests/test_init.py
diff --git a/tests/test_sensor.py b/tests/test_sensor.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../.github/prompts/coverage.prompt.md`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../.github/prompts/update-docs.prompt.md`