2025.4.3 (#143253)

Co-authored-by: Franck Nijhof <git@frenck.dev>

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ env:
   CACHE_VERSION: 12
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 9
-  HA_SHORT_VERSION: "2025.5"
+  HA_SHORT_VERSION: "2025.4"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version

homeassistant/brands/eve.json

@@ -0,0 +1,5 @@
+{
+  "domain": "eve",
+  "name": "Eve",
+  "iot_standards": ["matter"]
+}

homeassistant/components/airgradient/strings.json

@@ -68,8 +68,8 @@
       "led_bar_mode": {
         "name": "LED bar mode",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "off": "Off",
+          "co2": "Carbon dioxide",
           "pm": "Particulate matter"
         }
       },
@@ -143,8 +143,8 @@
       "led_bar_mode": {
         "name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "off": "[%key:component::airgradient::entity::select::led_bar_mode::state::off%]",
+          "co2": "[%key:component::airgradient::entity::select::led_bar_mode::state::co2%]",
           "pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
         }
       },

homeassistant/components/airvisual/strings.json

@@ -16,8 +16,8 @@
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "city": "City",
-          "state": "State",
-          "country": "[%key:common::config_flow::data::country%]"
+          "country": "Country",
+          "state": "State"
         }
       },
       "reauth_confirm": {
@@ -56,12 +56,12 @@
     "sensor": {
       "pollutant_label": {
         "state": {
-          "co": "[%key:component::sensor::entity_component::carbon_monoxide::name%]",
-          "n2": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]",
-          "o3": "[%key:component::sensor::entity_component::ozone::name%]",
-          "p1": "[%key:component::sensor::entity_component::pm10::name%]",
-          "p2": "[%key:component::sensor::entity_component::pm25::name%]",
-          "s2": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
+          "co": "Carbon monoxide",
+          "n2": "Nitrogen dioxide",
+          "o3": "Ozone",
+          "p1": "PM10",
+          "p2": "PM2.5",
+          "s2": "Sulfur dioxide"
         }
       },
       "pollutant_level": {

homeassistant/components/airzone/manifest.json

@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone",
   "iot_class": "local_polling",
   "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==0.9.9"]
+  "requirements": ["aioairzone==1.0.0"]
 }

homeassistant/components/airzone_cloud/strings.json

@@ -32,8 +32,8 @@
       "air_quality": {
         "name": "Air Quality mode",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]",
+          "off": "Off",
+          "on": "On",
           "auto": "Auto"
         }
       },

homeassistant/components/amazon_polly/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["boto3", "botocore", "s3transfer"],
   "quality_scale": "legacy",
-  "requirements": ["boto3==1.37.1"]
+  "requirements": ["boto3==1.34.131"]
 }

homeassistant/components/android_ip_webcam/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/android_ip_webcam",
   "iot_class": "local_polling",
-  "requirements": ["pydroid-ipcam==3.0.0"]
+  "requirements": ["pydroid-ipcam==2.0.0"]
 }

homeassistant/components/anthropic/conversation.py

@@ -266,7 +266,7 @@ async def _transform_stream(
                 raise ValueError("Unexpected stop event without a current block")
             if current_block["type"] == "tool_use":
                 tool_block = cast(ToolUseBlockParam, current_block)
-                tool_args = json.loads(current_tool_args)
+                tool_args = json.loads(current_tool_args) if current_tool_args else {}
                 tool_block["input"] = tool_args
                 yield {
                     "tool_calls": [

homeassistant/components/apple_tv/config_flow.py

@@ -20,6 +20,7 @@ import voluptuous as vol
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import (
     SOURCE_IGNORE,
+    SOURCE_REAUTH,
     SOURCE_ZEROCONF,
     ConfigEntry,
     ConfigFlow,
@@ -381,7 +382,9 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
                         CONF_IDENTIFIERS: list(combined_identifiers),
                     },
                 )
-                if entry.source != SOURCE_IGNORE:
+                # Don't reload ignored entries or in the middle of reauth,
+                # e.g. if the user is entering a new PIN
+                if entry.source != SOURCE_IGNORE and self.source != SOURCE_REAUTH:
                     self.hass.config_entries.async_schedule_reload(entry.entry_id)
             if not allow_exist:
                 raise DeviceAlreadyConfigured

homeassistant/components/apple_tv/media_player.py

@@ -120,6 +120,7 @@ class AppleTvMediaPlayer(
         """Initialize the Apple TV media player."""
         super().__init__(name, identifier, manager)
         self._playing: Playing | None = None
+        self._playing_last_updated: datetime | None = None
         self._app_list: dict[str, str] = {}
 
     @callback
@@ -209,6 +210,7 @@ class AppleTvMediaPlayer(
         This is a callback function from pyatv.interface.PushListener.
         """
         self._playing = playstatus
+        self._playing_last_updated = dt_util.utcnow()
         self.async_write_ha_state()
 
     @callback
@@ -316,7 +318,7 @@ class AppleTvMediaPlayer(
     def media_position_updated_at(self) -> datetime | None:
         """Last valid time of media position."""
         if self.state in {MediaPlayerState.PLAYING, MediaPlayerState.PAUSED}:
-            return dt_util.utcnow()
+            return self._playing_last_updated
         return None
 
     async def async_play_media(

homeassistant/components/apsystems/coordinator.py

@@ -43,7 +43,6 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
 
     config_entry: ApSystemsConfigEntry
     device_version: str
-    battery_system: bool
 
     def __init__(
         self,
@@ -69,7 +68,6 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
         self.api.max_power = device_info.maxPower
         self.api.min_power = device_info.minPower
         self.device_version = device_info.devVer
-        self.battery_system = device_info.isBatterySystem
 
     async def _async_update_data(self) -> ApSystemsSensorData:
         try:

homeassistant/components/apsystems/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/apsystems",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["apsystems-ez1==2.5.0"]
+  "requirements": ["apsystems-ez1==2.4.0"]
 }

homeassistant/components/apsystems/switch.py

@@ -36,8 +36,6 @@ class ApSystemsInverterSwitch(ApSystemsEntity, SwitchEntity):
         super().__init__(data)
         self._api = data.coordinator.api
         self._attr_unique_id = f"{data.device_id}_inverter_status"
-        if data.coordinator.battery_system:
-            self._attr_available = False
 
     async def async_update(self) -> None:
         """Update switch status and availability."""

homeassistant/components/assist_satellite/__init__.py

@@ -60,7 +60,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 {
                     vol.Optional("message"): str,
                     vol.Optional("media_id"): str,
-                    vol.Optional("preannounce_media_id"): vol.Any(str, None),
+                    vol.Optional("preannounce"): bool,
+                    vol.Optional("preannounce_media_id"): str,
                 }
             ),
             cv.has_at_least_one_key("message", "media_id"),
@@ -75,7 +76,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 {
                     vol.Optional("start_message"): str,
                     vol.Optional("start_media_id"): str,
-                    vol.Optional("preannounce_media_id"): vol.Any(str, None),
+                    vol.Optional("preannounce"): bool,
+                    vol.Optional("preannounce_media_id"): str,
                     vol.Optional("extra_system_prompt"): str,
                 }
             ),

homeassistant/components/assist_satellite/entity.py

@@ -180,7 +180,8 @@ class AssistSatelliteEntity(entity.Entity):
         self,
         message: str | None = None,
         media_id: str | None = None,
-        preannounce_media_id: str | None = PREANNOUNCE_URL,
+        preannounce: bool = True,
+        preannounce_media_id: str = PREANNOUNCE_URL,
     ) -> None:
         """Play and show an announcement on the satellite.
 
@@ -190,8 +191,8 @@ class AssistSatelliteEntity(entity.Entity):
         If media_id is provided, it is played directly. It is possible
         to omit the message and the satellite will not show any text.
 
+        If preannounce is True, a sound is played before the announcement.
         If preannounce_media_id is provided, it overrides the default sound.
-        If preannounce_media_id is None, no sound is played.
 
         Calls async_announce with message and media id.
         """
@@ -201,7 +202,9 @@ class AssistSatelliteEntity(entity.Entity):
             message = ""
 
         announcement = await self._resolve_announcement_media_id(
-            message, media_id, preannounce_media_id
+            message,
+            media_id,
+            preannounce_media_id=preannounce_media_id if preannounce else None,
         )
 
         if self._is_announcing:
@@ -229,7 +232,8 @@ class AssistSatelliteEntity(entity.Entity):
         start_message: str | None = None,
         start_media_id: str | None = None,
         extra_system_prompt: str | None = None,
-        preannounce_media_id: str | None = PREANNOUNCE_URL,
+        preannounce: bool = True,
+        preannounce_media_id: str = PREANNOUNCE_URL,
     ) -> None:
         """Start a conversation from the satellite.
 
@@ -239,8 +243,8 @@ class AssistSatelliteEntity(entity.Entity):
         If start_media_id is provided, it is played directly. It is possible
         to omit the message and the satellite will not show any text.
 
-        If preannounce_media_id is provided, it is played before the announcement.
-        If preannounce_media_id is None, no sound is played.
+        If preannounce is True, a sound is played before the start message or media.
+        If preannounce_media_id is provided, it overrides the default sound.
 
         Calls async_start_conversation.
         """
@@ -257,7 +261,9 @@ class AssistSatelliteEntity(entity.Entity):
             start_message = ""
 
         announcement = await self._resolve_announcement_media_id(
-            start_message, start_media_id, preannounce_media_id
+            start_message,
+            start_media_id,
+            preannounce_media_id=preannounce_media_id if preannounce else None,
         )
 
         if self._is_announcing:

homeassistant/components/assist_satellite/services.yaml

@@ -15,6 +15,11 @@ announce:
       required: false
       selector:
         text:
+    preannounce:
+      required: false
+      default: true
+      selector:
+        boolean:
     preannounce_media_id:
       required: false
       selector:
@@ -40,6 +45,11 @@ start_conversation:
       required: false
       selector:
         text:
+    preannounce:
+      required: false
+      default: true
+      selector:
+        boolean:
     preannounce_media_id:
       required: false
       selector:

homeassistant/components/assist_satellite/strings.json

@@ -24,9 +24,13 @@
           "name": "Media ID",
           "description": "The media ID to announce instead of using text-to-speech."
         },
+        "preannounce": {
+          "name": "Preannounce",
+          "description": "Play a sound before the announcement."
+        },
         "preannounce_media_id": {
-          "name": "Preannounce Media ID",
-          "description": "The media ID to play before the announcement."
+          "name": "Preannounce media ID",
+          "description": "Custom media ID to play before the announcement."
         }
       }
     },
@@ -46,9 +50,13 @@
           "name": "Extra system prompt",
           "description": "Provide background information to the AI about the request."
         },
+        "preannounce": {
+          "name": "Preannounce",
+          "description": "Play a sound before the start message or media."
+        },
         "preannounce_media_id": {
-          "name": "Preannounce Media ID",
-          "description": "The media ID to play before the start message or media."
+          "name": "Preannounce media ID",
+          "description": "Custom media ID to play before the start message or media."
         }
       }
     }

homeassistant/components/assist_satellite/websocket_api.py

@@ -199,7 +199,7 @@ async def websocket_test_connection(
     hass.async_create_background_task(
         satellite.async_internal_announce(
             media_id=f"{CONNECTION_TEST_URL_BASE}/{connection_id}",
-            preannounce_media_id=None,
+            preannounce=False,
         ),
         f"assist_satellite_connection_test_{msg['entity_id']}",
     )

homeassistant/components/aws/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["aiobotocore", "botocore"],
   "quality_scale": "legacy",
-  "requirements": ["aiobotocore==2.21.1", "botocore==1.37.1"]
+  "requirements": ["aiobotocore==2.13.1", "botocore==1.34.131"]
 }

homeassistant/components/azure_storage/backup.py

@@ -175,7 +175,8 @@ class AzureStorageBackupAgent(BackupAgent):
         """Find a blob by backup id."""
         async for blob in self._client.list_blobs(include="metadata"):
             if (
-                backup_id == blob.metadata.get("backup_id", "")
+                blob.metadata is not None
+                and backup_id == blob.metadata.get("backup_id", "")
                 and blob.metadata.get("metadata_version") == METADATA_VERSION
             ):
                 return blob

homeassistant/components/backup/strings.json

@@ -26,9 +26,9 @@
   "entity": {
     "sensor": {
       "backup_manager_state": {
-        "name": "Backup Manager state",
+        "name": "Backup Manager State",
         "state": {
-          "idle": "[%key:common::state::idle%]",
+          "idle": "Idle",
           "create_backup": "Creating a backup",
           "receive_backup": "Receiving a backup",
           "restore_backup": "Restoring a backup"

homeassistant/components/balay/__init__.py

@@ -1 +0,0 @@
-"""Balay virtual integration."""

homeassistant/components/balay/manifest.json

@@ -1,6 +0,0 @@
-{
-  "domain": "balay",
-  "name": "Balay",
-  "integration_type": "virtual",
-  "supported_by": "home_connect"
-}

homeassistant/components/binary_sensor/strings.json

@@ -132,7 +132,7 @@
       "name": "Charging",
       "state": {
         "off": "Not charging",
-        "on": "[%key:common::state::charging%]"
+        "on": "Charging"
       }
     },
     "carbon_monoxide": {

homeassistant/components/blue_current/strings.json

@@ -37,7 +37,7 @@
       "vehicle_status": {
         "name": "Vehicle status",
         "state": {
-          "standby": "[%key:common::state::standby%]",
+          "standby": "Standby",
           "vehicle_detected": "Detected",
           "ready": "Ready",
           "no_power": "No power",

homeassistant/components/bluesound/media_player.py

@@ -501,18 +501,16 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
             return
 
         # presets and inputs might have the same name; presets have priority
-        url: str | None = None
         for input_ in self._inputs:
             if input_.text == source:
-                url = input_.url
+                await self._player.play_url(input_.url)
+                return
         for preset in self._presets:
             if preset.name == source:
-                url = preset.url
+                await self._player.load_preset(preset.id)
+                return
 
-        if url is None:
-            raise ServiceValidationError(f"Source {source} not found")
-
-        await self._player.play_url(url)
+        raise ServiceValidationError(f"Source {source} not found")
 
     async def async_clear_playlist(self) -> None:
         """Clear players playlist."""

homeassistant/components/bluetooth/manifest.json

@@ -19,7 +19,7 @@
     "bleak-retry-connector==3.9.0",
     "bluetooth-adapters==0.21.4",
     "bluetooth-auto-recovery==1.4.5",
-    "bluetooth-data-tools==1.26.1",
+    "bluetooth-data-tools==1.26.5",
     "dbus-fast==2.43.0",
     "habluetooth==3.37.0"
   ]

homeassistant/components/bmw_connected_drive/strings.json

@@ -6,7 +6,7 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "region": "ConnectedDrive region"
+          "region": "ConnectedDrive Region"
         },
         "data_description": {
           "username": "The email address of your MyBMW/MINI Connected account.",
@@ -113,10 +113,10 @@
     },
     "select": {
       "ac_limit": {
-        "name": "AC charging limit"
+        "name": "AC Charging Limit"
       },
       "charging_mode": {
-        "name": "Charging mode",
+        "name": "Charging Mode",
         "state": {
           "immediate_charging": "Immediate charging",
           "delayed_charging": "Delayed charging",
@@ -181,7 +181,7 @@
           "cooling": "Cooling",
           "heating": "Heating",
           "inactive": "Inactive",
-          "standby": "[%key:common::state::standby%]",
+          "standby": "Standby",
           "ventilation": "Ventilation"
         }
       },

homeassistant/components/cambridge_audio/media_player.py

@@ -142,12 +142,6 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity):
     @property
     def media_artist(self) -> str | None:
         """Artist of current playing media, music track only."""
-        if (
-            not self.client.play_state.metadata.artist
-            and self.client.state.source == "IR"
-        ):
-            # Return channel instead of artist when playing internet radio
-            return self.client.play_state.metadata.station
         return self.client.play_state.metadata.artist
 
     @property
@@ -175,11 +169,6 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity):
         """Last time the media position was updated."""
         return self.client.position_last_updated
 
-    @property
-    def media_channel(self) -> str | None:
-        """Channel currently playing."""
-        return self.client.play_state.metadata.station
-
     @property
     def is_volume_muted(self) -> bool | None:
         """Volume mute status."""

homeassistant/components/climate/strings.json

@@ -98,13 +98,13 @@
           "name": "Preset",
           "state": {
             "none": "None",
-            "home": "[%key:common::state::home%]",
-            "away": "[%key:common::state::not_home%]",
-            "activity": "Activity",
+            "eco": "Eco",
+            "away": "Away",
             "boost": "Boost",
             "comfort": "Comfort",
-            "eco": "Eco",
-            "sleep": "Sleep"
+            "home": "[%key:common::state::home%]",
+            "sleep": "Sleep",
+            "activity": "Activity"
           }
         },
         "preset_modes": {
@@ -257,7 +257,7 @@
   "selector": {
     "hvac_mode": {
       "options": {
-        "off": "[%key:common::state::off%]",
+        "off": "Off",
         "auto": "Auto",
         "cool": "Cool",
         "dry": "Dry",

homeassistant/components/cloud/account_link.py

@@ -127,7 +127,11 @@ class CloudOAuth2Implementation(config_entry_oauth2_flow.AbstractOAuth2Implement
                     flow_id=flow_id, user_input=tokens
                 )
 
-        self.hass.async_create_task(await_tokens())
+        # It's a background task because it should be cancelled on shutdown and there's nothing else
+        # we can do in such case. There's also no need to wait for this during setup.
+        self.hass.async_create_background_task(
+            await_tokens(), name="Awaiting OAuth tokens"
+        )
 
         return authorize_url
 

homeassistant/components/cloudflare/config_flow.py

@@ -9,6 +9,7 @@ from typing import Any
 import pycfdns
 import voluptuous as vol
 
+from homeassistant.components import persistent_notification
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_TOKEN, CONF_ZONE
 from homeassistant.core import HomeAssistant
@@ -117,6 +118,8 @@ class CloudflareConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initiated by the user."""
+        persistent_notification.async_dismiss(self.hass, "cloudflare_setup")
+
         errors: dict[str, str] = {}
 
         if user_input is not None:

homeassistant/components/comelit/config_flow.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from asyncio.exceptions import TimeoutError
 from collections.abc import Mapping
 from typing import Any
 
@@ -53,10 +54,18 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
 
     try:
         await api.login()
-    except aiocomelit_exceptions.CannotConnect as err:
-        raise CannotConnect from err
+    except (aiocomelit_exceptions.CannotConnect, TimeoutError) as err:
+        raise CannotConnect(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+            translation_placeholders={"error": repr(err)},
+        ) from err
     except aiocomelit_exceptions.CannotAuthenticate as err:
-        raise InvalidAuth from err
+        raise InvalidAuth(
+            translation_domain=DOMAIN,
+            translation_key="cannot_authenticate",
+            translation_placeholders={"error": repr(err)},
+        ) from err
     finally:
         await api.logout()
         await api.close()

homeassistant/components/comelit/humidifier.py

@@ -162,7 +162,7 @@ class ComelitHumidifierEntity(CoordinatorEntity[ComelitSerialBridge], Humidifier
 
     async def async_set_humidity(self, humidity: int) -> None:
         """Set new target humidity."""
-        if self.mode == HumidifierComelitMode.OFF:
+        if not self._attr_is_on:
             raise ServiceValidationError(
                 translation_domain=DOMAIN,
                 translation_key="humidity_while_off",
@@ -190,9 +190,13 @@ class ComelitHumidifierEntity(CoordinatorEntity[ComelitSerialBridge], Humidifier
         await self.coordinator.api.set_humidity_status(
             self._device.index, self._set_command
         )
+        self._attr_is_on = True
+        self.async_write_ha_state()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off."""
         await self.coordinator.api.set_humidity_status(
             self._device.index, HumidifierComelitCommand.OFF
         )
+        self._attr_is_on = False
+        self.async_write_ha_state()

homeassistant/components/comelit/strings.json

@@ -52,7 +52,9 @@
           "rest": "Rest",
           "sabotated": "Sabotated"
         }
-      },
+      }
+    },
+    "humidifier": {
       "humidifier": {
         "name": "Humidifier"
       },
@@ -67,6 +69,12 @@
     },
     "invalid_clima_data": {
       "message": "Invalid 'clima' data"
+    },
+    "cannot_connect": {
+      "message": "Error connecting: {error}"
+    },
+    "cannot_authenticate": {
+      "message": "Error authenticating: {error}"
     }
   }
 }

homeassistant/components/comelit/switch.py

@@ -81,4 +81,7 @@ class ComelitSwitchEntity(CoordinatorEntity[ComelitSerialBridge], SwitchEntity):
     @property
     def is_on(self) -> bool:
         """Return True if switch is on."""
-        return self.coordinator.data[OTHER][self._device.index].status == STATE_ON
+        return (
+            self.coordinator.data[self._device.type][self._device.index].status
+            == STATE_ON
+        )

homeassistant/components/constructa/__init__.py

@@ -1 +0,0 @@
-"""Constructa virtual integration."""

homeassistant/components/constructa/manifest.json

@@ -1,6 +0,0 @@
-{
-  "domain": "constructa",
-  "name": "Constructa",
-  "integration_type": "virtual",
-  "supported_by": "home_connect"
-}

homeassistant/components/conversation/chat_log.py

@@ -354,35 +354,6 @@ class ChatLog:
                 if self.delta_listener:
                     self.delta_listener(self, asdict(tool_result))
 
-    async def _async_expand_prompt_template(
-        self,
-        llm_context: llm.LLMContext,
-        prompt: str,
-        language: str,
-        user_name: str | None = None,
-    ) -> str:
-        try:
-            return template.Template(prompt, self.hass).async_render(
-                {
-                    "ha_name": self.hass.config.location_name,
-                    "user_name": user_name,
-                    "llm_context": llm_context,
-                },
-                parse_result=False,
-            )
-        except TemplateError as err:
-            LOGGER.error("Error rendering prompt: %s", err)
-            intent_response = intent.IntentResponse(language=language)
-            intent_response.async_set_error(
-                intent.IntentResponseErrorCode.UNKNOWN,
-                "Sorry, I had a problem with my template",
-            )
-            raise ConverseError(
-                "Error rendering prompt",
-                conversation_id=self.conversation_id,
-                response=intent_response,
-            ) from err
-
     async def async_update_llm_data(
         self,
         conversing_domain: str,
@@ -438,28 +409,38 @@ class ChatLog:
         ):
             user_name = user.name
 
-        prompt_parts = []
-        prompt_parts.append(
-            await self._async_expand_prompt_template(
-                llm_context,
-                (user_llm_prompt or llm.DEFAULT_INSTRUCTIONS_PROMPT),
-                user_input.language,
-                user_name,
+        try:
+            prompt_parts = [
+                template.Template(
+                    llm.BASE_PROMPT
+                    + (user_llm_prompt or llm.DEFAULT_INSTRUCTIONS_PROMPT),
+                    self.hass,
+                ).async_render(
+                    {
+                        "ha_name": self.hass.config.location_name,
+                        "user_name": user_name,
+                        "llm_context": llm_context,
+                    },
+                    parse_result=False,
+                )
+            ]
+
+        except TemplateError as err:
+            LOGGER.error("Error rendering prompt: %s", err)
+            intent_response = intent.IntentResponse(language=user_input.language)
+            intent_response.async_set_error(
+                intent.IntentResponseErrorCode.UNKNOWN,
+                "Sorry, I had a problem with my template",
             )
-        )
+            raise ConverseError(
+                "Error rendering prompt",
+                conversation_id=self.conversation_id,
+                response=intent_response,
+            ) from err
 
         if llm_api:
             prompt_parts.append(llm_api.api_prompt)
 
-        prompt_parts.append(
-            await self._async_expand_prompt_template(
-                llm_context,
-                llm.BASE_PROMPT,
-                user_input.language,
-                user_name,
-            )
-        )
-
         if extra_system_prompt := (
             # Take new system prompt if one was given
             user_input.extra_system_prompt or self.extra_system_prompt

homeassistant/components/cookidoo/strings.json

@@ -6,7 +6,7 @@
         "data": {
           "email": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "country": "[%key:common::config_flow::data::country%]"
+          "country": "Country"
         },
         "data_description": {
           "email": "Email used to access your {cookidoo} account.",

homeassistant/components/cover/strings.json

@@ -38,10 +38,10 @@
       "name": "[%key:component::cover::title%]",
       "state": {
         "open": "[%key:common::state::open%]",
-        "opening": "[%key:common::state::opening%]",
+        "opening": "Opening",
         "closed": "[%key:common::state::closed%]",
-        "closing": "[%key:common::state::closing%]",
-        "stopped": "[%key:common::state::stopped%]"
+        "closing": "Closing",
+        "stopped": "Stopped"
       },
       "state_attributes": {
         "current_position": {

homeassistant/components/daikin/__init__.py

@@ -21,6 +21,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.util.ssl import client_context_no_verify
 
 from .const import KEY_MAC, TIMEOUT
 from .coordinator import DaikinConfigEntry, DaikinCoordinator
@@ -48,6 +49,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DaikinConfigEntry) -> bo
                 key=entry.data.get(CONF_API_KEY),
                 uuid=entry.data.get(CONF_UUID),
                 password=entry.data.get(CONF_PASSWORD),
+                ssl_context=client_context_no_verify(),
             )
         _LOGGER.debug("Connection to %s successful", host)
     except TimeoutError as err:

homeassistant/components/daikin/config_flow.py

@@ -18,6 +18,7 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PASSWORD, CONF_UUID
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
+from homeassistant.util.ssl import client_context_no_verify
 
 from .const import DOMAIN, KEY_MAC, TIMEOUT
 
@@ -90,6 +91,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
                     key=key,
                     uuid=uuid,
                     password=password,
+                    ssl_context=client_context_no_verify(),
                 )
         except (TimeoutError, ClientError):
             self.host = None

homeassistant/components/daikin/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/daikin",
   "iot_class": "local_polling",
   "loggers": ["pydaikin"],
-  "requirements": ["pydaikin==2.14.1"],
+  "requirements": ["pydaikin==2.15.0"],
   "zeroconf": ["_dkapi._tcp.local."]
 }

homeassistant/components/devolo_home_network/manifest.json

@@ -8,7 +8,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["devolo_plc_api"],
-  "requirements": ["devolo-plc-api==1.4.1"],
+  "requirements": ["devolo-plc-api==1.5.1"],
   "zeroconf": [
     {
       "type": "_dvl-deviceapi._tcp.local.",

homeassistant/components/dlna_dmr/manifest.json

@@ -8,7 +8,7 @@
   "documentation": "https://www.home-assistant.io/integrations/dlna_dmr",
   "iot_class": "local_push",
   "loggers": ["async_upnp_client"],
-  "requirements": ["async-upnp-client==0.43.0", "getmac==0.9.5"],
+  "requirements": ["async-upnp-client==0.44.0", "getmac==0.9.5"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",

homeassistant/components/dlna_dms/manifest.json

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

homeassistant/components/drop_connect/strings.json

@@ -38,8 +38,8 @@
       "protect_mode": {
         "name": "Protect mode",
         "state": {
-          "away": "[%key:common::state::not_home%]",
-          "home": "[%key:common::state::home%]",
+          "away": "Away",
+          "home": "Home",
           "schedule": "Schedule"
         }
       }

homeassistant/components/duke_energy/coordinator.py

@@ -179,22 +179,18 @@ class DukeEnergyCoordinator(DataUpdateCoordinator[None]):
         one = timedelta(days=1)
         if start_time is None:
             # Max 3 years of data
-            agreement_date = dt_util.parse_datetime(meter["agreementActiveDate"])
-            if agreement_date is None:
-                start = dt_util.now(tz) - timedelta(days=3 * 365)
-            else:
-                start = max(
-                    agreement_date.replace(tzinfo=tz),
-                    dt_util.now(tz) - timedelta(days=3 * 365),
-                )
+            start = dt_util.now(tz) - timedelta(days=3 * 365)
         else:
             start = datetime.fromtimestamp(start_time, tz=tz) - lookback
+        agreement_date = dt_util.parse_datetime(meter["agreementActiveDate"])
+        if agreement_date is not None:
+            start = max(agreement_date.replace(tzinfo=tz), start)
 
         start = start.replace(hour=0, minute=0, second=0, microsecond=0)
         end = dt_util.now(tz).replace(hour=0, minute=0, second=0, microsecond=0) - one
         _LOGGER.debug("Data lookup range: %s - %s", start, end)
 
-        start_step = end - lookback
+        start_step = max(end - lookback, start)
         end_step = end
         usage: dict[datetime, dict[str, float | int]] = {}
         while True:

homeassistant/components/ecovacs/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ecovacs",
   "iot_class": "cloud_push",
   "loggers": ["sleekxmppfs", "sucks", "deebot_client"],
-  "requirements": ["py-sucks==0.9.10", "deebot-client==12.4.0"]
+  "requirements": ["py-sucks==0.9.10", "deebot-client==12.5.0"]
 }

homeassistant/components/ecovacs/strings.json

@@ -14,7 +14,7 @@
     "step": {
       "auth": {
         "data": {
-          "country": "[%key:common::config_flow::data::country%]",
+          "country": "Country",
           "override_rest_url": "REST URL",
           "override_mqtt_url": "MQTT URL",
           "password": "[%key:common::config_flow::data::password%]",

homeassistant/components/emulated_roku/__init__.py

@@ -46,8 +46,6 @@ CONFIG_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
-type EmulatedRokuConfigEntry = ConfigEntry[EmulatedRoku]
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the emulated roku component."""
@@ -67,21 +65,22 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(
-    hass: HomeAssistant, entry: EmulatedRokuConfigEntry
-) -> bool:
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up an emulated roku server from a config entry."""
-    config = entry.data
-    name: str = config[CONF_NAME]
-    listen_port: int = config[CONF_LISTEN_PORT]
-    host_ip: str = config.get(CONF_HOST_IP) or await async_get_source_ip(hass)
-    advertise_ip: str | None = config.get(CONF_ADVERTISE_IP)
-    advertise_port: int | None = config.get(CONF_ADVERTISE_PORT)
-    upnp_bind_multicast: bool | None = config.get(CONF_UPNP_BIND_MULTICAST)
+    config = config_entry.data
+
+    if DOMAIN not in hass.data:
+        hass.data[DOMAIN] = {}
+
+    name = config[CONF_NAME]
+    listen_port = config[CONF_LISTEN_PORT]
+    host_ip = config.get(CONF_HOST_IP) or await async_get_source_ip(hass)
+    advertise_ip = config.get(CONF_ADVERTISE_IP)
+    advertise_port = config.get(CONF_ADVERTISE_PORT)
+    upnp_bind_multicast = config.get(CONF_UPNP_BIND_MULTICAST)
 
     server = EmulatedRoku(
         hass,
-        entry.entry_id,
         name,
         host_ip,
         listen_port,
@@ -89,12 +88,14 @@ async def async_setup_entry(
         advertise_port,
         upnp_bind_multicast,
     )
-    entry.runtime_data = server
+
+    hass.data[DOMAIN][name] = server
+
     return await server.setup()
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, entry: EmulatedRokuConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await entry.runtime_data.unload()
+    name = entry.data[CONF_NAME]
+    server = hass.data[DOMAIN].pop(name)
+    return await server.unload()

homeassistant/components/emulated_roku/binding.py

@@ -5,13 +5,7 @@ import logging
 from emulated_roku import EmulatedRokuCommandHandler, EmulatedRokuServer
 
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import (
-    CALLBACK_TYPE,
-    CoreState,
-    Event,
-    EventOrigin,
-    HomeAssistant,
-)
+from homeassistant.core import CoreState, EventOrigin
 
 LOGGER = logging.getLogger(__package__)
 
@@ -33,18 +27,16 @@ class EmulatedRoku:
 
     def __init__(
         self,
-        hass: HomeAssistant,
-        entry_id: str,
-        name: str,
-        host_ip: str,
-        listen_port: int,
-        advertise_ip: str | None,
-        advertise_port: int | None,
-        upnp_bind_multicast: bool | None,
-    ) -> None:
+        hass,
+        name,
+        host_ip,
+        listen_port,
+        advertise_ip,
+        advertise_port,
+        upnp_bind_multicast,
+    ):
         """Initialize the properties."""
         self.hass = hass
-        self.entry_id = entry_id
 
         self.roku_usn = name
         self.host_ip = host_ip
@@ -55,21 +47,21 @@ class EmulatedRoku:
 
         self.bind_multicast = upnp_bind_multicast
 
-        self._api_server: EmulatedRokuServer | None = None
+        self._api_server = None
 
-        self._unsub_start_listener: CALLBACK_TYPE | None = None
-        self._unsub_stop_listener: CALLBACK_TYPE | None = None
+        self._unsub_start_listener = None
+        self._unsub_stop_listener = None
 
-    async def setup(self) -> bool:
+    async def setup(self):
         """Start the emulated_roku server."""
 
         class EventCommandHandler(EmulatedRokuCommandHandler):
             """emulated_roku command handler to turn commands into events."""
 
-            def __init__(self, hass: HomeAssistant) -> None:
+            def __init__(self, hass):
                 self.hass = hass
 
-            def on_keydown(self, roku_usn: str, key: str) -> None:
+            def on_keydown(self, roku_usn, key):
                 """Handle keydown event."""
                 self.hass.bus.async_fire(
                     EVENT_ROKU_COMMAND,
@@ -81,7 +73,7 @@ class EmulatedRoku:
                     EventOrigin.local,
                 )
 
-            def on_keyup(self, roku_usn: str, key: str) -> None:
+            def on_keyup(self, roku_usn, key):
                 """Handle keyup event."""
                 self.hass.bus.async_fire(
                     EVENT_ROKU_COMMAND,
@@ -93,7 +85,7 @@ class EmulatedRoku:
                     EventOrigin.local,
                 )
 
-            def on_keypress(self, roku_usn: str, key: str) -> None:
+            def on_keypress(self, roku_usn, key):
                 """Handle keypress event."""
                 self.hass.bus.async_fire(
                     EVENT_ROKU_COMMAND,
@@ -105,7 +97,7 @@ class EmulatedRoku:
                     EventOrigin.local,
                 )
 
-            def launch(self, roku_usn: str, app_id: str) -> None:
+            def launch(self, roku_usn, app_id):
                 """Handle launch event."""
                 self.hass.bus.async_fire(
                     EVENT_ROKU_COMMAND,
@@ -137,19 +129,17 @@ class EmulatedRoku:
             bind_multicast=self.bind_multicast,
         )
 
-        async def emulated_roku_stop(event: Event | None) -> None:
+        async def emulated_roku_stop(event):
             """Wrap the call to emulated_roku.close."""
             LOGGER.debug("Stopping emulated_roku %s", self.roku_usn)
             self._unsub_stop_listener = None
-            assert self._api_server is not None
             await self._api_server.close()
 
-        async def emulated_roku_start(event: Event | None) -> None:
+        async def emulated_roku_start(event):
             """Wrap the call to emulated_roku.start."""
             try:
                 LOGGER.debug("Starting emulated_roku %s", self.roku_usn)
                 self._unsub_start_listener = None
-                assert self._api_server is not None
                 await self._api_server.start()
             except OSError:
                 LOGGER.exception(
@@ -175,7 +165,7 @@ class EmulatedRoku:
 
         return True
 
-    async def unload(self) -> bool:
+    async def unload(self):
         """Unload the emulated_roku server."""
         LOGGER.debug("Unloading emulated_roku %s", self.roku_usn)
 
@@ -187,7 +177,6 @@ class EmulatedRoku:
             self._unsub_stop_listener()
             self._unsub_stop_listener = None
 
-        assert self._api_server is not None
         await self._api_server.close()
 
         return True

homeassistant/components/enphase_envoy/manifest.json

@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/enphase_envoy",
   "iot_class": "local_polling",
   "loggers": ["pyenphase"],
-  "requirements": ["pyenphase==1.25.1"],
+  "requirements": ["pyenphase==1.25.5"],
   "zeroconf": [
     {
       "type": "_enphase-envoy._tcp.local."

homeassistant/components/environment_canada/config_flow.py

@@ -35,7 +35,7 @@ async def validate_input(data):
         lon = weather_data.lon
 
     return {
-        CONF_TITLE: weather_data.metadata.get("location"),
+        CONF_TITLE: weather_data.metadata.location,
         CONF_STATION: weather_data.station_id,
         CONF_LATITUDE: lat,
         CONF_LONGITUDE: lon,

homeassistant/components/environment_canada/coordinator.py

@@ -7,7 +7,7 @@ from datetime import timedelta
 import logging
 import xml.etree.ElementTree as ET
 
-from env_canada import ECAirQuality, ECRadar, ECWeather, ec_exc
+from env_canada import ECAirQuality, ECRadar, ECWeather, ECWeatherUpdateFailed, ec_exc
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -65,6 +65,6 @@ class ECDataUpdateCoordinator[DataT: ECDataType](DataUpdateCoordinator[DataT]):
         """Fetch data from EC."""
         try:
             await self.ec_data.update()
-        except (ET.ParseError, ec_exc.UnknownStationId) as ex:
+        except (ET.ParseError, ECWeatherUpdateFailed, ec_exc.UnknownStationId) as ex:
             raise UpdateFailed(f"Error fetching {self.name} data: {ex}") from ex
         return self.ec_data

homeassistant/components/environment_canada/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/environment_canada",
   "iot_class": "cloud_polling",
   "loggers": ["env_canada"],
-  "requirements": ["env-canada==0.8.0"]
+  "requirements": ["env-canada==0.10.1"]
 }

homeassistant/components/environment_canada/sensor.py

@@ -145,7 +145,7 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
         key="timestamp",
         translation_key="timestamp",
         device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=lambda data: data.metadata.get("timestamp"),
+        value_fn=lambda data: data.metadata.timestamp,
     ),
     ECSensorEntityDescription(
         key="uv_index",
@@ -289,7 +289,7 @@ class ECBaseSensorEntity[DataT: ECDataType](
         super().__init__(coordinator)
         self.entity_description = description
         self._ec_data = coordinator.ec_data
-        self._attr_attribution = self._ec_data.metadata["attribution"]
+        self._attr_attribution = self._ec_data.metadata.attribution
         self._attr_unique_id = f"{coordinator.config_entry.title}-{description.key}"
         self._attr_device_info = coordinator.device_info
 
@@ -313,8 +313,8 @@ class ECSensorEntity[DataT: ECDataType](ECBaseSensorEntity[DataT]):
         """Initialize the sensor."""
         super().__init__(coordinator, description)
         self._attr_extra_state_attributes = {
-            ATTR_LOCATION: self._ec_data.metadata.get("location"),
-            ATTR_STATION: self._ec_data.metadata.get("station"),
+            ATTR_LOCATION: self._ec_data.metadata.location,
+            ATTR_STATION: self._ec_data.metadata.station,
         }
 
 
@@ -329,8 +329,8 @@ class ECAlertSensorEntity(ECBaseSensorEntity[ECWeather]):
             return None
 
         extra_state_attrs = {
-            ATTR_LOCATION: self._ec_data.metadata.get("location"),
-            ATTR_STATION: self._ec_data.metadata.get("station"),
+            ATTR_LOCATION: self._ec_data.metadata.location,
+            ATTR_STATION: self._ec_data.metadata.station,
         }
         for index, alert in enumerate(value, start=1):
             extra_state_attrs[f"alert_{index}"] = alert.get("title")

homeassistant/components/environment_canada/weather.py

@@ -115,7 +115,7 @@ class ECWeatherEntity(
         """Initialize Environment Canada weather."""
         super().__init__(coordinator)
         self.ec_data = coordinator.ec_data
-        self._attr_attribution = self.ec_data.metadata["attribution"]
+        self._attr_attribution = self.ec_data.metadata.attribution
         self._attr_translation_key = "forecast"
         self._attr_unique_id = _calculate_unique_id(
             coordinator.config_entry.unique_id, False

homeassistant/components/epic_games_store/strings.json

@@ -3,8 +3,8 @@
     "step": {
       "user": {
         "data": {
-          "language": "[%key:common::config_flow::data::language%]",
-          "country": "[%key:common::config_flow::data::country%]"
+          "language": "Language",
+          "country": "Country"
         }
       }
     },

homeassistant/components/esphome/assist_satellite.py

@@ -310,13 +310,12 @@ class EsphomeAssistSatellite(
                         self.entry_data.api_version
                     )
                 )
-                if feature_flags & VoiceAssistantFeature.SPEAKER and (
-                    stream := tts.async_get_stream(self.hass, tts_output["token"])
-                ):
+                if feature_flags & VoiceAssistantFeature.SPEAKER:
+                    media_id = tts_output["media_id"]
                     self._tts_streaming_task = (
                         self.config_entry.async_create_background_task(
                             self.hass,
-                            self._stream_tts_audio(stream),
+                            self._stream_tts_audio(media_id),
                             "esphome_voice_assistant_tts",
                         )
                     )
@@ -565,7 +564,7 @@ class EsphomeAssistSatellite(
 
     async def _stream_tts_audio(
         self,
-        tts_result: tts.ResultStream,
+        media_id: str,
         sample_rate: int = 16000,
         sample_width: int = 2,
         sample_channels: int = 1,
@@ -580,13 +579,14 @@ class EsphomeAssistSatellite(
             if not self._is_running:
                 return
 
-            if tts_result.extension != "wav":
-                _LOGGER.error(
-                    "Only WAV audio can be streamed, got %s", tts_result.extension
-                )
-                return
+            extension, data = await tts.async_get_media_source_audio(
+                self.hass,
+                media_id,
+            )
 
-            data = b"".join([chunk async for chunk in tts_result.async_stream_result()])
+            if extension != "wav":
+                _LOGGER.error("Only WAV audio can be streamed, got %s", extension)
+                return
 
             with io.BytesIO(data) as wav_io, wave.open(wav_io, "rb") as wav_file:
                 if (

homeassistant/components/esphome/manager.py

@@ -13,7 +13,7 @@ from aioesphomeapi import (
     APIConnectionError,
     APIVersion,
     DeviceInfo as EsphomeDeviceInfo,
-    EncryptionHelloAPIError,
+    EncryptionPlaintextAPIError,
     EntityInfo,
     HomeassistantServiceCall,
     InvalidAuthAPIError,
@@ -571,7 +571,7 @@ class ESPHomeManager:
         if isinstance(
             err,
             (
-                EncryptionHelloAPIError,
+                EncryptionPlaintextAPIError,
                 RequiresEncryptionAPIError,
                 InvalidEncryptionKeyAPIError,
                 InvalidAuthAPIError,

homeassistant/components/esphome/manifest.json

@@ -16,7 +16,7 @@
   "loggers": ["aioesphomeapi", "noiseprotocol", "bleak_esphome"],
   "mqtt": ["esphome/discover/#"],
   "requirements": [
-    "aioesphomeapi==29.8.0",
+    "aioesphomeapi==29.9.0",
     "esphome-dashboard-api==1.2.3",
     "bleak-esphome==2.12.0"
   ],

homeassistant/components/evohome/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["evohome", "evohomeasync", "evohomeasync2"],
   "quality_scale": "legacy",
-  "requirements": ["evohome-async==1.0.4"]
+  "requirements": ["evohome-async==1.0.5"]
 }

homeassistant/components/fibaro/__init__.py

@@ -301,6 +301,7 @@ class FibaroController:
                 device.ha_id = (
                     f"{slugify(room_name)}_{slugify(device.name)}_{device.fibaro_id}"
                 )
+                platform = None
                 if device.enabled and (not device.is_plugin or self._import_plugins):
                     platform = self._map_device_to_platform(device)
                 if platform is None:

homeassistant/components/flux_led/manifest.json

@@ -53,5 +53,5 @@
   "documentation": "https://www.home-assistant.io/integrations/flux_led",
   "iot_class": "local_push",
   "loggers": ["flux_led"],
-  "requirements": ["flux-led==1.1.3"]
+  "requirements": ["flux-led==1.2.0"]
 }

homeassistant/components/forecast_solar/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/forecast_solar",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["forecast-solar==4.0.0"]
+  "requirements": ["forecast-solar==4.1.0"]
 }

homeassistant/components/fritz/button.py

@@ -18,7 +18,7 @@ from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, Device
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import BUTTON_TYPE_WOL, CONNECTION_TYPE_LAN, DOMAIN, MeshRoles
+from .const import BUTTON_TYPE_WOL, CONNECTION_TYPE_LAN, MeshRoles
 from .coordinator import (
     FRITZ_DATA_KEY,
     AvmWrapper,
@@ -175,16 +175,6 @@ class FritzBoxWOLButton(FritzDeviceBase, ButtonEntity):
         self._name = f"{self.hostname} Wake on LAN"
         self._attr_unique_id = f"{self._mac}_wake_on_lan"
         self._is_available = True
-        self._attr_device_info = DeviceInfo(
-            connections={(CONNECTION_NETWORK_MAC, self._mac)},
-            default_manufacturer="AVM",
-            default_model="FRITZ!Box Tracked device",
-            default_name=device.hostname,
-            via_device=(
-                DOMAIN,
-                avm_wrapper.unique_id,
-            ),
-        )
 
     async def async_press(self) -> None:
         """Press the button."""

homeassistant/components/fritz/coordinator.py

@@ -526,7 +526,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
     def manage_device_info(
         self, dev_info: Device, dev_mac: str, consider_home: bool
     ) -> bool:
-        """Update device lists."""
+        """Update device lists and return if device is new."""
         _LOGGER.debug("Client dev_info: %s", dev_info)
 
         if dev_mac in self._devices:
@@ -536,6 +536,16 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         device = FritzDevice(dev_mac, dev_info.name)
         device.update(dev_info, consider_home)
         self._devices[dev_mac] = device
+
+        # manually register device entry for new connected device
+        dr.async_get(self.hass).async_get_or_create(
+            config_entry_id=self.config_entry.entry_id,
+            connections={(CONNECTION_NETWORK_MAC, dev_mac)},
+            default_manufacturer="AVM",
+            default_model="FRITZ!Box Tracked device",
+            default_name=device.hostname,
+            via_device=(DOMAIN, self.unique_id),
+        )
         return True
 
     async def async_send_signal_device_update(self, new_device: bool) -> None:

homeassistant/components/fritz/entity.py

@@ -26,6 +26,9 @@ class FritzDeviceBase(CoordinatorEntity[AvmWrapper]):
         self._avm_wrapper = avm_wrapper
         self._mac: str = device.mac_address
         self._name: str = device.hostname or DEFAULT_DEVICE_NAME
+        self._attr_device_info = DeviceInfo(
+            connections={(dr.CONNECTION_NETWORK_MAC, device.mac_address)}
+        )
 
     @property
     def name(self) -> str:

homeassistant/components/fritz/quality_scale.yaml

@@ -7,9 +7,7 @@ rules:
   config-flow-test-coverage:
     status: todo
     comment: one coverage miss in line 110
-  config-flow:
-    status: todo
-    comment: data_description are missing
+  config-flow: done
   dependency-transparency: done
   docs-actions: done
   docs-high-level-description: done

homeassistant/components/fritz/sensor.py

@@ -238,6 +238,8 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
         key="link_noise_margin_sent",
         translation_key="link_noise_margin_sent",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
         value_fn=_retrieve_link_noise_margin_sent_state,
         is_suitable=lambda info: info.wan_enabled and info.connection == DSL_CONNECTION,
     ),
@@ -245,6 +247,8 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
         key="link_noise_margin_received",
         translation_key="link_noise_margin_received",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
         value_fn=_retrieve_link_noise_margin_received_state,
         is_suitable=lambda info: info.wan_enabled and info.connection == DSL_CONNECTION,
     ),
@@ -252,6 +256,8 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
         key="link_attenuation_sent",
         translation_key="link_attenuation_sent",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
         value_fn=_retrieve_link_attenuation_sent_state,
         is_suitable=lambda info: info.wan_enabled and info.connection == DSL_CONNECTION,
     ),
@@ -259,6 +265,8 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
         key="link_attenuation_received",
         translation_key="link_attenuation_received",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
         value_fn=_retrieve_link_attenuation_received_state,
         is_suitable=lambda info: info.wan_enabled and info.connection == DSL_CONNECTION,
     ),

homeassistant/components/fritz/strings.json

@@ -1,4 +1,11 @@
 {
+  "common": {
+    "data_description_host": "The hostname or IP address of your FRITZ!Box router.",
+    "data_description_port": "Leave empty to use the default port.",
+    "data_description_username": "Username for the FRITZ!Box.",
+    "data_description_password": "Password for the FRITZ!Box.",
+    "data_description_ssl": "Use SSL to connect to the FRITZ!Box."
+  },
   "config": {
     "flow_title": "{name}",
     "step": {
@@ -9,6 +16,11 @@
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
           "ssl": "[%key:common::config_flow::data::ssl%]"
+        },
+        "data_description": {
+          "username": "[%key:component::fritz::common::data_description_username%]",
+          "password": "[%key:component::fritz::common::data_description_password%]",
+          "ssl": "[%key:component::fritz::common::data_description_ssl%]"
         }
       },
       "reauth_confirm": {
@@ -17,6 +29,10 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "username": "[%key:component::fritz::common::data_description_username%]",
+          "password": "[%key:component::fritz::common::data_description_password%]"
         }
       },
       "reconfigure": {
@@ -28,8 +44,9 @@
           "ssl": "[%key:common::config_flow::data::ssl%]"
         },
         "data_description": {
-          "host": "The hostname or IP address of your FRITZ!Box router.",
-          "port": "Leave it empty to use the default port."
+          "host": "[%key:component::fritz::common::data_description_host%]",
+          "port": "[%key:component::fritz::common::data_description_port%]",
+          "ssl": "[%key:component::fritz::common::data_description_ssl%]"
         }
       },
       "user": {
@@ -43,8 +60,11 @@
           "ssl": "[%key:common::config_flow::data::ssl%]"
         },
         "data_description": {
-          "host": "The hostname or IP address of your FRITZ!Box router.",
-          "port": "Leave it empty to use the default port."
+          "host": "[%key:component::fritz::common::data_description_host%]",
+          "port": "[%key:component::fritz::common::data_description_port%]",
+          "username": "[%key:component::fritz::common::data_description_username%]",
+          "password": "[%key:component::fritz::common::data_description_password%]",
+          "ssl": "[%key:component::fritz::common::data_description_ssl%]"
         }
       }
     },
@@ -70,6 +90,10 @@
         "data": {
           "consider_home": "Seconds to consider a device at 'home'",
           "old_discovery": "Enable old discovery method"
+        },
+        "data_description": {
+          "consider_home": "Time in seconds to consider a device at home. Default is 180 seconds.",
+          "old_discovery": "Enable old discovery method. This is needed for some scenarios."
         }
       }
     }
@@ -169,8 +193,12 @@
     "config_entry_not_found": {
       "message": "Failed to perform action \"{service}\". Config entry for target not found"
     },
-    "service_parameter_unknown": { "message": "Action or parameter unknown" },
-    "service_not_supported": { "message": "Action not supported" },
+    "service_parameter_unknown": {
+      "message": "Action or parameter unknown"
+    },
+    "service_not_supported": {
+      "message": "Action not supported"
+    },
     "error_refresh_hosts_info": {
       "message": "Error refreshing hosts info"
     },

homeassistant/components/fritz/switch.py

@@ -511,16 +511,6 @@ class FritzBoxProfileSwitch(FritzDeviceBase, SwitchEntity):
         self._name = f"{device.hostname} Internet Access"
         self._attr_unique_id = f"{self._mac}_internet_access"
         self._attr_entity_category = EntityCategory.CONFIG
-        self._attr_device_info = DeviceInfo(
-            connections={(CONNECTION_NETWORK_MAC, self._mac)},
-            default_manufacturer="AVM",
-            default_model="FRITZ!Box Tracked device",
-            default_name=device.hostname,
-            via_device=(
-                DOMAIN,
-                avm_wrapper.unique_id,
-            ),
-        )
 
     @property
     def is_on(self) -> bool | None:

homeassistant/components/fritzbox/sensor.py

@@ -137,6 +137,7 @@ SENSOR_TYPES: Final[tuple[FritzSensorEntityDescription, ...]] = (
         key="battery",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
+        state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=lambda device: device.battery_level is not None,
         native_value=lambda device: device.battery_level,

homeassistant/components/fronius/strings.json

@@ -182,10 +182,10 @@
         "state": {
           "startup": "Startup",
           "running": "Running",
-          "standby": "[%key:common::state::standby%]",
+          "standby": "Standby",
           "bootloading": "Bootloading",
           "error": "Error",
-          "idle": "[%key:common::state::idle%]",
+          "idle": "Idle",
           "ready": "Ready",
           "sleeping": "Sleeping"
         }

homeassistant/components/frontend/manifest.json

@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20250328.0"]
+  "requirements": ["home-assistant-frontend==20250411.0"]
 }

homeassistant/components/gaggenau/__init__.py

@@ -1 +0,0 @@
-"""Gaggenau virtual integration."""

homeassistant/components/gaggenau/manifest.json

@@ -1,6 +0,0 @@
-{
-  "domain": "gaggenau",
-  "name": "Gaggenau",
-  "integration_type": "virtual",
-  "supported_by": "home_connect"
-}

homeassistant/components/generic_thermostat/climate.py

@@ -539,14 +539,10 @@ class GenericThermostat(ClimateEntity, RestoreEntity):
                     return
 
             assert self._cur_temp is not None and self._target_temp is not None
-
-            min_temp = self._target_temp - self._cold_tolerance
-            max_temp = self._target_temp + self._hot_tolerance
-
+            too_cold = self._target_temp >= self._cur_temp + self._cold_tolerance
+            too_hot = self._cur_temp >= self._target_temp + self._hot_tolerance
             if self._is_device_active:
-                if (self.ac_mode and self._cur_temp <= min_temp) or (
-                    not self.ac_mode and self._cur_temp >= max_temp
-                ):
+                if (self.ac_mode and too_cold) or (not self.ac_mode and too_hot):
                     _LOGGER.debug("Turning off heater %s", self.heater_entity_id)
                     await self._async_heater_turn_off()
                 elif time is not None:
@@ -556,9 +552,7 @@ class GenericThermostat(ClimateEntity, RestoreEntity):
                         self.heater_entity_id,
                     )
                     await self._async_heater_turn_on()
-            elif (self.ac_mode and self._cur_temp > max_temp) or (
-                not self.ac_mode and self._cur_temp < min_temp
-            ):
+            elif (self.ac_mode and too_hot) or (not self.ac_mode and too_cold):
                 _LOGGER.debug("Turning on heater %s", self.heater_entity_id)
                 await self._async_heater_turn_on()
             elif time is not None:

homeassistant/components/generic_thermostat/strings.json

@@ -21,17 +21,17 @@
           "heater": "Switch entity used to cool or heat depending on A/C mode.",
           "target_sensor": "Temperature sensor that reflects the current temperature.",
           "min_cycle_duration": "Set a minimum amount of time that the switch specified must be in its current state prior to being switched either off or on.",
-          "cold_tolerance": "Minimum amount of difference between the temperature read by the temperature sensor the target temperature that must change prior to being switched on. For example, if the target temperature is 25 and the tolerance is 0.5 the heater will start when the sensor goes below 24.5.",
+          "cold_tolerance": "Minimum amount of difference between the temperature read by the temperature sensor the target temperature that must change prior to being switched on. For example, if the target temperature is 25 and the tolerance is 0.5 the heater will start when the sensor equals or goes below 24.5.",
           "hot_tolerance": "Minimum amount of difference between the temperature read by the temperature sensor the target temperature that must change prior to being switched off. For example, if the target temperature is 25 and the tolerance is 0.5 the heater will stop when the sensor equals or goes above 25.5."
         }
       },
       "presets": {
         "title": "Temperature presets",
         "data": {
-          "home_temp": "[%key:common::state::home%]",
-          "away_temp": "[%key:common::state::not_home%]",
+          "away_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::away%]",
           "comfort_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::comfort%]",
           "eco_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::eco%]",
+          "home_temp": "[%key:common::state::home%]",
           "sleep_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::sleep%]",
           "activity_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::activity%]"
         }
@@ -63,10 +63,10 @@
       "presets": {
         "title": "[%key:component::generic_thermostat::config::step::presets::title%]",
         "data": {
-          "home_temp": "[%key:common::state::home%]",
-          "away_temp": "[%key:common::state::not_home%]",
+          "away_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::away%]",
           "comfort_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::comfort%]",
           "eco_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::eco%]",
+          "home_temp": "[%key:common::state::home%]",
           "sleep_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::sleep%]",
           "activity_temp": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::activity%]"
         }

homeassistant/components/google/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google",
   "iot_class": "cloud_polling",
   "loggers": ["googleapiclient"],
-  "requirements": ["gcal-sync==7.0.0", "oauth2client==4.1.3", "ical==9.0.3"]
+  "requirements": ["gcal-sync==7.0.0", "oauth2client==4.1.3", "ical==9.1.0"]
 }

homeassistant/components/google_cloud/manifest.json

@@ -8,7 +8,7 @@
   "integration_type": "service",
   "iot_class": "cloud_push",
   "requirements": [
-    "google-cloud-texttospeech==2.25.1",
-    "google-cloud-speech==2.31.1"
+    "google-cloud-texttospeech==2.17.2",
+    "google-cloud-speech==2.27.0"
   ]
 }

homeassistant/components/google_generative_ai_conversation/config_flow.py

@@ -179,28 +179,30 @@ class GoogleGenerativeAIOptionsFlow(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the options."""
         options: dict[str, Any] | MappingProxyType[str, Any] = self.config_entry.options
+        errors: dict[str, str] = {}
 
         if user_input is not None:
             if user_input[CONF_RECOMMENDED] == self.last_rendered_recommended:
                 if user_input[CONF_LLM_HASS_API] == "none":
                     user_input.pop(CONF_LLM_HASS_API)
-                return self.async_create_entry(title="", data=user_input)
+                if not (
+                    user_input.get(CONF_LLM_HASS_API, "none") != "none"
+                    and user_input.get(CONF_USE_GOOGLE_SEARCH_TOOL, False) is True
+                ):
+                    # Don't allow to save options that enable the Google Seearch tool with an Assist API
+                    return self.async_create_entry(title="", data=user_input)
+                errors[CONF_USE_GOOGLE_SEARCH_TOOL] = "invalid_google_search_option"
 
             # Re-render the options again, now with the recommended options shown/hidden
             self.last_rendered_recommended = user_input[CONF_RECOMMENDED]
 
-            options = {
-                CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
-                CONF_PROMPT: user_input[CONF_PROMPT],
-                CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
-            }
+            options = user_input
 
         schema = await google_generative_ai_config_option_schema(
             self.hass, options, self._genai_client
         )
         return self.async_show_form(
-            step_id="init",
-            data_schema=vol.Schema(schema),
+            step_id="init", data_schema=vol.Schema(schema), errors=errors
         )
 
 
@@ -301,7 +303,7 @@ async def google_generative_ai_config_option_schema(
                 CONF_TEMPERATURE,
                 description={"suggested_value": options.get(CONF_TEMPERATURE)},
                 default=RECOMMENDED_TEMPERATURE,
-            ): NumberSelector(NumberSelectorConfig(min=0, max=1, step=0.05)),
+            ): NumberSelector(NumberSelectorConfig(min=0, max=2, step=0.05)),
             vol.Optional(
                 CONF_TOP_P,
                 description={"suggested_value": options.get(CONF_TOP_P)},

homeassistant/components/google_generative_ai_conversation/conversation.py

@@ -55,6 +55,10 @@ from .const import (
 # Max number of back and forth with the LLM to generate a response
 MAX_TOOL_ITERATIONS = 10
 
+ERROR_GETTING_RESPONSE = (
+    "Sorry, I had a problem getting a response from Google Generative AI."
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -429,6 +433,12 @@ class GoogleGenerativeAIConversationEntity(
                     raise HomeAssistantError(
                         f"The message got blocked due to content violations, reason: {chat_response.prompt_feedback.block_reason_message}"
                     )
+                if not chat_response.candidates:
+                    LOGGER.error(
+                        "No candidates found in the response: %s",
+                        chat_response,
+                    )
+                    raise HomeAssistantError(ERROR_GETTING_RESPONSE)
 
             except (
                 APIError,
@@ -452,9 +462,7 @@ class GoogleGenerativeAIConversationEntity(
 
             response_parts = chat_response.candidates[0].content.parts
             if not response_parts:
-                raise HomeAssistantError(
-                    "Sorry, I had a problem getting a response from Google Generative AI."
-                )
+                raise HomeAssistantError(ERROR_GETTING_RESPONSE)
             content = " ".join(
                 [part.text.strip() for part in response_parts if part.text]
             )

homeassistant/components/google_generative_ai_conversation/strings.json

@@ -40,9 +40,13 @@
           "enable_google_search_tool": "Enable Google Search tool"
         },
         "data_description": {
-          "prompt": "Instruct how the LLM should respond. This can be a template."
+          "prompt": "Instruct how the LLM should respond. This can be a template.",
+          "enable_google_search_tool": "Only works with \"No control\" in the \"Control Home Assistant\" setting. See docs for a workaround using it with \"Assist\"."
         }
       }
+    },
+    "error": {
+      "invalid_google_search_option": "Google Search cannot be enabled alongside any Assist capability, this can only be used when Assist is set to \"No control\"."
     }
   },
   "services": {

homeassistant/components/growatt_server/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/growatt_server",
   "iot_class": "cloud_polling",
   "loggers": ["growattServer"],
-  "requirements": ["growattServer==1.5.0"]
+  "requirements": ["growattServer==1.6.0"]
 }

homeassistant/components/habitica/util.py

@@ -74,7 +74,7 @@ def build_rrule(task: TaskData) -> rrule:
 
     bysetpos = None
     if rrule_frequency == MONTHLY and task.weeksOfMonth:
-        bysetpos = task.weeksOfMonth
+        bysetpos = [i + 1 for i in task.weeksOfMonth]
         weekdays = weekdays if weekdays else [MO]
 
     return rrule(

homeassistant/components/hassio/strings.json

@@ -265,6 +265,11 @@
       "version_latest": {
         "name": "Newest version"
       }
+    },
+    "update": {
+      "update": {
+        "name": "[%key:component::update::title%]"
+      }
     }
   },
   "services": {

homeassistant/components/hassio/update.py

@@ -39,7 +39,7 @@ from .entity import (
 from .update_helper import update_addon, update_core
 
 ENTITY_DESCRIPTION = UpdateEntityDescription(
-    name="Update",
+    translation_key="update",
     key=ATTR_VERSION_LATEST,
 )
 

homeassistant/components/heos/const.py

@@ -2,13 +2,11 @@
 
 ATTR_PASSWORD = "password"
 ATTR_USERNAME = "username"
-ATTR_QUEUE_IDS = "queue_ids"
 DOMAIN = "heos"
 ENTRY_TITLE = "HEOS System"
 SERVICE_GET_QUEUE = "get_queue"
 SERVICE_GROUP_VOLUME_SET = "group_volume_set"
 SERVICE_GROUP_VOLUME_DOWN = "group_volume_down"
 SERVICE_GROUP_VOLUME_UP = "group_volume_up"
-SERVICE_REMOVE_FROM_QUEUE = "remove_from_queue"
 SERVICE_SIGN_IN = "sign_in"
 SERVICE_SIGN_OUT = "sign_out"

homeassistant/components/heos/icons.json

@@ -3,9 +3,6 @@
     "get_queue": {
       "service": "mdi:playlist-music"
     },
-    "remove_from_queue": {
-      "service": "mdi:playlist-remove"
-    },
     "group_volume_set": {
       "service": "mdi:volume-medium"
     },

homeassistant/components/heos/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_push",
   "loggers": ["pyheos"],
   "quality_scale": "platinum",
-  "requirements": ["pyheos==1.0.4"],
+  "requirements": ["pyheos==1.0.5"],
   "ssdp": [
     {
       "st": "urn:schemas-denon-com:device:ACT-Denon:1"

homeassistant/components/heos/media_player.py

@@ -24,10 +24,12 @@ from pyheos import (
     const as heos_const,
 )
 from pyheos.util import mediauri as heos_source
+import voluptuous as vol
 
 from homeassistant.components import media_source
 from homeassistant.components.media_player import (
     ATTR_MEDIA_ENQUEUE,
+    ATTR_MEDIA_VOLUME_LEVEL,
     BrowseError,
     BrowseMedia,
     MediaClass,
@@ -41,16 +43,30 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.components.media_source import BrowseMediaSource
 from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant, ServiceResponse, callback
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    entity_platform,
+    entity_registry as er,
+)
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utcnow
 
-from . import services
-from .const import DOMAIN as HEOS_DOMAIN
+from .const import (
+    DOMAIN as HEOS_DOMAIN,
+    SERVICE_GET_QUEUE,
+    SERVICE_GROUP_VOLUME_DOWN,
+    SERVICE_GROUP_VOLUME_SET,
+    SERVICE_GROUP_VOLUME_UP,
+)
 from .coordinator import HeosConfigEntry, HeosCoordinator
 
 PARALLEL_UPDATES = 0
@@ -71,6 +87,7 @@ BASE_SUPPORTED_FEATURES = (
 
 PLAY_STATE_TO_STATE = {
     None: MediaPlayerState.IDLE,
+    PlayState.UNKNOWN: MediaPlayerState.IDLE,
     PlayState.PLAY: MediaPlayerState.PLAYING,
     PlayState.STOP: MediaPlayerState.IDLE,
     PlayState.PAUSE: MediaPlayerState.PAUSED,
@@ -121,7 +138,25 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add media players for a config entry."""
-    services.register_media_player_services()
+    # Register custom entity services
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        SERVICE_GET_QUEUE,
+        None,
+        "async_get_queue",
+        supports_response=SupportsResponse.ONLY,
+    )
+    platform.async_register_entity_service(
+        SERVICE_GROUP_VOLUME_SET,
+        {vol.Required(ATTR_MEDIA_VOLUME_LEVEL): cv.small_float},
+        "async_set_group_volume_level",
+    )
+    platform.async_register_entity_service(
+        SERVICE_GROUP_VOLUME_DOWN, None, "async_group_volume_down"
+    )
+    platform.async_register_entity_service(
+        SERVICE_GROUP_VOLUME_UP, None, "async_group_volume_up"
+    )
 
     def add_entities_callback(players: Sequence[HeosPlayer]) -> None:
         """Add entities for each player."""
@@ -353,15 +388,6 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
             await self._player.play_preset_station(index)
             return
 
-        if media_type == "queue":
-            # media_id must be an int
-            try:
-                queue_id = int(media_id)
-            except ValueError:
-                raise ValueError(f"Invalid queue id '{media_id}'") from None
-            await self._player.play_queue(queue_id)
-            return
-
         raise ValueError(f"Unsupported media type '{media_type}'")
 
     @catch_action_error("select source")
@@ -475,10 +501,6 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
                 await self.coordinator.heos.set_group(new_members)
                 return
 
-    async def async_remove_from_queue(self, queue_ids: list[int]) -> None:
-        """Remove items from the queue."""
-        await self._player.remove_from_queue(queue_ids)
-
     @property
     def available(self) -> bool:
         """Return True if the device is available."""

homeassistant/components/heos/services.py

@@ -1,33 +1,19 @@
 """Services for the HEOS integration."""
 
-from dataclasses import dataclass
 import logging
-from typing import Final
 
 from pyheos import CommandAuthenticationError, Heos, HeosError
 import voluptuous as vol
 
-from homeassistant.components.media_player import ATTR_MEDIA_VOLUME_LEVEL
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant, ServiceCall, SupportsResponse
+from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import (
-    config_validation as cv,
-    entity_platform,
-    issue_registry as ir,
-)
-from homeassistant.helpers.typing import VolDictType, VolSchemaType
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
 
 from .const import (
     ATTR_PASSWORD,
-    ATTR_QUEUE_IDS,
     ATTR_USERNAME,
     DOMAIN,
-    SERVICE_GET_QUEUE,
-    SERVICE_GROUP_VOLUME_DOWN,
-    SERVICE_GROUP_VOLUME_SET,
-    SERVICE_GROUP_VOLUME_UP,
-    SERVICE_REMOVE_FROM_QUEUE,
     SERVICE_SIGN_IN,
     SERVICE_SIGN_OUT,
 )
@@ -58,62 +44,6 @@ def register(hass: HomeAssistant) -> None:
     )
 
 
-@dataclass(frozen=True)
-class EntityServiceDescription:
-    """Describe an entity service."""
-
-    name: str
-    method_name: str
-    schema: VolDictType | VolSchemaType | None = None
-    supports_response: SupportsResponse = SupportsResponse.NONE
-
-    def async_register(self, platform: entity_platform.EntityPlatform) -> None:
-        """Register the service with the platform."""
-        platform.async_register_entity_service(
-            self.name,
-            self.schema,
-            self.method_name,
-            supports_response=self.supports_response,
-        )
-
-
-REMOVE_FROM_QUEUE_SCHEMA: Final[VolDictType] = {
-    vol.Required(ATTR_QUEUE_IDS): vol.All(
-        cv.ensure_list,
-        [vol.All(cv.positive_int, vol.Range(min=1))],
-        vol.Unique(),
-    )
-}
-GROUP_VOLUME_SET_SCHEMA: Final[VolDictType] = {
-    vol.Required(ATTR_MEDIA_VOLUME_LEVEL): cv.small_float
-}
-
-MEDIA_PLAYER_ENTITY_SERVICES: Final = (
-    # Player queue services
-    EntityServiceDescription(
-        SERVICE_GET_QUEUE, "async_get_queue", supports_response=SupportsResponse.ONLY
-    ),
-    EntityServiceDescription(
-        SERVICE_REMOVE_FROM_QUEUE, "async_remove_from_queue", REMOVE_FROM_QUEUE_SCHEMA
-    ),
-    # Group volume services
-    EntityServiceDescription(
-        SERVICE_GROUP_VOLUME_SET,
-        "async_set_group_volume_level",
-        GROUP_VOLUME_SET_SCHEMA,
-    ),
-    EntityServiceDescription(SERVICE_GROUP_VOLUME_DOWN, "async_group_volume_down"),
-    EntityServiceDescription(SERVICE_GROUP_VOLUME_UP, "async_group_volume_up"),
-)
-
-
-def register_media_player_services() -> None:
-    """Register media_player entity services."""
-    platform = entity_platform.async_get_current_platform()
-    for service in MEDIA_PLAYER_ENTITY_SERVICES:
-        service.async_register(platform)
-
-
 def _get_controller(hass: HomeAssistant) -> Heos:
     """Get the HEOS controller instance."""
     _LOGGER.warning(

homeassistant/components/heos/services.yaml

@@ -4,19 +4,6 @@ get_queue:
       integration: heos
       domain: media_player
 
-remove_from_queue:
-  target:
-    entity:
-      integration: heos
-      domain: media_player
-  fields:
-    queue_ids:
-      required: true
-      selector:
-        text:
-          multiple: true
-          type: number
-
 group_volume_set:
   target:
     entity:

homeassistant/components/heos/strings.json

@@ -90,16 +90,6 @@
       "name": "Get queue",
       "description": "Retrieves the queue of the media player."
     },
-    "remove_from_queue": {
-      "name": "Remove from queue",
-      "description": "Removes items from the play queue.",
-      "fields": {
-        "queue_ids": {
-          "name": "Queue IDs",
-          "description": "The IDs (indexes) of the items in the queue to remove."
-        }
-      }
-    },
     "group_volume_down": {
       "name": "Turn down group volume",
       "description": "Turns down the group volume."

homeassistant/components/holiday/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/holiday",
   "iot_class": "local_polling",
-  "requirements": ["holidays==0.69", "babel==2.15.0"]
+  "requirements": ["holidays==0.70", "babel==2.15.0"]
 }

homeassistant/components/home_connect/coordinator.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from asyncio import sleep as asyncio_sleep
 from collections import defaultdict
 from collections.abc import Callable
-from contextlib import suppress
 from dataclasses import dataclass
 import logging
 from typing import Any, cast
@@ -74,6 +73,19 @@ class HomeConnectApplianceData:
         self.settings.update(other.settings)
         self.status.update(other.status)
 
+    @classmethod
+    def empty(cls, appliance: HomeAppliance) -> HomeConnectApplianceData:
+        """Return empty data."""
+        return cls(
+            commands=set(),
+            events={},
+            info=appliance,
+            options={},
+            programs=[],
+            settings={},
+            status={},
+        )
+
 
 class HomeConnectCoordinator(
     DataUpdateCoordinator[dict[str, HomeConnectApplianceData]]
@@ -120,11 +132,8 @@ class HomeConnectCoordinator(
         self.__dict__.pop("context_listeners", None)
 
         def remove_listener_and_invalidate_context_listeners() -> None:
-            # There are cases where the remove_listener will be called
-            # although it has been already removed somewhere else
-            with suppress(KeyError):
-                remove_listener()
-                self.__dict__.pop("context_listeners", None)
+            remove_listener()
+            self.__dict__.pop("context_listeners", None)
 
         return remove_listener_and_invalidate_context_listeners
 
@@ -195,7 +204,7 @@ class HomeConnectCoordinator(
                             events = self.data[event_message_ha_id].events
                             for event in event_message.data.items:
                                 event_key = event.key
-                                if event_key in SettingKey:
+                                if event_key in SettingKey.__members__.values():  # type: ignore[comparison-overlap]
                                     setting_key = SettingKey(event_key)
                                     if setting_key in settings:
                                         settings[setting_key].value = event.value
@@ -362,15 +371,7 @@ class HomeConnectCoordinator(
                 model=appliance.vib,
             )
             if appliance.ha_id not in self.data:
-                self.data[appliance.ha_id] = HomeConnectApplianceData(
-                    commands=set(),
-                    events={},
-                    info=appliance,
-                    options={},
-                    programs=[],
-                    settings={},
-                    status={},
-                )
+                self.data[appliance.ha_id] = HomeConnectApplianceData.empty(appliance)
             else:
                 self.data[appliance.ha_id].info.connected = appliance.connected
                 old_appliances.remove(appliance.ha_id)
@@ -406,6 +407,15 @@ class HomeConnectCoordinator(
             name=appliance.name,
             model=appliance.vib,
         )
+        if not appliance.connected:
+            _LOGGER.debug(
+                "Appliance %s is not connected, skipping data fetch",
+                appliance.ha_id,
+            )
+            if appliance_data_to_update:
+                appliance_data_to_update.info.connected = False
+                return appliance_data_to_update
+            return HomeConnectApplianceData.empty(appliance)
         try:
             settings = {
                 setting.key: setting