Merge pull request #16 from enoch85/fix/import-organization

Fix anti-windup blocking and pyright/left errors

Author: enoch85

README.md

@@ -5,7 +5,7 @@
 <img src="icons/logo.png" alt="EffektGuard Logo" width="200"/>
 
 [![hacs_badge](https://img.shields.io/badge/HACS-Default-41BDF5.svg)](https://github.com/hacs/integration)
-![Version](https://img.shields.io/badge/version-0.4.25-blue)
+![Version](https://img.shields.io/badge/version-0.4.26-beta.8-blue)
 ![HA](https://img.shields.io/badge/Home%20Assistant-2025.10%2B-blue)
 [![Sponsor on GitHub](https://img.shields.io/badge/sponsor-GitHub%20Sponsors-1f425f?logo=github&style=for-the-badge)](https://github.com/sponsors/enoch85)
 

custom_components/effektguard/adapters/gespot_adapter.py

@@ -20,14 +20,17 @@
 import logging
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from homeassistant.core import HomeAssistant
 from homeassistant.util import dt as dt_util
 
 from ..const import CONF_GESPOT_ENTITY, DAYTIME_END_HOUR, DAYTIME_START_HOUR
 from ..utils.time_utils import get_current_quarter
 
+if TYPE_CHECKING:
+    from ..models.types import AdapterConfigDict
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -109,7 +112,7 @@ def current_quarter(self) -> int | None:
 class GESpotAdapter:
     """Adapter for reading GE-Spot price entities."""
 
-    def __init__(self, hass: HomeAssistant, config: dict[str, Any]):
+    def __init__(self, hass: HomeAssistant, config: "AdapterConfigDict"):
         """Initialize GE-Spot adapter.
 
         Args:

custom_components/effektguard/adapters/nibe_adapter.py

@@ -17,8 +17,8 @@
 
 import logging
 from dataclasses import dataclass
-from datetime import datetime
-from typing import Any
+from datetime import datetime, timedelta
+from typing import TYPE_CHECKING
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -44,6 +44,9 @@
     TEMP_FACTOR_MIN,
 )
 
+if TYPE_CHECKING:
+    from ..models.types import AdapterConfigDict
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -97,7 +100,7 @@ def dhw_temp(self) -> float | None:
 class NibeAdapter:
     """Adapter for reading NIBE Myuplink entities."""
 
-    def __init__(self, hass: HomeAssistant, config: dict[str, Any]):
+    def __init__(self, hass: HomeAssistant, config: "AdapterConfigDict"):
         """Initialize NIBE adapter.
 
         Args:
@@ -111,6 +114,7 @@ def __init__(self, hass: HomeAssistant, config: dict[str, Any]):
         self._additional_indoor_sensors = config.get(CONF_ADDITIONAL_INDOOR_SENSORS, [])  # Optional
         self._indoor_temp_method = config.get(CONF_INDOOR_TEMP_METHOD, DEFAULT_INDOOR_TEMP_METHOD)
         self._last_write: datetime | None = None
+        self._last_ventilation_write: datetime | None = None
         self._entity_cache: dict[str, str] = {}
         # Fractional accumulator for precise offset tracking
         # NIBE only accepts integers, so we accumulate fractional parts
@@ -119,6 +123,20 @@ def __init__(self, hass: HomeAssistant, config: dict[str, Any]):
         # Track last integer offset sent to NIBE (to avoid redundant writes)
         self._last_nibe_offset: int | None = None
 
+    @property
+    def entity_cache(self) -> dict[str, str]:
+        """Public access to discovered entity cache."""
+        return self._entity_cache
+
+    @property
+    def power_sensor_entity(self) -> str | None:
+        """Public access to configured power sensor entity."""
+        return self._power_sensor_entity
+
+    async def discover_entities(self) -> None:
+        """Discover NIBE entities (public wrapper)."""
+        await self._discover_nibe_entities()
+
     async def get_current_state(self) -> NibeState:
         """Read current NIBE heat pump state from entities.
 
@@ -291,8 +309,6 @@ async def set_curve_offset(self, offset: float) -> bool:
         Note:
             Requires NIBE Myuplink Premium subscription for write access.
         """
-        from datetime import timedelta
-
         # Rate limiting - minimum time between writes
         now = dt_util.utcnow()
         if self._last_write and now - self._last_write < timedelta(
@@ -339,7 +355,7 @@ async def set_curve_offset(self, offset: float) -> bool:
         self._fractional_accumulator = offset - self._last_nibe_offset
 
         _LOGGER.debug(
-            "Offset calculation: calculated=%.2f°C, NIBE_current=%d°C, " "accumulator=%.2f°C",
+            "Offset calculation: calculated=%.2f°C, NIBE_current=%d°C, accumulator=%.2f°C",
             offset,
             self._last_nibe_offset,
             self._fractional_accumulator,
@@ -433,8 +449,6 @@ async def set_enhanced_ventilation(self, enabled: bool) -> bool:
         Note:
             Based on NIBE myuplink entity: switch.f750_cu_3x400v_increased_ventilation
         """
-        from datetime import timedelta
-
         # Get ventilation switch entity from cache
         ventilation_entity = self._entity_cache.get("increased_ventilation")
 
@@ -463,9 +477,6 @@ async def set_enhanced_ventilation(self, enabled: bool) -> bool:
 
         # Rate limiting - minimum time between writes
         now = dt_util.utcnow()
-        if not hasattr(self, "_last_ventilation_write"):
-            self._last_ventilation_write = None
-
         if self._last_ventilation_write and now - self._last_ventilation_write < timedelta(
             minutes=SERVICE_RATE_LIMIT_MINUTES
         ):

custom_components/effektguard/adapters/weather_adapter.py

@@ -13,13 +13,16 @@
 import random
 from dataclasses import dataclass
 from datetime import datetime, timedelta
-from typing import Any
+from typing import TYPE_CHECKING
 
 from homeassistant.core import HomeAssistant
 from homeassistant.util import dt as dt_util
 
 from ..const import CONF_WEATHER_ENTITY
 
+if TYPE_CHECKING:
+    from ..models.types import AdapterConfigDict
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -45,7 +48,7 @@ class WeatherData:
 class WeatherAdapter:
     """Adapter for reading weather forecast entities."""
 
-    def __init__(self, hass: HomeAssistant, config: dict[str, Any]):
+    def __init__(self, hass: HomeAssistant, config: "AdapterConfigDict"):
         """Initialize weather adapter.
 
         Args:
@@ -177,14 +180,14 @@ async def get_forecast(self) -> WeatherData | None:
                         source_method = "service_call"
                     else:
                         _LOGGER.warning(
-                            "Service call succeeded but returned no forecast data. " "Response: %s",
+                            "Service call succeeded but returned no forecast data. Response: %s",
                             forecast_data,
                         )
                         # Schedule next random attempt
                         self._schedule_next_random_attempt()
                 else:
                     _LOGGER.warning(
-                        "Service call succeeded but returned no forecast data. " "Response: %s",
+                        "Service call succeeded but returned no forecast data. Response: %s",
                         forecast_data,
                     )
                     # Schedule next random attempt

custom_components/effektguard/climate.py

@@ -7,12 +7,10 @@
 import logging
 from typing import Any
 
-from homeassistant.components.climate import (
-    ClimateEntity,
+from homeassistant.components.climate import ClimateEntity
+from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACMode,
-)
-from homeassistant.components.climate.const import (
     PRESET_AWAY,
     PRESET_COMFORT,
     PRESET_ECO,
@@ -54,13 +52,14 @@ async def async_setup_entry(
     async_add_entities([EffektGuardClimate(coordinator, entry)])
 
 
-class EffektGuardClimate(CoordinatorEntity, RestoreEntity, ClimateEntity):
+class EffektGuardClimate(CoordinatorEntity[EffektGuardCoordinator], RestoreEntity, ClimateEntity):
     """Climate entity for EffektGuard.
 
     Main user interface displaying current optimization status and allowing
     manual control of target temperature and optimization mode via presets.
     """
 
+    coordinator: EffektGuardCoordinator
     _attr_has_entity_name = True
     _attr_name = None
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
@@ -230,6 +229,48 @@ async def async_set_preset_mode(self, preset_mode: str) -> None:
         # This automatically calls async_reload_entry() which updates coordinator config
         # via async_update_config() - no need for explicit refresh
 
+    # Sync method stubs required by ClimateEntity abstract base class.
+    # These delegate to async versions - Home Assistant handles the async call.
+    def set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperature (sync wrapper)."""
+        raise NotImplementedError("Use async_set_temperature")
+
+    def set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+        """Set new target hvac mode (sync wrapper)."""
+        raise NotImplementedError("Use async_set_hvac_mode")
+
+    def set_preset_mode(self, preset_mode: str) -> None:
+        """Set new preset mode (sync wrapper)."""
+        raise NotImplementedError("Use async_set_preset_mode")
+
+    def turn_on(self) -> None:
+        """Turn the entity on (not used - use set_hvac_mode)."""
+        raise NotImplementedError("Use async_set_hvac_mode with HVACMode.HEAT")
+
+    def turn_off(self) -> None:
+        """Turn the entity off (not used - use set_hvac_mode)."""
+        raise NotImplementedError("Use async_set_hvac_mode with HVACMode.OFF")
+
+    def toggle(self) -> None:
+        """Toggle the entity (not supported)."""
+        raise NotImplementedError("Toggle not supported")
+
+    def set_humidity(self, humidity: int) -> None:
+        """Set new target humidity (not supported)."""
+        raise NotImplementedError("Humidity control not supported")
+
+    def set_fan_mode(self, fan_mode: str) -> None:
+        """Set new target fan mode (not supported)."""
+        raise NotImplementedError("Fan mode not supported")
+
+    def set_swing_mode(self, swing_mode: str) -> None:
+        """Set new target swing mode (not supported)."""
+        raise NotImplementedError("Swing mode not supported")
+
+    def set_swing_horizontal_mode(self, swing_horizontal_mode: str) -> None:
+        """Set new target horizontal swing mode (not supported)."""
+        raise NotImplementedError("Horizontal swing mode not supported")
+
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return additional state attributes."""

custom_components/effektguard/config_flow.py

@@ -6,9 +6,9 @@
 import voluptuous as vol
 
 from homeassistant import config_entries
+from homeassistant.config_entries import ConfigFlowResult
 from homeassistant.core import callback
-from homeassistant.data_entry_flow import FlowResult
-from homeassistant.helpers import selector
+from homeassistant.helpers import entity_registry as er, selector
 
 from .options import EffektGuardOptionsFlow
 from .const import (
@@ -36,11 +36,16 @@ class EffektGuardConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    def __init__(self):
+    def __init__(self) -> None:
         """Initialize config flow."""
         self._data: dict[str, Any] = {}
 
-    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult:
+    def is_matching(self, other_flow: "EffektGuardConfigFlow") -> bool:
+        """Return True if this flow matches another flow in progress."""
+        # Only one EffektGuard instance is supported
+        return True
+
+    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
         """Handle the initial step - NIBE integration selection."""
         errors = {}
 
@@ -87,7 +92,7 @@ async def async_step_user(self, user_input: dict[str, Any] | None = None) -> Flo
             },
         )
 
-    async def async_step_gespot(self, user_input: dict[str, Any] | None = None) -> FlowResult:
+    async def async_step_gespot(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
         """Configure spot price integration."""
         errors = {}
 
@@ -154,7 +159,7 @@ async def async_step_gespot(self, user_input: dict[str, Any] | None = None) -> F
             },
         )
 
-    async def async_step_model(self, user_input: dict[str, Any] | None = None) -> FlowResult:
+    async def async_step_model(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
         """Handle heat pump model selection."""
         errors = {}
 
@@ -185,7 +190,9 @@ async def async_step_model(self, user_input: dict[str, Any] | None = None) -> Fl
             },
         )
 
-    async def async_step_optional(self, user_input: dict[str, Any] | None = None) -> FlowResult:
+    async def async_step_optional(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """Configure optional features."""
         if user_input is not None:
             # Store optional settings
@@ -219,7 +226,7 @@ async def async_step_optional(self, user_input: dict[str, Any] | None = None) ->
 
     async def async_step_optional_sensors(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Configure optional sensors (degree minutes, power meter, extra temp sensors)."""
         if user_input is not None:
             # Store optional sensor settings
@@ -346,8 +353,6 @@ def _discover_nibe_entities(self) -> list[str]:
         - OR number.* entities with 'offset' in name AND 'nibe' in entity_id
         - Excludes entities with translation errors
         """
-        from homeassistant.helpers import entity_registry as er
-
         entities = []
         ent_reg = er.async_get(self.hass)
 
@@ -528,8 +533,6 @@ def _discover_temp_lux_entities(self) -> list[str]:
         - switch.*50004* (NIBE parameter ID)
         - Related to NIBE/MyUplink integration
         """
-        from homeassistant.helpers import entity_registry as er
-
         entities = []
         ent_reg = er.async_get(self.hass)
 
@@ -566,7 +569,9 @@ def _discover_temp_lux_entities(self) -> list[str]:
 
         return entities
 
-    async def async_step_reconfigure(self, user_input: dict[str, Any] | None = None) -> FlowResult:
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """Handle reconfiguration of entity selections.
 
         Allows users to change entity selections (weather, power sensor, etc.)

custom_components/effektguard/const.py

@@ -672,6 +672,12 @@ class OptimizationModeConfig:
     VOLATILE_MIN_DURATION_MINUTES // MINUTES_PER_QUARTER
 )  # 3 quarters (45min / 15min)
 
+# Volatile timing tolerance (Feb 2, 2026)
+# Prevents floating-point rounding in time.time() from blocking at the displayed boundary.
+# Jan 31 2026 incident: log showed "45min < 45min" still blocking because actual seconds
+# were 2699.x which rounds to 45min display but is still < 2700 seconds.
+VOLATILE_TIMING_TOLERANCE_SECONDS: Final = 2
+
 # Price forecast lookahead (Nov 27, 2025)
 # Forward-looking price optimization: reduce heating when cheaper period coming soon
 # Updated Nov 28, 2025: Horizon scales with thermal_mass (configurable 0.5-2.0)