Diff to HTML by rtfpessoa

Files changed (15) hide show

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/__init__.py +41 -82
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/binary_sensor.py +96 -63
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/climate.py +110 -88
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/config_flow.py +77 -183
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/const.py +48 -34
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/coordinator.py +81 -64
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/diagnostics.py +4 -10
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/entity.py +5 -2
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/manifest.json +5 -6
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/number.py +43 -72
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/select.py +50 -64
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/sensor.py +410 -29
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/strings.json +65 -66
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/switch.py +63 -22
/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/util.py +5 -9

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/__init__.py RENAMED Viewed

@@ -1,54 +1,29 @@
 """Plugwise platform for Home Assistant Core."""
 from __future__ import annotations
 from typing import Any
-import voluptuous as vol
-from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN
-from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from plugwise.exceptions import PlugwiseError
-from .const import (
-    CONF_REFRESH_INTERVAL,  # pw-beta options
-    COORDINATOR,
-    DOMAIN,
-    LOGGER,
-    PLATFORMS_GATEWAY,
-    SERVICE_DELETE,
-    UNDO_UPDATE_LISTENER,
-)
 from .coordinator import PlugwiseDataUpdateCoordinator
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Plugwise Smiles from a config entry."""
     await er.async_migrate_entries(hass, entry.entry_id, async_migrate_entity_entry)
-    cooldown = 1.5  # pw-beta frontend refresh-interval
-    if (
-        custom_refresh := entry.options.get(CONF_REFRESH_INTERVAL)
-    ) is not None:  # pragma: no cover
-        cooldown = custom_refresh
-    LOGGER.debug("DUC cooldown interval: %s", cooldown)
-    coordinator = PlugwiseDataUpdateCoordinator(
-        hass, entry, cooldown
-    )  # pw-beta - cooldown, update_interval as extra
     await coordinator.async_config_entry_first_refresh()
-    # Migrate a changed sensor unique_id
     migrate_sensor_entities(hass, coordinator)
-    undo_listener = entry.add_update_listener(_update_listener)  # pw-beta
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
-        COORDINATOR: coordinator,  # pw-beta
-        UNDO_UPDATE_LISTENER: undo_listener,  # pw-beta
-    }
     device_registry = dr.async_get(hass)
     device_registry.async_get_or_create(
@@ -56,66 +31,44 @@
         identifiers={(DOMAIN, str(coordinator.api.gateway_id))},
         manufacturer="Plugwise",
         model=coordinator.api.smile_model,
         name=coordinator.api.smile_name,
-        sw_version=coordinator.api.smile_version[0],
-    )
-    async def delete_notification(
-        call: ServiceCall,
-    ) -> None:  # pragma: no cover  # pw-beta: HA service - delete_notification
-        """Service: delete the Plugwise Notification."""
-        LOGGER.debug(
-            "Service delete PW Notification called for %s",
-            coordinator.api.smile_name,
-        )
-        try:
-            await coordinator.api.delete_notification()
-            LOGGER.debug("PW Notification deleted")
-        except PlugwiseError:
-            LOGGER.debug(
-                "Failed to delete the Plugwise Notification for %s",
-                coordinator.api.smile_name,
-            )
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS_GATEWAY)
-    for component in PLATFORMS_GATEWAY:  # pw-beta
-        if component == Platform.BINARY_SENSOR:
-            hass.services.async_register(
-                DOMAIN, SERVICE_DELETE, delete_notification, schema=vol.Schema({})
-            )
     return True
-async def _update_listener(
-    hass: HomeAssistant, entry: ConfigEntry
-) -> None:  # pragma: no cover  # pw-beta
-    """Handle options update."""
-    await hass.config_entries.async_reload(entry.entry_id)
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(
-        entry, PLATFORMS_GATEWAY
-    ):
-        hass.data[DOMAIN].pop(entry.entry_id)
-    return unload_ok
 @callback
 def async_migrate_entity_entry(entry: er.RegistryEntry) -> dict[str, Any] | None:
     """Migrate Plugwise entity entries.
-    - Migrates unique ID from old relay switches to the new unique ID
     """
-    if entry.domain == SWITCH_DOMAIN and entry.unique_id.endswith("-"):
         return {"new_unique_id": entry.unique_id.replace("-plug", "-relay")}
-    if entry.domain == NUMBER_DOMAIN and entry.unique_id.endswith("-domestic_hot_water_setpoint"):
-        return {"new_unique_id": entry.unique_id.replace("-domestic_hot_water_setpoint", "-max_dhw_temperature")}
     # No migration needed
     return None
@@ -127,10 +80,10 @@
     """Migrate Sensors if needed."""
     ent_reg = er.async_get(hass)
-    # Migrate opentherm_outdoor_temperature to  # pw-beta add to Core
-    # opentherm_outdoor_air_temperature sensor
     for device_id, device in coordinator.data.devices.items():
-        if device["dev_class"] != "heater_central":  # pw-beta add to Core
             continue
         old_unique_id = f"{device_id}-outdoor_temperature"
@@ -138,4 +91,10 @@
             Platform.SENSOR, DOMAIN, old_unique_id
         ):
             new_unique_id = f"{device_id}-outdoor_air_temperature"
             ent_reg.async_update_entity(entity_id, new_unique_id=new_unique_id)

 """Plugwise platform for Home Assistant Core."""
 from __future__ import annotations
 from typing import Any
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
+from .const import DOMAIN, LOGGER, PLATFORMS
 from .coordinator import PlugwiseDataUpdateCoordinator
+type PlugwiseConfigEntry = ConfigEntry[PlugwiseDataUpdateCoordinator]
+async def async_setup_entry(hass: HomeAssistant, entry: PlugwiseConfigEntry) -> bool:
+    """Set up Plugwise components from a config entry."""
     await er.async_migrate_entries(hass, entry.entry_id, async_migrate_entity_entry)
+    coordinator = PlugwiseDataUpdateCoordinator(hass)
     await coordinator.async_config_entry_first_refresh()
     migrate_sensor_entities(hass, coordinator)
+    entry.runtime_data = coordinator
     device_registry = dr.async_get(hass)
     device_registry.async_get_or_create(
         identifiers={(DOMAIN, str(coordinator.api.gateway_id))},
         manufacturer="Plugwise",
         model=coordinator.api.smile_model,
+        model_id=coordinator.api.smile_model_id,
         name=coordinator.api.smile_name,
+        sw_version=str(coordinator.api.smile_version),
+    )  # required for adding the entity-less P1 Gateway
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
+async def async_unload_entry(hass: HomeAssistant, entry: PlugwiseConfigEntry) -> bool:
+    """Unload the Plugwise components."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 @callback
 def async_migrate_entity_entry(entry: er.RegistryEntry) -> dict[str, Any] | None:
     """Migrate Plugwise entity entries.
+    - Migrates old unique ID's from old binary_sensors and switches to the new unique ID's
     """
+    if entry.domain == Platform.BINARY_SENSOR and entry.unique_id.endswith(
+        "-slave_boiler_state"
+    ):
+        return {
+            "new_unique_id": entry.unique_id.replace(
+                "-slave_boiler_state", "-secondary_boiler_state"
+            )
+        }
+    if entry.domain == Platform.SENSOR and entry.unique_id.endswith(
+        "-relative_humidity"
+    ):
+        return {
+            "new_unique_id": entry.unique_id.replace("-relative_humidity", "-humidity")
+        }
+    if entry.domain == Platform.SWITCH and entry.unique_id.endswith("-plug"):
         return {"new_unique_id": entry.unique_id.replace("-plug", "-relay")}
     # No migration needed
     return None
     """Migrate Sensors if needed."""
     ent_reg = er.async_get(hass)
+    # Migrating opentherm_outdoor_temperature
+    # to opentherm_outdoor_air_temperature sensor
     for device_id, device in coordinator.data.devices.items():
+        if device.get("dev_class") != "heater_central":
             continue
         old_unique_id = f"{device_id}-outdoor_temperature"
             Platform.SENSOR, DOMAIN, old_unique_id
         ):
             new_unique_id = f"{device_id}-outdoor_air_temperature"
+            LOGGER.debug(
+                "Migrating entity %s from old unique ID '%s' to new unique ID '%s'",
+                entity_id,
+                old_unique_id,
+                new_unique_id,
+            )
             ent_reg.async_update_entity(entity_id, new_unique_id=new_unique_id)

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/binary_sensor.py RENAMED Viewed

@@ -1,54 +1,115 @@
 """Plugwise Binary Sensor component for Home Assistant."""
 from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any
-from homeassistant.components.binary_sensor import BinarySensorEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from .const import (
-    COORDINATOR,  # pw-beta
-    DOMAIN,
-    LOGGER,
-    SEVERITIES,
 )
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
-from .models import PW_BINARY_SENSOR_TYPES, PlugwiseBinarySensorEntityDescription
-PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up Plugwise binary sensor based on config_entry."""
-    coordinator: PlugwiseDataUpdateCoordinator = hass.data[DOMAIN][
-        config_entry.entry_id
-    ][COORDINATOR]
-    entities: list[PlugwiseBinarySensorEntity] = []
-    for device_id, device in coordinator.data.devices.items():
-        if not (binary_sensors := device.get("binary_sensors")):
-            continue
-        for description in PW_BINARY_SENSOR_TYPES:
-            if description.key not in binary_sensors:
-                continue
-            entities.append(
-                PlugwiseBinarySensorEntity(
-                    coordinator,
-                    device_id,
-                    description,
                 )
             )
-            LOGGER.debug("Add %s binary sensor", description.key)
-    async_add_entities(entities)
 class PlugwiseBinarySensorEntity(PlugwiseEntity, BinarySensorEntity):
@@ -66,27 +127,11 @@
         super().__init__(coordinator, device_id)
         self.entity_description = description
         self._attr_unique_id = f"{device_id}-{description.key}"
-        self._notification: dict[str, str] = {}  # pw-beta
     @property
     def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
-        # pw-beta: show Plugwise notifications as HA persistent notifications
-        if self._notification:
-            for notify_id, message in self._notification.items():
-                self.hass.components.persistent_notification.async_create(
-                    message, "Plugwise Notification:", f"{DOMAIN}.{notify_id}"
-                )
-        # return self.device["binary_sensors"][self.entity_description.key]  # type: ignore [literal-required]
-        return self.entity_description.value_fn(self.device["binary_sensors"])
-    @property
-    def icon(self) -> str | None:
-        """Return the icon to use in the frontend, if any."""
-        if (icon_off := self.entity_description.icon_off) and self.is_on is False:
-            return icon_off
-        return self.entity_description.icon
     @property
     def extra_state_attributes(self) -> Mapping[str, Any] | None:
@@ -94,25 +139,13 @@
         if self.entity_description.key != "plugwise_notification":
             return None
-        # pw-beta adjustment with attrs is to only represent severities *with* content
-        # not all severities including those without content as empty lists
-        attrs: dict[str, list[str]] = {}  # pw-beta Re-evaluate against Core
-        self._notification = {}  # pw-beta
         if notify := self.coordinator.data.gateway["notifications"]:
-            for notify_id, details in notify.items():  # pw-beta uses notify_id
                 for msg_type, msg in details.items():
                     msg_type = msg_type.lower()
                     if msg_type not in SEVERITIES:
-                        msg_type = "other"  # pragma: no cover
-                    if (
-                        f"{msg_type}_msg" not in attrs
-                    ):  # pw-beta Re-evaluate against Core
-                        attrs[f"{msg_type}_msg"] = []
                     attrs[f"{msg_type}_msg"].append(msg)
-                    self._notification[
-                        notify_id
-                    ] = f"{msg_type.title()}: {msg}"  # pw-beta
         return attrs

 """Plugwise Binary Sensor component for Home Assistant."""
 from __future__ import annotations
 from collections.abc import Mapping
+from dataclasses import dataclass
 from typing import Any
+from plugwise.constants import BinarySensorType
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
 )
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from . import PlugwiseConfigEntry
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
+SEVERITIES = ["other", "info", "warning", "error"]
+@dataclass(frozen=True)
+class PlugwiseBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Describes a Plugwise binary sensor entity."""
+    key: BinarySensorType
+BINARY_SENSORS: tuple[PlugwiseBinarySensorEntityDescription, ...] = (
+    PlugwiseBinarySensorEntityDescription(
+        key="low_battery",
+        translation_key="low_battery",
+        device_class=BinarySensorDeviceClass.BATTERY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseBinarySensorEntityDescription(
+        key="compressor_state",
+        translation_key="compressor_state",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseBinarySensorEntityDescription(
+        key="cooling_enabled",
+        translation_key="cooling_enabled",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseBinarySensorEntityDescription(
+        key="dhw_state",
+        translation_key="dhw_state",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseBinarySensorEntityDescription(
+        key="flame_state",
+        translation_key="flame_state",
+        name="Flame state",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseBinarySensorEntityDescription(
+        key="heating_state",
+        translation_key="heating_state",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseBinarySensorEntityDescription(
+        key="cooling_state",
+        translation_key="cooling_state",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseBinarySensorEntityDescription(
+        key="secondary_boiler_state",
+        translation_key="secondary_boiler_state",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseBinarySensorEntityDescription(
+        key="plugwise_notification",
+        translation_key="plugwise_notification",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+)
 async def async_setup_entry(
     hass: HomeAssistant,
+    entry: PlugwiseConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
+    """Set up the Smile binary_sensors from a config entry."""
+    coordinator = entry.runtime_data
+    @callback
+    def _add_entities() -> None:
+        """Add Entities."""
+        if not coordinator.new_devices:
+            return
+        async_add_entities(
+            PlugwiseBinarySensorEntity(coordinator, device_id, description)
+            for device_id in coordinator.new_devices
+            if (
+                binary_sensors := coordinator.data.devices[device_id].get(
+                    "binary_sensors"
                 )
             )
+            for description in BINARY_SENSORS
+            if description.key in binary_sensors
+        )
+    _add_entities()
+    entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 class PlugwiseBinarySensorEntity(PlugwiseEntity, BinarySensorEntity):
         super().__init__(coordinator, device_id)
         self.entity_description = description
         self._attr_unique_id = f"{device_id}-{description.key}"
     @property
     def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
+        return self.device["binary_sensors"][self.entity_description.key]
     @property
     def extra_state_attributes(self) -> Mapping[str, Any] | None:
         if self.entity_description.key != "plugwise_notification":
             return None
+        attrs: dict[str, list[str]] = {f"{severity}_msg": [] for severity in SEVERITIES}
         if notify := self.coordinator.data.gateway["notifications"]:
+            for details in notify.values():
                 for msg_type, msg in details.items():
                     msg_type = msg_type.lower()
                     if msg_type not in SEVERITIES:
+                        msg_type = "other"
                     attrs[f"{msg_type}_msg"].append(msg)
         return attrs

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/climate.py RENAMED Viewed

@@ -1,4 +1,5 @@
 """Plugwise Climate component for Home Assistant."""
 from __future__ import annotations
 from typing import Any
@@ -12,22 +13,13 @@
     HVACAction,
     HVACMode,
 )
-from homeassistant.components.climate.const import (
-    PRESET_AWAY,  # pw-beta homekit emulation
-    PRESET_HOME,  # pw-beta homekit emulation
-)
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
-from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from .const import (
-    CONF_HOMEKIT_EMULATION,  # pw-beta homekit emulation
-    COORDINATOR,  # pw-beta
-    DOMAIN,
-    MASTER_THERMOSTATS,
-)
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 from .util import plugwise_command
@@ -35,72 +27,89 @@
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Smile Thermostats from a config entry."""
-    coordinator: PlugwiseDataUpdateCoordinator = hass.data[DOMAIN][
-        config_entry.entry_id
-    ][COORDINATOR]
-    homekit_enabled: bool = config_entry.options.get(
-        CONF_HOMEKIT_EMULATION, False
-    )  # pw-beta homekit emulation
-    async_add_entities(
-        PlugwiseClimateEntity(
-            coordinator, device_id, homekit_enabled
-        )  # pw-beta homekit emulation
-        for device_id, device in coordinator.data.devices.items()
-        if device["dev_class"] in MASTER_THERMOSTATS
-    )
 class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity):
-    """Representation of an Plugwise thermostat."""
     _attr_has_entity_name = True
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_translation_key = DOMAIN
     def __init__(
         self,
         coordinator: PlugwiseDataUpdateCoordinator,
         device_id: str,
-        homekit_enabled: bool,  # pw-beta homekit emulation
     ) -> None:
         """Set up the Plugwise API."""
         super().__init__(coordinator, device_id)
-        self._homekit_enabled = homekit_enabled  # pw-beta homekit emulation
-        self._homekit_mode: str | None = None  # pw-beta homekit emulation
         self._attr_unique_id = f"{device_id}-climate"
         # Determine supported features
         self._attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
-        if self.coordinator.data.gateway["cooling_present"]:
             self._attr_supported_features = (
                 ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
             )
         if presets := self.device.get("preset_modes"):
             self._attr_supported_features |= ClimateEntityFeature.PRESET_MODE
             self._attr_preset_modes = presets
-        # Determine hvac modes and current hvac mode
-        self._attr_hvac_modes = [HVACMode.HEAT]
-        if self.coordinator.data.gateway["cooling_present"]:
-            self._attr_hvac_modes = [HVACMode.HEAT_COOL]
-        if self.device["available_schedules"] != ["None"]:
-            self._attr_hvac_modes.append(HVACMode.AUTO)
-        if self._homekit_enabled:  # pw-beta homekit emulation
-            self._attr_hvac_modes.append(HVACMode.OFF)  # pragma: no cover
         self._attr_min_temp = self.device["thermostat"]["lower_bound"]
-        self._attr_max_temp = self.device["thermostat"]["upper_bound"]
-        # Fix unpractical resolution provided by Plugwise
         self._attr_target_temperature_step = max(
-            self.device["thermostat"]["resolution"], 0.5
         )
     @property
     def current_temperature(self) -> float:
         """Return the current temperature."""
@@ -133,53 +142,67 @@
     @property
     def hvac_mode(self) -> HVACMode:
-        """Return HVAC operation ie. auto, heat, heat_cool, or off mode."""
-        if (
-            mode := self.device["mode"]
-        ) is None or mode not in self.hvac_modes:  # pw-beta add to Core
-            return HVACMode.HEAT  # pragma: no cover
-        # pw-beta homekit emulation
-        if self._homekit_enabled and self._homekit_mode == HVACMode.OFF:
-            mode = HVACMode.OFF  # pragma: no cover
         return HVACMode(mode)
     @property
-    def hvac_action(self) -> HVACAction:  # pw-beta add to Core
         """Return the current running hvac operation if supported."""
-        # When control_state is present, prefer this data
         if (control_state := self.device.get("control_state")) == "cooling":
             return HVACAction.COOLING
-        # Support preheating state as heating,
-        # until preheating is added as a separate state
-        if control_state in ["heating", "preheating"]:
             return HVACAction.HEATING
         if control_state == "off":
             return HVACAction.IDLE
-        heater: str | None = self.coordinator.data.gateway["heater_id"]
-        if heater is not None:
-            heater_data = self.coordinator.data.devices[heater]
-            if heater_data["binary_sensors"]["heating_state"]:
-                return HVACAction.HEATING
-            if heater_data["binary_sensors"].get("cooling_state", False):
-                return HVACAction.COOLING
         return HVACAction.IDLE
     @property
     def preset_mode(self) -> str | None:
         """Return the current preset mode."""
-        return self.device["active_preset"]
     @plugwise_command
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
-        if ATTR_HVAC_MODE in kwargs:  # pw-beta add to Core
-            await self.async_set_hvac_mode(
-                kwargs[ATTR_HVAC_MODE]
-            )  # pw-beta add to Core
         data: dict[str, Any] = {}
         if ATTR_TEMPERATURE in kwargs:
             data["setpoint"] = kwargs.get(ATTR_TEMPERATURE)
@@ -194,6 +217,9 @@
             ):
                 raise ValueError("Invalid temperature change requested")
         await self.coordinator.api.set_temperature(self.device["location"], data)
     @plugwise_command
@@ -202,22 +228,18 @@
         if hvac_mode not in self.hvac_modes:
             raise HomeAssistantError("Unsupported hvac_mode")
-        await self.coordinator.api.set_schedule_state(
-            self.device["location"],
-            self.device["last_used"],
-            "on" if hvac_mode == HVACMode.AUTO else "off",
-        )
-        # pw-beta: feature request - mimic HomeKit behavior
-        self._homekit_mode = hvac_mode
-        if self._homekit_enabled:
-            if self._homekit_mode == HVACMode.OFF:  # pragma: no cover
-                await self.async_set_preset_mode(PRESET_AWAY)  # pragma: no cover
-            if (
-                self._homekit_mode in [HVACMode.HEAT, HVACMode.COOL, HVACMode.HEAT_COOL]
-                and self.device["active_preset"] == PRESET_AWAY
-            ):  # pragma: no cover
-                await self.async_set_preset_mode(PRESET_HOME)  # pragma: no cover
     @plugwise_command
     async def async_set_preset_mode(self, preset_mode: str) -> None:

 """Plugwise Climate component for Home Assistant."""
 from __future__ import annotations
 from typing import Any
     HVACAction,
     HVACMode,
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from . import PlugwiseConfigEntry
+from .const import DOMAIN, MASTER_THERMOSTATS
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 from .util import plugwise_command
 async def async_setup_entry(
     hass: HomeAssistant,
+    entry: PlugwiseConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Smile Thermostats from a config entry."""
+    coordinator = entry.runtime_data
+    @callback
+    def _add_entities() -> None:
+        """Add Entities."""
+        if not coordinator.new_devices:
+            return
+        async_add_entities(
+            PlugwiseClimateEntity(coordinator, device_id)
+            for device_id in coordinator.new_devices
+            if coordinator.data.devices[device_id]["dev_class"] in MASTER_THERMOSTATS
+        )
+    _add_entities()
+    entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity):
+    """Representation of a Plugwise thermostat."""
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_translation_key = DOMAIN
+    _enable_turn_on_off_backwards_compatibility = False
+    _previous_mode: str = "heating"
     def __init__(
         self,
         coordinator: PlugwiseDataUpdateCoordinator,
         device_id: str,
     ) -> None:
         """Set up the Plugwise API."""
         super().__init__(coordinator, device_id)
+        self._attr_extra_state_attributes = {}
         self._attr_unique_id = f"{device_id}-climate"
+        self.cdr_gateway = coordinator.data.gateway
+        gateway_id: str = coordinator.data.gateway["gateway_id"]
+        self.gateway_data = coordinator.data.devices[gateway_id]
         # Determine supported features
         self._attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
+        if (
+            self.cdr_gateway["cooling_present"]
+            and self.cdr_gateway["smile_name"] != "Adam"
+        ):
             self._attr_supported_features = (
                 ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
             )
+        if HVACMode.OFF in self.hvac_modes:
+            self._attr_supported_features |= (
+                ClimateEntityFeature.TURN_OFF | ClimateEntityFeature.TURN_ON
+            )
         if presets := self.device.get("preset_modes"):
             self._attr_supported_features |= ClimateEntityFeature.PRESET_MODE
             self._attr_preset_modes = presets
         self._attr_min_temp = self.device["thermostat"]["lower_bound"]
+        self._attr_max_temp = min(self.device["thermostat"]["upper_bound"], 35.0)
+        # Ensure we don't drop below 0.1
         self._attr_target_temperature_step = max(
+            self.device["thermostat"]["resolution"], 0.1
         )
+    def _previous_action_mode(self, coordinator: PlugwiseDataUpdateCoordinator) -> None:
+        """Return the previous action-mode when the regulation-mode is not heating or cooling.
+        Helper for set_hvac_mode().
+        """
+        # When no cooling available, _previous_mode is always heating
+        if (
+            "regulation_modes" in self.gateway_data
+            and "cooling" in self.gateway_data["regulation_modes"]
+        ):
+            mode = self.gateway_data["select_regulation_mode"]
+            if mode in ("cooling", "heating"):
+                self._previous_mode = mode
     @property
     def current_temperature(self) -> float:
         """Return the current temperature."""
     @property
     def hvac_mode(self) -> HVACMode:
+        """Return HVAC operation ie. auto, cool, heat, heat_cool, or off mode."""
+        if (mode := self.device.get("mode")) is None or mode not in self.hvac_modes:
+            return HVACMode.HEAT
         return HVACMode(mode)
     @property
+    def hvac_modes(self) -> list[HVACMode]:
+        """Return a list of available HVACModes."""
+        hvac_modes: list[HVACMode] = []
+        if "regulation_modes" in self.gateway_data:
+            hvac_modes.append(HVACMode.OFF)
+        if "available_schedules" in self.device:
+            hvac_modes.append(HVACMode.AUTO)
+        if self.cdr_gateway["cooling_present"]:
+            if "regulation_modes" in self.gateway_data:
+                if self.gateway_data["select_regulation_mode"] == "cooling":
+                    hvac_modes.append(HVACMode.COOL)
+                if self.gateway_data["select_regulation_mode"] == "heating":
+                    hvac_modes.append(HVACMode.HEAT)
+            else:
+                hvac_modes.append(HVACMode.HEAT_COOL)
+        else:
+            hvac_modes.append(HVACMode.HEAT)
+        return hvac_modes
+    @property
+    def hvac_action(self) -> HVACAction:
         """Return the current running hvac operation if supported."""
+        # Keep track of the previous action-mode
+        self._previous_action_mode(self.coordinator)
+        # Adam provides the hvac_action for each thermostat
         if (control_state := self.device.get("control_state")) == "cooling":
             return HVACAction.COOLING
+        if control_state == "heating":
             return HVACAction.HEATING
+        if control_state == "preheating":
+            return HVACAction.PREHEATING
         if control_state == "off":
             return HVACAction.IDLE
+        heater: str = self.coordinator.data.gateway["heater_id"]
+        heater_data = self.coordinator.data.devices[heater]
+        if heater_data["binary_sensors"]["heating_state"]:
+            return HVACAction.HEATING
+        if heater_data["binary_sensors"].get("cooling_state", False):
+            return HVACAction.COOLING
         return HVACAction.IDLE
     @property
     def preset_mode(self) -> str | None:
         """Return the current preset mode."""
+        return self.device.get("active_preset")
     @plugwise_command
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         data: dict[str, Any] = {}
         if ATTR_TEMPERATURE in kwargs:
             data["setpoint"] = kwargs.get(ATTR_TEMPERATURE)
             ):
                 raise ValueError("Invalid temperature change requested")
+        if mode := kwargs.get(ATTR_HVAC_MODE):
+            await self.async_set_hvac_mode(mode)
         await self.coordinator.api.set_temperature(self.device["location"], data)
     @plugwise_command
         if hvac_mode not in self.hvac_modes:
             raise HomeAssistantError("Unsupported hvac_mode")
+        if hvac_mode == self.hvac_mode:
+            return
+        if hvac_mode == HVACMode.OFF:
+            await self.coordinator.api.set_regulation_mode(hvac_mode)
+        else:
+            await self.coordinator.api.set_schedule_state(
+                self.device["location"],
+                "on" if hvac_mode == HVACMode.AUTO else "off",
+            )
+            if self.hvac_mode == HVACMode.OFF:
+                await self.coordinator.api.set_regulation_mode(self._previous_mode)
     @plugwise_command
     async def async_set_preset_mode(self, preset_mode: str) -> None:

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/config_flow.py RENAMED Viewed

@@ -1,43 +1,36 @@
 """Config flow for Plugwise integration."""
 from __future__ import annotations
-import datetime as dt  # pw-beta options
-from typing import Any
 import voluptuous as vol
-from homeassistant import config_entries
 from homeassistant.components.zeroconf import ZeroconfServiceInfo
-from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import (
     CONF_BASE,
     CONF_HOST,
     CONF_NAME,
     CONF_PASSWORD,
     CONF_PORT,
-    CONF_SCAN_INTERVAL,
     CONF_USERNAME,
 )
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import FlowResult
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from plugwise import Smile
-from plugwise.exceptions import (
-    ConnectionFailedError,
-    InvalidAuthentication,
-    InvalidSetupError,
-    InvalidXMLError,
-    ResponseError,
-    UnsupportedDeviceError,
-)
 from .const import (
-    CONF_HOMEKIT_EMULATION,  # pw-beta option
-    CONF_REFRESH_INTERVAL,  # pw-beta option
-    COORDINATOR,
     DEFAULT_PORT,
-    DEFAULT_SCAN_INTERVAL,  # pw-beta option
     DEFAULT_USERNAME,
     DOMAIN,
     FLOW_SMILE,
@@ -49,41 +42,28 @@
 )
-def _base_gw_schema(
-    discovery_info: ZeroconfServiceInfo | None,
-    user_input: dict[str, Any] | None,
-) -> vol.Schema:
     """Generate base schema for gateways."""
     if not discovery_info:
-        if not user_input:
-            return vol.Schema(
-                {
-                    vol.Required(CONF_PASSWORD): str,
-                    vol.Required(CONF_HOST): str,
-                    vol.Optional(CONF_PORT, default=DEFAULT_PORT): int,
-                    vol.Required(CONF_USERNAME, default=SMILE): vol.In(
-                        {SMILE: FLOW_SMILE, STRETCH: FLOW_STRETCH}
-                    ),
-                }
-            )
-        return vol.Schema(
             {
-                vol.Required(CONF_PASSWORD, default=user_input[CONF_PASSWORD]): str,
-                vol.Required(CONF_HOST, default=user_input[CONF_HOST]): str,
-                vol.Optional(CONF_PORT, default=user_input[CONF_PORT]): int,
-                vol.Required(CONF_USERNAME, default=user_input[CONF_USERNAME]): vol.In(
                     {SMILE: FLOW_SMILE, STRETCH: FLOW_STRETCH}
                 ),
             }
         )
-    return vol.Schema({vol.Required(CONF_PASSWORD): str})
-async def validate_gw_input(hass: HomeAssistant, data: dict[str, Any]) -> Smile:
     """Validate whether the user input allows us to connect to the gateway.
-    Data has the keys from _base_gw_schema() with values provided by the user.
     """
     websession = async_get_clientsession(hass, verify_ssl=False)
     api = Smile(
@@ -91,7 +71,6 @@
         password=data[CONF_PASSWORD],
         port=data[CONF_PORT],
         username=data[CONF_USERNAME],
-        timeout=30,
         websession=websession,
     )
     await api.connect()
@@ -104,11 +83,12 @@
     VERSION = 1
     discovery_info: ZeroconfServiceInfo | None = None
     _username: str = DEFAULT_USERNAME
     async def async_step_zeroconf(
         self, discovery_info: ZeroconfServiceInfo
-    ) -> FlowResult:
         """Prepare configuration for a discovered Plugwise Smile."""
         self.discovery_info = discovery_info
         _properties = discovery_info.properties
@@ -116,7 +96,7 @@
         unique_id = discovery_info.hostname.split(".")[0].split("-")[0]
         if config_entry := await self.async_set_unique_id(unique_id):
             try:
-                await validate_gw_input(
                     self.hass,
                     {
                         CONF_HOST: discovery_info.host,
@@ -125,7 +105,7 @@
                         CONF_PASSWORD: config_entry.data[CONF_PASSWORD],
                     },
                 )
-            except Exception:  # pylint: disable=broad-except
                 self._abort_if_unique_id_configured()
             else:
                 self._abort_if_unique_id_configured(
@@ -137,7 +117,7 @@
         if DEFAULT_USERNAME not in unique_id:
             self._username = STRETCH_USERNAME
-        _product = _properties.get("product", None)
         _version = _properties.get("version", "n/a")
         _name = f"{ZEROCONF_MAP.get(_product, _product)} v{_version}"
@@ -149,153 +129,67 @@
         # If we have discovered an Adam or Anna, both might be on the network.
         # In that case, we need to cancel the Anna flow, as the Adam should
         # be added.
-        for flow in self._async_in_progress():
-            # This is an Anna, and there is already an Adam flow in progress
-            if (
-                _product == "smile_thermo"
-                and "context" in flow
-                and flow["context"].get("product") == "smile_open_therm"
-            ):
-                return self.async_abort(reason="anna_with_adam")
-            # This is an Adam, and there is already an Anna flow in progress
-            if (
-                _product == "smile_open_therm"
-                and "context" in flow
-                and flow["context"].get("product") == "smile_thermo"
-                and "flow_id" in flow
-            ):
-                self.hass.config_entries.flow.async_abort(flow["flow_id"])
         self.context.update(
             {
-                "title_placeholders": {
-                    CONF_HOST: discovery_info.host,
-                    CONF_NAME: _name,
-                    CONF_PORT: discovery_info.port,
-                    CONF_USERNAME: self._username,
-                },
-                "configuration_url": f"http://{discovery_info.host}:{discovery_info.port}",
-                "product": _product,
             }
         )
         return await self.async_step_user()
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
         """Handle the initial step when using network/gateway setups."""
         errors: dict[str, str] = {}
-        if not user_input:
-            return self.async_show_form(
-                step_id="user",
-                data_schema=_base_gw_schema(self.discovery_info, None),
-                errors=errors,
-            )
-        if self.discovery_info:
-            user_input[CONF_HOST] = self.discovery_info.host
-            user_input[CONF_PORT] = self.discovery_info.port
-            user_input[CONF_USERNAME] = self._username
-        try:
-            api = await validate_gw_input(self.hass, user_input)
-        except ConnectionFailedError:
-            errors[CONF_BASE] = "cannot_connect"
-        except InvalidAuthentication:
-            errors[CONF_BASE] = "invalid_auth"
-        except InvalidSetupError:
-            errors[CONF_BASE] = "invalid_setup"
-        except (InvalidXMLError, ResponseError):
-            errors[CONF_BASE] = "response_error"
-        except UnsupportedDeviceError:
-            errors[CONF_BASE] = "unsupported"
-        except Exception:  # pylint: disable=broad-except
-            errors[CONF_BASE] = "unknown"
-        if errors:
-            return self.async_show_form(
-                step_id="user",
-                data_schema=_base_gw_schema(None, user_input),
-                errors=errors,
-            )
-        await self.async_set_unique_id(
-            api.smile_hostname or api.gateway_id, raise_on_progress=False
-        )
-        self._abort_if_unique_id_configured()
-        return self.async_create_entry(title=api.smile_name, data=user_input)
-    @staticmethod
-    @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> config_entries.OptionsFlow:  # pw-beta options
-        """Get the options flow for this handler."""
-        return PlugwiseOptionsFlowHandler(config_entry)
-# pw-beta - change the scan-interval via CONFIGURE
-# pw-beta - add homekit emulation via CONFIGURE
-# pw-beta - change the frontend refresh interval via CONFIGURE
-class PlugwiseOptionsFlowHandler(config_entries.OptionsFlow):  # pw-beta options
-    """Plugwise option flow."""
-    def __init__(self, config_entry: ConfigEntry) -> None:  # pragma: no cover
-        """Initialize options flow."""
-        self.config_entry = config_entry
-    async def async_step_none(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:  # pragma: no cover
-        """No options available."""
-        if user_input is not None:
-            # Apparently not possible to abort an options flow at the moment
-            return self.async_create_entry(title="", data=self.config_entry.options)
-        return self.async_show_form(step_id="none")
-    async def async_step_init(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:  # pragma: no cover
-        """Manage the Plugwise options."""
-        if not self.config_entry.data.get(CONF_HOST):
-            return await self.async_step_none(user_input)
         if user_input is not None:
-            return self.async_create_entry(title="", data=user_input)
-        coordinator = self.hass.data[DOMAIN][self.config_entry.entry_id][COORDINATOR]
-        interval: dt.timedelta = DEFAULT_SCAN_INTERVAL[
-            coordinator.api.smile_type
-        ]  # pw-beta options
-        data = {
-            vol.Optional(
-                CONF_SCAN_INTERVAL,
-                default=self.config_entry.options.get(
-                    CONF_SCAN_INTERVAL, interval.seconds
-                ),
-            ): vol.All(cv.positive_int, vol.Clamp(min=10)),
-        }  # pw-beta
-        if coordinator.api.smile_type != "thermostat":
-            return self.async_show_form(step_id="init", data_schema=vol.Schema(data))
-        data.update(
-            {
-                vol.Optional(
-                    CONF_HOMEKIT_EMULATION,
-                    default=self.config_entry.options.get(
-                        CONF_HOMEKIT_EMULATION, False
-                    ),
-                ): cv.boolean,
-                vol.Optional(
-                    CONF_REFRESH_INTERVAL,
-                    default=self.config_entry.options.get(CONF_REFRESH_INTERVAL, 1.5),
-                ): vol.All(vol.Coerce(float), vol.Range(min=1.5, max=10.0)),
-            }
-        )  # pw-beta
-        return self.async_show_form(step_id="init", data_schema=vol.Schema(data))

 """Config flow for Plugwise integration."""
 from __future__ import annotations
+from typing import Any, Self
+from plugwise import Smile
+from plugwise.exceptions import (
+    ConnectionFailedError,
+    InvalidAuthentication,
+    InvalidSetupError,
+    InvalidXMLError,
+    ResponseError,
+    UnsupportedDeviceError,
+)
 import voluptuous as vol
 from homeassistant.components.zeroconf import ZeroconfServiceInfo
+from homeassistant.config_entries import SOURCE_USER, ConfigFlow, ConfigFlowResult
 from homeassistant.const import (
+    ATTR_CONFIGURATION_URL,
     CONF_BASE,
     CONF_HOST,
     CONF_NAME,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_USERNAME,
 )
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from .const import (
     DEFAULT_PORT,
     DEFAULT_USERNAME,
     DOMAIN,
     FLOW_SMILE,
 )
+def base_schema(discovery_info: ZeroconfServiceInfo | None) -> vol.Schema:
     """Generate base schema for gateways."""
+    schema = vol.Schema({vol.Required(CONF_PASSWORD): str})
     if not discovery_info:
+        schema = schema.extend(
             {
+                vol.Required(CONF_HOST): str,
+                vol.Optional(CONF_PORT, default=DEFAULT_PORT): int,
+                vol.Required(CONF_USERNAME, default=SMILE): vol.In(
                     {SMILE: FLOW_SMILE, STRETCH: FLOW_STRETCH}
                 ),
             }
         )
+    return schema
+async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> Smile:
     """Validate whether the user input allows us to connect to the gateway.
+    Data has the keys from base_schema() with values provided by the user.
     """
     websession = async_get_clientsession(hass, verify_ssl=False)
     api = Smile(
         password=data[CONF_PASSWORD],
         port=data[CONF_PORT],
         username=data[CONF_USERNAME],
         websession=websession,
     )
     await api.connect()
     VERSION = 1
     discovery_info: ZeroconfServiceInfo | None = None
+    product: str = "Unknown Smile"
     _username: str = DEFAULT_USERNAME
     async def async_step_zeroconf(
         self, discovery_info: ZeroconfServiceInfo
+    ) -> ConfigFlowResult:
         """Prepare configuration for a discovered Plugwise Smile."""
         self.discovery_info = discovery_info
         _properties = discovery_info.properties
         unique_id = discovery_info.hostname.split(".")[0].split("-")[0]
         if config_entry := await self.async_set_unique_id(unique_id):
             try:
+                await validate_input(
                     self.hass,
                     {
                         CONF_HOST: discovery_info.host,
                         CONF_PASSWORD: config_entry.data[CONF_PASSWORD],
                     },
                 )
+            except Exception:  # noqa: BLE001
                 self._abort_if_unique_id_configured()
             else:
                 self._abort_if_unique_id_configured(
         if DEFAULT_USERNAME not in unique_id:
             self._username = STRETCH_USERNAME
+        self.product = _product = _properties.get("product", "Unknown Smile")
         _version = _properties.get("version", "n/a")
         _name = f"{ZEROCONF_MAP.get(_product, _product)} v{_version}"
         # If we have discovered an Adam or Anna, both might be on the network.
         # In that case, we need to cancel the Anna flow, as the Adam should
         # be added.
+        if self.hass.config_entries.flow.async_has_matching_flow(self):
+            return self.async_abort(reason="anna_with_adam")
         self.context.update(
             {
+                "title_placeholders": {CONF_NAME: _name},
+                ATTR_CONFIGURATION_URL: (
+                    f"http://{discovery_info.host}:{discovery_info.port}"
+                ),
             }
         )
         return await self.async_step_user()
+    def is_matching(self, other_flow: Self) -> bool:
+        """Return True if other_flow is matching this flow."""
+        # This is an Anna, and there is already an Adam flow in progress
+        if self.product == "smile_thermo" and other_flow.product == "smile_open_therm":
+            return True
+        # This is an Adam, and there is already an Anna flow in progress
+        if self.product == "smile_open_therm" and other_flow.product == "smile_thermo":
+            self.hass.config_entries.flow.async_abort(other_flow.flow_id)
+        return False
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """Handle the initial step when using network/gateway setups."""
         errors: dict[str, str] = {}
         if user_input is not None:
+            if self.discovery_info:
+                user_input[CONF_HOST] = self.discovery_info.host
+                user_input[CONF_PORT] = self.discovery_info.port
+                user_input[CONF_USERNAME] = self._username
+            try:
+                api = await validate_input(self.hass, user_input)
+            except ConnectionFailedError:
+                errors[CONF_BASE] = "cannot_connect"
+            except InvalidAuthentication:
+                errors[CONF_BASE] = "invalid_auth"
+            except InvalidSetupError:
+                errors[CONF_BASE] = "invalid_setup"
+            except (InvalidXMLError, ResponseError):
+                errors[CONF_BASE] = "response_error"
+            except UnsupportedDeviceError:
+                errors[CONF_BASE] = "unsupported"
+            except Exception:  # noqa: BLE001
+                errors[CONF_BASE] = "unknown"
+            else:
+                await self.async_set_unique_id(
+                    api.smile_hostname or api.gateway_id, raise_on_progress=False
+                )
+                self._abort_if_unique_id_configured()
+                return self.async_create_entry(title=api.smile_name, data=user_input)
+        return self.async_show_form(
+            step_id=SOURCE_USER,
+            data_schema=base_schema(self.discovery_info),
+            errors=errors,
+        )

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/const.py RENAMED Viewed

@@ -1,7 +1,10 @@
 """Constants for Plugwise component."""
 from datetime import timedelta
 import logging
-from typing import Final
 from homeassistant.const import Platform
@@ -10,56 +13,67 @@
 LOGGER = logging.getLogger(__package__)
 API: Final = "api"
-COORDINATOR: Final = "coordinator"
-CONF_HOMEKIT_EMULATION: Final = "homekit_emulation"  # pw-beta options
-CONF_REFRESH_INTERVAL: Final = "refresh_interval"  # pw-beta options
-CONF_MANUAL_PATH: Final = "Enter Manually"
 SMILE: Final = "smile"
 STRETCH: Final = "stretch"
 STRETCH_USERNAME: Final = "stretch"
-FLOW_NET: Final = "Network: Smile/Stretch"
-FLOW_SMILE: Final = "Smile (Adam/Anna/P1)"
-FLOW_STRETCH: Final = "Stretch (Stretch)"
-FLOW_TYPE: Final = "flow_type"
-UNDO_UPDATE_LISTENER: Final = "undo_update_listener"
 # Default directives
 DEFAULT_PORT: Final = 80
 DEFAULT_SCAN_INTERVAL: Final[dict[str, timedelta]] = {
     "power": timedelta(seconds=10),
     "stretch": timedelta(seconds=60),
     "thermostat": timedelta(seconds=60),
 }
-DEFAULT_TIMEOUT: Final = 10
 DEFAULT_USERNAME: Final = "smile"
-# --- Const for Plugwise Smile and Stretch
-PLATFORMS_GATEWAY: Final[list[str]] = [
-    Platform.BINARY_SENSOR,
-    Platform.CLIMATE,
-    Platform.NUMBER,
-    Platform.SELECT,
-    Platform.SENSOR,
-    Platform.SWITCH,
-]
-SENSOR_PLATFORMS: Final[list[str]] = [Platform.SENSOR, Platform.SWITCH]
-SERVICE_DELETE: Final = "delete_notification"
-SEVERITIES: Final[list[str]] = ["other", "info", "message", "warning", "error"]
-# Climate const:
 MASTER_THERMOSTATS: Final[list[str]] = [
     "thermostat",
     "zone_thermometer",
     "zone_thermostat",
-    "thermostatic_radiator_valve",
 ]
-# Config_flow const:
-ZEROCONF_MAP: Final[dict[str, str]] = {
-    "smile": "Smile P1",
-    "smile_thermo": "Smile Anna",
-    "smile_open_therm": "Adam",
-    "stretch": "Stretch",
-}

 """Constants for Plugwise component."""
+from __future__ import annotations
 from datetime import timedelta
 import logging
+from typing import Final, Literal
 from homeassistant.const import Platform
 LOGGER = logging.getLogger(__package__)
 API: Final = "api"
+FLOW_SMILE: Final = "smile (Adam/Anna/P1)"
+FLOW_STRETCH: Final = "stretch (Stretch)"
+FLOW_TYPE: Final = "flow_type"
+GATEWAY: Final = "gateway"
+GATEWAY_ID: Final = "gateway_id"
+LOCATION: Final = "location"
+PW_TYPE: Final = "plugwise_type"
+REBOOT: Final = "reboot"
 SMILE: Final = "smile"
 STRETCH: Final = "stretch"
 STRETCH_USERNAME: Final = "stretch"
+PLATFORMS: Final[list[str]] = [
+    Platform.BINARY_SENSOR,
+    Platform.BUTTON,
+    Platform.CLIMATE,
+    Platform.NUMBER,
+    Platform.SELECT,
+    Platform.SENSOR,
+    Platform.SWITCH,
+]
+ZEROCONF_MAP: Final[dict[str, str]] = {
+    "smile": "Smile P1",
+    "smile_thermo": "Smile Anna",
+    "smile_open_therm": "Adam",
+    "stretch": "Stretch",
+}
+type NumberType = Literal[
+    "maximum_boiler_temperature",
+    "max_dhw_temperature",
+    "temperature_offset",
+]
+type SelectType = Literal[
+    "select_dhw_mode",
+    "select_gateway_mode",
+    "select_regulation_mode",
+    "select_schedule",
+]
+type SelectOptionsType = Literal[
+    "dhw_modes",
+    "gateway_modes",
+    "regulation_modes",
+    "available_schedules",
+]
 # Default directives
+DEFAULT_MAX_TEMP: Final = 30
+DEFAULT_MIN_TEMP: Final = 4
 DEFAULT_PORT: Final = 80
 DEFAULT_SCAN_INTERVAL: Final[dict[str, timedelta]] = {
     "power": timedelta(seconds=10),
     "stretch": timedelta(seconds=60),
     "thermostat": timedelta(seconds=60),
 }
 DEFAULT_USERNAME: Final = "smile"
 MASTER_THERMOSTATS: Final[list[str]] = [
     "thermostat",
+    "thermostatic_radiator_valve",
     "zone_thermometer",
     "zone_thermostat",
 ]

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/coordinator.py RENAMED Viewed

@@ -1,29 +1,28 @@
 """DataUpdateCoordinator for Plugwise."""
 from datetime import timedelta
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_PASSWORD,
-    CONF_PORT,
-    CONF_SCAN_INTERVAL,  # pw-beta options
-    CONF_USERNAME,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.debounce import Debouncer
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from plugwise import PlugwiseData, Smile
 from plugwise.exceptions import (
     ConnectionFailedError,
     InvalidAuthentication,
     InvalidXMLError,
     ResponseError,
     UnsupportedDeviceError,
 )
-from .const import DEFAULT_PORT, DEFAULT_SCAN_INTERVAL, DEFAULT_USERNAME, DOMAIN, LOGGER
 class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
@@ -31,85 +30,103 @@
     _connected: bool = False
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry: ConfigEntry,
-        cooldown: float,
-        update_interval: timedelta = timedelta(seconds=60),
-    ) -> None:  # pw-beta cooldown
         """Initialize the coordinator."""
         super().__init__(
             hass,
             LOGGER,
             name=DOMAIN,
-            # Core directly updates from const's DEFAULT_SCAN_INTERVAL
-            update_interval=update_interval,
             # Don't refresh immediately, give the device time to process
             # the change in state before we query it.
             request_refresh_debouncer=Debouncer(
                 hass,
                 LOGGER,
-                cooldown=cooldown,
                 immediate=False,
             ),
         )
         self.api = Smile(
-            host=entry.data[CONF_HOST],
-            username=entry.data.get(CONF_USERNAME, DEFAULT_USERNAME),
-            password=entry.data[CONF_PASSWORD],
-            port=entry.data.get(CONF_PORT, DEFAULT_PORT),
-            timeout=30,
             websession=async_get_clientsession(hass, verify_ssl=False),
         )
-        self._entry = entry
-        self._unavailable_logged = False
-        self.update_interval = update_interval
     async def _connect(self) -> None:
         """Connect to the Plugwise Smile."""
-        self._connected = await self.api.connect()
-        self.api.get_all_devices()
-        self.update_interval = DEFAULT_SCAN_INTERVAL.get(
-            self.api.smile_type, timedelta(seconds=60)
-        )  # pw-beta options scan-interval
-        if (custom_time := self._entry.options.get(CONF_SCAN_INTERVAL)) is not None:
-            self.update_interval = timedelta(
-                seconds=int(custom_time)
-            )  # pragma: no cover  # pw-beta options
-        LOGGER.debug("DUC update interval: %s", self.update_interval)  # pw-beta options
     async def _async_update_data(self) -> PlugwiseData:
         """Fetch data from Plugwise."""
-        data = PlugwiseData(gateway={}, devices={})
         try:
             if not self._connected:
                 await self._connect()
             data = await self.api.async_update()
-            LOGGER.debug(f"{self.api.smile_name} data: %s", data)
-            if self._unavailable_logged:
-                self._unavailable_logged = False
         except InvalidAuthentication as err:
-            if not self._unavailable_logged:  # pw-beta add to Core
-                self._unavailable_logged = True
-                raise ConfigEntryError("Authentication failed") from err
         except (InvalidXMLError, ResponseError) as err:
-            if not self._unavailable_logged:  # pw-beta add to Core
-                self._unavailable_logged = True
-                raise UpdateFailed(
-                    "Invalid XML data, or error indication received from the Plugwise Adam/Smile/Stretch"
-                ) from err
         except UnsupportedDeviceError as err:
-            if not self._unavailable_logged:  # pw-beta add to Core
-                self._unavailable_logged = True
-                raise ConfigEntryError("Device with unsupported firmware") from err
-        except ConnectionFailedError as err:
-            if not self._unavailable_logged:  # pw-beta add to Core
-                self._unavailable_logged = True
-                raise UpdateFailed("Failed to connect") from err
         return data

 """DataUpdateCoordinator for Plugwise."""
 from datetime import timedelta
+from packaging.version import Version
 from plugwise import PlugwiseData, Smile
 from plugwise.exceptions import (
     ConnectionFailedError,
     InvalidAuthentication,
     InvalidXMLError,
+    PlugwiseError,
     ResponseError,
     UnsupportedDeviceError,
 )
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryError
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.debounce import Debouncer
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from .const import DEFAULT_PORT, DEFAULT_USERNAME, DOMAIN, GATEWAY_ID, LOGGER
 class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
     _connected: bool = False
+    config_entry: ConfigEntry
+    def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             LOGGER,
             name=DOMAIN,
+            update_interval=timedelta(seconds=60),
             # Don't refresh immediately, give the device time to process
             # the change in state before we query it.
             request_refresh_debouncer=Debouncer(
                 hass,
                 LOGGER,
+                cooldown=1.5,
                 immediate=False,
             ),
         )
         self.api = Smile(
+            host=self.config_entry.data[CONF_HOST],
+            username=self.config_entry.data.get(CONF_USERNAME, DEFAULT_USERNAME),
+            password=self.config_entry.data[CONF_PASSWORD],
+            port=self.config_entry.data.get(CONF_PORT, DEFAULT_PORT),
             websession=async_get_clientsession(hass, verify_ssl=False),
         )
+        self._current_devices: set[str] = set()
+        self.new_devices: set[str] = set()
     async def _connect(self) -> None:
         """Connect to the Plugwise Smile."""
+        version = await self.api.connect()
+        self._connected = isinstance(version, Version)
+        if self._connected:
+            self.api.get_all_devices()
     async def _async_update_data(self) -> PlugwiseData:
         """Fetch data from Plugwise."""
+        data = PlugwiseData({}, {})
         try:
             if not self._connected:
                 await self._connect()
             data = await self.api.async_update()
+        except ConnectionFailedError as err:
+            raise UpdateFailed("Failed to connect") from err
         except InvalidAuthentication as err:
+            raise ConfigEntryError("Authentication failed") from err
         except (InvalidXMLError, ResponseError) as err:
+            raise UpdateFailed(
+                "Invalid XML data, or error indication received from the Plugwise Adam/Smile/Stretch"
+            ) from err
+        except PlugwiseError as err:
+            raise UpdateFailed("Data incomplete or missing") from err
         except UnsupportedDeviceError as err:
+            raise ConfigEntryError("Device with unsupported firmware") from err
+        else:
+            self._async_add_remove_devices(data, self.config_entry)
         return data
+    def _async_add_remove_devices(self, data: PlugwiseData, entry: ConfigEntry) -> None:
+        """Add new Plugwise devices, remove non-existing devices."""
+        # Check for new or removed devices
+        self.new_devices = set(data.devices) - self._current_devices
+        removed_devices = self._current_devices - set(data.devices)
+        self._current_devices = set(data.devices)
+        if removed_devices:
+            self._async_remove_devices(data, entry)
+    def _async_remove_devices(self, data: PlugwiseData, entry: ConfigEntry) -> None:
+        """Clean registries when removed devices found."""
+        device_reg = dr.async_get(self.hass)
+        device_list = dr.async_entries_for_config_entry(
+            device_reg, self.config_entry.entry_id
+        )
+        # First find the Plugwise via_device
+        gateway_device = device_reg.async_get_device(
+            {(DOMAIN, data.gateway[GATEWAY_ID])}
+        )
+        assert gateway_device is not None
+        via_device_id = gateway_device.id
+        # Then remove the connected orphaned device(s)
+        for device_entry in device_list:
+            for identifier in device_entry.identifiers:
+                if identifier[0] == DOMAIN:
+                    if (
+                        device_entry.via_device_id == via_device_id
+                        and identifier[1] not in data.devices
+                    ):
+                        device_reg.async_update_device(
+                            device_entry.id, remove_config_entry_id=entry.entry_id
+                        )
+                        LOGGER.debug(
+                            "Removed %s device %s %s from device_registry",
+                            DOMAIN,
+                            device_entry.model,
+                            identifier[1],
+                        )

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/diagnostics.py RENAMED Viewed

@@ -1,25 +1,19 @@
 """Diagnostics support for Plugwise."""
 from __future__ import annotations
 from typing import Any
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from .const import (
-    COORDINATOR,  # pw-beta
-    DOMAIN,
-)
-from .coordinator import PlugwiseDataUpdateCoordinator
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: PlugwiseDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        COORDINATOR
-    ]
     return {
         "gateway": coordinator.data.gateway,
         "devices": coordinator.data.devices,

 """Diagnostics support for Plugwise."""
 from __future__ import annotations
 from typing import Any
 from homeassistant.core import HomeAssistant
+from . import PlugwiseConfigEntry
 async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: PlugwiseConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
+    coordinator = entry.runtime_data
     return {
         "gateway": coordinator.data.gateway,
         "devices": coordinator.data.devices,

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/entity.py RENAMED Viewed

@@ -1,14 +1,16 @@
 """Generic Plugwise Entity Class."""
 from __future__ import annotations
 from homeassistant.const import ATTR_NAME, ATTR_VIA_DEVICE, CONF_HOST
 from homeassistant.helpers.device_registry import (
     CONNECTION_NETWORK_MAC,
     CONNECTION_ZIGBEE,
 )
-from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from plugwise.constants import DeviceData
 from .const import DOMAIN
 from .coordinator import PlugwiseDataUpdateCoordinator
@@ -45,6 +47,7 @@
             connections=connections,
             manufacturer=data.get("vendor"),
             model=data.get("model"),
             name=coordinator.data.gateway["smile_name"],
             sw_version=data.get("firmware"),
             hw_version=data.get("hardware"),

 """Generic Plugwise Entity Class."""
 from __future__ import annotations
+from plugwise.constants import DeviceData
 from homeassistant.const import ATTR_NAME, ATTR_VIA_DEVICE, CONF_HOST
 from homeassistant.helpers.device_registry import (
     CONNECTION_NETWORK_MAC,
     CONNECTION_ZIGBEE,
+    DeviceInfo,
 )
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from .const import DOMAIN
 from .coordinator import PlugwiseDataUpdateCoordinator
             connections=connections,
             manufacturer=data.get("vendor"),
             model=data.get("model"),
+            model_id=data.get("model_id"),
             name=coordinator.data.gateway["smile_name"],
             sw_version=data.get("firmware"),
             hw_version=data.get("hardware"),

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/manifest.json RENAMED Viewed

@@ -1,13 +1,12 @@
 {
   "domain": "plugwise",
-  "name": "Plugwise Smile/Stretch Beta",
-  "after_dependencies": ["zeroconf"],
-  "codeowners": ["@CoMPaTech", "@bouwew"],
   "config_flow": true,
-  "documentation": "https://github.com/plugwise/plugwise-beta",
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
-  "requirements": ["plugwise==0.31.6"],
-  "version": "0.40.3a6"
 }

 {
   "domain": "plugwise",
+  "name": "Plugwise",
+  "codeowners": ["@CoMPaTech", "@bouwew", "@frenck"],
   "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/plugwise",
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
+  "requirements": ["plugwise==1.5.0"],
+  "zeroconf": ["_plugwise._tcp.local."]
 }

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/number.py RENAMED Viewed

@@ -1,7 +1,7 @@
 """Number platform for Plugwise integration."""
 from __future__ import annotations
-from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from homeassistant.components.number import (
@@ -10,89 +10,72 @@
     NumberEntityDescription,
     NumberMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfTemperature
-from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from plugwise import ActuatorData, DeviceData, Smile
-from .const import (
-    COORDINATOR,  # pw-beta
-    DOMAIN,
-    LOGGER,
-)
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
-@dataclass
-class PlugwiseNumberMixin:
-    """Mixin values for Plugwse entities."""
-    command: Callable[[Smile, str, float], Awaitable[None]]
-    native_max_value_fn: Callable[[ActuatorData], float]
-    native_min_value_fn: Callable[[ActuatorData], float]
-    native_step_fn: Callable[[ActuatorData], float]
-    native_value_fn: Callable[[ActuatorData], float]
-    actuator_fn: Callable[[DeviceData], ActuatorData | None]
-@dataclass
-class PlugwiseNumberEntityDescription(NumberEntityDescription, PlugwiseNumberMixin):
     """Class describing Plugwise Number entities."""
 NUMBER_TYPES = (
     PlugwiseNumberEntityDescription(
         key="maximum_boiler_temperature",
         translation_key="maximum_boiler_temperature",
-        command=lambda api, number, value: api.set_number_setpoint(number, value),
         device_class=NumberDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        native_max_value_fn=lambda data: data["upper_bound"],
-        native_min_value_fn=lambda data: data["lower_bound"],
-        native_step_fn=lambda data: data["resolution"],
-        native_value_fn=lambda data: data["setpoint"],
-        actuator_fn=lambda data: data.get("maximum_boiler_temperature"),
     ),
     PlugwiseNumberEntityDescription(
         key="max_dhw_temperature",
         translation_key="max_dhw_temperature",
-        command=lambda api, number, value: api.set_number_setpoint(number, value),
         device_class=NumberDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        native_max_value_fn=lambda data: data["upper_bound"],
-        native_min_value_fn=lambda data: data["lower_bound"],
-        native_step_fn=lambda data: data["resolution"],
-        native_value_fn=lambda data: data["setpoint"],
-        actuator_fn=lambda data: data.get("max_dhw_temperature"),
     ),
 )
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up Plugwise number platform."""
-    coordinator: PlugwiseDataUpdateCoordinator = hass.data[DOMAIN][
-        config_entry.entry_id
-    ][COORDINATOR]
-    entities: list[PlugwiseNumberEntity] = []
-    for device_id, device in coordinator.data.devices.items():
-        for description in NUMBER_TYPES:
-            if actuator := description.actuator_fn(device):
-                entities.append(
-                    PlugwiseNumberEntity(actuator, coordinator, device_id, description)
-                )
-                LOGGER.debug("Add %s %s number", device["name"], description.name)
-    async_add_entities(entities)
 class PlugwiseNumberEntity(PlugwiseEntity, NumberEntity):
@@ -102,44 +85,32 @@
     def __init__(
         self,
-        actuator: ActuatorData,
         coordinator: PlugwiseDataUpdateCoordinator,
         device_id: str,
         description: PlugwiseNumberEntityDescription,
     ) -> None:
         """Initiate Plugwise Number."""
         super().__init__(coordinator, device_id)
-        self.actuator = actuator
         self.entity_description = description
         self._attr_unique_id = f"{device_id}-{description.key}"
         self._attr_mode = NumberMode.BOX
-    @property
-    def native_max_value(self) -> float:
-        """Return the setpoint max. value."""
-        return self.entity_description.native_max_value_fn(self.actuator)
-    @property
-    def native_min_value(self) -> float:
-        """Return the setpoint min. value."""
-        return self.entity_description.native_min_value_fn(self.actuator)
-    @property
-    def native_step(self) -> float:
-        """Return the setpoint step value."""
-        return max(self.entity_description.native_step_fn(self.actuator), 0.5)
     @property
     def native_value(self) -> float:
         """Return the present setpoint value."""
-        return self.entity_description.native_value_fn(self.actuator)
     async def async_set_native_value(self, value: float) -> None:
         """Change to the new setpoint value."""
-        await self.entity_description.command(
-            self.coordinator.api, self.entity_description.key, value
-        )
-        LOGGER.debug(
-            "Setting %s to %s was successful", self.entity_description.name, value
         )
-        await self.coordinator.async_request_refresh()

 """Number platform for Plugwise integration."""
 from __future__ import annotations
 from dataclasses import dataclass
 from homeassistant.components.number import (
     NumberEntityDescription,
     NumberMode,
 )
 from homeassistant.const import EntityCategory, UnitOfTemperature
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from . import PlugwiseConfigEntry
+from .const import NumberType
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
+from .util import plugwise_command
+@dataclass(frozen=True, kw_only=True)
+class PlugwiseNumberEntityDescription(NumberEntityDescription):
     """Class describing Plugwise Number entities."""
+    key: NumberType
 NUMBER_TYPES = (
     PlugwiseNumberEntityDescription(
         key="maximum_boiler_temperature",
         translation_key="maximum_boiler_temperature",
         device_class=NumberDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
     PlugwiseNumberEntityDescription(
         key="max_dhw_temperature",
         translation_key="max_dhw_temperature",
         device_class=NumberDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    ),
+    PlugwiseNumberEntityDescription(
+        key="temperature_offset",
+        translation_key="temperature_offset",
+        device_class=NumberDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.CONFIG,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
 )
 async def async_setup_entry(
     hass: HomeAssistant,
+    entry: PlugwiseConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up Plugwise number platform."""
+    coordinator = entry.runtime_data
+    @callback
+    def _add_entities() -> None:
+        """Add Entities."""
+        if not coordinator.new_devices:
+            return
+        async_add_entities(
+            PlugwiseNumberEntity(coordinator, device_id, description)
+            for device_id in coordinator.new_devices
+            for description in NUMBER_TYPES
+            if description.key in coordinator.data.devices[device_id]
+        )
+    _add_entities()
+    entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 class PlugwiseNumberEntity(PlugwiseEntity, NumberEntity):
     def __init__(
         self,
         coordinator: PlugwiseDataUpdateCoordinator,
         device_id: str,
         description: PlugwiseNumberEntityDescription,
     ) -> None:
         """Initiate Plugwise Number."""
         super().__init__(coordinator, device_id)
+        self.device_id = device_id
         self.entity_description = description
         self._attr_unique_id = f"{device_id}-{description.key}"
         self._attr_mode = NumberMode.BOX
+        self._attr_native_max_value = self.device[description.key]["upper_bound"]
+        self._attr_native_min_value = self.device[description.key]["lower_bound"]
+        native_step = self.device[description.key]["resolution"]
+        if description.key != "temperature_offset":
+            native_step = max(native_step, 0.5)
+        self._attr_native_step = native_step
     @property
     def native_value(self) -> float:
         """Return the present setpoint value."""
+        return self.device[self.entity_description.key]["setpoint"]
+    @plugwise_command
     async def async_set_native_value(self, value: float) -> None:
         """Change to the new setpoint value."""
+        await self.coordinator.api.set_number(
+            self.device_id, self.entity_description.key, value
         )

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/select.py RENAMED Viewed

@@ -1,93 +1,79 @@
 """Plugwise Select component for Home Assistant."""
 from __future__ import annotations
-from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON, EntityCategory
-from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from plugwise import DeviceData, Smile
-from .const import (
-    COORDINATOR,  # pw-beta
-    DOMAIN,
-    LOGGER,
-)
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
-PARALLEL_UPDATES = 0
-@dataclass
-class PlugwiseSelectDescriptionMixin:
-    """Mixin values for Plugwise Select entities."""
-    command: Callable[[Smile, str, str], Awaitable[None]]
-    value_fn: Callable[[DeviceData], str]
-    options_fn: Callable[[DeviceData], list[str] | None]
-@dataclass
-class PlugwiseSelectEntityDescription(
-    SelectEntityDescription, PlugwiseSelectDescriptionMixin
-):
-    """Class describing Plugwise Number entities."""
 SELECT_TYPES = (
     PlugwiseSelectEntityDescription(
         key="select_schedule",
-        translation_key="thermostat_schedule",
-        icon="mdi:calendar-clock",
-        command=lambda api, loc, opt: api.set_schedule_state(loc, opt, STATE_ON),
-        value_fn=lambda data: data["selected_schedule"],
-        options_fn=lambda data: data.get("available_schedules"),
     ),
     PlugwiseSelectEntityDescription(
         key="select_regulation_mode",
         translation_key="regulation_mode",
-        icon="mdi:hvac",
         entity_category=EntityCategory.CONFIG,
-        command=lambda api, loc, opt: api.set_regulation_mode(opt),
-        value_fn=lambda data: data["regulation_mode"],
-        options_fn=lambda data: data.get("regulation_modes"),
     ),
     PlugwiseSelectEntityDescription(
         key="select_dhw_mode",
         translation_key="dhw_mode",
-        icon="mdi:shower",
         entity_category=EntityCategory.CONFIG,
-        command=lambda api, loc, opt: api.set_dhw_mode(opt),
-        value_fn=lambda data: data["dhw_mode"],
-        options_fn=lambda data: data.get("dhw_modes"),
     ),
 )
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Smile selector from a config entry."""
-    coordinator: PlugwiseDataUpdateCoordinator = hass.data[DOMAIN][
-        config_entry.entry_id
-    ][COORDINATOR]
-    entities: list[PlugwiseSelectEntity] = []
-    for device_id, device in coordinator.data.devices.items():
-        for description in SELECT_TYPES:
-            if (options := description.options_fn(device)) and len(options) > 1:
-                entities.append(
-                    PlugwiseSelectEntity(coordinator, device_id, description, options)
-                )
-                LOGGER.debug("Add %s %s selector", device["name"], description.name)
-    async_add_entities(entities)
 class PlugwiseSelectEntity(PlugwiseEntity, SelectEntity):
@@ -100,28 +86,28 @@
         coordinator: PlugwiseDataUpdateCoordinator,
         device_id: str,
         entity_description: PlugwiseSelectEntityDescription,
-        options: list[str],
     ) -> None:
         """Initialise the selector."""
         super().__init__(coordinator, device_id)
         self.entity_description = entity_description
         self._attr_unique_id = f"{device_id}-{entity_description.key}"
-        self._attr_options = options
     @property
     def current_option(self) -> str:
         """Return the selected entity option to represent the entity state."""
-        # return self.device[self.entity_description.current_option_key]  # type: ignore [literal-required]
-        return self.entity_description.value_fn(self.device)
     async def async_select_option(self, option: str) -> None:
-        """Change to the selected entity option."""
-        await self.entity_description.command(
-            self.coordinator.api, self.device["location"], option
-        )
-        LOGGER.debug(
-            "Set %s to %s was successful.",
-            self.entity_description.name,
-            option,
         )
-        await self.coordinator.async_request_refresh()

 """Plugwise Select component for Home Assistant."""
 from __future__ import annotations
 from dataclasses import dataclass
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import STATE_ON, EntityCategory
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from . import PlugwiseConfigEntry
+from .const import LOCATION, SelectOptionsType, SelectType
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
+from .util import plugwise_command
+@dataclass(frozen=True, kw_only=True)
+class PlugwiseSelectEntityDescription(SelectEntityDescription):
+    """Class describing Plugwise Select entities."""
+    key: SelectType
+    options_key: SelectOptionsType
 SELECT_TYPES = (
     PlugwiseSelectEntityDescription(
         key="select_schedule",
+        translation_key="select_schedule",
+        options_key="available_schedules",
     ),
     PlugwiseSelectEntityDescription(
         key="select_regulation_mode",
         translation_key="regulation_mode",
         entity_category=EntityCategory.CONFIG,
+        options_key="regulation_modes",
     ),
     PlugwiseSelectEntityDescription(
         key="select_dhw_mode",
         translation_key="dhw_mode",
         entity_category=EntityCategory.CONFIG,
+        options_key="dhw_modes",
+    ),
+    PlugwiseSelectEntityDescription(
+        key="select_gateway_mode",
+        translation_key="gateway_mode",
+        entity_category=EntityCategory.CONFIG,
+        options_key="gateway_modes",
     ),
 )
 async def async_setup_entry(
     hass: HomeAssistant,
+    entry: PlugwiseConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Smile selector from a config entry."""
+    coordinator = entry.runtime_data
+    @callback
+    def _add_entities() -> None:
+        """Add Entities."""
+        if not coordinator.new_devices:
+            return
+        async_add_entities(
+            PlugwiseSelectEntity(coordinator, device_id, description)
+            for device_id in coordinator.new_devices
+            for description in SELECT_TYPES
+            if description.options_key in coordinator.data.devices[device_id]
+        )
+    _add_entities()
+    entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 class PlugwiseSelectEntity(PlugwiseEntity, SelectEntity):
         coordinator: PlugwiseDataUpdateCoordinator,
         device_id: str,
         entity_description: PlugwiseSelectEntityDescription,
     ) -> None:
         """Initialise the selector."""
         super().__init__(coordinator, device_id)
         self.entity_description = entity_description
         self._attr_unique_id = f"{device_id}-{entity_description.key}"
     @property
     def current_option(self) -> str:
         """Return the selected entity option to represent the entity state."""
+        return self.device[self.entity_description.key]
+    @property
+    def options(self) -> list[str]:
+        """Return the available select-options."""
+        return self.device[self.entity_description.options_key]
+    @plugwise_command
     async def async_select_option(self, option: str) -> None:
+        """Change to the selected entity option.
+        self.device[LOCATION] and STATE_ON are required for the thermostat-schedule select.
+        """
+        await self.coordinator.api.set_select(
+            self.entity_description.key, self.device[LOCATION], option, STATE_ON
         )

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/sensor.py RENAMED Viewed

@@ -1,48 +1,429 @@
 """Plugwise Sensor component for Home Assistant."""
 from __future__ import annotations
-from homeassistant.components.sensor import SensorEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from .const import (
-    COORDINATOR,  # pw-beta
-    DOMAIN,
-    LOGGER,
 )
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
-from .models import PW_SENSOR_TYPES, PlugwiseSensorEntityDescription
-PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Smile sensors from a config entry."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id][COORDINATOR]
-    entities: list[PlugwiseSensorEntity] = []
-    for device_id, device in coordinator.data.devices.items():
-        if not (sensors := device.get("sensors")):
-            continue
-        for description in PW_SENSOR_TYPES:
-            if description.key not in sensors:
-                continue
-            entities.append(
-                PlugwiseSensorEntity(
-                    coordinator,
-                    device_id,
-                    description,
-                )
-            )
-            LOGGER.debug("Add %s sensor", description.key)
-    async_add_entities(entities)
 class PlugwiseSensorEntity(PlugwiseEntity, SensorEntity):
@@ -64,4 +445,4 @@
     @property
     def native_value(self) -> int | float:
         """Return the value reported by the sensor."""
-        return self.entity_description.value_fn(self.device["sensors"])

 """Plugwise Sensor component for Home Assistant."""
 from __future__ import annotations
+from dataclasses import dataclass
+from plugwise.constants import SensorType
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.const import (
+    LIGHT_LUX,
+    PERCENTAGE,
+    EntityCategory,
+    UnitOfElectricPotential,
+    UnitOfEnergy,
+    UnitOfPower,
+    UnitOfPressure,
+    UnitOfTemperature,
+    UnitOfVolume,
+    UnitOfVolumeFlowRate,
 )
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from . import PlugwiseConfigEntry
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
+@dataclass(frozen=True)
+class PlugwiseSensorEntityDescription(SensorEntityDescription):
+    """Describes Plugwise sensor entity."""
+    key: SensorType
+SENSORS: tuple[PlugwiseSensorEntityDescription, ...] = (
+    PlugwiseSensorEntityDescription(
+        key="setpoint",
+        translation_key="setpoint",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="setpoint_high",
+        translation_key="cooling_setpoint",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="setpoint_low",
+        translation_key="heating_setpoint",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="intended_boiler_temperature",
+        translation_key="intended_boiler_temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="temperature_difference",
+        translation_key="temperature_difference",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="outdoor_temperature",
+        translation_key="outdoor_temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="outdoor_air_temperature",
+        translation_key="outdoor_air_temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="water_temperature",
+        translation_key="water_temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="return_temperature",
+        translation_key="return_temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed",
+        translation_key="electricity_consumed",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced",
+        translation_key="electricity_produced",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed_interval",
+        translation_key="electricity_consumed_interval",
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed_peak_interval",
+        translation_key="electricity_consumed_peak_interval",
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed_off_peak_interval",
+        translation_key="electricity_consumed_off_peak_interval",
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced_interval",
+        translation_key="electricity_produced_interval",
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+        entity_registry_enabled_default=False,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced_peak_interval",
+        translation_key="electricity_produced_peak_interval",
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced_off_peak_interval",
+        translation_key="electricity_produced_off_peak_interval",
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed_point",
+        translation_key="electricity_consumed_point",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed_off_peak_point",
+        translation_key="electricity_consumed_off_peak_point",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed_peak_point",
+        translation_key="electricity_consumed_peak_point",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed_off_peak_cumulative",
+        translation_key="electricity_consumed_off_peak_cumulative",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_consumed_peak_cumulative",
+        translation_key="electricity_consumed_peak_cumulative",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced_point",
+        translation_key="electricity_produced_point",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced_off_peak_point",
+        translation_key="electricity_produced_off_peak_point",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced_peak_point",
+        translation_key="electricity_produced_peak_point",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced_off_peak_cumulative",
+        translation_key="electricity_produced_off_peak_cumulative",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_produced_peak_cumulative",
+        translation_key="electricity_produced_peak_cumulative",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_phase_one_consumed",
+        translation_key="electricity_phase_one_consumed",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_phase_two_consumed",
+        translation_key="electricity_phase_two_consumed",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_phase_three_consumed",
+        translation_key="electricity_phase_three_consumed",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_phase_one_produced",
+        translation_key="electricity_phase_one_produced",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_phase_two_produced",
+        translation_key="electricity_phase_two_produced",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="electricity_phase_three_produced",
+        translation_key="electricity_phase_three_produced",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="voltage_phase_one",
+        translation_key="voltage_phase_one",
+        device_class=SensorDeviceClass.VOLTAGE,
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="voltage_phase_two",
+        translation_key="voltage_phase_two",
+        device_class=SensorDeviceClass.VOLTAGE,
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="voltage_phase_three",
+        translation_key="voltage_phase_three",
+        device_class=SensorDeviceClass.VOLTAGE,
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="gas_consumed_interval",
+        translation_key="gas_consumed_interval",
+        native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="gas_consumed_cumulative",
+        translation_key="gas_consumed_cumulative",
+        native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
+        device_class=SensorDeviceClass.GAS,
+        state_class=SensorStateClass.TOTAL,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="net_electricity_point",
+        translation_key="net_electricity_point",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="net_electricity_cumulative",
+        translation_key="net_electricity_cumulative",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="battery",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.BATTERY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="illuminance",
+        native_unit_of_measurement=LIGHT_LUX,
+        device_class=SensorDeviceClass.ILLUMINANCE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="modulation_level",
+        translation_key="modulation_level",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="valve_position",
+        translation_key="valve_position",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="water_pressure",
+        translation_key="water_pressure",
+        native_unit_of_measurement=UnitOfPressure.BAR,
+        device_class=SensorDeviceClass.PRESSURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="humidity",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.HUMIDITY,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="dhw_temperature",
+        translation_key="dhw_temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    PlugwiseSensorEntityDescription(
+        key="domestic_hot_water_setpoint",
+        translation_key="domestic_hot_water_setpoint",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
 async def async_setup_entry(
     hass: HomeAssistant,
+    entry: PlugwiseConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Smile sensors from a config entry."""
+    coordinator = entry.runtime_data
+    @callback
+    def _add_entities() -> None:
+        """Add Entities."""
+        if not coordinator.new_devices:
+            return
+        async_add_entities(
+            PlugwiseSensorEntity(coordinator, device_id, description)
+            for device_id in coordinator.new_devices
+            if (sensors := coordinator.data.devices[device_id].get("sensors"))
+            for description in SENSORS
+            if description.key in sensors
+        )
+    _add_entities()
+    entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 class PlugwiseSensorEntity(PlugwiseEntity, SensorEntity):
     @property
     def native_value(self) -> int | float:
         """Return the value reported by the sensor."""
+        return self.device["sensors"][self.entity_description.key]

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/strings.json RENAMED Viewed

@@ -1,52 +1,38 @@
 {
-  "options": {
-    "step": {
-      "none": {
-        "title": "No Options available",
-        "description": "This Integration does not provide any Options"
-      },
-      "init": {
-        "description": "Adjust Smile/Stretch Options",
-        "data": {
-          "cooling_on": "Anna: cooling-mode is on",
-          "scan_interval": "Scan Interval (seconds) *) beta-only option",
-          "homekit_emulation": "Homekit emulation (i.e. on hvac_off => Away) *) beta-only option",
-          "refresh_interval": "Frontend refresh-time (1.5 - 5 seconds) *) beta-only option"
-        }
-      }
-    }
-  },
   "config": {
     "step": {
       "user": {
-        "title": "Connect to the Plugwise Adam/Smile/Stretch",
-        "description": "Please enter:",
         "data": {
-          "password": "ID",
-          "username": "Username",
-          "host": "IP-address",
-          "port": "Port number"
         }
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect",
-      "invalid_auth": "Authentication failed",
       "invalid_setup": "Add your Adam instead of your Anna, see the documentation",
-      "network_down": "Plugwise Zigbee network is down",
-      "network_timeout": "Network communication timeout",
       "response_error": "Invalid XML data, or error indication received",
-      "stick_init": "Initialization of Plugwise USB-stick failed",
-      "unknown": "Unknown error!",
       "unsupported": "Device with unsupported firmware"
     },
     "abort": {
-      "already_configured": "This device is already configured",
       "anna_with_adam": "Both Anna and Adam detected. Add your Adam instead of your Anna"
     }
   },
   "entity": {
     "binary_sensor": {
       "compressor_state": {
         "name": "Compressor state"
       },
@@ -60,29 +46,40 @@
         "name": "Flame state"
       },
       "heating_state": {
-        "name": "Heating"
       },
       "cooling_state": {
-        "name": "Cooling"
       },
-      "slave_boiler_state": {
         "name": "Secondary boiler state"
       },
       "plugwise_notification": {
         "name": "Plugwise notification"
       }
     },
     "climate": {
       "plugwise": {
         "state_attributes": {
           "preset_mode": {
             "state": {
               "asleep": "Night",
-              "away": "Away",
-              "home": "Home",
               "no_frost": "Anti-frost",
               "vacation": "Vacation"
             }
           }
         }
       }
@@ -93,16 +90,27 @@
       },
       "max_dhw_temperature": {
         "name": "Domestic hot water setpoint"
       }
     },
     "select": {
       "dhw_mode": {
         "name": "DHW mode",
         "state": {
           "auto": "Auto",
-          "boost": "Boost",
-          "comfort": "Comfort",
-          "off": "Off"
         }
       },
       "regulation_mode": {
@@ -110,13 +118,16 @@
         "state": {
           "bleeding_cold": "Bleeding cold",
           "bleeding_hot": "Bleeding hot",
-          "cooling": "Cooling",
-          "heating": "Heating",
-          "off": "Off"
         }
       },
-      "thermostat_schedule": {
-        "name": "Thermostat schedule"
       }
     },
     "sensor": {
@@ -127,10 +138,7 @@
         "name": "Cooling setpoint"
       },
       "heating_setpoint": {
-        "name": " Heating setpoint"
-      },
-      "temperature": {
-        "name": "Temperature"
       },
       "intended_boiler_temperature": {
         "name": "Intended boiler temperature"
@@ -156,12 +164,6 @@
       "electricity_produced": {
         "name": "Electricity produced"
       },
-      "electricity_consumed_point": {
-        "name": "Electricity consumed point"
-      },
-      "electricity_produced_point": {
-        "name": "Electricity produced point"
-      },
       "electricity_consumed_interval": {
         "name": "Electricity consumed interval"
       },
@@ -180,6 +182,9 @@
       "electricity_produced_off_peak_interval": {
         "name": "Electricity produced off peak interval"
       },
       "electricity_consumed_off_peak_point": {
         "name": "Electricity consumed off peak point"
       },
@@ -192,6 +197,9 @@
       "electricity_consumed_peak_cumulative": {
         "name": "Electricity consumed peak cumulative"
       },
       "electricity_produced_off_peak_point": {
         "name": "Electricity produced off peak point"
       },
@@ -199,7 +207,7 @@
         "name": "Electricity produced peak point"
       },
       "electricity_produced_off_peak_cumulative": {
-        "name": "Electricity produced off peak_cumulative"
       },
       "electricity_produced_peak_cumulative": {
         "name": "Electricity produced peak cumulative"
@@ -243,12 +251,6 @@
       "net_electricity_cumulative": {
         "name": "Net electricity cumulative"
       },
-      "battery": {
-        "name": "Battery"
-      },
-      "illuminance": {
-        "name": "Illuminance"
-      },
       "modulation_level": {
         "name": "Modulation level"
       },
@@ -258,9 +260,6 @@
       "water_pressure": {
         "name": "Water pressure"
       },
-      "relative_humidity": {
-        "name": "Relative humidity"
-      },
       "dhw_temperature": {
         "name": "DHW temperature"
       },
@@ -268,18 +267,18 @@
         "name": "DHW setpoint"
       },
       "maximum_boiler_temperature": {
-        "name": "Maximum boiler temperature setpoint"
       }
     },
     "switch": {
       "cooling_ena_switch": {
-        "name": "Cooling"
       },
       "dhw_cm_switch": {
         "name": "DHW comfort mode"
       },
       "lock": {
-        "name": "Lock"
       },
       "relay": {
         "name": "Relay"

 {
   "config": {
     "step": {
       "user": {
+        "title": "Connect to the Smile",
+        "description": "Please enter",
         "data": {
+          "password": "Smile ID",
+          "host": "[%key:common::config_flow::data::ip%]",
+          "port": "[%key:common::config_flow::data::port%]",
+          "username": "Smile Username"
+        },
+        "data_description": {
+          "host": "Leave empty if using Auto Discovery"
         }
       }
     },
     "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "invalid_setup": "Add your Adam instead of your Anna, see the documentation",
       "response_error": "Invalid XML data, or error indication received",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
       "unsupported": "Device with unsupported firmware"
     },
     "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "anna_with_adam": "Both Anna and Adam detected. Add your Adam instead of your Anna"
     }
   },
   "entity": {
     "binary_sensor": {
+      "low_battery": {
+        "name": "Battery state"
+      },
       "compressor_state": {
         "name": "Compressor state"
       },
         "name": "Flame state"
       },
       "heating_state": {
+        "name": "[%key:component::climate::entity_component::_::state_attributes::hvac_action::state::heating%]"
       },
       "cooling_state": {
+        "name": "[%key:component::climate::entity_component::_::state_attributes::hvac_action::state::cooling%]"
       },
+      "secondary_boiler_state": {
         "name": "Secondary boiler state"
       },
       "plugwise_notification": {
         "name": "Plugwise notification"
       }
     },
+    "button": {
+      "reboot": {
+        "name": "Reboot"
+      }
+    },
     "climate": {
       "plugwise": {
         "state_attributes": {
+          "available_schemas": {
+            "name": "Available schemas"
+          },
           "preset_mode": {
             "state": {
               "asleep": "Night",
+              "away": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::away%]",
+              "home": "[%key:common::state::home%]",
               "no_frost": "Anti-frost",
               "vacation": "Vacation"
             }
+          },
+          "selected_schema": {
+            "name": "Selected schema"
           }
         }
       }
       },
       "max_dhw_temperature": {
         "name": "Domestic hot water setpoint"
+      },
+      "temperature_offset": {
+        "name": "Temperature offset"
       }
     },
     "select": {
       "dhw_mode": {
         "name": "DHW mode",
         "state": {
+          "off": "[%key:common::state::off%]",
           "auto": "Auto",
+          "boost": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::boost%]",
+          "comfort": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::comfort%]"
+        }
+      },
+      "gateway_mode": {
+        "name": "Gateway mode",
+        "state": {
+          "away": "Pause",
+          "full": "Normal",
+          "vacation": "Vacation"
         }
       },
       "regulation_mode": {
         "state": {
           "bleeding_cold": "Bleeding cold",
           "bleeding_hot": "Bleeding hot",
+          "cooling": "[%key:component::climate::entity_component::_::state_attributes::hvac_action::state::cooling%]",
+          "heating": "[%key:component::climate::entity_component::_::state_attributes::hvac_action::state::heating%]",
+          "off": "[%key:common::state::off%]"
         }
       },
+      "select_schedule": {
+        "name": "Thermostat schedule",
+        "state": {
+          "off": "Off"
+        }
       }
     },
     "sensor": {
         "name": "Cooling setpoint"
       },
       "heating_setpoint": {
+        "name": "Heating setpoint"
       },
       "intended_boiler_temperature": {
         "name": "Intended boiler temperature"
       "electricity_produced": {
         "name": "Electricity produced"
       },
       "electricity_consumed_interval": {
         "name": "Electricity consumed interval"
       },
       "electricity_produced_off_peak_interval": {
         "name": "Electricity produced off peak interval"
       },
+      "electricity_consumed_point": {
+        "name": "Electricity consumed point"
+      },
       "electricity_consumed_off_peak_point": {
         "name": "Electricity consumed off peak point"
       },
       "electricity_consumed_peak_cumulative": {
         "name": "Electricity consumed peak cumulative"
       },
+      "electricity_produced_point": {
+        "name": "Electricity produced point"
+      },
       "electricity_produced_off_peak_point": {
         "name": "Electricity produced off peak point"
       },
         "name": "Electricity produced peak point"
       },
       "electricity_produced_off_peak_cumulative": {
+        "name": "Electricity produced off peak cumulative"
       },
       "electricity_produced_peak_cumulative": {
         "name": "Electricity produced peak cumulative"
       "net_electricity_cumulative": {
         "name": "Net electricity cumulative"
       },
       "modulation_level": {
         "name": "Modulation level"
       },
       "water_pressure": {
         "name": "Water pressure"
       },
       "dhw_temperature": {
         "name": "DHW temperature"
       },
         "name": "DHW setpoint"
       },
       "maximum_boiler_temperature": {
+        "name": "Maximum boiler temperature"
       }
     },
     "switch": {
       "cooling_ena_switch": {
+        "name": "[%key:component::climate::entity_component::_::state_attributes::hvac_action::state::cooling%]"
       },
       "dhw_cm_switch": {
         "name": "DHW comfort mode"
       },
       "lock": {
+        "name": "[%key:component::lock::title%]"
       },
       "relay": {
         "name": "Relay"

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/switch.py RENAMED Viewed

@@ -1,42 +1,83 @@
 """Plugwise Switch component for HomeAssistant."""
 from __future__ import annotations
 from typing import Any
-from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from .const import (
-    COORDINATOR,  # pw-beta
-    DOMAIN,
-    LOGGER,
 )
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
-from .models import PW_SWITCH_TYPES, PlugwiseSwitchEntityDescription
 from .util import plugwise_command
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Smile switches from a config entry."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id][COORDINATOR]
-    entities: list[PlugwiseSwitchEntity] = []
-    for device_id, device in coordinator.data.devices.items():
-        if not (switches := device.get("switches")):
-            continue
-        for description in PW_SWITCH_TYPES:
-            if description.key not in switches:
-                continue
-            entities.append(PlugwiseSwitchEntity(coordinator, device_id, description))
-            LOGGER.debug("Add %s switch", description.key)
-    async_add_entities(entities)
 class PlugwiseSwitchEntity(PlugwiseEntity, SwitchEntity):
@@ -58,7 +99,7 @@
     @property
     def is_on(self) -> bool:
         """Return True if entity is on."""
-        return self.entity_description.value_fn(self.device["switches"])
     @plugwise_command
     async def async_turn_on(self, **kwargs: Any) -> None:

 """Plugwise Switch component for HomeAssistant."""
 from __future__ import annotations
+from dataclasses import dataclass
 from typing import Any
+from plugwise.constants import SwitchType
+from homeassistant.components.switch import (
+    SwitchDeviceClass,
+    SwitchEntity,
+    SwitchEntityDescription,
 )
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from . import PlugwiseConfigEntry
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 from .util import plugwise_command
+@dataclass(frozen=True)
+class PlugwiseSwitchEntityDescription(SwitchEntityDescription):
+    """Describes Plugwise switch entity."""
+    key: SwitchType
+SWITCHES: tuple[PlugwiseSwitchEntityDescription, ...] = (
+    PlugwiseSwitchEntityDescription(
+        key="dhw_cm_switch",
+        translation_key="dhw_cm_switch",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    PlugwiseSwitchEntityDescription(
+        key="lock",
+        translation_key="lock",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    PlugwiseSwitchEntityDescription(
+        key="relay",
+        translation_key="relay",
+        device_class=SwitchDeviceClass.SWITCH,
+    ),
+    PlugwiseSwitchEntityDescription(
+        key="cooling_ena_switch",
+        translation_key="cooling_ena_switch",
+        name="Cooling",
+        entity_category=EntityCategory.CONFIG,
+    ),
+)
 async def async_setup_entry(
     hass: HomeAssistant,
+    entry: PlugwiseConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Smile switches from a config entry."""
+    coordinator = entry.runtime_data
+    @callback
+    def _add_entities() -> None:
+        """Add Entities."""
+        if not coordinator.new_devices:
+            return
+        async_add_entities(
+            PlugwiseSwitchEntity(coordinator, device_id, description)
+            for device_id in coordinator.new_devices
+            if (switches := coordinator.data.devices[device_id].get("switches"))
+            for description in SWITCHES
+            if description.key in switches
+        )
+    _add_entities()
+    entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 class PlugwiseSwitchEntity(PlugwiseEntity, SwitchEntity):
     @property
     def is_on(self) -> bool:
         """Return True if entity is on."""
+        return self.device["switches"][self.entity_description.key]
     @plugwise_command
     async def async_turn_on(self, **kwargs: Any) -> None:

/home/runner/work/progress/progress/clones/beta/{beta/custom_components → ha-core/homeassistant/components}/plugwise/util.py RENAMED Viewed

@@ -1,21 +1,17 @@
 """Utilities for Plugwise."""
 from collections.abc import Awaitable, Callable, Coroutine
-from typing import Any, Concatenate, TypeVar
-from typing_extensions import ParamSpec
 from homeassistant.exceptions import HomeAssistantError
-from plugwise.exceptions import PlugwiseException
 from .entity import PlugwiseEntity
-_PlugwiseEntityT = TypeVar("_PlugwiseEntityT", bound=PlugwiseEntity)
-_R = TypeVar("_R")
-_P = ParamSpec("_P")
-def plugwise_command(
-    func: Callable[Concatenate[_PlugwiseEntityT, _P], Awaitable[_R]]
 ) -> Callable[Concatenate[_PlugwiseEntityT, _P], Coroutine[Any, Any, _R]]:
     """Decorate Plugwise calls that send commands/make changes to the device.

 """Utilities for Plugwise."""
 from collections.abc import Awaitable, Callable, Coroutine
+from typing import Any, Concatenate
+from plugwise.exceptions import PlugwiseException
 from homeassistant.exceptions import HomeAssistantError
 from .entity import PlugwiseEntity
+def plugwise_command[_PlugwiseEntityT: PlugwiseEntity, **_P, _R](
+    func: Callable[Concatenate[_PlugwiseEntityT, _P], Awaitable[_R]],
 ) -> Callable[Concatenate[_PlugwiseEntityT, _P], Coroutine[Any, Any, _R]]:
     """Decorate Plugwise calls that send commands/make changes to the device.