Merge pull request #4232 from bramstroker/renovate/all-minor-patch

fix(deps): update all non-major dependencies

Author: bramstroker

.github/workflows/generate-plots.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: true
-      - uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           working-directory: './utils/visualize'
           enable-cache: true

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
-      - uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           activate-environment: true
           enable-cache: "true"

.github/workflows/pr-comment-generate-plots.yml

@@ -18,7 +18,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           persist-credentials: false
-      - uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           working-directory: './utils/visualize'
           enable-cache: true

.github/workflows/test-measure.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           working-directory: './utils/measure'
           python-version: '3.14'

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+      - uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           enable-cache: true
           cache-dependency-glob: |

.github/workflows/zizmor.yml

@@ -23,4 +23,4 @@ jobs:
           persist-credentials: false
 
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6
+        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7

custom_components/powercalc/strategy/composite.py

@@ -9,6 +9,7 @@
 
 from homeassistant.const import CONF_ATTRIBUTE, CONF_CONDITION, CONF_ENTITY_ID, STATE_OFF
 from homeassistant.core import HomeAssistant, State
+from homeassistant.exceptions import ConditionError
 from homeassistant.helpers.condition import ConditionCheckerType
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import TrackTemplate
@@ -152,7 +153,7 @@ async def calculate(self, entity_state: State) -> Decimal | None:
         for sub_strategy in self.strategies:
             strategy = sub_strategy.strategy
 
-            if sub_strategy.condition and not sub_strategy.condition(self.hass, {"state": entity_state}):
+            if sub_strategy.condition and not self._condition_matches(sub_strategy.condition, entity_state):
                 continue
 
             if isinstance(strategy, PlaybookStrategy):
@@ -169,6 +170,13 @@ async def calculate(self, entity_state: State) -> Decimal | None:
 
         return total if self.mode == CompositeMode.SUM_ALL else None
 
+    def _condition_matches(self, condition: ConditionCheckerType, entity_state: State) -> bool:
+        try:
+            return condition(self.hass, {"state": entity_state})
+        except ConditionError:
+            _LOGGER.debug("Skipping composite sub-strategy because condition evaluation failed", exc_info=True)
+            return False
+
     async def stop_active_playbooks(self) -> None:
         """Stop any active playbooks from sub strategies."""
         for playbook in self.playbook_strategies:

custom_components/powercalc/strategy/wled.py

@@ -54,14 +54,21 @@ async def calculate(self, entity_state: State) -> Decimal | None:
             if entity_state.entity_id == self._light_entity.entity_id
             else self._hass.states.get(self._light_entity.entity_id)
         )
+        if light_state is None:
+            return None
 
         if light_state.state in OFF_STATES and self._standby_power:
             return self._standby_power
 
-        if entity_state.entity_id != self._estimated_current_entity:
-            entity_state = self._hass.states.get(self._estimated_current_entity)
+        current_state = (
+            entity_state
+            if entity_state.entity_id == self._estimated_current_entity
+            else self._hass.states.get(self._estimated_current_entity)
+        )
+        if current_state is None:
+            return None
 
-        if entity_state.state in [STATE_UNAVAILABLE, STATE_UNKNOWN]:
+        if current_state.state in [STATE_UNAVAILABLE, STATE_UNKNOWN]:
             _LOGGER.warning(
                 "%s: Estimated current entity %s is not available",
                 self._light_entity.entity_id,
@@ -72,11 +79,11 @@ async def calculate(self, entity_state: State) -> Decimal | None:
         _LOGGER.debug(
             "%s: Estimated current %s (voltage=%d, power_factor=%.2f)",
             self._light_entity.entity_id,
-            entity_state.state,
+            current_state.state,
             self._voltage,
             self._power_factor,
         )
-        power = float(entity_state.state) / 1000 * self._voltage * self._power_factor
+        power = float(current_state.state) / 1000 * self._voltage * self._power_factor
         return evaluate_to_decimal(power)
 
     async def find_estimated_current_entity(self) -> str:

pyproject.toml

@@ -107,10 +107,10 @@ docs = [
 dev = [
     "prek",
     "ruff>=0.15.0",
-    "mypy==2.1.0",
+    "mypy==2.2.0",
     "voluptuous-stubs>=0.1",
     "homeassistant-stubs",
-    "pytest-homeassistant-custom-component==0.13.340",
+    "pytest-homeassistant-custom-component==0.13.345",
     "types-pytz>=2024.1",
     "types-croniter>=2.0",
     "croniter>=6.0.0",

tests/conftest.py

@@ -1,15 +1,18 @@
 import asyncio
 from collections.abc import Generator
 from functools import lru_cache
+import inspect
 import json
 import logging
 import os
 import shutil
 from typing import Any, Protocol, cast
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock, Mock, patch
 import uuid
 
 from _pytest.fixtures import SubRequest
+import aiohttp
+import aioresponses.core
 from homeassistant import loader
 from homeassistant.const import CONF_ENTITY_ID
 from homeassistant.core import HomeAssistant
@@ -30,6 +33,23 @@
 from custom_components.powercalc.helpers import get_library_json_path, get_library_path
 from tests.common import get_test_config_dir, mock_device
 
+# Remove this once aioresponses supports aiohttp 3.14+.
+# See https://github.com/pnuckowski/aioresponses/issues/289.
+_client_response_init = aiohttp.ClientResponse.__init__
+if "stream_writer" in inspect.signature(_client_response_init).parameters:
+    _client_response_init_any = cast(Any, _client_response_init)
+
+    def _patched_client_response_init(self: aiohttp.ClientResponse, *args: object, **kwargs: object) -> None:
+        kwargs.setdefault("stream_writer", Mock(output_size=0))
+        _client_response_init_any(self, *args, **kwargs)
+
+    aiohttp.ClientResponse.__init__ = _patched_client_response_init  # type: ignore[method-assign]
+
+    def _patched_stream_reader_factory(loop: asyncio.AbstractEventLoop | None = None) -> aiohttp.StreamReader:
+        return aiohttp.StreamReader(Mock(), limit=2**16, loop=loop)
+
+    aioresponses.core.stream_reader_factory = _patched_stream_reader_factory
+
 
 @lru_cache(maxsize=1)
 def _load_test_library_json() -> dict[str, Any]: