homevolt tests

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

.github/copilot-instructions.md

@@ -1024,6 +1024,18 @@ class MyCoordinator(DataUpdateCoordinator[MyData]):
         )
 ```
 
+### Entity Performance Optimization
+```python
+# Use __slots__ for memory efficiency
+class MySensor(SensorEntity):
+    __slots__ = ("_attr_native_value", "_attr_available")
+    
+    @property 
+    def should_poll(self) -> bool:
+        """Disable polling when using coordinator."""
+        return False  # ✅ Let coordinator handle updates
+```
+
 ## Testing Patterns
 
 ### Testing Best Practices
@@ -1169,4 +1181,4 @@ python -m script.hassfest --integration-path homeassistant/components/my_integra
 pytest ./tests/components/my_integration \
   --cov=homeassistant.components.my_integration \
   --cov-report term-missing
-```
+```

homeassistant/components/alarm_control_panel/trigger.py

@@ -14,7 +14,7 @@ from .const import DOMAIN, AlarmControlPanelEntityFeature, AlarmControlPanelStat
 
 
 def supports_feature(hass: HomeAssistant, entity_id: str, features: int) -> bool:
-    """Test if an entity supports the specified features."""
+    """Get the device class of an entity or UNDEFINED if not found."""
     try:
         return bool(get_supported_features(hass, entity_id) & features)
     except HomeAssistantError:
@@ -39,7 +39,7 @@ class EntityStateTriggerRequiredFeatures(EntityTargetStateTriggerBase):
 def make_entity_state_trigger_required_features(
     domain: str, to_state: str, required_features: int
 ) -> type[EntityTargetStateTriggerBase]:
-    """Create an entity state trigger class with required feature filtering."""
+    """Create an entity state trigger class."""
 
     class CustomTrigger(EntityStateTriggerRequiredFeatures):
         """Trigger for entity state changes."""

homeassistant/components/blebox/sensor.py

@@ -1,7 +1,5 @@
 """BleBox sensor entities."""
 
-from datetime import datetime
-
 import blebox_uniapi.sensor
 
 from homeassistant.components.sensor import (
@@ -148,7 +146,7 @@ class BleBoxSensorEntity(BleBoxEntity[blebox_uniapi.sensor.BaseSensor], SensorEn
         return self._feature.native_value
 
     @property
-    def last_reset(self) -> datetime | None:
+    def last_reset(self):
         """Return the time when the sensor was last reset, if implemented."""
         native_implementation = getattr(self._feature, "last_reset", None)
 

homeassistant/components/ebusd/__init__.py

@@ -1,7 +1,6 @@
 """Support for Ebusd daemon for communication with eBUS heating systems."""
 
 import logging
-from typing import Any
 
 import ebusdpy
 import voluptuous as vol
@@ -18,7 +17,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN, EBUSD_DATA, SENSOR_TYPES
+from .const import DOMAIN, SENSOR_TYPES
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -29,9 +28,9 @@ CACHE_TTL = 900
 SERVICE_EBUSD_WRITE = "ebusd_write"
 
 
-def verify_ebusd_config(config: ConfigType) -> ConfigType:
+def verify_ebusd_config(config):
     """Verify eBusd config."""
-    circuit: str = config[CONF_CIRCUIT]
+    circuit = config[CONF_CIRCUIT]
     for condition in config[CONF_MONITORED_CONDITIONS]:
         if condition not in SENSOR_TYPES[circuit]:
             raise vol.Invalid(f"Condition '{condition}' not in '{circuit}'.")
@@ -60,17 +59,17 @@ CONFIG_SCHEMA = vol.Schema(
 def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the eBusd component."""
     _LOGGER.debug("Integration setup started")
-    conf: ConfigType = config[DOMAIN]
-    name: str = conf[CONF_NAME]
-    circuit: str = conf[CONF_CIRCUIT]
-    monitored_conditions: list[str] = conf[CONF_MONITORED_CONDITIONS]
-    server_address: tuple[str, int] = (conf[CONF_HOST], conf[CONF_PORT])
+    conf = config[DOMAIN]
+    name = conf[CONF_NAME]
+    circuit = conf[CONF_CIRCUIT]
+    monitored_conditions = conf.get(CONF_MONITORED_CONDITIONS)
+    server_address = (conf.get(CONF_HOST), conf.get(CONF_PORT))
 
     try:
         ebusdpy.init(server_address)
     except (TimeoutError, OSError):
         return False
-    hass.data[EBUSD_DATA] = EbusdData(server_address, circuit)
+    hass.data[DOMAIN] = EbusdData(server_address, circuit)
     sensor_config = {
         CONF_MONITORED_CONDITIONS: monitored_conditions,
         "client_name": name,
@@ -78,7 +77,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     }
     load_platform(hass, Platform.SENSOR, DOMAIN, sensor_config, config)
 
-    hass.services.register(DOMAIN, SERVICE_EBUSD_WRITE, hass.data[EBUSD_DATA].write)
+    hass.services.register(DOMAIN, SERVICE_EBUSD_WRITE, hass.data[DOMAIN].write)
 
     _LOGGER.debug("Ebusd integration setup completed")
     return True
@@ -87,13 +86,13 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
 class EbusdData:
     """Get the latest data from Ebusd."""
 
-    def __init__(self, address: tuple[str, int], circuit: str) -> None:
+    def __init__(self, address, circuit):
         """Initialize the data object."""
         self._circuit = circuit
         self._address = address
-        self.value: dict[str, Any] = {}
+        self.value = {}
 
-    def update(self, name: str, stype: int) -> None:
+    def update(self, name, stype):
         """Call the Ebusd API to update the data."""
         try:
             _LOGGER.debug("Opening socket to ebusd %s", name)

homeassistant/components/ebusd/const.py

@@ -1,9 +1,5 @@
 """Constants for ebus component."""
 
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
@@ -12,283 +8,277 @@ from homeassistant.const import (
     UnitOfTemperature,
     UnitOfTime,
 )
-from homeassistant.util.hass_dict import HassKey
-
-if TYPE_CHECKING:
-    from . import EbusdData
 
 DOMAIN = "ebusd"
-EBUSD_DATA: HassKey[EbusdData] = HassKey(DOMAIN)
 
 #  SensorTypes from ebusdpy module :
 #  0='decimal', 1='time-schedule', 2='switch', 3='string', 4='value;status'
 
-type SensorSpecs = tuple[str, str | None, str | None, int, SensorDeviceClass | None]
-SENSOR_TYPES: dict[str, dict[str, SensorSpecs]] = {
+SENSOR_TYPES = {
     "700": {
-        "ActualFlowTemperatureDesired": (
+        "ActualFlowTemperatureDesired": [
             "Hc1ActualFlowTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "MaxFlowTemperatureDesired": (
+        ],
+        "MaxFlowTemperatureDesired": [
             "Hc1MaxFlowTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "MinFlowTemperatureDesired": (
+        ],
+        "MinFlowTemperatureDesired": [
             "Hc1MinFlowTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "PumpStatus": ("Hc1PumpStatus", None, "mdi:toggle-switch", 2, None),
-        "HCSummerTemperatureLimit": (
+        ],
+        "PumpStatus": ["Hc1PumpStatus", None, "mdi:toggle-switch", 2, None],
+        "HCSummerTemperatureLimit": [
             "Hc1SummerTempLimit",
             UnitOfTemperature.CELSIUS,
             "mdi:weather-sunny",
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "HolidayTemperature": (
+        ],
+        "HolidayTemperature": [
             "HolidayTemp",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "HWTemperatureDesired": (
+        ],
+        "HWTemperatureDesired": [
             "HwcTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "HWActualTemperature": (
+        ],
+        "HWActualTemperature": [
             "HwcStorageTemp",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "HWTimerMonday": ("hwcTimer.Monday", None, "mdi:timer-outline", 1, None),
-        "HWTimerTuesday": ("hwcTimer.Tuesday", None, "mdi:timer-outline", 1, None),
-        "HWTimerWednesday": ("hwcTimer.Wednesday", None, "mdi:timer-outline", 1, None),
-        "HWTimerThursday": ("hwcTimer.Thursday", None, "mdi:timer-outline", 1, None),
-        "HWTimerFriday": ("hwcTimer.Friday", None, "mdi:timer-outline", 1, None),
-        "HWTimerSaturday": ("hwcTimer.Saturday", None, "mdi:timer-outline", 1, None),
-        "HWTimerSunday": ("hwcTimer.Sunday", None, "mdi:timer-outline", 1, None),
-        "HWOperativeMode": ("HwcOpMode", None, "mdi:math-compass", 3, None),
-        "WaterPressure": (
+        ],
+        "HWTimerMonday": ["hwcTimer.Monday", None, "mdi:timer-outline", 1, None],
+        "HWTimerTuesday": ["hwcTimer.Tuesday", None, "mdi:timer-outline", 1, None],
+        "HWTimerWednesday": ["hwcTimer.Wednesday", None, "mdi:timer-outline", 1, None],
+        "HWTimerThursday": ["hwcTimer.Thursday", None, "mdi:timer-outline", 1, None],
+        "HWTimerFriday": ["hwcTimer.Friday", None, "mdi:timer-outline", 1, None],
+        "HWTimerSaturday": ["hwcTimer.Saturday", None, "mdi:timer-outline", 1, None],
+        "HWTimerSunday": ["hwcTimer.Sunday", None, "mdi:timer-outline", 1, None],
+        "HWOperativeMode": ["HwcOpMode", None, "mdi:math-compass", 3, None],
+        "WaterPressure": [
             "WaterPressure",
             UnitOfPressure.BAR,
             "mdi:water-pump",
             0,
             SensorDeviceClass.PRESSURE,
-        ),
-        "Zone1RoomZoneMapping": ("z1RoomZoneMapping", None, "mdi:label", 0, None),
-        "Zone1NightTemperature": (
+        ],
+        "Zone1RoomZoneMapping": ["z1RoomZoneMapping", None, "mdi:label", 0, None],
+        "Zone1NightTemperature": [
             "z1NightTemp",
             UnitOfTemperature.CELSIUS,
             "mdi:weather-night",
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "Zone1DayTemperature": (
+        ],
+        "Zone1DayTemperature": [
             "z1DayTemp",
             UnitOfTemperature.CELSIUS,
             "mdi:weather-sunny",
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "Zone1HolidayTemperature": (
+        ],
+        "Zone1HolidayTemperature": [
             "z1HolidayTemp",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "Zone1RoomTemperature": (
+        ],
+        "Zone1RoomTemperature": [
             "z1RoomTemp",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "Zone1ActualRoomTemperatureDesired": (
+        ],
+        "Zone1ActualRoomTemperatureDesired": [
             "z1ActualRoomTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "Zone1TimerMonday": ("z1Timer.Monday", None, "mdi:timer-outline", 1, None),
-        "Zone1TimerTuesday": ("z1Timer.Tuesday", None, "mdi:timer-outline", 1, None),
-        "Zone1TimerWednesday": (
+        ],
+        "Zone1TimerMonday": ["z1Timer.Monday", None, "mdi:timer-outline", 1, None],
+        "Zone1TimerTuesday": ["z1Timer.Tuesday", None, "mdi:timer-outline", 1, None],
+        "Zone1TimerWednesday": [
             "z1Timer.Wednesday",
             None,
             "mdi:timer-outline",
             1,
             None,
-        ),
-        "Zone1TimerThursday": ("z1Timer.Thursday", None, "mdi:timer-outline", 1, None),
-        "Zone1TimerFriday": ("z1Timer.Friday", None, "mdi:timer-outline", 1, None),
-        "Zone1TimerSaturday": ("z1Timer.Saturday", None, "mdi:timer-outline", 1, None),
-        "Zone1TimerSunday": ("z1Timer.Sunday", None, "mdi:timer-outline", 1, None),
-        "Zone1OperativeMode": ("z1OpMode", None, "mdi:math-compass", 3, None),
-        "ContinuosHeating": (
+        ],
+        "Zone1TimerThursday": ["z1Timer.Thursday", None, "mdi:timer-outline", 1, None],
+        "Zone1TimerFriday": ["z1Timer.Friday", None, "mdi:timer-outline", 1, None],
+        "Zone1TimerSaturday": ["z1Timer.Saturday", None, "mdi:timer-outline", 1, None],
+        "Zone1TimerSunday": ["z1Timer.Sunday", None, "mdi:timer-outline", 1, None],
+        "Zone1OperativeMode": ["z1OpMode", None, "mdi:math-compass", 3, None],
+        "ContinuosHeating": [
             "ContinuosHeating",
             UnitOfTemperature.CELSIUS,
             "mdi:weather-snowy",
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "PowerEnergyConsumptionLastMonth": (
+        ],
+        "PowerEnergyConsumptionLastMonth": [
             "PrEnergySumHcLastMonth",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ),
-        "PowerEnergyConsumptionThisMonth": (
+        ],
+        "PowerEnergyConsumptionThisMonth": [
             "PrEnergySumHcThisMonth",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ),
+        ],
     },
     "ehp": {
-        "HWTemperature": (
+        "HWTemperature": [
             "HwcTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "OutsideTemp": (
+        ],
+        "OutsideTemp": [
             "OutsideTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ),
+        ],
     },
     "bai": {
-        "HotWaterTemperature": (
+        "HotWaterTemperature": [
             "HwcTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "StorageTemperature": (
+        ],
+        "StorageTemperature": [
             "StorageTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "DesiredStorageTemperature": (
+        ],
+        "DesiredStorageTemperature": [
             "StorageTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "OutdoorsTemperature": (
+        ],
+        "OutdoorsTemperature": [
             "OutdoorstempSensor",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "WaterPressure": (
+        ],
+        "WaterPressure": [
             "WaterPressure",
             UnitOfPressure.BAR,
             "mdi:pipe",
             4,
             SensorDeviceClass.PRESSURE,
-        ),
-        "AverageIgnitionTime": (
+        ],
+        "AverageIgnitionTime": [
             "averageIgnitiontime",
             UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
             SensorDeviceClass.DURATION,
-        ),
-        "MaximumIgnitionTime": (
+        ],
+        "MaximumIgnitionTime": [
             "maxIgnitiontime",
             UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
             SensorDeviceClass.DURATION,
-        ),
-        "MinimumIgnitionTime": (
+        ],
+        "MinimumIgnitionTime": [
             "minIgnitiontime",
             UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
             SensorDeviceClass.DURATION,
-        ),
-        "ReturnTemperature": (
+        ],
+        "ReturnTemperature": [
             "ReturnTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "CentralHeatingPump": ("WP", None, "mdi:toggle-switch", 2, None),
-        "HeatingSwitch": ("HeatingSwitch", None, "mdi:toggle-switch", 2, None),
-        "DesiredFlowTemperature": (
+        ],
+        "CentralHeatingPump": ["WP", None, "mdi:toggle-switch", 2, None],
+        "HeatingSwitch": ["HeatingSwitch", None, "mdi:toggle-switch", 2, None],
+        "DesiredFlowTemperature": [
             "FlowTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "FlowTemperature": (
+        ],
+        "FlowTemperature": [
             "FlowTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ),
-        "Flame": ("Flame", None, "mdi:toggle-switch", 2, None),
-        "PowerEnergyConsumptionHeatingCircuit": (
+        ],
+        "Flame": ["Flame", None, "mdi:toggle-switch", 2, None],
+        "PowerEnergyConsumptionHeatingCircuit": [
             "PrEnergySumHc1",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ),
-        "PowerEnergyConsumptionHotWaterCircuit": (
+        ],
+        "PowerEnergyConsumptionHotWaterCircuit": [
             "PrEnergySumHwc1",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ),
-        "RoomThermostat": ("DCRoomthermostat", None, "mdi:toggle-switch", 2, None),
-        "HeatingPartLoad": (
+        ],
+        "RoomThermostat": ["DCRoomthermostat", None, "mdi:toggle-switch", 2, None],
+        "HeatingPartLoad": [
             "PartloadHcKW",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ),
-        "StateNumber": ("StateNumber", None, "mdi:fire", 3, None),
-        "ModulationPercentage": (
+        ],
+        "StateNumber": ["StateNumber", None, "mdi:fire", 3, None],
+        "ModulationPercentage": [
             "ModulationTempDesired",
             PERCENTAGE,
             "mdi:percent",
             0,
             None,
-        ),
+        ],
     },
 }

homeassistant/components/ebusd/sensor.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import datetime
 import logging
-from typing import Any, cast
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.core import HomeAssistant
@@ -12,8 +11,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle, dt as dt_util
 
-from . import EbusdData
-from .const import EBUSD_DATA, SensorSpecs
+from .const import DOMAIN
 
 TIME_FRAME1_BEGIN = "time_frame1_begin"
 TIME_FRAME1_END = "time_frame1_end"
@@ -35,9 +33,9 @@ def setup_platform(
     """Set up the Ebus sensor."""
     if not discovery_info:
         return
-    ebusd_api = hass.data[EBUSD_DATA]
-    monitored_conditions: list[str] = discovery_info["monitored_conditions"]
-    name: str = discovery_info["client_name"]
+    ebusd_api = hass.data[DOMAIN]
+    monitored_conditions = discovery_info["monitored_conditions"]
+    name = discovery_info["client_name"]
 
     add_entities(
         (
@@ -51,8 +49,9 @@ def setup_platform(
 class EbusdSensor(SensorEntity):
     """Ebusd component sensor methods definition."""
 
-    def __init__(self, data: EbusdData, sensor: SensorSpecs, name: str) -> None:
+    def __init__(self, data, sensor, name):
         """Initialize the sensor."""
+        self._state = None
         self._client_name = name
         (
             self._name,
@@ -64,15 +63,20 @@ class EbusdSensor(SensorEntity):
         self.data = data
 
     @property
-    def name(self) -> str:
+    def name(self):
         """Return the name of the sensor."""
         return f"{self._client_name} {self._name}"
 
     @property
-    def extra_state_attributes(self) -> dict[str, Any] | None:
+    def native_value(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def extra_state_attributes(self):
         """Return the device state attributes."""
-        if self._type == 1 and (native_value := self.native_value) is not None:
-            schedule: dict[str, str | None] = {
+        if self._type == 1 and self._state is not None:
+            schedule = {
                 TIME_FRAME1_BEGIN: None,
                 TIME_FRAME1_END: None,
                 TIME_FRAME2_BEGIN: None,
@@ -80,7 +84,7 @@ class EbusdSensor(SensorEntity):
                 TIME_FRAME3_BEGIN: None,
                 TIME_FRAME3_END: None,
             }
-            time_frame = cast(str, native_value).split(";")
+            time_frame = self._state.split(";")
             for index, item in enumerate(sorted(schedule.items())):
                 if index < len(time_frame):
                     parsed = datetime.datetime.strptime(time_frame[index], "%H:%M")
@@ -97,12 +101,12 @@ class EbusdSensor(SensorEntity):
         return self._device_class
 
     @property
-    def icon(self) -> str | None:
+    def icon(self):
         """Icon to use in the frontend, if any."""
         return self._icon
 
     @property
-    def native_unit_of_measurement(self) -> str | None:
+    def native_unit_of_measurement(self):
         """Return the unit of measurement."""
         return self._unit_of_measurement
 
@@ -114,6 +118,6 @@ class EbusdSensor(SensorEntity):
             if self._name not in self.data.value:
                 return
 
-            self._attr_native_value = self.data.value[self._name]
+            self._state = self.data.value[self._name]
         except RuntimeError:
             _LOGGER.debug("EbusdData.update exception")

homeassistant/components/homevolt/__init__.py

@@ -10,7 +10,12 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .coordinator import HomevoltConfigEntry, HomevoltDataUpdateCoordinator
 
-PLATFORMS: list[Platform] = [Platform.SENSOR]
+PLATFORMS: list[Platform] = [
+    Platform.NUMBER,
+    Platform.SELECT,
+    Platform.SENSOR,
+    Platform.SWITCH,
+]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: HomevoltConfigEntry) -> bool:

homeassistant/components/homevolt/config_flow.py

@@ -11,6 +11,7 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PASSWORD
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import DOMAIN
 
@@ -30,6 +31,9 @@ class HomevoltConfigFlow(ConfigFlow, domain=DOMAIN):
     VERSION = 1
     MINOR_VERSION = 1
 
+    _host: str
+    _device_id: str
+
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -68,3 +72,81 @@ class HomevoltConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_show_form(
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
+
+    async def async_step_zeroconf(
+        self, discovery_info: ZeroconfServiceInfo
+    ) -> ConfigFlowResult:
+        """Handle zeroconf discovery."""
+        _LOGGER.debug("Zeroconf discovery: %s", discovery_info)
+        self._host = str(discovery_info.ip_address)
+
+        websession = async_get_clientsession(self.hass)
+        client = Homevolt(self._host, websession=websession)
+        try:
+            await client.update_info()
+            device = client.get_device()
+            self._device_id = device.device_id
+        except HomevoltConnectionError:
+            return self.async_abort(reason="cannot_connect")
+        except HomevoltAuthenticationError:
+            # Device requires authentication - proceed to discovery confirm
+            # where user can enter password
+            self._device_id = discovery_info.hostname.removesuffix(".local.")
+        except Exception:
+            _LOGGER.exception("Error occurred while connecting to the Homevolt battery")
+            return self.async_abort(reason="cannot_connect")
+
+        await self.async_set_unique_id(self._device_id)
+        self._abort_if_unique_id_configured(updates={CONF_HOST: self._host})
+
+        self.context.update(
+            {
+                "title_placeholders": {
+                    "name": "Homevolt",
+                }
+            }
+        )
+        return await self.async_step_discovery_confirm()
+
+    async def async_step_discovery_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm discovery and optionally get password."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            password = user_input.get(CONF_PASSWORD)
+            websession = async_get_clientsession(self.hass)
+            client = Homevolt(self._host, password, websession=websession)
+            try:
+                await client.update_info()
+                device = client.get_device()
+                self._device_id = device.device_id
+            except HomevoltAuthenticationError:
+                errors["base"] = "invalid_auth"
+            except HomevoltConnectionError:
+                errors["base"] = "cannot_connect"
+            except Exception:
+                _LOGGER.exception(
+                    "Error occurred while connecting to the Homevolt battery"
+                )
+                errors["base"] = "unknown"
+            else:
+                await self.async_set_unique_id(self._device_id)
+                self._abort_if_unique_id_configured()
+
+                return self.async_create_entry(
+                    title="Homevolt",
+                    data={
+                        CONF_HOST: self._host,
+                        CONF_PASSWORD: password,
+                    },
+                )
+
+        return self.async_show_form(
+            step_id="discovery_confirm",
+            data_schema=vol.Schema({vol.Optional(CONF_PASSWORD): str}),
+            errors=errors,
+            description_placeholders={
+                "host": self._host,
+            },
+        )

homeassistant/components/homevolt/manifest.json

@@ -8,5 +8,11 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["homevolt==0.2.4"]
+  "requirements": ["homevolt==0.2.4"],
+  "zeroconf": [
+    {
+      "name": "homevolt*",
+      "type": "_http._tcp.local."
+    }
+  ]
 }

homeassistant/components/homevolt/sensor.py

@@ -21,13 +21,11 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN, MANUFACTURER
 from .coordinator import HomevoltConfigEntry, HomevoltDataUpdateCoordinator
+from .entity import HomevoltEntity
 
 PARALLEL_UPDATES = 0  # Coordinator-based updates
 
@@ -121,11 +119,9 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class HomevoltSensor(CoordinatorEntity[HomevoltDataUpdateCoordinator], SensorEntity):
+class HomevoltSensor(HomevoltEntity, SensorEntity):
     """Representation of a Homevolt sensor."""
 
-    _attr_has_entity_name = True
-
     def __init__(
         self,
         description: SensorEntityDescription,
@@ -133,23 +129,13 @@ class HomevoltSensor(CoordinatorEntity[HomevoltDataUpdateCoordinator], SensorEnt
         sensor_key: str,
     ) -> None:
         """Initialize the sensor."""
-        super().__init__(coordinator)
         self.entity_description = description
         device_id = coordinator.data.device_id
         self._attr_unique_id = f"{device_id}_{sensor_key}"
         sensor_data = coordinator.data.sensors[sensor_key]
         self._attr_translation_key = sensor_data.slug
         self._sensor_key = sensor_key
-        device_metadata = coordinator.data.device_metadata.get(
-            sensor_data.device_identifier
-        )
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, f"{device_id}_{sensor_data.device_identifier}")},
-            configuration_url=coordinator.client.base_url,
-            manufacturer=MANUFACTURER,
-            model=device_metadata.model if device_metadata else None,
-            name=device_metadata.name if device_metadata else None,
-        )
+        super().__init__(coordinator, sensor_data.device_identifier)
 
     @property
     def available(self) -> bool:

homeassistant/components/homevolt/strings.json

@@ -1,14 +1,25 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "Failed to connect"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
+    "flow_title": "{name}",
     "step": {
+      "discovery_confirm": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "The local password configured for your Homevolt battery, if required."
+        },
+        "description": "A Homevolt battery was discovered at {host}. Enter the password if required."
+      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
@@ -24,6 +35,28 @@
     }
   },
   "entity": {
+    "number": {
+      "battery_max_charge_power": {
+        "name": "Battery max charge power"
+      },
+      "battery_max_discharge_power": {
+        "name": "Battery max discharge power"
+      },
+      "battery_max_soc": {
+        "name": "Battery maximum state of charge"
+      },
+      "battery_min_soc": {
+        "name": "Battery minimum state of charge"
+      },
+      "battery_power_setpoint": {
+        "name": "Battery power setpoint"
+      }
+    },
+    "select": {
+      "battery_control_mode": {
+        "name": "Battery control mode"
+      }
+    },
     "sensor": {
       "available_charging_energy": {
         "name": "Available charging energy"
@@ -193,6 +226,11 @@
       "tmin": {
         "name": "Minimum temperature"
       }
+    },
+    "switch": {
+      "local_mode": {
+        "name": "Local mode"
+      }
     }
   }
 }

homeassistant/components/hue/v1/sensor_base.py

@@ -181,7 +181,7 @@ class GenericHueSensor(GenericHueDevice, entity.Entity):  # pylint: disable=hass
         )
 
     @property
-    def state_class(self) -> SensorStateClass:
+    def state_class(self):
         """Return the state class of this entity, from STATE_CLASSES, if any."""
         return SensorStateClass.MEASUREMENT
 

homeassistant/components/light/conditions.yaml

@@ -1,4 +1,18 @@
-.condition_common: &condition_common
+is_off:
+  target:
+    entity:
+      domain: light
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+is_on:
   target:
     entity:
       domain: light
@@ -12,6 +26,3 @@
           options:
             - all
             - any
-
-is_off: *condition_common
-is_on: *condition_common

homeassistant/components/mfi/sensor.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 
-from mficlient.client import FailedToLogin, MFiClient, Port as MFiPort
+from mficlient.client import FailedToLogin, MFiClient
 import requests
 import voluptuous as vol
 
@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
     PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
     SensorDeviceClass,
     SensorEntity,
-    StateType,
 )
 from homeassistant.const import (
     CONF_HOST,
@@ -65,29 +64,24 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up mFi sensors."""
-    host: str = config[CONF_HOST]
-    username: str = config[CONF_USERNAME]
-    password: str = config[CONF_PASSWORD]
-    use_tls: bool = config[CONF_SSL]
-    verify_tls: bool = config[CONF_VERIFY_SSL]
+    host = config.get(CONF_HOST)
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+    use_tls = config.get(CONF_SSL)
+    verify_tls = config.get(CONF_VERIFY_SSL)
     default_port = 6443 if use_tls else 6080
-    network_port: int = config.get(CONF_PORT, default_port)
+    port = int(config.get(CONF_PORT, default_port))
 
     try:
         client = MFiClient(
-            host,
-            username,
-            password,
-            port=network_port,
-            use_tls=use_tls,
-            verify=verify_tls,
+            host, username, password, port=port, use_tls=use_tls, verify=verify_tls
         )
     except (FailedToLogin, requests.exceptions.ConnectionError) as ex:
         _LOGGER.error("Unable to connect to mFi: %s", str(ex))
         return
 
     add_entities(
-        MfiSensor(port)
+        MfiSensor(port, hass)
         for device in client.get_devices()
         for port in device.ports.values()
         if port.model in SENSOR_MODELS
@@ -97,17 +91,18 @@ def setup_platform(
 class MfiSensor(SensorEntity):
     """Representation of a mFi sensor."""
 
-    def __init__(self, port: MFiPort) -> None:
+    def __init__(self, port, hass):
         """Initialize the sensor."""
         self._port = port
+        self._hass = hass
 
     @property
-    def name(self) -> str:
+    def name(self):
         """Return the name of the sensor."""
         return self._port.label
 
     @property
-    def native_value(self) -> StateType:
+    def native_value(self):
         """Return the state of the sensor."""
         try:
             tag = self._port.tag
@@ -134,7 +129,7 @@ class MfiSensor(SensorEntity):
         return None
 
     @property
-    def native_unit_of_measurement(self) -> str | None:
+    def native_unit_of_measurement(self):
         """Return the unit of measurement of this entity, if any."""
         try:
             tag = self._port.tag

homeassistant/components/mfi/switch.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from mficlient.client import FailedToLogin, MFiClient, Port as MFiPort
+from mficlient.client import FailedToLogin, MFiClient
 import requests
 import voluptuous as vol
 
@@ -51,23 +51,18 @@ def setup_platform(
     add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up mFi switches."""
-    host: str = config[CONF_HOST]
-    username: str = config[CONF_USERNAME]
-    password: str = config[CONF_PASSWORD]
-    use_tls: bool = config[CONF_SSL]
-    verify_tls: bool = config[CONF_VERIFY_SSL]
+    """Set up mFi sensors."""
+    host = config.get(CONF_HOST)
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+    use_tls = config[CONF_SSL]
+    verify_tls = config.get(CONF_VERIFY_SSL)
     default_port = 6443 if use_tls else 6080
-    network_port: int = config.get(CONF_PORT, default_port)
+    port = int(config.get(CONF_PORT, default_port))
 
     try:
         client = MFiClient(
-            host,
-            username,
-            password,
-            port=network_port,
-            use_tls=use_tls,
-            verify=verify_tls,
+            host, username, password, port=port, use_tls=use_tls, verify=verify_tls
         )
     except (FailedToLogin, requests.exceptions.ConnectionError) as ex:
         _LOGGER.error("Unable to connect to mFi: %s", str(ex))
@@ -84,23 +79,23 @@ def setup_platform(
 class MfiSwitch(SwitchEntity):
     """Representation of an mFi switch-able device."""
 
-    def __init__(self, port: MFiPort) -> None:
+    def __init__(self, port):
         """Initialize the mFi device."""
         self._port = port
-        self._target_state: bool | None = None
+        self._target_state = None
 
     @property
-    def unique_id(self) -> str:
+    def unique_id(self):
         """Return the unique ID of the device."""
         return self._port.ident
 
     @property
-    def name(self) -> str:
+    def name(self):
         """Return the name of the device."""
         return self._port.label
 
     @property
-    def is_on(self) -> bool | None:
+    def is_on(self):
         """Return true if the device is on."""
         return self._port.output
 

homeassistant/components/onedrive/manifest.json

@@ -10,5 +10,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["onedrive_personal_sdk"],
   "quality_scale": "platinum",
-  "requirements": ["onedrive-personal-sdk==0.1.0"]
+  "requirements": ["onedrive-personal-sdk==0.0.17"]
 }

homeassistant/components/openai_conversation/config_flow.py

@@ -112,49 +112,45 @@ class OpenAIConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle the initial step."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user", data_schema=STEP_USER_DATA_SCHEMA
+            )
 
         errors: dict[str, str] = {}
 
-        if user_input is not None:
-            self._async_abort_entries_match(user_input)
-            try:
-                await validate_input(self.hass, user_input)
-            except openai.APIConnectionError:
-                errors["base"] = "cannot_connect"
-            except openai.AuthenticationError:
-                errors["base"] = "invalid_auth"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                return self.async_create_entry(
-                    title="ChatGPT",
-                    data=user_input,
-                    subentries=[
-                        {
-                            "subentry_type": "conversation",
-                            "data": RECOMMENDED_CONVERSATION_OPTIONS,
-                            "title": DEFAULT_CONVERSATION_NAME,
-                            "unique_id": None,
-                        },
-                        {
-                            "subentry_type": "ai_task_data",
-                            "data": RECOMMENDED_AI_TASK_OPTIONS,
-                            "title": DEFAULT_AI_TASK_NAME,
-                            "unique_id": None,
-                        },
-                    ],
-                )
+        self._async_abort_entries_match(user_input)
+        try:
+            await validate_input(self.hass, user_input)
+        except openai.APIConnectionError:
+            errors["base"] = "cannot_connect"
+        except openai.AuthenticationError:
+            errors["base"] = "invalid_auth"
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
+            errors["base"] = "unknown"
+        else:
+            return self.async_create_entry(
+                title="ChatGPT",
+                data=user_input,
+                subentries=[
+                    {
+                        "subentry_type": "conversation",
+                        "data": RECOMMENDED_CONVERSATION_OPTIONS,
+                        "title": DEFAULT_CONVERSATION_NAME,
+                        "unique_id": None,
+                    },
+                    {
+                        "subentry_type": "ai_task_data",
+                        "data": RECOMMENDED_AI_TASK_OPTIONS,
+                        "title": DEFAULT_AI_TASK_NAME,
+                        "unique_id": None,
+                    },
+                ],
+            )
 
         return self.async_show_form(
-            step_id="user",
-            data_schema=self.add_suggested_values_to_schema(
-                STEP_USER_DATA_SCHEMA, user_input
-            ),
-            errors=errors,
-            description_placeholders={
-                "instructions_url": "https://www.home-assistant.io/integrations/openai_conversation/#generate-an-api-key",
-            },
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
 
     @classmethod

homeassistant/components/openai_conversation/strings.json

@@ -12,11 +12,7 @@
       "user": {
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
-        },
-        "data_description": {
-          "api_key": "Your OpenAI API key."
-        },
-        "description": "Set up OpenAI Conversation integration by providing your OpenAI API key. Instructions to obtain an API key can be found [here]({instructions_url})."
+        }
       }
     }
   },

homeassistant/components/opower/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["opower"],
   "quality_scale": "bronze",
-  "requirements": ["opower==0.16.3"]
+  "requirements": ["opower==0.16.2"]
 }

homeassistant/components/sunricher_dali/manifest.json

@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sunricher_dali",
   "iot_class": "local_push",
   "quality_scale": "silver",
-  "requirements": ["PySrDaliGateway==0.19.3"]
+  "requirements": ["PySrDaliGateway==0.18.0"]
 }

homeassistant/components/teslemetry/__init__.py

@@ -2,10 +2,10 @@
 
 import asyncio
 from collections.abc import Callable
-from functools import partial
 from typing import Final
 
-from aiohttp import ClientError, ClientResponseError
+from aiohttp import ClientResponseError
+from aiohttp.client_exceptions import ClientError
 from tesla_fleet_api.const import Scope
 from tesla_fleet_api.exceptions import (
     Forbidden,
@@ -27,7 +27,6 @@ from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import (
-    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
@@ -76,48 +75,28 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def _get_access_token(oauth_session: OAuth2Session) -> str:
-    """Get a valid access token, refreshing if necessary."""
-    LOGGER.debug(
-        "Token valid: %s, expires_at: %s",
-        oauth_session.valid_token,
-        oauth_session.token.get("expires_at"),
-    )
-    try:
-        await oauth_session.async_ensure_token_valid()
-    except ClientResponseError as err:
-        if err.status == 401:
-            raise ConfigEntryAuthFailed from err
-        raise ConfigEntryNotReady from err
-    except (KeyError, TypeError) as err:
-        raise ConfigEntryAuthFailed(
-            translation_domain=DOMAIN,
-            translation_key="token_data_malformed",
-        ) from err
-    except ClientError as err:
-        raise ConfigEntryNotReady from err
-    return oauth_session.token[CONF_ACCESS_TOKEN]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -> bool:
     """Set up Teslemetry config."""
 
     session = async_get_clientsession(hass)
 
-    try:
-        implementation = await async_get_config_entry_implementation(hass, entry)
-    except ImplementationUnavailableError as err:
-        raise ConfigEntryAuthFailed(
-            translation_domain=DOMAIN,
-            translation_key="oauth_implementation_not_available",
-        ) from err
+    implementation = await async_get_config_entry_implementation(hass, entry)
     oauth_session = OAuth2Session(hass, entry, implementation)
 
+    async def _get_access_token() -> str:
+        try:
+            await oauth_session.async_ensure_token_valid()
+        except ClientResponseError as e:
+            if e.status == 401:
+                raise ConfigEntryAuthFailed from e
+            raise ConfigEntryNotReady from e
+        token: str = oauth_session.token[CONF_ACCESS_TOKEN]
+        return token
+
     # Create API connection
-    access_token = partial(_get_access_token, oauth_session)
     teslemetry = Teslemetry(
         session=session,
-        access_token=access_token,
+        access_token=_get_access_token,
     )
     try:
         calls = await asyncio.gather(
@@ -175,7 +154,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
             if not stream:
                 stream = TeslemetryStream(
                     session,
-                    access_token,
+                    _get_access_token,
                     server=f"{region.lower()}.teslemetry.com",
                     parse_timestamp=True,
                     manual=True,

homeassistant/components/teslemetry/strings.json

@@ -997,6 +997,7 @@
       "total_grid_energy_exported": {
         "name": "Grid exported"
       },
+
       "total_home_usage": {
         "name": "Home usage"
       },
@@ -1126,9 +1127,6 @@
     "no_vehicle_data_for_device": {
       "message": "No vehicle data for device ID: {device_id}"
     },
-    "oauth_implementation_not_available": {
-      "message": "OAuth implementation not available, try reauthenticating"
-    },
     "set_scheduled_charging_time": {
       "message": "Scheduled charging time is required when enabling"
     },
@@ -1138,9 +1136,6 @@
     "set_scheduled_departure_preconditioning": {
       "message": "Preconditioning departure time is required when enabling"
     },
-    "token_data_malformed": {
-      "message": "Token data malformed, try reauthenticating"
-    },
     "wake_up_failed": {
       "message": "Failed to wake up vehicle: {message}"
     },

homeassistant/components/utility_meter/__init__.py

@@ -9,8 +9,8 @@ import voluptuous as vol
 from homeassistant.components.select import DOMAIN as SELECT_DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_NAME, CONF_UNIQUE_ID, Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME, CONF_UNIQUE_ID, Platform
+from homeassistant.core import HomeAssistant, split_entity_id
 from homeassistant.helpers import (
     config_validation as cv,
     discovery,
@@ -20,6 +20,7 @@ from homeassistant.helpers.device import (
     async_entity_id_to_device_id,
     async_remove_stale_devices_links_keep_entity_device,
 )
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.helper_integration import (
     async_handle_source_entity_changes,
     async_remove_helper_config_entry_from_source_device,
@@ -43,8 +44,9 @@ from .const import (
     DATA_UTILITY,
     DOMAIN,
     METER_TYPES,
+    SERVICE_RESET,
+    SIGNAL_RESET_METER,
 )
-from .services import async_setup_services
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -118,7 +120,27 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up an Utility Meter."""
     hass.data[DATA_UTILITY] = {}
 
-    async_setup_services(hass)
+    async def async_reset_meters(service_call):
+        """Reset all sensors of a meter."""
+        meters = service_call.data["entity_id"]
+
+        for meter in meters:
+            _LOGGER.debug("resetting meter %s", meter)
+            domain, entity = split_entity_id(meter)
+            # backward compatibility up to 2022.07:
+            if domain == DOMAIN:
+                async_dispatcher_send(
+                    hass, SIGNAL_RESET_METER, f"{SELECT_DOMAIN}.{entity}"
+                )
+            else:
+                async_dispatcher_send(hass, SIGNAL_RESET_METER, meter)
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_RESET,
+        async_reset_meters,
+        vol.Schema({ATTR_ENTITY_ID: vol.All(cv.ensure_list, [cv.entity_id])}),
+    )
 
     if DOMAIN not in config:
         return True

homeassistant/components/utility_meter/sensor.py

@@ -700,7 +700,7 @@ class UtilityMeterSensor(RestoreSensor):
         return None
 
     @property
-    def state_class(self) -> SensorStateClass:
+    def state_class(self):
         """Return the device class of the sensor."""
         return (
             SensorStateClass.TOTAL

homeassistant/components/utility_meter/services.py

@@ -1,43 +0,0 @@
-"""Support for tracking consumption over given periods of time."""
-
-import logging
-
-import voluptuous as vol
-
-from homeassistant.components.select import DOMAIN as SELECT_DOMAIN
-from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall, callback, split_entity_id
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.dispatcher import async_dispatcher_send
-
-from .const import DOMAIN, SERVICE_RESET, SIGNAL_RESET_METER
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_reset_meters(service_call: ServiceCall) -> None:
-    """Reset all sensors of a meter."""
-    meters = service_call.data["entity_id"]
-
-    for meter in meters:
-        _LOGGER.debug("resetting meter %s", meter)
-        domain, entity = split_entity_id(meter)
-        # backward compatibility up to 2022.07:
-        if domain == DOMAIN:
-            async_dispatcher_send(
-                service_call.hass, SIGNAL_RESET_METER, f"{SELECT_DOMAIN}.{entity}"
-            )
-        else:
-            async_dispatcher_send(service_call.hass, SIGNAL_RESET_METER, meter)
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up the services."""
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_RESET,
-        async_reset_meters,
-        vol.Schema({ATTR_ENTITY_ID: vol.All(cv.ensure_list, [cv.entity_id])}),
-    )

homeassistant/generated/zeroconf.py

@@ -581,6 +581,10 @@ ZEROCONF = {
             "domain": "eheimdigital",
             "name": "eheimdigital._http._tcp.local.",
         },
+        {
+            "domain": "homevolt",
+            "name": "homevolt*",
+        },
         {
             "domain": "lektrico",
             "name": "lektrico*",

homeassistant/helpers/config_entry_oauth2_flow.py

@@ -679,6 +679,7 @@ class OAuth2Session:
     @property
     def valid_token(self) -> bool:
         """Return if token is still valid."""
+        _LOGGER.error("Token: %s", self.token["expires_at"])
         return (
             cast(float, self.token["expires_at"])
             > time.time() + CLOCK_OUT_OF_SYNC_MAX_SEC

pylint/plugins/hass_enforce_type_hints.py

@@ -700,7 +700,6 @@ _ENTITY_MATCH: list[TypeHintMatch] = [
     TypeHintMatch(
         function_name="device_class",
         return_type=["str", None],
-        mandatory=True,
     ),
     TypeHintMatch(
         function_name="unit_of_measurement",
@@ -2519,12 +2518,10 @@ _INHERITANCE_MATCH: dict[str, list[ClassTypeHintMatch]] = {
                 TypeHintMatch(
                     function_name="state_class",
                     return_type=["SensorStateClass", "str", None],
-                    mandatory=True,
                 ),
                 TypeHintMatch(
                     function_name="last_reset",
                     return_type=["datetime", None],
-                    mandatory=True,
                 ),
                 TypeHintMatch(
                     function_name="native_value",

requirements_all.txt

@@ -80,7 +80,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.sunricher_dali
-PySrDaliGateway==0.19.3
+PySrDaliGateway==0.18.0
 
 # homeassistant.components.switchbot
 PySwitchbot==0.76.0
@@ -1649,7 +1649,7 @@ omnilogic==0.4.5
 ondilo==0.5.0
 
 # homeassistant.components.onedrive
-onedrive-personal-sdk==0.1.0
+onedrive-personal-sdk==0.0.17
 
 # homeassistant.components.onvif
 onvif-zeep-async==4.0.4
@@ -1686,7 +1686,7 @@ openwrt-luci-rpc==1.1.17
 openwrt-ubus-rpc==0.0.2
 
 # homeassistant.components.opower
-opower==0.16.3
+opower==0.16.2
 
 # homeassistant.components.oralb
 oralb-ble==1.0.2

requirements_test_all.txt

@@ -80,7 +80,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.sunricher_dali
-PySrDaliGateway==0.19.3
+PySrDaliGateway==0.18.0
 
 # homeassistant.components.switchbot
 PySwitchbot==0.76.0
@@ -1432,7 +1432,7 @@ omnilogic==0.4.5
 ondilo==0.5.0
 
 # homeassistant.components.onedrive
-onedrive-personal-sdk==0.1.0
+onedrive-personal-sdk==0.0.17
 
 # homeassistant.components.onvif
 onvif-zeep-async==4.0.4
@@ -1460,7 +1460,7 @@ openrgb-python==0.3.6
 openwebifpy==4.3.1
 
 # homeassistant.components.opower
-opower==0.16.3
+opower==0.16.2
 
 # homeassistant.components.oralb
 oralb-ble==1.0.2

tests/components/firefly_iii/test_sensor.py

@@ -2,7 +2,6 @@
 
 from unittest.mock import AsyncMock, patch
 
-from freezegun.api import FrozenDateTimeFactory
 from pyfirefly.exceptions import (
     FireflyAuthenticationError,
     FireflyConnectionError,
@@ -11,16 +10,14 @@ from pyfirefly.exceptions import (
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.firefly_iii.coordinator import DEFAULT_SCAN_INTERVAL
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt as dt_util
 
 from . import setup_integration
 
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+from tests.common import MockConfigEntry, snapshot_platform
 
 
 async def test_all_entities(
@@ -54,7 +51,6 @@ async def test_refresh_exceptions(
     mock_firefly_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     exception: Exception,
-    freezer: FrozenDateTimeFactory,
 ) -> None:
     """Test entities go unavailable after coordinator refresh failures."""
     await setup_integration(hass, mock_config_entry)
@@ -62,9 +58,7 @@ async def test_refresh_exceptions(
 
     mock_firefly_client.get_accounts.side_effect = exception
 
-    freezer.tick(DEFAULT_SCAN_INTERVAL)
-    async_fire_time_changed(hass, dt_util.utcnow())
-    await hass.async_block_till_done(wait_background_tasks=True)
+    await mock_config_entry.runtime_data.async_refresh()
 
     state = hass.states.get("sensor.credit_card_account_balance")
     assert state is not None

tests/components/homevolt/test_config_flow.py

@@ -2,19 +2,31 @@
 
 from __future__ import annotations
 
+from ipaddress import ip_address
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from homevolt import HomevoltAuthenticationError, HomevoltConnectionError
 import pytest
 
 from homeassistant.components.homevolt.const import DOMAIN
-from homeassistant.config_entries import SOURCE_USER
+from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF
 from homeassistant.const import CONF_HOST, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from tests.common import MockConfigEntry
 
+ZEROCONF_DISCOVERY = ZeroconfServiceInfo(
+    ip_address=ip_address("192.168.68.87"),
+    ip_addresses=[ip_address("192.168.68.87")],
+    hostname="homevolt-68b6b34ce824.local.",
+    name="Homevolt._http._tcp.local.",
+    port=80,
+    type="_http._tcp.local.",
+    properties={},
+)
+
 
 async def test_full_flow_success(
     hass: HomeAssistant, mock_setup_entry: AsyncMock
@@ -168,3 +180,225 @@ async def test_duplicate_entry(
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
+
+
+async def test_zeroconf_discovery_success(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test successful zeroconf discovery flow."""
+    with (
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+            new_callable=AsyncMock,
+        ),
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.get_device",
+        ) as mock_get_device,
+    ):
+        mock_device = MagicMock()
+        mock_device.device_id = "40580137858664"
+        mock_get_device.return_value = mock_device
+
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_ZEROCONF},
+            data=ZEROCONF_DISCOVERY,
+        )
+
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "discovery_confirm"
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Homevolt"
+    assert result["data"] == {
+        CONF_HOST: "192.168.68.87",
+        CONF_PASSWORD: None,
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_zeroconf_discovery_with_password(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test zeroconf discovery when device requires password."""
+    with patch(
+        "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+        new_callable=AsyncMock,
+        side_effect=HomevoltAuthenticationError,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_ZEROCONF},
+            data=ZEROCONF_DISCOVERY,
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "discovery_confirm"
+
+    with (
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+            new_callable=AsyncMock,
+        ),
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.get_device",
+        ) as mock_get_device,
+    ):
+        mock_device = MagicMock()
+        mock_device.device_id = "40580137858664"
+        mock_get_device.return_value = mock_device
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={CONF_PASSWORD: "test-password"},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Homevolt"
+    assert result["data"] == {
+        CONF_HOST: "192.168.68.87",
+        CONF_PASSWORD: "test-password",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_zeroconf_discovery_connection_error(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test zeroconf discovery when device cannot be reached."""
+    with patch(
+        "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+        new_callable=AsyncMock,
+        side_effect=HomevoltConnectionError,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_ZEROCONF},
+            data=ZEROCONF_DISCOVERY,
+        )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "cannot_connect"
+
+
+async def test_zeroconf_discovery_unknown_error(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test zeroconf discovery when an unknown error occurs."""
+    with patch(
+        "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+        new_callable=AsyncMock,
+        side_effect=Exception("Unknown error"),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_ZEROCONF},
+            data=ZEROCONF_DISCOVERY,
+        )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "cannot_connect"
+
+
+async def test_zeroconf_discovery_already_configured(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test zeroconf discovery when device is already configured."""
+    existing_entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "192.168.1.100", CONF_PASSWORD: "test-password"},
+        unique_id="40580137858664",
+    )
+    existing_entry.add_to_hass(hass)
+
+    with (
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+            new_callable=AsyncMock,
+        ),
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.get_device",
+        ) as mock_get_device,
+    ):
+        mock_device = MagicMock()
+        mock_device.device_id = "40580137858664"
+        mock_get_device.return_value = mock_device
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_ZEROCONF},
+            data=ZEROCONF_DISCOVERY,
+        )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+    # Verify host was updated
+    assert existing_entry.data[CONF_HOST] == "192.168.68.87"
+
+
+async def test_zeroconf_discovery_confirm_errors(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test error handling in discovery confirm step."""
+    with (
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+            new_callable=AsyncMock,
+        ),
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.get_device",
+        ) as mock_get_device,
+    ):
+        mock_device = MagicMock()
+        mock_device.device_id = "40580137858664"
+        mock_get_device.return_value = mock_device
+
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_ZEROCONF},
+            data=ZEROCONF_DISCOVERY,
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "discovery_confirm"
+
+    # Test invalid auth error
+    with patch(
+        "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+        new_callable=AsyncMock,
+        side_effect=HomevoltAuthenticationError,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={CONF_PASSWORD: "wrong-password"},
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "discovery_confirm"
+    assert result["errors"] == {"base": "invalid_auth"}
+
+    # Recover with correct password
+    with (
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.update_info",
+            new_callable=AsyncMock,
+        ),
+        patch(
+            "homeassistant.components.homevolt.config_flow.Homevolt.get_device",
+        ) as mock_get_device,
+    ):
+        mock_device = MagicMock()
+        mock_device.device_id = "40580137858664"
+        mock_get_device.return_value = mock_device
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={CONF_PASSWORD: "correct-password"},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY

tests/components/mfi/test_sensor.py

@@ -34,7 +34,7 @@ async def test_setup_missing_config(hass: HomeAssistant) -> None:
     """Test setup with missing configuration."""
     with mock.patch("homeassistant.components.mfi.sensor.MFiClient") as mock_client:
         config = {"sensor": {"platform": "mfi"}}
-        assert await async_setup_component(hass, COMPONENT.DOMAIN, config)
+        assert await async_setup_component(hass, "sensor", config)
         assert not mock_client.called
 
 
@@ -42,14 +42,14 @@ async def test_setup_failed_login(hass: HomeAssistant) -> None:
     """Test setup with login failure."""
     with mock.patch("homeassistant.components.mfi.sensor.MFiClient") as mock_client:
         mock_client.side_effect = FailedToLogin
-        assert not PLATFORM.setup_platform(hass, GOOD_CONFIG[COMPONENT.DOMAIN], None)
+        assert not PLATFORM.setup_platform(hass, GOOD_CONFIG, None)
 
 
 async def test_setup_failed_connect(hass: HomeAssistant) -> None:
     """Test setup with connection failure."""
     with mock.patch("homeassistant.components.mfi.sensor.MFiClient") as mock_client:
         mock_client.side_effect = requests.exceptions.ConnectionError
-        assert not PLATFORM.setup_platform(hass, GOOD_CONFIG[COMPONENT.DOMAIN], None)
+        assert not PLATFORM.setup_platform(hass, GOOD_CONFIG, None)
 
 
 async def test_setup_minimum(hass: HomeAssistant) -> None:
@@ -111,7 +111,7 @@ async def test_setup_adds_proper_devices(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
         for ident, port in ports.items():
             if ident != "bad":
-                mock_sensor.assert_any_call(port)
+                mock_sensor.assert_any_call(port, hass)
         assert mock.call(ports["bad"], hass) not in mock_sensor.mock_calls
 
 
@@ -124,7 +124,7 @@ def port_fixture() -> mock.MagicMock:
 @pytest.fixture(name="sensor")
 def sensor_fixture(hass: HomeAssistant, port: mock.MagicMock) -> mfi.MfiSensor:
     """Sensor fixture."""
-    sensor = mfi.MfiSensor(port)
+    sensor = mfi.MfiSensor(port, hass)
     sensor.hass = hass
     return sensor
 

tests/components/openai_conversation/test_config_flow.py

@@ -58,7 +58,7 @@ async def test_form(hass: HomeAssistant) -> None:
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
     assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
+    assert result["errors"] is None
 
     with (
         patch(

tests/components/sunricher_dali/snapshots/test_button.ambr

@@ -20,7 +20,6 @@
     'labels': set({
     }),
     'name': None,
-    'object_id_base': None,
     'options': dict({
     }),
     'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
@@ -70,7 +69,6 @@
     'labels': set({
     }),
     'name': None,
-    'object_id_base': None,
     'options': dict({
     }),
     'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
@@ -120,7 +118,6 @@
     'labels': set({
     }),
     'name': None,
-    'object_id_base': None,
     'options': dict({
     }),
     'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
@@ -170,7 +167,6 @@
     'labels': set({
     }),
     'name': None,
-    'object_id_base': None,
     'options': dict({
     }),
     'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,

tests/components/teslemetry/test_init.py

@@ -443,37 +443,6 @@ async def test_migrate_from_future_version_fails(hass: HomeAssistant) -> None:
     assert entry.version == 3  # Version should remain unchanged
 
 
-async def test_oauth_implementation_not_available(hass: HomeAssistant) -> None:
-    """Test that missing OAuth implementation triggers reauth."""
-    mock_entry = MockConfigEntry(
-        domain=DOMAIN,
-        version=2,
-        unique_id=UNIQUE_ID,
-        data={
-            "auth_implementation": DOMAIN,
-            "token": {
-                "access_token": "test_access_token",
-                "refresh_token": "test_refresh_token",
-                "expires_at": int(time.time()) + 3600,
-            },
-        },
-    )
-    mock_entry.add_to_hass(hass)
-
-    # Mock the implementation lookup to raise ValueError
-    with patch(
-        "homeassistant.components.teslemetry.async_get_config_entry_implementation",
-        side_effect=ValueError("Implementation not available"),
-    ):
-        await hass.config_entries.async_setup(mock_entry.entry_id)
-        await hass.async_block_till_done()
-
-    entry = hass.config_entries.async_get_entry(mock_entry.entry_id)
-    assert entry is not None
-    # Should trigger reauth, not just fail silently
-    assert entry.state is ConfigEntryState.SETUP_ERROR
-
-
 RETRY_EXCEPTIONS = [
     (RateLimited(data={"after": 5}), 5.0),
     (InvalidResponse(), 10.0),