Bump version to 2026.1.0b0

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ env:
   CACHE_VERSION: 2
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.2"
+  HA_SHORT_VERSION: "2026.1"
   DEFAULT_PYTHON: "3.13.11"
   ALL_PYTHON_VERSIONS: "['3.13.11', '3.14.2']"
   # 10.3 is the oldest supported version

CODEOWNERS

@@ -1170,8 +1170,6 @@ build.json @home-assistant/supervisor
 /tests/components/open_router/ @joostlek
 /homeassistant/components/openerz/ @misialq
 /tests/components/openerz/ @misialq
-/homeassistant/components/openevse/ @c00w
-/tests/components/openevse/ @c00w
 /homeassistant/components/openexchangerates/ @MartinHjelmare
 /tests/components/openexchangerates/ @MartinHjelmare
 /homeassistant/components/opengarage/ @danielhiversen

homeassistant/components/airobot/__init__.py

@@ -7,12 +7,7 @@ from homeassistant.core import HomeAssistant
 
 from .coordinator import AirobotConfigEntry, AirobotDataUpdateCoordinator
 
-PLATFORMS: list[Platform] = [
-    Platform.BUTTON,
-    Platform.CLIMATE,
-    Platform.NUMBER,
-    Platform.SENSOR,
-]
+PLATFORMS: list[Platform] = [Platform.CLIMATE, Platform.NUMBER, Platform.SENSOR]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: AirobotConfigEntry) -> bool:

homeassistant/components/airobot/button.py

@@ -1,89 +0,0 @@
-"""Button platform for Airobot integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Coroutine
-from dataclasses import dataclass
-from typing import Any
-
-from pyairobotrest.exceptions import (
-    AirobotConnectionError,
-    AirobotError,
-    AirobotTimeoutError,
-)
-
-from homeassistant.components.button import (
-    ButtonDeviceClass,
-    ButtonEntity,
-    ButtonEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import DOMAIN
-from .coordinator import AirobotConfigEntry, AirobotDataUpdateCoordinator
-from .entity import AirobotEntity
-
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class AirobotButtonEntityDescription(ButtonEntityDescription):
-    """Describes Airobot button entity."""
-
-    press_fn: Callable[[AirobotDataUpdateCoordinator], Coroutine[Any, Any, None]]
-
-
-BUTTON_TYPES: tuple[AirobotButtonEntityDescription, ...] = (
-    AirobotButtonEntityDescription(
-        key="restart",
-        device_class=ButtonDeviceClass.RESTART,
-        entity_category=EntityCategory.CONFIG,
-        press_fn=lambda coordinator: coordinator.client.reboot_thermostat(),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AirobotConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Airobot button entities."""
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        AirobotButton(coordinator, description) for description in BUTTON_TYPES
-    )
-
-
-class AirobotButton(AirobotEntity, ButtonEntity):
-    """Representation of an Airobot button."""
-
-    entity_description: AirobotButtonEntityDescription
-
-    def __init__(
-        self,
-        coordinator: AirobotDataUpdateCoordinator,
-        description: AirobotButtonEntityDescription,
-    ) -> None:
-        """Initialize the button."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.data.status.device_id}_{description.key}"
-
-    async def async_press(self) -> None:
-        """Handle the button press."""
-        try:
-            await self.entity_description.press_fn(self.coordinator)
-        except (AirobotConnectionError, AirobotTimeoutError):
-            # Connection errors during reboot are expected as device restarts
-            pass
-        except AirobotError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="button_press_failed",
-                translation_placeholders={"button": self.entity_description.key},
-            ) from err

homeassistant/components/airobot/manifest.json

@@ -13,5 +13,5 @@
   "iot_class": "local_polling",
   "loggers": ["pyairobotrest"],
   "quality_scale": "silver",
-  "requirements": ["pyairobotrest==0.2.0"]
+  "requirements": ["pyairobotrest==0.1.0"]
 }

homeassistant/components/airobot/strings.json

@@ -86,9 +86,6 @@
     "authentication_failed": {
       "message": "Authentication failed, please reauthenticate."
     },
-    "button_press_failed": {
-      "message": "Failed to press {button} button."
-    },
     "connection_failed": {
       "message": "Failed to communicate with device."
     },

homeassistant/components/airos/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "silver",
-  "requirements": ["airos==0.6.1"]
+  "requirements": ["airos==0.6.0"]
 }

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==11.0.2"]
+  "requirements": ["aioamazondevices==10.0.0"]
 }

homeassistant/components/automation/__init__.py

@@ -136,7 +136,6 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "light",
     "lock",
     "media_player",
-    "person",
     "scene",
     "siren",
     "switch",

homeassistant/components/bsblan/icons.json

@@ -2,9 +2,6 @@
   "services": {
     "set_hot_water_schedule": {
       "service": "mdi:calendar-clock"
-    },
-    "sync_time": {
-      "service": "mdi:timer-sync-outline"
     }
   }
 }

homeassistant/components/bsblan/manifest.json

@@ -7,7 +7,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
-  "requirements": ["python-bsblan==3.1.6"],
+  "requirements": ["python-bsblan==3.1.4"],
   "zeroconf": [
     {
       "name": "bsb-lan*",

homeassistant/components/bsblan/services.py

@@ -7,13 +7,11 @@ import logging
 from typing import TYPE_CHECKING
 
 from bsblan import BSBLANError, DaySchedule, DHWSchedule, TimeSlot
-import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import config_validation as cv, device_registry as dr
-from homeassistant.util import dt as dt_util
+from homeassistant.helpers import device_registry as dr
 
 from .const import DOMAIN
 
@@ -31,32 +29,32 @@ ATTR_FRIDAY_SLOTS = "friday_slots"
 ATTR_SATURDAY_SLOTS = "saturday_slots"
 ATTR_SUNDAY_SLOTS = "sunday_slots"
 
-# Service names
+# Service name
 SERVICE_SET_HOT_WATER_SCHEDULE = "set_hot_water_schedule"
-SERVICE_SYNC_TIME = "sync_time"
 
 
-# Schema for a single time slot
-_SLOT_SCHEMA = vol.Schema(
-    {
-        vol.Required("start_time"): cv.time,
-        vol.Required("end_time"): cv.time,
-    }
-)
+def _parse_time_value(value: time | str) -> time:
+    """Parse a time value from either a time object or string.
 
+    Raises ServiceValidationError if the format is invalid.
+    """
+    if isinstance(value, time):
+        return value
 
-SERVICE_SET_HOT_WATER_SCHEDULE_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_DEVICE_ID): cv.string,
-        vol.Optional(ATTR_MONDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_TUESDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_WEDNESDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_THURSDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_FRIDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_SATURDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_SUNDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-    }
-)
+    if isinstance(value, str):
+        try:
+            parts = value.split(":")
+            return time(int(parts[0]), int(parts[1]))
+        except (ValueError, IndexError):
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="invalid_time_format",
+            ) from None
+
+    raise ServiceValidationError(
+        translation_domain=DOMAIN,
+        translation_key="invalid_time_format",
+    )
 
 
 def _convert_time_slots_to_day_schedule(
@@ -64,8 +62,8 @@ def _convert_time_slots_to_day_schedule(
 ) -> DaySchedule | None:
     """Convert list of time slot dicts to a DaySchedule object.
 
-    Example: [{"start_time": time(6, 0), "end_time": time(8, 0)},
-              {"start_time": time(17, 0), "end_time": time(21, 0)}]
+    Example: [{"start_time": "06:00", "end_time": "08:00"},
+              {"start_time": "17:00", "end_time": "21:00"}]
     becomes: DaySchedule with two TimeSlot objects
 
     None returns None (don't modify this day).
@@ -79,27 +77,31 @@ def _convert_time_slots_to_day_schedule(
 
     time_slots = []
     for slot in slots:
-        start_time = slot["start_time"]
-        end_time = slot["end_time"]
+        start = slot.get("start_time")
+        end = slot.get("end_time")
 
-        # Validate that end time is after start time
-        if end_time <= start_time:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="end_time_before_start_time",
-                translation_placeholders={
-                    "start_time": start_time.strftime("%H:%M"),
-                    "end_time": end_time.strftime("%H:%M"),
-                },
+        if start and end:
+            start_time = _parse_time_value(start)
+            end_time = _parse_time_value(end)
+
+            # Validate that end time is after start time
+            if end_time <= start_time:
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="end_time_before_start_time",
+                    translation_placeholders={
+                        "start_time": start_time.strftime("%H:%M"),
+                        "end_time": end_time.strftime("%H:%M"),
+                    },
+                )
+
+            time_slots.append(TimeSlot(start=start_time, end=end_time))
+            LOGGER.debug(
+                "Created time slot: %s-%s",
+                start_time.strftime("%H:%M"),
+                end_time.strftime("%H:%M"),
             )
 
-        time_slots.append(TimeSlot(start=start_time, end=end_time))
-        LOGGER.debug(
-            "Created time slot: %s-%s",
-            start_time.strftime("%H:%M"),
-            end_time.strftime("%H:%M"),
-        )
-
     LOGGER.debug("Created DaySchedule with %d slots", len(time_slots))
     return DaySchedule(slots=time_slots)
 
@@ -205,74 +207,6 @@ async def set_hot_water_schedule(service_call: ServiceCall) -> None:
     await entry.runtime_data.slow_coordinator.async_request_refresh()
 
 
-async def async_sync_time(service_call: ServiceCall) -> None:
-    """Synchronize BSB-LAN device time with Home Assistant."""
-    device_id: str = service_call.data[ATTR_DEVICE_ID]
-
-    # Get the device and config entry
-    device_registry = dr.async_get(service_call.hass)
-    device_entry = device_registry.async_get(device_id)
-
-    if device_entry is None:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_device_id",
-            translation_placeholders={"device_id": device_id},
-        )
-
-    # Find the config entry for this device
-    matching_entries: list[BSBLanConfigEntry] = [
-        entry
-        for entry in service_call.hass.config_entries.async_entries(DOMAIN)
-        if entry.entry_id in device_entry.config_entries
-    ]
-
-    if not matching_entries:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="no_config_entry_for_device",
-            translation_placeholders={"device_id": device_entry.name or device_id},
-        )
-
-    entry = matching_entries[0]
-
-    # Verify the config entry is loaded
-    if entry.state is not ConfigEntryState.LOADED:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="config_entry_not_loaded",
-            translation_placeholders={"device_name": device_entry.name or device_id},
-        )
-
-    client = entry.runtime_data.client
-
-    try:
-        # Get current device time
-        device_time = await client.time()
-        current_time = dt_util.now()
-        current_time_str = current_time.strftime("%d.%m.%Y %H:%M:%S")
-
-        # Only sync if device time differs from HA time
-        if device_time.time.value != current_time_str:
-            await client.set_time(current_time_str)
-    except BSBLANError as err:
-        raise HomeAssistantError(
-            translation_domain=DOMAIN,
-            translation_key="sync_time_failed",
-            translation_placeholders={
-                "device_name": device_entry.name or device_id,
-                "error": str(err),
-            },
-        ) from err
-
-
-SYNC_TIME_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_DEVICE_ID): cv.string,
-    }
-)
-
-
 @callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register the BSB-Lan services."""
@@ -280,12 +214,4 @@ def async_setup_services(hass: HomeAssistant) -> None:
         DOMAIN,
         SERVICE_SET_HOT_WATER_SCHEDULE,
         set_hot_water_schedule,
-        schema=SERVICE_SET_HOT_WATER_SCHEDULE_SCHEMA,
-    )
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_SYNC_TIME,
-        async_sync_time,
-        schema=SYNC_TIME_SCHEMA,
     )

homeassistant/components/bsblan/services.yaml

@@ -1,12 +1,3 @@
-sync_time:
-  fields:
-    device_id:
-      required: true
-      example: "abc123device456"
-      selector:
-        device:
-          integration: bsblan
-
 set_hot_water_schedule:
   fields:
     device_id:

homeassistant/components/bsblan/strings.json

@@ -79,6 +79,9 @@
     "invalid_device_id": {
       "message": "Invalid device ID: {device_id}"
     },
+    "invalid_time_format": {
+      "message": "Invalid time format provided"
+    },
     "no_config_entry_for_device": {
       "message": "No configuration entry found for device: {device_id}"
     },
@@ -105,9 +108,6 @@
     },
     "setup_general_error": {
       "message": "An unknown error occurred while retrieving static device data"
-    },
-    "sync_time_failed": {
-      "message": "Failed to sync time for {device_name}: {error}"
     }
   },
   "services": {
@@ -148,16 +148,6 @@
         }
       },
       "name": "Set hot water schedule"
-    },
-    "sync_time": {
-      "description": "Synchronize Home Assistant time to the BSB-Lan device. Only updates if device time differs from Home Assistant time.",
-      "fields": {
-        "device_id": {
-          "description": "The BSB-LAN device to sync time for.",
-          "name": "Device"
-        }
-      },
-      "name": "Sync time"
     }
   }
 }

homeassistant/components/conversation/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["hassil==3.5.0", "home-assistant-intents==2026.1.1"]
+  "requirements": ["hassil==3.5.0", "home-assistant-intents==2025.12.2"]
 }

homeassistant/components/dlna_dmr/manifest.json

@@ -9,7 +9,7 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["async_upnp_client"],
-  "requirements": ["async-upnp-client==0.46.2", "getmac==0.9.5"],
+  "requirements": ["async-upnp-client==0.46.1", "getmac==0.9.5"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",

homeassistant/components/dlna_dms/manifest.json

@@ -8,7 +8,7 @@
   "documentation": "https://www.home-assistant.io/integrations/dlna_dms",
   "integration_type": "service",
   "iot_class": "local_polling",
-  "requirements": ["async-upnp-client==0.46.2"],
+  "requirements": ["async-upnp-client==0.46.1"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaServer:1",

homeassistant/components/duckdns/__init__.py

@@ -1,4 +1,4 @@
-"""Duck DNS integration."""
+"""Integrate with DuckDNS."""
 
 from __future__ import annotations
 

homeassistant/components/duckdns/manifest.json

@@ -4,6 +4,5 @@
   "codeowners": ["@tr4nt0r"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/duckdns",
-  "integration_type": "service",
   "iot_class": "cloud_polling"
 }

homeassistant/components/duckdns/services.py

@@ -2,12 +2,11 @@
 
 from __future__ import annotations
 
-from aiohttp import ClientError
 import voluptuous as vol
 
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_DOMAIN
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.selector import ConfigEntrySelector
@@ -63,25 +62,9 @@ async def update_domain_service(call: ServiceCall) -> None:
 
     session = async_get_clientsession(call.hass)
 
-    try:
-        if not await update_duckdns(
-            session,
-            entry.data[CONF_DOMAIN],
-            entry.data[CONF_ACCESS_TOKEN],
-            txt=call.data.get(ATTR_TXT),
-        ):
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="update_failed",
-                translation_placeholders={
-                    CONF_DOMAIN: entry.data[CONF_DOMAIN],
-                },
-            )
-    except ClientError as e:
-        raise HomeAssistantError(
-            translation_domain=DOMAIN,
-            translation_key="connection_error",
-            translation_placeholders={
-                CONF_DOMAIN: entry.data[CONF_DOMAIN],
-            },
-        ) from e
+    await update_duckdns(
+        session,
+        entry.data[CONF_DOMAIN],
+        entry.data[CONF_ACCESS_TOKEN],
+        txt=call.data.get(ATTR_TXT),
+    )

homeassistant/components/ecowitt/sensor.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import dataclasses
 from datetime import datetime
-import logging
 from typing import Final
 
 from aioecowitt import EcoWittSensor, EcoWittSensorTypes
@@ -40,9 +39,6 @@ from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 from . import EcowittConfigEntry
 from .entity import EcowittEntity
 
-_LOGGER = logging.getLogger(__name__)
-
-
 _METRIC: Final = (
     EcoWittSensorTypes.TEMPERATURE_C,
     EcoWittSensorTypes.RAIN_COUNT_MM,
@@ -61,40 +57,6 @@ _IMPERIAL: Final = (
 )
 
 
-_RAIN_COUNT_SENSORS_STATE_CLASS_MAPPING: Final = {
-    "eventrainin": SensorStateClass.TOTAL_INCREASING,
-    "hourlyrainin": None,
-    "totalrainin": SensorStateClass.TOTAL_INCREASING,
-    "dailyrainin": SensorStateClass.TOTAL_INCREASING,
-    "weeklyrainin": SensorStateClass.TOTAL_INCREASING,
-    "monthlyrainin": SensorStateClass.TOTAL_INCREASING,
-    "yearlyrainin": SensorStateClass.TOTAL_INCREASING,
-    "last24hrainin": None,
-    "eventrainmm": SensorStateClass.TOTAL_INCREASING,
-    "hourlyrainmm": None,
-    "totalrainmm": SensorStateClass.TOTAL_INCREASING,
-    "dailyrainmm": SensorStateClass.TOTAL_INCREASING,
-    "weeklyrainmm": SensorStateClass.TOTAL_INCREASING,
-    "monthlyrainmm": SensorStateClass.TOTAL_INCREASING,
-    "yearlyrainmm": SensorStateClass.TOTAL_INCREASING,
-    "last24hrainmm": None,
-    "erain_piezo": SensorStateClass.TOTAL_INCREASING,
-    "hrain_piezo": None,
-    "drain_piezo": SensorStateClass.TOTAL_INCREASING,
-    "wrain_piezo": SensorStateClass.TOTAL_INCREASING,
-    "mrain_piezo": SensorStateClass.TOTAL_INCREASING,
-    "yrain_piezo": SensorStateClass.TOTAL_INCREASING,
-    "last24hrain_piezo": None,
-    "erain_piezomm": SensorStateClass.TOTAL_INCREASING,
-    "hrain_piezomm": None,
-    "drain_piezomm": SensorStateClass.TOTAL_INCREASING,
-    "wrain_piezomm": SensorStateClass.TOTAL_INCREASING,
-    "mrain_piezomm": SensorStateClass.TOTAL_INCREASING,
-    "yrain_piezomm": SensorStateClass.TOTAL_INCREASING,
-    "last24hrain_piezomm": None,
-}
-
-
 ECOWITT_SENSORS_MAPPING: Final = {
     EcoWittSensorTypes.HUMIDITY: SensorEntityDescription(
         key="HUMIDITY",
@@ -323,15 +285,15 @@ async def async_setup_entry(
             name=sensor.name,
         )
 
-        if sensor.stype in (
-            EcoWittSensorTypes.RAIN_COUNT_INCHES,
-            EcoWittSensorTypes.RAIN_COUNT_MM,
+        # Only total rain needs state class for long-term statistics
+        if sensor.key in (
+            "totalrainin",
+            "totalrainmm",
         ):
-            if sensor.key not in _RAIN_COUNT_SENSORS_STATE_CLASS_MAPPING:
-                _LOGGER.warning("Unknown rain count sensor: %s", sensor.key)
-                return
-            state_class = _RAIN_COUNT_SENSORS_STATE_CLASS_MAPPING[sensor.key]
-            description = dataclasses.replace(description, state_class=state_class)
+            description = dataclasses.replace(
+                description,
+                state_class=SensorStateClass.TOTAL_INCREASING,
+            )
 
         async_add_entities([EcowittSensorEntity(sensor, description)])
 

homeassistant/components/eheimdigital/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "loggers": ["eheimdigital"],
   "quality_scale": "platinum",
-  "requirements": ["eheimdigital==1.5.0"],
+  "requirements": ["eheimdigital==1.4.0"],
   "zeroconf": [
     { "name": "eheimdigital._http._tcp.local.", "type": "_http._tcp.local." }
   ]

homeassistant/components/esphome/manifest.json

@@ -17,7 +17,7 @@
   "mqtt": ["esphome/discover/#"],
   "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==43.10.1",
+    "aioesphomeapi==43.9.0",
     "esphome-dashboard-api==1.3.0",
     "bleak-esphome==3.4.0"
   ],

homeassistant/components/feedreader/__init__.py

@@ -9,12 +9,14 @@ from homeassistant.util.hass_dict import HassKey
 from .const import DOMAIN
 from .coordinator import FeedReaderConfigEntry, FeedReaderCoordinator, StoredData
 
-FEEDREADER_KEY: HassKey[StoredData] = HassKey(DOMAIN)
+CONF_URLS = "urls"
+
+MY_KEY: HassKey[StoredData] = HassKey(DOMAIN)
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: FeedReaderConfigEntry) -> bool:
     """Set up Feedreader from a config entry."""
-    storage = hass.data.setdefault(FEEDREADER_KEY, StoredData(hass))
+    storage = hass.data.setdefault(MY_KEY, StoredData(hass))
     if not storage.is_initialized:
         await storage.async_setup()
 
@@ -40,5 +42,5 @@ async def async_unload_entry(hass: HomeAssistant, entry: FeedReaderConfigEntry)
     )
     # if this is the last entry, remove the storage
     if len(entries) == 1:
-        hass.data.pop(FEEDREADER_KEY)
+        hass.data.pop(MY_KEY)
     return await hass.config_entries.async_unload_platforms(entry, [Platform.EVENT])

homeassistant/components/feedreader/event.py

@@ -19,9 +19,6 @@ from .coordinator import FeedReaderCoordinator
 
 LOGGER = logging.getLogger(__name__)
 
-# Coordinator is used to centralize the data updates
-PARALLEL_UPDATES = 0
-
 ATTR_CONTENT = "content"
 ATTR_DESCRIPTION = "description"
 ATTR_LINK = "link"
@@ -45,15 +42,16 @@ class FeedReaderEvent(CoordinatorEntity[FeedReaderCoordinator], EventEntity):
     _attr_event_types = [EVENT_FEEDREADER]
     _attr_name = None
     _attr_has_entity_name = True
-    _attr_translation_key = "latest_feed"
     _unrecorded_attributes = frozenset(
         {ATTR_CONTENT, ATTR_DESCRIPTION, ATTR_TITLE, ATTR_LINK}
     )
+    coordinator: FeedReaderCoordinator
 
     def __init__(self, coordinator: FeedReaderCoordinator) -> None:
         """Initialize the feedreader event."""
         super().__init__(coordinator)
         self._attr_unique_id = f"{coordinator.config_entry.entry_id}_latest_feed"
+        self._attr_translation_key = "latest_feed"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, coordinator.config_entry.entry_id)},
             name=coordinator.config_entry.title,

homeassistant/components/feedreader/quality_scale.yaml

@@ -1,94 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: No custom actions are defined.
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage:
-    status: todo
-    comment: missing test for uniqueness of feed URL.
-  config-flow:
-    status: todo
-    comment: missing data descriptions
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: No custom actions are defined.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup: done
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: No custom actions are defined.
-  config-entry-unloading: done
-  docs-configuration-parameters: done
-  docs-installation-parameters: done
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow:
-    status: exempt
-    comment: No authentication support.
-  test-coverage:
-    status: done
-    comment: Can use freezer for skipping time instead
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info:
-    status: exempt
-    comment: No discovery support.
-  discovery:
-    status: exempt
-    comment: No discovery support.
-  docs-data-update: done
-  docs-examples: done
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-troubleshooting: todo
-  docs-use-cases: done
-  dynamic-devices:
-    status: exempt
-    comment: Each config entry, represents one service.
-  entity-category: done
-  entity-device-class:
-    status: exempt
-    comment: Matches no available event entity class.
-  entity-disabled-by-default:
-    status: exempt
-    comment: Only one entity per config entry.
-  entity-translations: todo
-  exception-translations: todo
-  icon-translations: done
-  reconfiguration-flow: done
-  repair-issues:
-    status: done
-    comment: Only one repair-issue for yaml-import defined.
-  stale-devices:
-    status: exempt
-    comment: Each config entry, represents one service.
-
-  # Platinum
-  async-dependency:
-    status: todo
-    comment: feedparser lib is not async.
-  inject-websession:
-    status: todo
-    comment: feedparser lib doesn't take a session as argument.
-  strict-typing:
-    status: todo
-    comment: feedparser lib is not fully typed.

homeassistant/components/feedreader/strings.json

@@ -21,6 +21,12 @@
       }
     }
   },
+  "issues": {
+    "import_yaml_error_url_error": {
+      "description": "Configuring the Feedreader using YAML is being removed but there was a connection error when trying to import the YAML configuration for `{url}`.\n\nPlease verify that the URL is reachable and accessible for Home Assistant and restart Home Assistant to try again or remove the Feedreader YAML configuration from your configuration.yaml file and continue to set up the integration manually.",
+      "title": "The Feedreader YAML configuration import failed"
+    }
+  },
   "options": {
     "step": {
       "init": {

homeassistant/components/firefly_iii/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["pyfirefly==0.1.10"]
+  "requirements": ["pyfirefly==0.1.8"]
 }

homeassistant/components/fish_audio/const.py

@@ -35,6 +35,6 @@ BACKEND_MODELS = ["s1", "speech-1.5", "speech-1.6"]
 SORT_BY_OPTIONS = ["task_count", "score", "created_at"]
 LATENCY_OPTIONS = ["normal", "balanced"]
 
-SIGNUP_URL = "https://fish.audio/"
+SIGNUP_URL = "https://fish.audio/?fpr=homeassistant"  # codespell:ignore fpr
 BILLING_URL = "https://fish.audio/app/billing/"
 API_KEYS_URL = "https://fish.audio/app/api-keys/"

homeassistant/components/fressnapf_tracker/light.py

@@ -2,8 +2,6 @@
 
 from typing import TYPE_CHECKING, Any
 
-from fressnapftracker import FressnapfTrackerError
-
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ColorMode,
@@ -18,7 +16,6 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from . import FressnapfTrackerConfigEntry
 from .const import DOMAIN
 from .entity import FressnapfTrackerEntity
-from .services import handle_fressnapf_tracker_exception
 
 PARALLEL_UPDATES = 1
 
@@ -64,18 +61,12 @@ class FressnapfTrackerLight(FressnapfTrackerEntity, LightEntity):
         self.raise_if_not_activatable()
         brightness = kwargs.get(ATTR_BRIGHTNESS, 255)
         brightness = int((brightness / 255) * 100)
-        try:
-            await self.coordinator.client.set_led_brightness(brightness)
-        except FressnapfTrackerError as e:
-            handle_fressnapf_tracker_exception(e)
+        await self.coordinator.client.set_led_brightness(brightness)
         await self.coordinator.async_request_refresh()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the device."""
-        try:
-            await self.coordinator.client.set_led_brightness(0)
-        except FressnapfTrackerError as e:
-            handle_fressnapf_tracker_exception(e)
+        await self.coordinator.client.set_led_brightness(0)
         await self.coordinator.async_request_refresh()
 
     def raise_if_not_activatable(self) -> None:

homeassistant/components/fressnapf_tracker/quality_scale.yaml

@@ -26,7 +26,7 @@ rules:
   unique-config-entry: done
 
   # Silver
-  action-exceptions: done
+  action-exceptions: todo
   config-entry-unloading: done
   docs-configuration-parameters: done
   docs-installation-parameters: done

homeassistant/components/fressnapf_tracker/services.py

@@ -1,21 +0,0 @@
-"""Services and service helpers for fressnapf_tracker."""
-
-from fressnapftracker import FressnapfTrackerError, FressnapfTrackerInvalidTokenError
-
-from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
-
-from .const import DOMAIN
-
-
-def handle_fressnapf_tracker_exception(exception: FressnapfTrackerError):
-    """Handle the different FressnapfTracker errors."""
-    if isinstance(exception, FressnapfTrackerInvalidTokenError):
-        raise ConfigEntryAuthFailed(
-            translation_domain=DOMAIN,
-            translation_key="invalid_auth",
-        ) from exception
-    raise HomeAssistantError(
-        translation_domain=DOMAIN,
-        translation_key="api_error",
-        translation_placeholders={"error_message": str(exception)},
-    ) from exception

homeassistant/components/fressnapf_tracker/strings.json

@@ -77,9 +77,6 @@
     }
   },
   "exceptions": {
-    "api_error": {
-      "message": "An error occurred while communicating with the Fressnapf Tracker API: {error_message}"
-    },
     "charging": {
       "message": "The flashlight cannot be activated while charging."
     },

homeassistant/components/fressnapf_tracker/switch.py

@@ -2,8 +2,6 @@
 
 from typing import TYPE_CHECKING, Any
 
-from fressnapftracker import FressnapfTrackerError
-
 from homeassistant.components.switch import (
     SwitchDeviceClass,
     SwitchEntity,
@@ -15,7 +13,6 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FressnapfTrackerConfigEntry
 from .entity import FressnapfTrackerEntity
-from .services import handle_fressnapf_tracker_exception
 
 PARALLEL_UPDATES = 1
 
@@ -46,18 +43,12 @@ class FressnapfTrackerSwitch(FressnapfTrackerEntity, SwitchEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the device."""
-        try:
-            await self.coordinator.client.set_energy_saving(True)
-        except FressnapfTrackerError as e:
-            handle_fressnapf_tracker_exception(e)
+        await self.coordinator.client.set_energy_saving(True)
         await self.coordinator.async_request_refresh()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the device."""
-        try:
-            await self.coordinator.client.set_energy_saving(False)
-        except FressnapfTrackerError as e:
-            handle_fressnapf_tracker_exception(e)
+        await self.coordinator.client.set_energy_saving(False)
         await self.coordinator.async_request_refresh()
 
     @property

homeassistant/components/google_cloud/helpers.py

@@ -48,8 +48,6 @@ async def async_tts_voices(
     list_voices_response = await client.list_voices()
     for voice in list_voices_response.voices:
         language_code = voice.language_codes[0]
-        if not voice.name.startswith(language_code):
-            continue
         if language_code not in voices:
             voices[language_code] = []
         voices[language_code].append(voice.name)

homeassistant/components/google_generative_ai_conversation/manifest.json

@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google_generative_ai_conversation",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["google-genai==1.56.0"]
+  "requirements": ["google-genai==1.38.0"]
 }

homeassistant/components/hikvision/binary_sensor.py

@@ -24,7 +24,7 @@ from homeassistant.const import (
     CONF_SSL,
     CONF_USERNAME,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import config_validation as cv, issue_registry as ir
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -227,10 +227,7 @@ class HikvisionBinarySensor(BinarySensorEntity):
         # Register callback with pyhik
         self._camera.add_update_callback(self._update_callback, self._callback_id)
 
+    @callback
     def _update_callback(self, msg: str) -> None:
-        """Update the sensor's state when callback is triggered.
-
-        This is called from pyhik's event stream thread, so we use
-        schedule_update_ha_state which is thread-safe.
-        """
-        self.schedule_update_ha_state()
+        """Update the sensor's state when callback is triggered."""
+        self.async_write_ha_state()

homeassistant/components/hue_ble/manifest.json

@@ -4,8 +4,7 @@
   "bluetooth": [
     {
       "connectable": true,
-      "service_data_uuid": "0000fe0f-0000-1000-8000-00805f9b34fb",
-      "service_uuid": "0000fe0f-0000-1000-8000-00805f9b34fb"
+      "service_data_uuid": "0000fe0f-0000-1000-8000-00805f9b34fb"
     }
   ],
   "codeowners": ["@flip-dots"],

homeassistant/components/humidifier/icons.json

@@ -66,7 +66,7 @@
       "trigger": "mdi:air-humidifier-off"
     },
     "turned_on": {
-      "trigger": "mdi:air-humidifier"
+      "trigger": "mdi:air-humidifier-on"
     }
   }
 }

homeassistant/components/hydrawise/sensor.py

@@ -67,21 +67,21 @@ FLOW_CONTROLLER_SENSORS: tuple[HydrawiseSensorEntityDescription, ...] = (
     HydrawiseSensorEntityDescription(
         key="daily_total_water_use",
         translation_key="daily_total_water_use",
-        device_class=SensorDeviceClass.WATER,
+        device_class=SensorDeviceClass.VOLUME,
         suggested_display_precision=1,
         value_fn=lambda sensor: _get_water_use(sensor).total_use,
     ),
     HydrawiseSensorEntityDescription(
         key="daily_active_water_use",
         translation_key="daily_active_water_use",
-        device_class=SensorDeviceClass.WATER,
+        device_class=SensorDeviceClass.VOLUME,
         suggested_display_precision=1,
         value_fn=lambda sensor: _get_water_use(sensor).total_active_use,
     ),
     HydrawiseSensorEntityDescription(
         key="daily_inactive_water_use",
         translation_key="daily_inactive_water_use",
-        device_class=SensorDeviceClass.WATER,
+        device_class=SensorDeviceClass.VOLUME,
         suggested_display_precision=1,
         value_fn=lambda sensor: _get_water_use(sensor).total_inactive_use,
     ),
@@ -91,7 +91,7 @@ FLOW_ZONE_SENSORS: tuple[SensorEntityDescription, ...] = (
     HydrawiseSensorEntityDescription(
         key="daily_active_water_use",
         translation_key="daily_active_water_use",
-        device_class=SensorDeviceClass.WATER,
+        device_class=SensorDeviceClass.VOLUME,
         suggested_display_precision=1,
         value_fn=lambda sensor: float(
             _get_water_use(sensor).active_use_by_zone_id.get(sensor.zone.id, 0.0)
@@ -204,7 +204,7 @@ class HydrawiseSensor(HydrawiseEntity, SensorEntity):
     @property
     def native_unit_of_measurement(self) -> str | None:
         """Return the unit_of_measurement of the sensor."""
-        if self.entity_description.device_class != SensorDeviceClass.WATER:
+        if self.entity_description.device_class != SensorDeviceClass.VOLUME:
             return self.entity_description.native_unit_of_measurement
         return (
             UnitOfVolume.GALLONS
@@ -217,7 +217,7 @@ class HydrawiseSensor(HydrawiseEntity, SensorEntity):
         """Icon of the entity based on the value."""
         if (
             self.entity_description.key in FLOW_MEASUREMENT_KEYS
-            and self.entity_description.device_class == SensorDeviceClass.WATER
+            and self.entity_description.device_class == SensorDeviceClass.VOLUME
             and round(self.state, 2) == 0.0
         ):
             return "mdi:water-outline"

homeassistant/components/knx/manifest.json

@@ -13,7 +13,7 @@
   "requirements": [
     "xknx==3.13.0",
     "xknxproject==3.8.2",
-    "knx-frontend==2025.12.30.151231"
+    "knx-frontend==2025.12.28.215221"
   ],
   "single_config_entry": true
 }

homeassistant/components/knx/strings.json

@@ -154,27 +154,6 @@
     }
   },
   "config_panel": {
-    "dashboard": {
-      "connection_flow": {
-        "description": "Reconfigure KNX connection or import a new KNX keyring file",
-        "title": "Connection settings"
-      },
-      "options_flow": {
-        "description": "Configure integration settings",
-        "title": "Integration options"
-      },
-      "project_upload": {
-        "description": "Import a KNX project file to help configure group addresses and datapoint types",
-        "title": "[%key:component::knx::config_panel::dialogs::project_upload::title%]"
-      }
-    },
-    "dialogs": {
-      "project_upload": {
-        "description": "Details such as group address names, datapoint types, devices and group objects are extracted from your project file. The ETS project file itself and its optional password are not stored.\n\n`.knxproj` files exported by ETS 4, 5 or 6 are supported.",
-        "file_upload_label": "ETS project file",
-        "title": "Import ETS project"
-      }
-    },
     "dpt": {
       "options": {
         "5": "Generic 1-byte unsigned integer",
@@ -866,9 +845,9 @@
             },
             "mode": {
               "description": "Select how the entity is displayed in Home Assistant.",
-              "label": "[%key:common::config_flow::data::mode%]",
+              "label": "[%common::config_flow::data::mode%]",
               "options": {
-                "password": "[%key:common::config_flow::data::password%]",
+                "password": "[%common::config_flow::data::password%]",
                 "text": "[%key:component::text::entity_component::_::state_attributes::mode::state::text%]"
               }
             }

homeassistant/components/knx/websocket.py

@@ -80,6 +80,8 @@ async def register_panel(hass: HomeAssistant) -> None:
             hass=hass,
             frontend_url_path=DOMAIN,
             webcomponent_name=knx_panel.webcomponent_name,
+            sidebar_title=DOMAIN.upper(),
+            sidebar_icon="mdi:bus-electric",
             module_url=f"{URL_BASE}/{knx_panel.entrypoint_js}",
             embed_iframe=True,
             require_admin=True,

homeassistant/components/libre_hardware_monitor/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "silver",
-  "requirements": ["librehardwaremonitor-api==1.8.4"]
+  "requirements": ["librehardwaremonitor-api==1.6.0"]
 }

homeassistant/components/matter/climate.py

@@ -154,7 +154,6 @@ SUPPORT_FAN_MODE_DEVICES: set[tuple[int, int]] = {
     (0x1209, 0x8027),
     (0x1209, 0x8028),
     (0x1209, 0x8029),
-    (0x131A, 0x1000),
 }
 
 SystemModeEnum = clusters.Thermostat.Enums.SystemModeEnum

homeassistant/components/met/coordinator.py

@@ -116,12 +116,8 @@ class MetDataUpdateCoordinator(DataUpdateCoordinator[MetWeatherData]):
         """Fetch data from Met."""
         try:
             return await self.weather.fetch_data()
-        except CannotConnect as err:
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="update_failed",
-                translation_placeholders={"error": str(err)},
-            ) from err
+        except Exception as err:
+            raise UpdateFailed(f"Update failed: {err}") from err
 
     def track_home(self) -> None:
         """Start tracking changes to HA home setting."""

homeassistant/components/met/strings.json

@@ -19,11 +19,6 @@
       }
     }
   },
-  "exceptions": {
-    "update_failed": {
-      "message": "Update of data from the web site failed: {error}"
-    }
-  },
   "options": {
     "step": {
       "init": {

homeassistant/components/miele/__init__.py

@@ -19,12 +19,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from .api import AsyncConfigEntryAuth
 from .const import DOMAIN
-from .coordinator import (
-    MieleAuxDataUpdateCoordinator,
-    MieleConfigEntry,
-    MieleDataUpdateCoordinator,
-    MieleRuntimeData,
-)
+from .coordinator import MieleConfigEntry, MieleDataUpdateCoordinator
 from .services import async_setup_services
 
 PLATFORMS: list[Platform] = [
@@ -80,23 +75,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: MieleConfigEntry) -> boo
         ) from err
 
     # Setup MieleAPI and coordinator for data fetch
-    _api = MieleAPI(auth)
-    _coordinator = MieleDataUpdateCoordinator(hass, entry, _api)
-    await _coordinator.async_config_entry_first_refresh()
-    _aux_coordinator = MieleAuxDataUpdateCoordinator(hass, entry, _api)
-    await _aux_coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = MieleRuntimeData(_api, _coordinator, _aux_coordinator)
+    api = MieleAPI(auth)
+    coordinator = MieleDataUpdateCoordinator(hass, entry, api)
+    await coordinator.async_config_entry_first_refresh()
+    entry.runtime_data = coordinator
 
     entry.async_create_background_task(
         hass,
-        entry.runtime_data.api.listen_events(
-            data_callback=_coordinator.callback_update_data,
-            actions_callback=_coordinator.callback_update_actions,
+        coordinator.api.listen_events(
+            data_callback=coordinator.callback_update_data,
+            actions_callback=coordinator.callback_update_actions,
         ),
         "pymiele event listener",
     )
-
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
@@ -116,5 +107,5 @@ async def async_remove_config_entry_device(
         identifier
         for identifier in device_entry.identifiers
         if identifier[0] == DOMAIN
-        and identifier[1] in config_entry.runtime_data.coordinator.data.devices
+        and identifier[1] in config_entry.runtime_data.data.devices
     )

homeassistant/components/miele/binary_sensor.py

@@ -264,7 +264,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary sensor platform."""
-    coordinator = config_entry.runtime_data.coordinator
+    coordinator = config_entry.runtime_data
     added_devices: set[str] = set()
 
     def _async_add_new_devices() -> None:

homeassistant/components/miele/button.py

@@ -112,7 +112,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the button platform."""
-    coordinator = config_entry.runtime_data.coordinator
+    coordinator = config_entry.runtime_data
     added_devices: set[str] = set()
 
     def _async_add_new_devices() -> None:

homeassistant/components/miele/climate.py

@@ -138,7 +138,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the climate platform."""
-    coordinator = config_entry.runtime_data.coordinator
+    coordinator = config_entry.runtime_data
     added_devices: set[str] = set()
 
     def _async_add_new_devices() -> None:

homeassistant/components/miele/coordinator.py

@@ -9,13 +9,7 @@ from datetime import timedelta
 import logging
 
 from aiohttp import ClientResponseError
-from pymiele import (
-    MieleAction,
-    MieleAPI,
-    MieleDevice,
-    MieleFillingLevel,
-    MieleFillingLevels,
-)
+from pymiele import MieleAction, MieleAPI, MieleDevice
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -26,16 +20,7 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass
-class MieleRuntimeData:
-    """Runtime data for the Miele integration."""
-
-    api: MieleAPI
-    coordinator: MieleDataUpdateCoordinator
-    aux_coordinator: MieleAuxDataUpdateCoordinator
-
-
-type MieleConfigEntry = ConfigEntry[MieleRuntimeData]
+type MieleConfigEntry = ConfigEntry[MieleDataUpdateCoordinator]
 
 
 @dataclass
@@ -46,15 +31,8 @@ class MieleCoordinatorData:
     actions: dict[str, MieleAction]
 
 
-@dataclass
-class MieleAuxCoordinatorData:
-    """Data class for storing auxiliary coordinator data."""
-
-    filling_levels: dict[str, MieleFillingLevel]
-
-
 class MieleDataUpdateCoordinator(DataUpdateCoordinator[MieleCoordinatorData]):
-    """Main coordinator for Miele data."""
+    """Coordinator for Miele data."""
 
     config_entry: MieleConfigEntry
     new_device_callbacks: list[Callable[[dict[str, MieleDevice]], None]] = []
@@ -88,7 +66,6 @@ class MieleDataUpdateCoordinator(DataUpdateCoordinator[MieleCoordinatorData]):
             }
             self.devices = devices
             actions = {}
-
             for device_id in devices:
                 try:
                     actions_json = await self.api.get_actions(device_id)
@@ -122,7 +99,10 @@ class MieleDataUpdateCoordinator(DataUpdateCoordinator[MieleCoordinatorData]):
             device_id: MieleDevice(device) for device_id, device in devices_json.items()
         }
         self.async_set_updated_data(
-            MieleCoordinatorData(devices=devices, actions=self.data.actions)
+            MieleCoordinatorData(
+                devices=devices,
+                actions=self.data.actions,
+            )
         )
 
     async def callback_update_actions(self, actions_json: dict[str, dict]) -> None:
@@ -131,34 +111,8 @@ class MieleDataUpdateCoordinator(DataUpdateCoordinator[MieleCoordinatorData]):
             device_id: MieleAction(action) for device_id, action in actions_json.items()
         }
         self.async_set_updated_data(
-            MieleCoordinatorData(devices=self.data.devices, actions=actions)
-        )
-
-
-class MieleAuxDataUpdateCoordinator(DataUpdateCoordinator[MieleAuxCoordinatorData]):
-    """Coordinator for Miele data for slowly polled endpoints."""
-
-    config_entry: MieleConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: MieleConfigEntry,
-        api: MieleAPI,
-    ) -> None:
-        """Initialize the Miele data coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=config_entry,
-            name=DOMAIN,
-            update_interval=timedelta(seconds=60),
-        )
-        self.api = api
-
-    async def _async_update_data(self) -> MieleAuxCoordinatorData:
-        """Fetch data from the Miele API."""
-        filling_levels_json = await self.api.get_filling_levels()
-        return MieleAuxCoordinatorData(
-            filling_levels=MieleFillingLevels(filling_levels_json).filling_levels
+            MieleCoordinatorData(
+                devices=self.data.devices,
+                actions=actions,
+            )
         )

homeassistant/components/miele/diagnostics.py

@@ -38,19 +38,13 @@ async def async_get_config_entry_diagnostics(
         "devices": redact_identifiers(
             {
                 device_id: device_data.raw
-                for device_id, device_data in config_entry.runtime_data.coordinator.data.devices.items()
-            }
-        ),
-        "filling_levels": redact_identifiers(
-            {
-                device_id: filling_level_data.raw
-                for device_id, filling_level_data in config_entry.runtime_data.aux_coordinator.data.filling_levels.items()
+                for device_id, device_data in config_entry.runtime_data.data.devices.items()
             }
         ),
         "actions": redact_identifiers(
             {
                 device_id: action_data.raw
-                for device_id, action_data in config_entry.runtime_data.coordinator.data.actions.items()
+                for device_id, action_data in config_entry.runtime_data.data.actions.items()
             }
         ),
     }
@@ -74,19 +68,13 @@ async def async_get_device_diagnostics(
         "model_id": device.model_id,
     }
 
-    coordinator = config_entry.runtime_data.coordinator
-    aux_coordinator = config_entry.runtime_data.aux_coordinator
+    coordinator = config_entry.runtime_data
 
     device_id = cast(str, device.serial_number)
     miele_data: dict[str, Any] = {
         "devices": {
             hash_identifier(device_id): coordinator.data.devices[device_id].raw
         },
-        "filling_levels": {
-            hash_identifier(device_id): aux_coordinator.data.filling_levels[
-                device_id
-            ].raw
-        },
         "actions": {
             hash_identifier(device_id): coordinator.data.actions[device_id].raw
         },

homeassistant/components/miele/entity.py

@@ -1,18 +1,16 @@
 """Entity base class for the Miele integration."""
 
-from pymiele import MieleAction, MieleAPI, MieleDevice, MieleFillingLevel
+from pymiele import MieleAction, MieleAPI, MieleDevice
 
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DEVICE_TYPE_TAGS, DOMAIN, MANUFACTURER, MieleAppliance, StateStatus
-from .coordinator import MieleAuxDataUpdateCoordinator, MieleDataUpdateCoordinator
+from .coordinator import MieleDataUpdateCoordinator
 
 
-class MieleBaseEntity[
-    _MieleCoordinatorT: MieleDataUpdateCoordinator | MieleAuxDataUpdateCoordinator
-](CoordinatorEntity[_MieleCoordinatorT]):
+class MieleEntity(CoordinatorEntity[MieleDataUpdateCoordinator]):
     """Base class for Miele entities."""
 
     _attr_has_entity_name = True
@@ -24,7 +22,7 @@ class MieleBaseEntity[
 
     def __init__(
         self,
-        coordinator: _MieleCoordinatorT,
+        coordinator: MieleDataUpdateCoordinator,
         device_id: str,
         description: EntityDescription,
     ) -> None:
@@ -32,26 +30,7 @@ class MieleBaseEntity[
         super().__init__(coordinator)
         self._device_id = device_id
         self.entity_description = description
-        self._attr_unique_id = MieleBaseEntity.get_unique_id(device_id, description)
-        self._attr_device_info = DeviceInfo(identifiers={(DOMAIN, device_id)})
-
-    @property
-    def api(self) -> MieleAPI:
-        """Return the api object."""
-        return self.coordinator.api
-
-
-class MieleEntity(MieleBaseEntity[MieleDataUpdateCoordinator]):
-    """Base class for Miele entities that use the main data coordinator."""
-
-    def __init__(
-        self,
-        coordinator: MieleDataUpdateCoordinator,
-        device_id: str,
-        description: EntityDescription,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator, device_id, description)
+        self._attr_unique_id = MieleEntity.get_unique_id(device_id, description)
 
         device = self.device
         appliance_type = DEVICE_TYPE_TAGS.get(MieleAppliance(device.device_type))
@@ -82,6 +61,11 @@ class MieleEntity(MieleBaseEntity[MieleDataUpdateCoordinator]):
         """Return the actions object."""
         return self.coordinator.data.actions[self._device_id]
 
+    @property
+    def api(self) -> MieleAPI:
+        """Return the api object."""
+        return self.coordinator.api
+
     @property
     def available(self) -> bool:
         """Return the availability of the entity."""
@@ -91,12 +75,3 @@ class MieleEntity(MieleBaseEntity[MieleDataUpdateCoordinator]):
             and self._device_id in self.coordinator.data.devices
             and (self.device.state_status is not StateStatus.not_connected)
         )
-
-
-class MieleAuxEntity(MieleBaseEntity[MieleAuxDataUpdateCoordinator]):
-    """Base class for Miele entities that use the auxiliary data coordinator."""
-
-    @property
-    def levels(self) -> MieleFillingLevel:
-        """Return the filling levels object."""
-        return self.coordinator.data.filling_levels[self._device_id]

homeassistant/components/miele/fan.py

@@ -66,7 +66,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the fan platform."""
-    coordinator = config_entry.runtime_data.coordinator
+    coordinator = config_entry.runtime_data
     added_devices: set[str] = set()
 
     def _async_add_new_devices() -> None:

homeassistant/components/miele/icons.json

@@ -71,9 +71,6 @@
           "plate_step_warming": "mdi:alpha-w-circle-outline"
         }
       },
-      "power_disk_level": {
-        "default": "mdi:car-coolant-level"
-      },
       "program_id": {
         "default": "mdi:selection-ellipse-arrow-inside"
       },
@@ -86,12 +83,6 @@
       "remaining_time": {
         "default": "mdi:clock-end"
       },
-      "rinse_aid_level": {
-        "default": "mdi:water-opacity"
-      },
-      "salt_level": {
-        "default": "mdi:shaker-outline"
-      },
       "spin_speed": {
         "default": "mdi:sync"
       },
@@ -104,12 +95,6 @@
       "target_temperature": {
         "default": "mdi:thermometer-check"
       },
-      "twin_dos_1_level": {
-        "default": "mdi:car-coolant-level"
-      },
-      "twin_dos_2_level": {
-        "default": "mdi:car-coolant-level"
-      },
       "water_forecast": {
         "default": "mdi:water-outline"
       }

homeassistant/components/miele/light.py

@@ -86,7 +86,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the light platform."""
-    coordinator = config_entry.runtime_data.coordinator
+    coordinator = config_entry.runtime_data
     added_devices: set[str] = set()
 
     def _async_add_new_devices() -> None:

homeassistant/components/miele/select.py

@@ -71,7 +71,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the select platform."""
-    coordinator = config_entry.runtime_data.coordinator
+    coordinator = config_entry.runtime_data
     added_devices: set[str] = set()
 
     def _async_add_new_devices() -> None:

homeassistant/components/miele/sensor.py

@@ -8,7 +8,7 @@ from datetime import datetime, timedelta
 import logging
 from typing import Any, Final, cast
 
-from pymiele import MieleDevice, MieleFillingLevel, MieleTemperature
+from pymiele import MieleDevice, MieleTemperature
 
 from homeassistant.components.sensor import (
     RestoreSensor,
@@ -44,12 +44,8 @@ from .const import (
     StateProgramType,
     StateStatus,
 )
-from .coordinator import (
-    MieleAuxDataUpdateCoordinator,
-    MieleConfigEntry,
-    MieleDataUpdateCoordinator,
-)
-from .entity import MieleAuxEntity, MieleEntity
+from .coordinator import MieleConfigEntry, MieleDataUpdateCoordinator
+from .entity import MieleEntity
 
 PARALLEL_UPDATES = 0
 
@@ -143,13 +139,10 @@ def _convert_finish_timestamp(
 
 
 @dataclass(frozen=True, kw_only=True)
-class MieleSensorDescription[T: (MieleDevice, MieleFillingLevel)](
-    SensorEntityDescription
-):
+class MieleSensorDescription(SensorEntityDescription):
     """Class describing Miele sensor entities."""
 
-    value_fn: Callable[[T], StateType | datetime]
-
+    value_fn: Callable[[MieleDevice], StateType | datetime]
     end_value_fn: Callable[[StateType | datetime], StateType | datetime] | None = None
     extra_attributes: dict[str, Callable[[MieleDevice], StateType]] | None = None
     zone: int | None = None
@@ -157,14 +150,14 @@ class MieleSensorDescription[T: (MieleDevice, MieleFillingLevel)](
 
 
 @dataclass
-class MieleSensorDefinition[T: (MieleDevice, MieleFillingLevel)]:
+class MieleSensorDefinition:
     """Class for defining sensor entities."""
 
     types: tuple[MieleAppliance, ...]
-    description: MieleSensorDescription[T]
+    description: MieleSensorDescription
 
 
-SENSOR_TYPES: Final[tuple[MieleSensorDefinition[MieleDevice], ...]] = (
+SENSOR_TYPES: Final[tuple[MieleSensorDefinition, ...]] = (
     MieleSensorDefinition(
         types=(
             MieleAppliance.WASHING_MACHINE,
@@ -696,59 +689,6 @@ SENSOR_TYPES: Final[tuple[MieleSensorDefinition[MieleDevice], ...]] = (
     ),
 )
 
-POLLED_SENSOR_TYPES: Final[tuple[MieleSensorDefinition[MieleFillingLevel], ...]] = (
-    MieleSensorDefinition(
-        types=(MieleAppliance.WASHING_MACHINE,),
-        description=MieleSensorDescription[MieleFillingLevel](
-            key="twin_dos_1_level",
-            translation_key="twin_dos_1_level",
-            value_fn=lambda value: value.twin_dos_container_1_filling_level,
-            native_unit_of_measurement=PERCENTAGE,
-            entity_category=EntityCategory.DIAGNOSTIC,
-        ),
-    ),
-    MieleSensorDefinition(
-        types=(MieleAppliance.WASHING_MACHINE,),
-        description=MieleSensorDescription[MieleFillingLevel](
-            key="twin_dos_2_level",
-            translation_key="twin_dos_2_level",
-            value_fn=lambda value: value.twin_dos_container_2_filling_level,
-            native_unit_of_measurement=PERCENTAGE,
-            entity_category=EntityCategory.DIAGNOSTIC,
-        ),
-    ),
-    MieleSensorDefinition(
-        types=(MieleAppliance.DISHWASHER,),
-        description=MieleSensorDescription[MieleFillingLevel](
-            key="power_disk_level",
-            translation_key="power_disk_level",
-            value_fn=lambda value: None,
-            native_unit_of_measurement=PERCENTAGE,
-            entity_category=EntityCategory.DIAGNOSTIC,
-        ),
-    ),
-    MieleSensorDefinition(
-        types=(MieleAppliance.DISHWASHER,),
-        description=MieleSensorDescription[MieleFillingLevel](
-            key="salt_level",
-            translation_key="salt_level",
-            value_fn=lambda value: value.salt_filling_level,
-            native_unit_of_measurement=PERCENTAGE,
-            entity_category=EntityCategory.DIAGNOSTIC,
-        ),
-    ),
-    MieleSensorDefinition(
-        types=(MieleAppliance.DISHWASHER,),
-        description=MieleSensorDescription[MieleFillingLevel](
-            key="rinse_aid_level",
-            translation_key="rinse_aid_level",
-            value_fn=lambda value: value.rinse_aid_filling_level,
-            native_unit_of_measurement=PERCENTAGE,
-            entity_category=EntityCategory.DIAGNOSTIC,
-        ),
-    ),
-)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -756,14 +696,11 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
-    coordinator = config_entry.runtime_data.coordinator
-    aux_coordinator = config_entry.runtime_data.aux_coordinator
+    coordinator = config_entry.runtime_data
     added_devices: set[str] = set()  # device_id
     added_entities: set[str] = set()  # unique_id
 
-    def _get_entity_class(
-        definition: MieleSensorDefinition[MieleDevice],
-    ) -> type[MieleSensor]:
+    def _get_entity_class(definition: MieleSensorDefinition) -> type[MieleSensor]:
         """Get the entity class for the sensor."""
         return {
             "state_status": MieleStatusSensor,
@@ -788,7 +725,7 @@ async def async_setup_entry(
         )
 
     def _is_sensor_enabled(
-        definition: MieleSensorDefinition[MieleDevice],
+        definition: MieleSensorDefinition,
         device: MieleDevice,
         unique_id: str,
     ) -> bool:
@@ -811,15 +748,6 @@ async def async_setup_entry(
             return False
         return True
 
-    def _enabled_aux_sensor(
-        definition: MieleSensorDefinition[MieleFillingLevel], level: MieleFillingLevel
-    ) -> bool:
-        """Check if aux sensors are enabled."""
-        return not (
-            definition.description.value_fn is not None
-            and definition.description.value_fn(level) is None
-        )
-
     def _async_add_devices() -> None:
         nonlocal added_devices, added_entities
         entities: list = []
@@ -847,11 +775,7 @@ async def async_setup_entry(
                     continue
 
                 # sensors is not enabled, skip
-                if not _is_sensor_enabled(
-                    definition,
-                    device,
-                    unique_id,
-                ):
+                if not _is_sensor_enabled(definition, device, unique_id):
                     continue
 
                 added_entities.add(unique_id)
@@ -863,15 +787,6 @@ async def async_setup_entry(
     config_entry.async_on_unload(coordinator.async_add_listener(_async_add_devices))
     _async_add_devices()
 
-    async_add_entities(
-        MieleAuxSensor(aux_coordinator, device_id, definition.description)
-        for device_id in aux_coordinator.data.filling_levels
-        for definition in POLLED_SENSOR_TYPES
-        if _enabled_aux_sensor(
-            definition, aux_coordinator.data.filling_levels[device_id]
-        )
-    )
-
 
 APPLIANCE_ICONS = {
     MieleAppliance.WASHING_MACHINE: "mdi:washing-machine",
@@ -970,32 +885,6 @@ class MieleRestorableSensor(MieleSensor, RestoreSensor):
         super()._handle_coordinator_update()
 
 
-class MieleAuxSensor(MieleAuxEntity, SensorEntity):
-    """Representation of a filling level Sensor."""
-
-    entity_description: MieleSensorDescription
-
-    def __init__(
-        self,
-        coordinator: MieleAuxDataUpdateCoordinator,
-        device_id: str,
-        description: MieleSensorDescription,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator, device_id, description)
-        if description.unique_id_fn is not None:
-            self._attr_unique_id = description.unique_id_fn(device_id, description)
-
-    @property
-    def native_value(self) -> StateType | datetime:
-        """Return the state of the level sensor."""
-        return (
-            self.entity_description.value_fn(self.levels)
-            if self.entity_description.value_fn is not None
-            else None
-        )
-
-
 class MielePlateSensor(MieleSensor):
     """Representation of a Sensor."""
 

homeassistant/components/miele/strings.json

@@ -257,9 +257,6 @@
           "plate_step_warm": "Warming"
         }
       },
-      "power_disk_level": {
-        "name": "PowerDisk level"
-      },
       "program_id": {
         "name": "Program",
         "state": {
@@ -1041,12 +1038,6 @@
       "remaining_time": {
         "name": "Remaining time"
       },
-      "rinse_aid_level": {
-        "name": "Rinse aid level"
-      },
-      "salt_level": {
-        "name": "Salt level"
-      },
       "spin_speed": {
         "name": "Spin speed"
       },
@@ -1089,12 +1080,6 @@
       "temperature_zone_3": {
         "name": "Temperature zone 3"
       },
-      "twin_dos_1_level": {
-        "name": "TwinDos 1 level"
-      },
-      "twin_dos_2_level": {
-        "name": "TwinDos 2 level"
-      },
       "water_consumption": {
         "name": "Water consumption"
       },

homeassistant/components/miele/switch.py

@@ -117,7 +117,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switch platform."""
-    coordinator = config_entry.runtime_data.coordinator
+    coordinator = config_entry.runtime_data
     added_devices: set[str] = set()
 
     def _async_add_new_devices() -> None:

homeassistant/components/miele/vacuum.py

@@ -128,7 +128,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the vacuum platform."""
-    coordinator = config_entry.runtime_data.coordinator
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         MieleVacuum(coordinator, device_id, definition.description)

homeassistant/components/mobile_app/http_api.py

@@ -69,7 +69,7 @@ class RegistrationsView(HomeAssistantView):
 
         webhook_id = secrets.token_hex()
 
-        if cloud.async_active_subscription(hass) and cloud.async_is_connected(hass):
+        if cloud.async_active_subscription(hass):
             data[CONF_CLOUDHOOK_URL] = await async_create_cloud_hook(
                 hass, webhook_id, None
             )

homeassistant/components/netgear/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@hacf-fr", "@Quentame", "@starkillerOG"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/netgear",
-  "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pynetgear"],
   "requirements": ["pynetgear==0.10.10"],

homeassistant/components/netgear_lte/__init__.py

@@ -51,6 +51,7 @@ ALL_BINARY_SENSORS = [
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
+    Platform.NOTIFY,
     Platform.SENSOR,
 ]
 
@@ -60,7 +61,6 @@ CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Netgear LTE component."""
     hass.data[DATA_HASS_CONFIG] = config
-    async_setup_services(hass)
 
     return True
 
@@ -96,15 +96,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: NetgearLTEConfigEntry) -
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
+    async_setup_services(hass)
+
     await discovery.async_load_platform(
         hass,
         Platform.NOTIFY,
         DOMAIN,
-        {CONF_NAME: entry.title, "modem": modem, "entry": entry},
+        {CONF_NAME: entry.title, "modem": modem},
         hass.data[DATA_HASS_CONFIG],
     )
 
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(
+        entry, [platform for platform in PLATFORMS if platform != Platform.NOTIFY]
+    )
 
     return True
 
@@ -114,5 +118,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: NetgearLTEConfigEntry)
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
     if not hass.config_entries.async_loaded_entries(DOMAIN):
         hass.data.pop(DOMAIN, None)
+        for service_name in hass.services.async_services()[DOMAIN]:
+            hass.services.async_remove(DOMAIN, service_name)
 
     return unload_ok

homeassistant/components/netgear_lte/config_flow.py

@@ -14,7 +14,7 @@ from homeassistant.const import CONF_HOST, CONF_PASSWORD
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
-from .const import DEFAULT_HOST, DOMAIN, MANUFACTURER
+from .const import DEFAULT_HOST, DOMAIN, LOGGER, MANUFACTURER
 
 
 class NetgearLTEFlowHandler(ConfigFlow, domain=DOMAIN):
@@ -72,6 +72,9 @@ class NetgearLTEFlowHandler(ConfigFlow, domain=DOMAIN):
             info = await modem.information()
         except Error as ex:
             raise InputValidationError("cannot_connect") from ex
+        except Exception as ex:
+            LOGGER.exception("Unexpected exception")
+            raise InputValidationError("unknown") from ex
         await modem.logout()
         return info
 

homeassistant/components/netgear_lte/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["eternalegypt"],
-  "requirements": ["eternalegypt==0.0.18"]
+  "requirements": ["eternalegypt==0.0.16"]
 }

homeassistant/components/netgear_lte/notify.py

@@ -38,7 +38,6 @@ class NetgearNotifyService(BaseNotificationService):
         """Initialize the service."""
         self.config = config
         self.modem: Modem = discovery_info["modem"]
-        discovery_info["entry"].async_on_unload(self.async_unregister_services)
 
     async def async_send_message(self, message="", **kwargs):
         """Send a message to a user."""

homeassistant/components/netgear_lte/services.py

@@ -4,7 +4,6 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 
 from .const import (
@@ -15,6 +14,7 @@ from .const import (
     AUTOCONNECT_MODES,
     DOMAIN,
     FAILOVER_MODES,
+    LOGGER,
 )
 from .coordinator import NetgearLTEConfigEntry
 
@@ -56,11 +56,8 @@ async def _service_handler(call: ServiceCall) -> None:
             break
 
     if not entry or not (modem := entry.runtime_data.modem).token:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="config_entry_not_found",
-            translation_placeholders={"service": call.service},
-        )
+        LOGGER.error("%s: host %s unavailable", call.service, host)
+        return
 
     if call.service == SERVICE_DELETE_SMS:
         for sms_id in call.data[ATTR_SMS_ID]:

homeassistant/components/netgear_lte/strings.json

@@ -71,11 +71,6 @@
       }
     }
   },
-  "exceptions": {
-    "config_entry_not_found": {
-      "message": "Failed to perform action \"{service}\". Config entry for target not found"
-    }
-  },
   "services": {
     "connect_lte": {
       "description": "Asks the modem to establish the LTE connection.",

homeassistant/components/nextdns/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["nextdns"],
   "quality_scale": "platinum",
-  "requirements": ["nextdns==5.0.0"]
+  "requirements": ["nextdns==4.1.0"]
 }

homeassistant/components/nibe_heatpump/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nibe_heatpump",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["nibe==2.21.0"]
+  "requirements": ["nibe==2.20.0"]
 }

homeassistant/components/nuheat/manifest.json

@@ -10,7 +10,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/nuheat",
-  "integration_type": "device",
   "iot_class": "cloud_polling",
   "loggers": ["nuheat"],
   "requirements": ["nuheat==1.0.1"]

homeassistant/components/openevse/__init__.py

@@ -1,30 +1 @@
-"""The OpenEVSE integration."""
-
-from __future__ import annotations
-
-import openevsewifi
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-
-type OpenEVSEConfigEntry = ConfigEntry[openevsewifi.Charger]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: OpenEVSEConfigEntry) -> bool:
-    """Set up openevse from a config entry."""
-
-    entry.runtime_data = openevsewifi.Charger(entry.data[CONF_HOST])
-    try:
-        await hass.async_add_executor_job(entry.runtime_data.getStatus)
-    except AttributeError as ex:
-        raise ConfigEntryError("Unable to connect to charger") from ex
-
-    await hass.config_entries.async_forward_entry_setups(entry, [Platform.SENSOR])
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, [Platform.SENSOR])
+"""The openevse component."""

homeassistant/components/openevse/config_flow.py

@@ -1,64 +0,0 @@
-"""Config flow for OpenEVSE integration."""
-
-from typing import Any
-
-import openevsewifi
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST
-
-from .const import DOMAIN
-
-
-class OpenEVSEConfigFlow(ConfigFlow, domain=DOMAIN):
-    """OpenEVSE config flow."""
-
-    VERSION = 1
-    MINOR_VERSION = 1
-
-    async def check_status(self, host: str) -> bool:
-        """Check if we can connect to the OpenEVSE charger."""
-
-        charger = openevsewifi.Charger(host)
-        try:
-            result = await self.hass.async_add_executor_job(charger.getStatus)
-        except AttributeError:
-            return False
-        else:
-            return result is not None
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-
-        errors = None
-        if user_input is not None:
-            self._async_abort_entries_match({CONF_HOST: user_input[CONF_HOST]})
-
-            if await self.check_status(user_input[CONF_HOST]):
-                return self.async_create_entry(
-                    title=f"OpenEVSE {user_input[CONF_HOST]}",
-                    data=user_input,
-                )
-            errors = {CONF_HOST: "cannot_connect"}
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema({vol.Required(CONF_HOST): str}),
-            errors=errors,
-        )
-
-    async def async_step_import(self, data: dict[str, str]) -> ConfigFlowResult:
-        """Handle the initial step."""
-
-        self._async_abort_entries_match({CONF_HOST: data[CONF_HOST]})
-
-        if not await self.check_status(data[CONF_HOST]):
-            return self.async_abort(reason="unavailable_host")
-
-        return self.async_create_entry(
-            title=f"OpenEVSE {data[CONF_HOST]}",
-            data=data,
-        )

homeassistant/components/openevse/const.py

@@ -1,4 +0,0 @@
-"""Constants for the OpenEVSE integration."""
-
-DOMAIN = "openevse"
-INTEGRATION_TITLE = "OpenEVSE"

homeassistant/components/openevse/manifest.json

@@ -1,10 +1,8 @@
 {
   "domain": "openevse",
   "name": "OpenEVSE",
-  "codeowners": ["@c00w"],
-  "config_flow": true,
+  "codeowners": [],
   "documentation": "https://www.home-assistant.io/integrations/openevse",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["openevsewifi"],
   "quality_scale": "legacy",

homeassistant/components/openevse/sensor.py

@@ -9,14 +9,12 @@ from requests import RequestException
 import voluptuous as vol
 
 from homeassistant.components.sensor import (
-    DOMAIN as HOMEASSISTANT_DOMAIN,
     PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import (
     CONF_HOST,
     CONF_MONITORED_VARIABLES,
@@ -25,17 +23,10 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers import config_validation as cv, issue_registry as ir
-from homeassistant.helpers.entity_platform import (
-    AddConfigEntryEntitiesCallback,
-    AddEntitiesCallback,
-)
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import ConfigEntry
-from .const import DOMAIN, INTEGRATION_TITLE
-
 _LOGGER = logging.getLogger(__name__)
 
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
@@ -63,7 +54,6 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="rtc_temp",
@@ -71,7 +61,6 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="usage_session",
@@ -101,86 +90,33 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
 )
 
 
-async def async_setup_platform(
+def setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
+    add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the openevse platform."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_IMPORT},
-        data=config,
-    )
+    """Set up the OpenEVSE sensor."""
+    host = config[CONF_HOST]
+    monitored_variables = config[CONF_MONITORED_VARIABLES]
 
-    if (
-        result.get("type") is FlowResultType.ABORT
-        and result.get("reason") != "already_configured"
-    ):
-        ir.async_create_issue(
-            hass,
-            DOMAIN,
-            f"deprecated_yaml_import_issue_{result.get('reason')}",
-            breaks_in_ha_version="2026.6.0",
-            is_fixable=False,
-            issue_domain=DOMAIN,
-            severity=ir.IssueSeverity.WARNING,
-            translation_key=f"deprecated_yaml_import_issue_{result.get('reason')}",
-            translation_placeholders={
-                "domain": DOMAIN,
-                "integration_title": INTEGRATION_TITLE,
-            },
-        )
-        return
+    charger = openevsewifi.Charger(host)
 
-    ir.async_create_issue(
-        hass,
-        HOMEASSISTANT_DOMAIN,
-        "deprecated_yaml",
-        breaks_in_ha_version="2026.7.0",
-        is_fixable=False,
-        issue_domain=DOMAIN,
-        severity=ir.IssueSeverity.WARNING,
-        translation_key="deprecated_yaml",
-        translation_placeholders={
-            "domain": DOMAIN,
-            "integration_title": INTEGRATION_TITLE,
-        },
-    )
+    entities = [
+        OpenEVSESensor(charger, description)
+        for description in SENSOR_TYPES
+        if description.key in monitored_variables
+    ]
 
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Add sensors for passed config_entry in HA."""
-    async_add_entities(
-        (
-            OpenEVSESensor(
-                config_entry.data[CONF_HOST],
-                config_entry.runtime_data,
-                description,
-            )
-            for description in SENSOR_TYPES
-        ),
-        True,
-    )
+    add_entities(entities, True)
 
 
 class OpenEVSESensor(SensorEntity):
     """Implementation of an OpenEVSE sensor."""
 
-    def __init__(
-        self,
-        host: str,
-        charger: openevsewifi.Charger,
-        description: SensorEntityDescription,
-    ) -> None:
+    def __init__(self, charger, description: SensorEntityDescription) -> None:
         """Initialize the sensor."""
         self.entity_description = description
-        self.host = host
         self.charger = charger
 
     def update(self) -> None:

homeassistant/components/openevse/strings.json

@@ -1,27 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "This charger is already configured",
-      "unavailable_host": "Unable to connect to host"
-    },
-    "error": {
-      "cannot_connect": "Unable to connect"
-    },
-    "step": {
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        },
-        "data_description": {
-          "host": "Enter the IP Address of your openevse. Should match the address you used to set it up."
-        }
-      }
-    }
-  },
-  "issues": {
-    "yaml_deprecated": {
-      "description": "Configuring OpenEVSE using YAML is being removed. Your existing YAML configuration has been imported into the UI automatically. Remove the `openevse` configuration from your configuration.yaml file and restart Home Assistant to fix this issue.",
-      "title": "OpenEVSE YAML configuration is deprecated"
-    }
-  }
-}

homeassistant/components/opower/manifest.json

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

homeassistant/components/overkiz/diagnostics.py

@@ -61,10 +61,7 @@ async def async_get_device_diagnostics(
         data["execution_history"] = [
             repr(execution)
             for execution in await client.get_execution_history()
-            if any(
-                command.device_url.split("#", 1)[0] == device_url.split("#", 1)[0]
-                for command in execution.commands
-            )
+            if any(command.device_url == device_url for command in execution.commands)
         ]
 
     return data

homeassistant/components/permobil/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@IsakNyberg"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/permobil",
-  "integration_type": "device",
   "iot_class": "cloud_polling",
   "requirements": ["mypermobil==0.1.8"]
 }

homeassistant/components/person/icons.json

@@ -11,13 +11,5 @@
     "reload": {
       "service": "mdi:reload"
     }
-  },
-  "triggers": {
-    "entered_home": {
-      "trigger": "mdi:account-arrow-left"
-    },
-    "left_home": {
-      "trigger": "mdi:account-arrow-right"
-    }
   }
 }

homeassistant/components/person/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted persons to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "entity_component": {
     "_": {
       "name": "[%key:component::person::title%]",
@@ -29,42 +25,11 @@
       }
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "reload": {
       "description": "Reloads persons from the YAML-configuration.",
       "name": "[%key:common::action::reload%]"
     }
   },
-  "title": "Person",
-  "triggers": {
-    "entered_home": {
-      "description": "Triggers when one or more persons enter home.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::person::common::trigger_behavior_description%]",
-          "name": "[%key:component::person::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Entered home"
-    },
-    "left_home": {
-      "description": "Triggers when one or more persons leave home.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::person::common::trigger_behavior_description%]",
-          "name": "[%key:component::person::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Left home"
-    }
-  }
+  "title": "Person"
 }

homeassistant/components/person/trigger.py

@@ -1,21 +0,0 @@
-"""Provides triggers for persons."""
-
-from homeassistant.const import STATE_HOME
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.trigger import (
-    Trigger,
-    make_entity_origin_state_trigger,
-    make_entity_target_state_trigger,
-)
-
-from .const import DOMAIN
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "entered_home": make_entity_target_state_trigger(DOMAIN, STATE_HOME),
-    "left_home": make_entity_origin_state_trigger(DOMAIN, from_state=STATE_HOME),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for persons."""
-    return TRIGGERS

homeassistant/components/person/triggers.yaml

@@ -1,18 +0,0 @@
-.trigger_common: &trigger_common
-  target:
-    entity:
-      domain: person
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          options:
-            - first
-            - last
-            - any
-          translation_key: trigger_behavior
-
-entered_home: *trigger_common
-left_home: *trigger_common

homeassistant/components/playstation_network/manifest.json

@@ -75,15 +75,6 @@
     },
     {
       "macaddress": "84E657*"
-    },
-    {
-      "hostname": "ps5-*"
-    },
-    {
-      "hostname": "ps4-*"
-    },
-    {
-      "hostname": "ps3"
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/playstation_network",

homeassistant/components/pooldose/config_flow.py

@@ -114,72 +114,32 @@ class PooldoseConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle the initial step."""
-        if user_input is not None:
-            host = user_input[CONF_HOST]
-            serial_number, api_versions, errors = await self._validate_host(host)
-            if errors:
-                return self.async_show_form(
-                    step_id="user",
-                    data_schema=SCHEMA_DEVICE,
-                    errors=errors,
-                    # Handle API version info for error display; pass version info when available
-                    # or None when api_versions is None to avoid displaying version details
-                    description_placeholders={
-                        "api_version_is": api_versions.get("api_version_is") or "",
-                        "api_version_should": api_versions.get("api_version_should")
-                        or "",
-                    }
-                    if api_versions
-                    else None,
-                )
-
-            await self.async_set_unique_id(serial_number, raise_on_progress=False)
-            self._abort_if_unique_id_configured()
-            return self.async_create_entry(
-                title=f"PoolDose {serial_number}",
-                data={CONF_HOST: host},
+        if not user_input:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=SCHEMA_DEVICE,
             )
 
-        return self.async_show_form(
-            step_id="user",
-            data_schema=SCHEMA_DEVICE,
-        )
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfigure to change the device host/IP for an existing entry."""
-        if user_input is not None:
-            host = user_input[CONF_HOST]
-            serial_number, api_versions, errors = await self._validate_host(host)
-            if errors:
-                return self.async_show_form(
-                    step_id="reconfigure",
-                    data_schema=SCHEMA_DEVICE,
-                    errors=errors,
-                    # Handle API version info for error display identical to other steps
-                    description_placeholders={
-                        "api_version_is": api_versions.get("api_version_is") or "",
-                        "api_version_should": api_versions.get("api_version_should")
-                        or "",
-                    }
-                    if api_versions
-                    else None,
-                )
-
-            # Ensure new serial number matches the existing entry unique_id (serial number)
-            if serial_number != self._get_reconfigure_entry().unique_id:
-                return self.async_abort(reason="wrong_device")
-
-            # Update the existing config entry with the new host and schedule reload
-            return self.async_update_reload_and_abort(
-                self._get_reconfigure_entry(), data_updates={CONF_HOST: host}
+        host = user_input[CONF_HOST]
+        serial_number, api_versions, errors = await self._validate_host(host)
+        if errors:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=SCHEMA_DEVICE,
+                errors=errors,
+                # Handle API version info for error display; pass version info when available
+                # or None when api_versions is None to avoid displaying version details
+                description_placeholders={
+                    "api_version_is": api_versions.get("api_version_is") or "",
+                    "api_version_should": api_versions.get("api_version_should") or "",
+                }
+                if api_versions
+                else None,
             )
 
-        return self.async_show_form(
-            step_id="reconfigure",
-            # Pre-fill with current host from the entry being reconfigured
-            data_schema=self.add_suggested_values_to_schema(
-                SCHEMA_DEVICE, self._get_reconfigure_entry().data
-            ),
+        await self.async_set_unique_id(serial_number, raise_on_progress=False)
+        self._abort_if_unique_id_configured()
+        return self.async_create_entry(
+            title=f"PoolDose {serial_number}",
+            data={CONF_HOST: host},
         )

homeassistant/components/pooldose/diagnostics.py

@@ -1,34 +0,0 @@
-"""Diagnostics support for Pooldose."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.core import HomeAssistant
-
-from . import PooldoseConfigEntry
-
-TO_REDACT = {
-    "IP",
-    "MAC",
-    "WIFI_SSID",
-    "AP_SSID",
-    "SERIAL_NUMBER",
-    "DEVICE_ID",
-    "OWNERID",
-    "NAME",
-    "GROUPNAME",
-}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: PooldoseConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    coordinator = entry.runtime_data
-
-    return {
-        "device_info": async_redact_data(coordinator.device_info, TO_REDACT),
-        "data": coordinator.data,
-    }

homeassistant/components/pooldose/manifest.json

@@ -9,7 +9,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/pooldose",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "silver",
   "requirements": ["python-pooldose==0.8.1"]

homeassistant/components/pooldose/quality_scale.yaml

@@ -41,7 +41,7 @@ rules:
 
   # Gold
   devices: done
-  diagnostics: done
+  diagnostics: todo
   discovery-update-info: done
   discovery: done
   docs-data-update: done
@@ -53,20 +53,20 @@ rules:
   docs-use-cases: todo
   dynamic-devices:
     status: exempt
-    comment: This integration does not support dynamic device discovery, as each config entry represents a single PoolDose device with all available entities.
+    comment: This integration does not support dynamic devices, as it is designed for a single PoolDose device.
   entity-category: done
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done
   exception-translations: done
   icon-translations: done
-  reconfiguration-flow: done
+  reconfiguration-flow: todo
   repair-issues:
     status: exempt
-    comment: This integration does not have any identified cases where repair issues would be needed.
+    comment: This integration does not provide repair issues, as it is designed for a single PoolDose device with a fixed configuration.
   stale-devices:
     status: exempt
-    comment: This integration manages a single device per config entry, so stale device removal is not applicable.
+    comment: This integration does not support stale devices, as it is designed for a single PoolDose device with a fixed configuration.
 
   # Platinum
   async-dependency: done

homeassistant/components/pooldose/strings.json

@@ -4,9 +4,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "no_device_info": "Unable to retrieve device information",
-      "no_serial_number": "No serial number found on the device",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "wrong_device": "The provided device does not match the configured device"
+      "no_serial_number": "No serial number found on the device"
     },
     "error": {
       "api_not_set": "API version not found in device response. Device firmware may not be compatible with this integration.",
@@ -22,14 +20,6 @@
         "description": "A PoolDose device was found on your network at {ip} with MAC address {mac}.\n\nDo you want to add {name} to Home Assistant?",
         "title": "Confirm DHCP discovered PoolDose device"
       },
-      "reconfigure": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        },
-        "data_description": {
-          "host": "[%key:component::pooldose::config::step::user::data_description::host%]"
-        }
-      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]"

homeassistant/components/poolsense/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@haemishkyd"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/poolsense",
-  "integration_type": "device",
   "iot_class": "cloud_polling",
   "loggers": ["poolsense"],
   "requirements": ["poolsense==0.0.8"]

homeassistant/components/portainer/binary_sensor.py

@@ -15,7 +15,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import PortainerConfigEntry
-from .const import CONTAINER_STATE_RUNNING
 from .coordinator import PortainerContainerData, PortainerCoordinator
 from .entity import (
     PortainerContainerEntity,
@@ -42,7 +41,7 @@ CONTAINER_SENSORS: tuple[PortainerContainerBinarySensorEntityDescription, ...] =
     PortainerContainerBinarySensorEntityDescription(
         key="status",
         translation_key="status",
-        state_fn=lambda data: data.container.state == CONTAINER_STATE_RUNNING,
+        state_fn=lambda data: data.container.state == "running",
         device_class=BinarySensorDeviceClass.RUNNING,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -164,11 +163,7 @@ class PortainerContainerSensor(PortainerContainerEntity, BinarySensorEntity):
     @property
     def available(self) -> bool:
         """Return if the device is available."""
-        return (
-            super().available
-            and self.endpoint_id in self.coordinator.data
-            and self.device_name in self.coordinator.data[self.endpoint_id].containers
-        )
+        return super().available and self.endpoint_id in self.coordinator.data
 
     @property
     def is_on(self) -> bool | None:

homeassistant/components/portainer/button.py

@@ -113,9 +113,7 @@ class PortainerButton(PortainerContainerEntity, ButtonEntity):
         """Trigger the Portainer button press service."""
         try:
             await self.entity_description.press_action(
-                self.coordinator.portainer,
-                self.endpoint_id,
-                self.container_data.container.id,
+                self.coordinator.portainer, self.endpoint_id, self.device_id
             )
         except PortainerConnectionError as err:
             raise HomeAssistantError(

homeassistant/components/portainer/const.py

@@ -4,5 +4,3 @@ DOMAIN = "portainer"
 DEFAULT_NAME = "Portainer"
 
 ENDPOINT_STATUS_DOWN = 2
-
-CONTAINER_STATE_RUNNING = "running"

homeassistant/components/portainer/coordinator.py

@@ -24,7 +24,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONTAINER_STATE_RUNNING, DOMAIN, ENDPOINT_STATUS_DOWN
+from .const import DOMAIN, ENDPOINT_STATUS_DOWN
 
 type PortainerConfigEntry = ConfigEntry[PortainerCoordinator]
 
@@ -50,7 +50,7 @@ class PortainerContainerData:
     """Container data held by the Portainer coordinator."""
 
     container: DockerContainer
-    stats: DockerContainerStats | None
+    stats: DockerContainerStats
     stats_pre: DockerContainerStats | None
 
 
@@ -147,52 +147,46 @@ class PortainerCoordinator(DataUpdateCoordinator[dict[int, PortainerCoordinatorD
                 docker_version = await self.portainer.docker_version(endpoint.id)
                 docker_info = await self.portainer.docker_info(endpoint.id)
 
-                prev_endpoint = self.data.get(endpoint.id) if self.data else None
                 container_map: dict[str, PortainerContainerData] = {}
 
-                # Map containers, started and stopped
-                for container in containers:
-                    container_name = self._get_container_name(container.names[0])
-                    prev_container = (
-                        prev_endpoint.containers[container_name]
-                        if prev_endpoint
-                        else None
+                container_stats_task = [
+                    (
+                        container,
+                        self.portainer.container_stats(
+                            endpoint_id=endpoint.id,
+                            container_id=container.id,
+                        ),
                     )
+                    for container in containers
+                ]
+
+                container_stats_gather = await asyncio.gather(
+                    *[task for _, task in container_stats_task],
+                )
+                for (container, _), container_stats in zip(
+                    container_stats_task, container_stats_gather, strict=False
+                ):
+                    container_name = container.names[0].replace("/", " ").strip()
+
+                    # Store previous stats if available. This is used to calculate deltas for CPU and network usage
+                    # In the first call it will be None, since it has nothing to compare with
+                    # Added a walrus pattern to check if not None on prev_container, to keep mypy happy. :)
                     container_map[container_name] = PortainerContainerData(
                         container=container,
-                        stats=None,
-                        stats_pre=prev_container.stats if prev_container else None,
-                    )
-
-                # Separately fetch stats for running containers
-                running_containers = [
-                    container
-                    for container in containers
-                    if container.state == CONTAINER_STATE_RUNNING
-                ]
-                if running_containers:
-                    container_stats = dict(
-                        zip(
-                            (
-                                self._get_container_name(container.names[0])
-                                for container in running_containers
-                            ),
-                            await asyncio.gather(
-                                *(
-                                    self.portainer.container_stats(
-                                        endpoint_id=endpoint.id,
-                                        container_id=container.id,
-                                    )
-                                    for container in running_containers
+                        stats=container_stats,
+                        stats_pre=(
+                            prev_container.stats
+                            if self.data
+                            and (prev_data := self.data.get(endpoint.id)) is not None
+                            and (
+                                prev_container := prev_data.containers.get(
+                                    container_name
                                 )
-                            ),
-                            strict=False,
-                        )
+                            )
+                            is not None
+                            else None
+                        ),
                     )
-
-                    # Now assign stats to the containers
-                    for container_name, stats in container_stats.items():
-                        container_map[container_name].stats = stats
             except PortainerConnectionError as err:
                 _LOGGER.exception("Connection error")
                 raise UpdateFailed(
@@ -233,15 +227,11 @@ class PortainerCoordinator(DataUpdateCoordinator[dict[int, PortainerCoordinatorD
 
         # Surprise, we also handle containers here :)
         current_containers = {
-            (endpoint.id, container_name)
+            (endpoint.id, container.container.id)
             for endpoint in mapped_endpoints.values()
-            for container_name in endpoint.containers
+            for container in endpoint.containers.values()
         }
         new_containers = current_containers - self.known_containers
         if new_containers:
             _LOGGER.debug("New containers found: %s", new_containers)
             self.known_containers.update(new_containers)
-
-    def _get_container_name(self, container_name: str) -> str:
-        """Sanitize to get a proper container name."""
-        return container_name.replace("/", " ").strip()

homeassistant/components/portainer/icons.json

@@ -7,9 +7,6 @@
       "architecture": {
         "default": "mdi:cpu-64-bit"
       },
-      "container_state": {
-        "default": "mdi:state-machine"
-      },
       "containers_count": {
         "default": "mdi:database"
       },

homeassistant/components/portainer/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["pyportainer==1.0.22"]
+  "requirements": ["pyportainer==1.0.17"]
 }

homeassistant/components/portainer/sensor.py

@@ -49,19 +49,10 @@ CONTAINER_SENSORS: tuple[PortainerContainerSensorEntityDescription, ...] = (
         translation_key="image",
         value_fn=lambda data: data.container.image,
     ),
-    PortainerContainerSensorEntityDescription(
-        key="container_state",
-        translation_key="container_state",
-        value_fn=lambda data: data.container.state,
-        device_class=SensorDeviceClass.ENUM,
-        options=["running", "exited", "paused", "restarting", "created", "dead"],
-    ),
     PortainerContainerSensorEntityDescription(
         key="memory_limit",
         translation_key="memory_limit",
-        value_fn=lambda data: (
-            data.stats.memory_stats.limit if data.stats is not None else 0
-        ),
+        value_fn=lambda data: data.stats.memory_stats.limit,
         device_class=SensorDeviceClass.DATA_SIZE,
         native_unit_of_measurement=UnitOfInformation.BYTES,
         suggested_unit_of_measurement=UnitOfInformation.MEGABYTES,
@@ -72,9 +63,7 @@ CONTAINER_SENSORS: tuple[PortainerContainerSensorEntityDescription, ...] = (
     PortainerContainerSensorEntityDescription(
         key="memory_usage",
         translation_key="memory_usage",
-        value_fn=lambda data: (
-            data.stats.memory_stats.usage if data.stats is not None else 0
-        ),
+        value_fn=lambda data: data.stats.memory_stats.usage,
         device_class=SensorDeviceClass.DATA_SIZE,
         native_unit_of_measurement=UnitOfInformation.BYTES,
         suggested_unit_of_measurement=UnitOfInformation.MEGABYTES,
@@ -87,9 +76,7 @@ CONTAINER_SENSORS: tuple[PortainerContainerSensorEntityDescription, ...] = (
         translation_key="memory_usage_percentage",
         value_fn=lambda data: (
             (data.stats.memory_stats.usage / data.stats.memory_stats.limit) * 100.0
-            if data.stats is not None
-            and data.stats.memory_stats.limit > 0
-            and data.stats.memory_stats.usage > 0
+            if data.stats.memory_stats.limit > 0 and data.stats.memory_stats.usage > 0
             else 0.0
         ),
         native_unit_of_measurement=PERCENTAGE,
@@ -102,8 +89,7 @@ CONTAINER_SENSORS: tuple[PortainerContainerSensorEntityDescription, ...] = (
         translation_key="cpu_usage_total",
         value_fn=lambda data: (
             (total_delta / system_delta) * data.stats.cpu_stats.online_cpus * 100.0
-            if data.stats is not None
-            and (prev := data.stats_pre) is not None
+            if (prev := data.stats_pre) is not None
             and (
                 system_delta := (
                     data.stats.cpu_stats.system_cpu_usage
@@ -261,6 +247,7 @@ async def async_setup_entry(
             )
             for (endpoint, container) in containers
             for entity_description in CONTAINER_SENSORS
+            if entity_description.value_fn(container) is not None
         )
 
     coordinator.new_endpoints_callbacks.append(_async_add_new_endpoints)
@@ -303,11 +290,7 @@ class PortainerContainerSensor(PortainerContainerEntity, SensorEntity):
     @property
     def available(self) -> bool:
         """Return if the device is available."""
-        return (
-            super().available
-            and self.endpoint_id in self.coordinator.data
-            and self.device_name in self.coordinator.data[self.endpoint_id].containers
-        )
+        return super().available and self.endpoint_id in self.coordinator.data
 
     @property
     def native_value(self) -> StateType: