Raise errors on interactive entity actions when suspended

For consistency with integration setup.

.github/workflows/builder.yml

@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -116,7 +116,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -175,7 +175,7 @@ jobs:
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
 
       - name: Download translations
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: translations
 
@@ -457,12 +457,12 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: translations
 
@@ -509,7 +509,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -522,7 +522,7 @@ jobs:
       - name: Push Docker image
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
         id: push
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -531,7 +531,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
+        uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
         with:
           subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}

.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.6"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version
@@ -249,7 +249,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -294,7 +294,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -334,7 +334,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -374,7 +374,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -484,7 +484,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -587,7 +587,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -620,7 +620,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -677,7 +677,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -720,7 +720,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -767,7 +767,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -812,7 +812,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -889,7 +889,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -949,7 +949,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -968,7 +968,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: pytest_buckets
       - name: Compile English translations
@@ -1074,7 +1074,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1208,7 +1208,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1312,7 +1312,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
@@ -1359,7 +1359,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1454,7 +1454,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
@@ -1479,7 +1479,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           pattern: test-results-*
       - name: Upload test results to Codecov

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.28.15
+        uses: github/codeql-action/init@v3.28.16
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.28.15
+        uses: github/codeql-action/analyze@v3.28.16
         with:
           category: "/language:python"

.github/workflows/translations.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 

.github/workflows/wheels.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -138,17 +138,17 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: env_file
 
       - name: Download build_constraints
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: build_constraints
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: requirements_diff
 
@@ -187,22 +187,22 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: env_file
 
       - name: Download build_constraints
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: build_constraints
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.3.0
         with:
           name: requirements_all_wheels
 

.strict-typing

@@ -332,6 +332,7 @@ homeassistant.components.media_player.*
 homeassistant.components.media_source.*
 homeassistant.components.met_eireann.*
 homeassistant.components.metoffice.*
+homeassistant.components.miele.*
 homeassistant.components.mikrotik.*
 homeassistant.components.min_max.*
 homeassistant.components.minecraft_server.*
@@ -386,6 +387,7 @@ homeassistant.components.pandora.*
 homeassistant.components.panel_custom.*
 homeassistant.components.peblar.*
 homeassistant.components.peco.*
+homeassistant.components.pegel_online.*
 homeassistant.components.persistent_notification.*
 homeassistant.components.person.*
 homeassistant.components.pi_hole.*
@@ -462,6 +464,7 @@ homeassistant.components.slack.*
 homeassistant.components.sleepiq.*
 homeassistant.components.smhi.*
 homeassistant.components.smlight.*
+homeassistant.components.smtp.*
 homeassistant.components.snooz.*
 homeassistant.components.solarlog.*
 homeassistant.components.sonarr.*

CODEOWNERS

@@ -1081,8 +1081,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/ombi/ @larssont
 /homeassistant/components/onboarding/ @home-assistant/core
 /tests/components/onboarding/ @home-assistant/core
-/homeassistant/components/oncue/ @bdraco @peterager
-/tests/components/oncue/ @bdraco @peterager
 /homeassistant/components/ondilo_ico/ @JeromeHXP
 /tests/components/ondilo_ico/ @JeromeHXP
 /homeassistant/components/onedrive/ @zweckj
@@ -1260,6 +1258,8 @@ build.json @home-assistant/supervisor
 /tests/components/recovery_mode/ @home-assistant/core
 /homeassistant/components/refoss/ @ashionky
 /tests/components/refoss/ @ashionky
+/homeassistant/components/rehlko/ @bdraco @peterager
+/tests/components/rehlko/ @bdraco @peterager
 /homeassistant/components/remote/ @home-assistant/core
 /tests/components/remote/ @home-assistant/core
 /homeassistant/components/remote_calendar/ @Thomas55555
@@ -1318,6 +1318,8 @@ build.json @home-assistant/supervisor
 /tests/components/ruuvitag_ble/ @akx
 /homeassistant/components/rympro/ @OnFreund @elad-bar @maorcc
 /tests/components/rympro/ @OnFreund @elad-bar @maorcc
+/homeassistant/components/s3/ @tomasbedrich
+/tests/components/s3/ @tomasbedrich
 /homeassistant/components/sabnzbd/ @shaiu @jpbede
 /tests/components/sabnzbd/ @shaiu @jpbede
 /homeassistant/components/saj/ @fredericvl
@@ -1439,8 +1441,8 @@ build.json @home-assistant/supervisor
 /tests/components/solarlog/ @Ernst79 @dontinelli
 /homeassistant/components/solax/ @squishykid @Darsstar
 /tests/components/solax/ @squishykid @Darsstar
-/homeassistant/components/soma/ @ratsept @sebfortier2288
-/tests/components/soma/ @ratsept @sebfortier2288
+/homeassistant/components/soma/ @ratsept
+/tests/components/soma/ @ratsept
 /homeassistant/components/sonarr/ @ctalkington
 /tests/components/sonarr/ @ctalkington
 /homeassistant/components/songpal/ @rytilahti @shenxn
@@ -1472,7 +1474,8 @@ build.json @home-assistant/supervisor
 /tests/components/steam_online/ @tkdrob
 /homeassistant/components/steamist/ @bdraco
 /tests/components/steamist/ @bdraco
-/homeassistant/components/stiebel_eltron/ @fucm
+/homeassistant/components/stiebel_eltron/ @fucm @ThyMYthOS
+/tests/components/stiebel_eltron/ @fucm @ThyMYthOS
 /homeassistant/components/stookwijzer/ @fwestenberg
 /tests/components/stookwijzer/ @fwestenberg
 /homeassistant/components/stream/ @hunterjm @uvjustin @allenporter

Dockerfile

@@ -31,7 +31,7 @@ RUN \
     && go2rtc --version
 
 # Install uv
-RUN pip3 install uv==0.6.10
+RUN pip3 install uv==0.7.1
 
 WORKDIR /usr/src
 

homeassistant/brands/google.json

@@ -6,6 +6,7 @@
     "google_assistant_sdk",
     "google_cloud",
     "google_drive",
+    "google_gemini",
     "google_generative_ai_conversation",
     "google_mail",
     "google_maps",

homeassistant/brands/nuki.json

@@ -0,0 +1,6 @@
+{
+  "domain": "nuki",
+  "name": "Nuki",
+  "integrations": ["nuki"],
+  "iot_standards": ["matter"]
+}

homeassistant/components/accuweather/const.py

@@ -67,6 +67,7 @@ POLLEN_CATEGORY_MAP = {
     2: "moderate",
     3: "high",
     4: "very_high",
+    5: "extreme",
 }
 UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=40)
 UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)

homeassistant/components/accuweather/strings.json

@@ -72,6 +72,7 @@
           "level": {
             "name": "Level",
             "state": {
+              "extreme": "Extreme",
               "high": "[%key:common::state::high%]",
               "low": "[%key:common::state::low%]",
               "moderate": "Moderate",
@@ -89,6 +90,7 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
+              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
               "high": "[%key:common::state::high%]",
               "low": "[%key:common::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
@@ -123,6 +125,7 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
+              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
               "high": "[%key:common::state::high%]",
               "low": "[%key:common::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
@@ -167,6 +170,7 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
+              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
               "high": "[%key:common::state::high%]",
               "low": "[%key:common::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
@@ -181,6 +185,7 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
+              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
               "high": "[%key:common::state::high%]",
               "low": "[%key:common::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
@@ -195,6 +200,7 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
+              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
               "high": "[%key:common::state::high%]",
               "low": "[%key:common::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",

homeassistant/components/adax/__init__.py

@@ -2,25 +2,38 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
+from .const import CONNECTION_TYPE, LOCAL
+from .coordinator import AdaxCloudCoordinator, AdaxConfigEntry, AdaxLocalCoordinator
+
 PLATFORMS = [Platform.CLIMATE]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: AdaxConfigEntry) -> bool:
     """Set up Adax from a config entry."""
+    if entry.data.get(CONNECTION_TYPE) == LOCAL:
+        local_coordinator = AdaxLocalCoordinator(hass, entry)
+        entry.runtime_data = local_coordinator
+    else:
+        cloud_coordinator = AdaxCloudCoordinator(hass, entry)
+        entry.runtime_data = cloud_coordinator
+
+    await entry.runtime_data.async_config_entry_first_refresh()
+
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: AdaxConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: AdaxConfigEntry
+) -> bool:
     """Migrate old entry."""
     # convert title and unique_id to string
     if config_entry.version == 1:

homeassistant/components/adax/climate.py

@@ -12,57 +12,42 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_TEMPERATURE,
-    CONF_IP_ADDRESS,
-    CONF_PASSWORD,
-    CONF_TOKEN,
     CONF_UNIQUE_ID,
     PRECISION_WHOLE,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import ACCOUNT_ID, CONNECTION_TYPE, DOMAIN, LOCAL
+from . import AdaxConfigEntry
+from .const import CONNECTION_TYPE, DOMAIN, LOCAL
+from .coordinator import AdaxCloudCoordinator, AdaxLocalCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: AdaxConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Adax thermostat with config flow."""
     if entry.data.get(CONNECTION_TYPE) == LOCAL:
-        adax_data_handler = AdaxLocal(
-            entry.data[CONF_IP_ADDRESS],
-            entry.data[CONF_TOKEN],
-            websession=async_get_clientsession(hass, verify_ssl=False),
-        )
+        local_coordinator = cast(AdaxLocalCoordinator, entry.runtime_data)
         async_add_entities(
-            [LocalAdaxDevice(adax_data_handler, entry.data[CONF_UNIQUE_ID])], True
+            [LocalAdaxDevice(local_coordinator, entry.data[CONF_UNIQUE_ID])],
+        )
+    else:
+        cloud_coordinator = cast(AdaxCloudCoordinator, entry.runtime_data)
+        async_add_entities(
+            AdaxDevice(cloud_coordinator, device_id)
+            for device_id in cloud_coordinator.data
         )
-        return
-
-    adax_data_handler = Adax(
-        entry.data[ACCOUNT_ID],
-        entry.data[CONF_PASSWORD],
-        websession=async_get_clientsession(hass),
-    )
-
-    async_add_entities(
-        (
-            AdaxDevice(room, adax_data_handler)
-            for room in await adax_data_handler.get_rooms()
-        ),
-        True,
-    )
 
 
-class AdaxDevice(ClimateEntity):
+class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
     """Representation of a heater."""
 
     _attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF]
@@ -76,20 +61,37 @@ class AdaxDevice(ClimateEntity):
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    def __init__(self, heater_data: dict[str, Any], adax_data_handler: Adax) -> None:
+    def __init__(
+        self,
+        coordinator: AdaxCloudCoordinator,
+        device_id: str,
+    ) -> None:
         """Initialize the heater."""
-        self._device_id = heater_data["id"]
-        self._adax_data_handler = adax_data_handler
+        super().__init__(coordinator)
+        self._adax_data_handler: Adax = coordinator.adax_data_handler
+        self._device_id = device_id
 
-        self._attr_unique_id = f"{heater_data['homeId']}_{heater_data['id']}"
+        self._attr_name = self.room["name"]
+        self._attr_unique_id = f"{self.room['homeId']}_{self._device_id}"
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, heater_data["id"])},
+            identifiers={(DOMAIN, device_id)},
             # Instead of setting the device name to the entity name, adax
             # should be updated to set has_entity_name = True, and set the entity
             # name to None
             name=cast(str | None, self.name),
             manufacturer="Adax",
         )
+        self._apply_data(self.room)
+
+    @property
+    def available(self) -> bool:
+        """Whether the entity is available or not."""
+        return super().available and self._device_id in self.coordinator.data
+
+    @property
+    def room(self) -> dict[str, Any]:
+        """Gets the data for this particular device."""
+        return self.coordinator.data[self._device_id]
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
@@ -104,7 +106,9 @@ class AdaxDevice(ClimateEntity):
             )
         else:
             return
-        await self._adax_data_handler.update()
+
+        # Request data refresh from source to verify that update was successful
+        await self.coordinator.async_request_refresh()
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
@@ -114,28 +118,31 @@ class AdaxDevice(ClimateEntity):
             self._device_id, temperature, True
         )
 
-    async def async_update(self) -> None:
-        """Get the latest data."""
-        for room in await self._adax_data_handler.get_rooms():
-            if room["id"] != self._device_id:
-                continue
-            self._attr_name = room["name"]
-            self._attr_current_temperature = room.get("temperature")
-            self._attr_target_temperature = room.get("targetTemperature")
-            if room["heatingEnabled"]:
-                self._attr_hvac_mode = HVACMode.HEAT
-                self._attr_icon = "mdi:radiator"
-            else:
-                self._attr_hvac_mode = HVACMode.OFF
-                self._attr_icon = "mdi:radiator-off"
-            return
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        if room := self.room:
+            self._apply_data(room)
+        super()._handle_coordinator_update()
+
+    def _apply_data(self, room: dict[str, Any]) -> None:
+        """Update the appropriate attributues based on received data."""
+        self._attr_current_temperature = room.get("temperature")
+        self._attr_target_temperature = room.get("targetTemperature")
+        if room["heatingEnabled"]:
+            self._attr_hvac_mode = HVACMode.HEAT
+            self._attr_icon = "mdi:radiator"
+        else:
+            self._attr_hvac_mode = HVACMode.OFF
+            self._attr_icon = "mdi:radiator-off"
 
 
-class LocalAdaxDevice(ClimateEntity):
+class LocalAdaxDevice(CoordinatorEntity[AdaxLocalCoordinator], ClimateEntity):
     """Representation of a heater."""
 
     _attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF]
-    _attr_hvac_mode = HVACMode.HEAT
+    _attr_hvac_mode = HVACMode.OFF
+    _attr_icon = "mdi:radiator-off"
     _attr_max_temp = 35
     _attr_min_temp = 5
     _attr_supported_features = (
@@ -146,9 +153,10 @@ class LocalAdaxDevice(ClimateEntity):
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    def __init__(self, adax_data_handler: AdaxLocal, unique_id: str) -> None:
+    def __init__(self, coordinator: AdaxLocalCoordinator, unique_id: str) -> None:
         """Initialize the heater."""
-        self._adax_data_handler = adax_data_handler
+        super().__init__(coordinator)
+        self._adax_data_handler: AdaxLocal = coordinator.adax_data_handler
         self._attr_unique_id = unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
@@ -169,17 +177,20 @@ class LocalAdaxDevice(ClimateEntity):
             return
         await self._adax_data_handler.set_target_temperature(temperature)
 
-    async def async_update(self) -> None:
-        """Get the latest data."""
-        data = await self._adax_data_handler.get_status()
-        self._attr_current_temperature = data["current_temperature"]
-        self._attr_available = self._attr_current_temperature is not None
-        if (target_temp := data["target_temperature"]) == 0:
-            self._attr_hvac_mode = HVACMode.OFF
-            self._attr_icon = "mdi:radiator-off"
-            if target_temp == 0:
-                self._attr_target_temperature = self._attr_min_temp
-        else:
-            self._attr_hvac_mode = HVACMode.HEAT
-            self._attr_icon = "mdi:radiator"
-            self._attr_target_temperature = target_temp
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        if data := self.coordinator.data:
+            self._attr_current_temperature = data["current_temperature"]
+            self._attr_available = self._attr_current_temperature is not None
+            if (target_temp := data["target_temperature"]) == 0:
+                self._attr_hvac_mode = HVACMode.OFF
+                self._attr_icon = "mdi:radiator-off"
+                if target_temp == 0:
+                    self._attr_target_temperature = self._attr_min_temp
+            else:
+                self._attr_hvac_mode = HVACMode.HEAT
+                self._attr_icon = "mdi:radiator"
+                self._attr_target_temperature = target_temp
+
+        super()._handle_coordinator_update()

homeassistant/components/adax/const.py

@@ -1,5 +1,6 @@
 """Constants for the Adax integration."""
 
+import datetime
 from typing import Final
 
 ACCOUNT_ID: Final = "account_id"
@@ -9,3 +10,5 @@ DOMAIN: Final = "adax"
 LOCAL = "Local"
 WIFI_SSID = "wifi_ssid"
 WIFI_PSWD = "wifi_pswd"
+
+SCAN_INTERVAL = datetime.timedelta(seconds=60)

homeassistant/components/adax/coordinator.py

@@ -0,0 +1,71 @@
+"""DataUpdateCoordinator for the Adax component."""
+
+import logging
+from typing import Any, cast
+
+from adax import Adax
+from adax_local import Adax as AdaxLocal
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_TOKEN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import ACCOUNT_ID, SCAN_INTERVAL
+
+_LOGGER = logging.getLogger(__name__)
+
+
+type AdaxConfigEntry = ConfigEntry[AdaxCloudCoordinator | AdaxLocalCoordinator]
+
+
+class AdaxCloudCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
+    """Coordinator for updating data to and from Adax (cloud)."""
+
+    def __init__(self, hass: HomeAssistant, entry: AdaxConfigEntry) -> None:
+        """Initialize the Adax coordinator used for Cloud mode."""
+        super().__init__(
+            hass,
+            config_entry=entry,
+            logger=_LOGGER,
+            name="AdaxCloud",
+            update_interval=SCAN_INTERVAL,
+        )
+
+        self.adax_data_handler = Adax(
+            entry.data[ACCOUNT_ID],
+            entry.data[CONF_PASSWORD],
+            websession=async_get_clientsession(hass),
+        )
+
+    async def _async_update_data(self) -> dict[str, dict[str, Any]]:
+        """Fetch data from the Adax."""
+        rooms = await self.adax_data_handler.get_rooms() or []
+        return {r["id"]: r for r in rooms}
+
+
+class AdaxLocalCoordinator(DataUpdateCoordinator[dict[str, Any] | None]):
+    """Coordinator for updating data to and from Adax (local)."""
+
+    def __init__(self, hass: HomeAssistant, entry: AdaxConfigEntry) -> None:
+        """Initialize the Adax coordinator used for Local mode."""
+        super().__init__(
+            hass,
+            config_entry=entry,
+            logger=_LOGGER,
+            name="AdaxLocal",
+            update_interval=SCAN_INTERVAL,
+        )
+
+        self.adax_data_handler = AdaxLocal(
+            entry.data[CONF_IP_ADDRESS],
+            entry.data[CONF_TOKEN],
+            websession=async_get_clientsession(hass, verify_ssl=False),
+        )
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Fetch data from the Adax."""
+        if result := await self.adax_data_handler.get_status():
+            return cast(dict[str, Any], result)
+        raise UpdateFailed("Got invalid status from device")

homeassistant/components/alexa/entities.py

@@ -719,7 +719,7 @@ class LockCapabilities(AlexaEntity):
         yield Alexa(self.entity)
 
 
-@ENTITY_ADAPTERS.register(media_player.const.DOMAIN)
+@ENTITY_ADAPTERS.register(media_player.DOMAIN)
 class MediaPlayerCapabilities(AlexaEntity):
     """Class to represent MediaPlayer capabilities."""
 
@@ -757,9 +757,7 @@ class MediaPlayerCapabilities(AlexaEntity):
 
         if supported & media_player.MediaPlayerEntityFeature.SELECT_SOURCE:
             inputs = AlexaInputController.get_valid_inputs(
-                self.entity.attributes.get(
-                    media_player.const.ATTR_INPUT_SOURCE_LIST, []
-                )
+                self.entity.attributes.get(media_player.ATTR_INPUT_SOURCE_LIST, [])
             )
             if len(inputs) > 0:
                 yield AlexaInputController(self.entity)
@@ -776,8 +774,7 @@ class MediaPlayerCapabilities(AlexaEntity):
             and domain != "denonavr"
         ):
             inputs = AlexaEqualizerController.get_valid_inputs(
-                self.entity.attributes.get(media_player.const.ATTR_SOUND_MODE_LIST)
-                or []
+                self.entity.attributes.get(media_player.ATTR_SOUND_MODE_LIST) or []
             )
             if len(inputs) > 0:
                 yield AlexaEqualizerController(self.entity)

homeassistant/components/alexa/handlers.py

@@ -566,7 +566,7 @@ async def async_api_set_volume(
 
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.const.ATTR_MEDIA_VOLUME_LEVEL: volume,
+        media_player.ATTR_MEDIA_VOLUME_LEVEL: volume,
     }
 
     await hass.services.async_call(
@@ -589,7 +589,7 @@ async def async_api_select_input(
 
     # Attempt to map the ALL UPPERCASE payload name to a source.
     # Strips trailing 1 to match single input devices.
-    source_list = entity.attributes.get(media_player.const.ATTR_INPUT_SOURCE_LIST) or []
+    source_list = entity.attributes.get(media_player.ATTR_INPUT_SOURCE_LIST) or []
     for source in source_list:
         formatted_source = (
             source.lower().replace("-", "").replace("_", "").replace(" ", "")
@@ -611,7 +611,7 @@ async def async_api_select_input(
 
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.const.ATTR_INPUT_SOURCE: media_input,
+        media_player.ATTR_INPUT_SOURCE: media_input,
     }
 
     await hass.services.async_call(
@@ -636,7 +636,7 @@ async def async_api_adjust_volume(
     volume_delta = int(directive.payload["volume"])
 
     entity = directive.entity
-    current_level = entity.attributes[media_player.const.ATTR_MEDIA_VOLUME_LEVEL]
+    current_level = entity.attributes[media_player.ATTR_MEDIA_VOLUME_LEVEL]
 
     # read current state
     try:
@@ -648,7 +648,7 @@ async def async_api_adjust_volume(
 
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.const.ATTR_MEDIA_VOLUME_LEVEL: volume,
+        media_player.ATTR_MEDIA_VOLUME_LEVEL: volume,
     }
 
     await hass.services.async_call(
@@ -709,7 +709,7 @@ async def async_api_set_mute(
     entity = directive.entity
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.const.ATTR_MEDIA_VOLUME_MUTED: mute,
+        media_player.ATTR_MEDIA_VOLUME_MUTED: mute,
     }
 
     await hass.services.async_call(
@@ -1708,15 +1708,13 @@ async def async_api_changechannel(
 
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.const.ATTR_MEDIA_CONTENT_ID: channel,
-        media_player.const.ATTR_MEDIA_CONTENT_TYPE: (
-            media_player.const.MEDIA_TYPE_CHANNEL
-        ),
+        media_player.ATTR_MEDIA_CONTENT_ID: channel,
+        media_player.ATTR_MEDIA_CONTENT_TYPE: (media_player.MediaType.CHANNEL),
     }
 
     await hass.services.async_call(
         entity.domain,
-        media_player.const.SERVICE_PLAY_MEDIA,
+        media_player.SERVICE_PLAY_MEDIA,
         data,
         blocking=False,
         context=context,
@@ -1825,13 +1823,13 @@ async def async_api_set_eq_mode(
     context: ha.Context,
 ) -> AlexaResponse:
     """Process a SetMode request for EqualizerController."""
-    mode = directive.payload["mode"]
+    mode: str = directive.payload["mode"]
     entity = directive.entity
     data: dict[str, Any] = {ATTR_ENTITY_ID: entity.entity_id}
 
-    sound_mode_list = entity.attributes.get(media_player.const.ATTR_SOUND_MODE_LIST)
+    sound_mode_list = entity.attributes.get(media_player.ATTR_SOUND_MODE_LIST)
     if sound_mode_list and mode.lower() in sound_mode_list:
-        data[media_player.const.ATTR_SOUND_MODE] = mode.lower()
+        data[media_player.ATTR_SOUND_MODE] = mode.lower()
     else:
         msg = f"failed to map sound mode {mode} to a mode on {entity.entity_id}"
         raise AlexaInvalidValueError(msg)

homeassistant/components/anthropic/conversation.py

@@ -9,11 +9,13 @@ from anthropic import AsyncStream
 from anthropic._types import NOT_GIVEN
 from anthropic.types import (
     InputJSONDelta,
+    MessageDeltaUsage,
     MessageParam,
     MessageStreamEvent,
     RawContentBlockDeltaEvent,
     RawContentBlockStartEvent,
     RawContentBlockStopEvent,
+    RawMessageDeltaEvent,
     RawMessageStartEvent,
     RawMessageStopEvent,
     RedactedThinkingBlock,
@@ -31,6 +33,7 @@ from anthropic.types import (
     ToolResultBlockParam,
     ToolUseBlock,
     ToolUseBlockParam,
+    Usage,
 )
 from voluptuous_openapi import convert
 
@@ -162,7 +165,8 @@ def _convert_content(
     return messages
 
 
-async def _transform_stream(
+async def _transform_stream(  # noqa: C901 - This is complex, but better to have it in one place
+    chat_log: conversation.ChatLog,
     result: AsyncStream[MessageStreamEvent],
     messages: list[MessageParam],
 ) -> AsyncGenerator[conversation.AssistantContentDeltaDict]:
@@ -207,6 +211,7 @@ async def _transform_stream(
         | None
     ) = None
     current_tool_args: str
+    input_usage: Usage | None = None
 
     async for response in result:
         LOGGER.debug("Received response: %s", response)
@@ -215,6 +220,7 @@ async def _transform_stream(
             if response.message.role != "assistant":
                 raise ValueError("Unexpected message role")
             current_message = MessageParam(role=response.message.role, content=[])
+            input_usage = response.message.usage
         elif isinstance(response, RawContentBlockStartEvent):
             if isinstance(response.content_block, ToolUseBlock):
                 current_block = ToolUseBlockParam(
@@ -285,12 +291,34 @@ async def _transform_stream(
                 raise ValueError("Unexpected stop event without a current message")
             current_message["content"].append(current_block)  # type: ignore[union-attr]
             current_block = None
+        elif isinstance(response, RawMessageDeltaEvent):
+            if (usage := response.usage) is not None:
+                chat_log.async_trace(_create_token_stats(input_usage, usage))
         elif isinstance(response, RawMessageStopEvent):
             if current_message is not None:
                 messages.append(current_message)
                 current_message = None
 
 
+def _create_token_stats(
+    input_usage: Usage | None, response_usage: MessageDeltaUsage
+) -> dict[str, Any]:
+    """Create token stats for conversation agent tracing."""
+    input_tokens = 0
+    cached_input_tokens = 0
+    if input_usage:
+        input_tokens = input_usage.input_tokens
+        cached_input_tokens = input_usage.cache_creation_input_tokens or 0
+    output_tokens = response_usage.output_tokens
+    return {
+        "stats": {
+            "input_tokens": input_tokens,
+            "cached_input_tokens": cached_input_tokens,
+            "output_tokens": output_tokens,
+        }
+    }
+
+
 class AnthropicConversationEntity(
     conversation.ConversationEntity, conversation.AbstractConversationAgent
 ):
@@ -393,7 +421,8 @@ class AnthropicConversationEntity(
                     [
                         content
                         async for content in chat_log.async_add_delta_content_stream(
-                            user_input.agent_id, _transform_stream(stream, messages)
+                            user_input.agent_id,
+                            _transform_stream(chat_log, stream, messages),
                         )
                         if not isinstance(content, conversation.AssistantContent)
                     ]

homeassistant/components/apcupsd/coordinator.py

@@ -113,4 +113,7 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
                 data = await aioapcaccess.request_status(self._host, self._port)
                 return APCUPSdData(data)
             except (OSError, asyncio.IncompleteReadError) as error:
-                raise UpdateFailed(error) from error
+                raise UpdateFailed(
+                    translation_domain=DOMAIN,
+                    translation_key="cannot_connect",
+                ) from error

homeassistant/components/apcupsd/strings.json

@@ -93,7 +93,7 @@
         "name": "Internal temperature"
       },
       "last_self_test": {
-        "name": "Last self test"
+        "name": "Last self-test"
       },
       "last_transfer": {
         "name": "Last transfer"
@@ -177,7 +177,7 @@
         "name": "Restore requirement"
       },
       "self_test_result": {
-        "name": "Self test result"
+        "name": "Self-test result"
       },
       "sensitivity": {
         "name": "Sensitivity"
@@ -195,7 +195,7 @@
         "name": "Status"
       },
       "self_test_interval": {
-        "name": "Self test interval"
+        "name": "Self-test interval"
       },
       "time_left": {
         "name": "Time left"
@@ -219,5 +219,10 @@
         "name": "Transfer to battery"
       }
     }
+  },
+  "exceptions": {
+    "cannot_connect": {
+      "message": "Cannot connect to APC UPS Daemon."
+    }
   }
 }

homeassistant/components/apsystems/manifest.json

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

homeassistant/components/automation/__init__.py

@@ -18,6 +18,7 @@ from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_MODE,
     ATTR_NAME,
+    CONF_ACTIONS,
     CONF_ALIAS,
     CONF_CONDITIONS,
     CONF_DEVICE_ID,
@@ -27,6 +28,7 @@ from homeassistant.const import (
     CONF_MODE,
     CONF_PATH,
     CONF_PLATFORM,
+    CONF_TRIGGERS,
     CONF_VARIABLES,
     CONF_ZONE,
     EVENT_HOMEASSISTANT_STARTED,
@@ -86,11 +88,9 @@ from homeassistant.util.hass_dict import HassKey
 
 from .config import AutomationConfig, ValidationStatus
 from .const import (
-    CONF_ACTIONS,
     CONF_INITIAL_STATE,
     CONF_TRACE,
     CONF_TRIGGER_VARIABLES,
-    CONF_TRIGGERS,
     DEFAULT_INITIAL_STATE,
     DOMAIN,
     LOGGER,

homeassistant/components/automation/config.py

@@ -14,11 +14,15 @@ from homeassistant.components import blueprint
 from homeassistant.components.trace import TRACE_CONFIG_SCHEMA
 from homeassistant.config import config_per_platform, config_without_domain
 from homeassistant.const import (
+    CONF_ACTION,
+    CONF_ACTIONS,
     CONF_ALIAS,
     CONF_CONDITION,
     CONF_CONDITIONS,
     CONF_DESCRIPTION,
     CONF_ID,
+    CONF_TRIGGER,
+    CONF_TRIGGERS,
     CONF_VARIABLES,
 )
 from homeassistant.core import HomeAssistant
@@ -30,14 +34,10 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.yaml.input import UndefinedSubstitution
 
 from .const import (
-    CONF_ACTION,
-    CONF_ACTIONS,
     CONF_HIDE_ENTITY,
     CONF_INITIAL_STATE,
     CONF_TRACE,
-    CONF_TRIGGER,
     CONF_TRIGGER_VARIABLES,
-    CONF_TRIGGERS,
     DOMAIN,
     LOGGER,
 )
@@ -58,34 +58,9 @@ _MINIMAL_PLATFORM_SCHEMA = vol.Schema(
 def _backward_compat_schema(value: Any | None) -> Any:
     """Backward compatibility for automations."""
 
-    if not isinstance(value, dict):
-        return value
-
-    # `trigger` has been renamed to `triggers`
-    if CONF_TRIGGER in value:
-        if CONF_TRIGGERS in value:
-            raise vol.Invalid(
-                "Cannot specify both 'trigger' and 'triggers'. Please use 'triggers' only."
-            )
-        value[CONF_TRIGGERS] = value.pop(CONF_TRIGGER)
-
-    # `condition` has been renamed to `conditions`
-    if CONF_CONDITION in value:
-        if CONF_CONDITIONS in value:
-            raise vol.Invalid(
-                "Cannot specify both 'condition' and 'conditions'. Please use 'conditions' only."
-            )
-        value[CONF_CONDITIONS] = value.pop(CONF_CONDITION)
-
-    # `action` has been renamed to `actions`
-    if CONF_ACTION in value:
-        if CONF_ACTIONS in value:
-            raise vol.Invalid(
-                "Cannot specify both 'action' and 'actions'. Please use 'actions' only."
-            )
-        value[CONF_ACTIONS] = value.pop(CONF_ACTION)
-
-    return value
+    value = cv.renamed(CONF_TRIGGER, CONF_TRIGGERS)(value)
+    value = cv.renamed(CONF_ACTION, CONF_ACTIONS)(value)
+    return cv.renamed(CONF_CONDITION, CONF_CONDITIONS)(value)
 
 
 PLATFORM_SCHEMA = vol.All(

homeassistant/components/automation/const.py

@@ -2,10 +2,6 @@
 
 import logging
 
-CONF_ACTION = "action"
-CONF_ACTIONS = "actions"
-CONF_TRIGGER = "trigger"
-CONF_TRIGGERS = "triggers"
 CONF_TRIGGER_VARIABLES = "trigger_variables"
 DOMAIN = "automation"
 

homeassistant/components/backup/config.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections import defaultdict
 from dataclasses import dataclass, field, replace
 import datetime as dt
 from datetime import datetime, timedelta
@@ -87,12 +88,26 @@ class BackupConfigData:
         else:
             time = None
         days = [Day(day) for day in data["schedule"]["days"]]
+        agents = {}
+        for agent_id, agent_data in data["agents"].items():
+            protected = agent_data["protected"]
+            stored_retention = agent_data["retention"]
+            agent_retention: AgentRetentionConfig | None
+            if stored_retention:
+                agent_retention = AgentRetentionConfig(
+                    copies=stored_retention["copies"],
+                    days=stored_retention["days"],
+                )
+            else:
+                agent_retention = None
+            agent_config = AgentConfig(
+                protected=protected,
+                retention=agent_retention,
+            )
+            agents[agent_id] = agent_config
 
         return cls(
-            agents={
-                agent_id: AgentConfig(protected=agent_data["protected"])
-                for agent_id, agent_data in data["agents"].items()
-            },
+            agents=agents,
             automatic_backups_configured=data["automatic_backups_configured"],
             create_backup=CreateBackupConfig(
                 agent_ids=data["create_backup"]["agent_ids"],
@@ -176,12 +191,36 @@ class BackupConfig:
         """Update config."""
         if agents is not UNDEFINED:
             for agent_id, agent_config in agents.items():
-                if agent_id not in self.data.agents:
-                    self.data.agents[agent_id] = AgentConfig(**agent_config)
+                agent_retention = agent_config.get("retention")
+                if agent_retention is None:
+                    new_agent_retention = None
                 else:
-                    self.data.agents[agent_id] = replace(
-                        self.data.agents[agent_id], **agent_config
+                    new_agent_retention = AgentRetentionConfig(
+                        copies=agent_retention.get("copies"),
+                        days=agent_retention.get("days"),
                     )
+                if agent_id not in self.data.agents:
+                    old_agent_retention = None
+                    self.data.agents[agent_id] = AgentConfig(
+                        protected=agent_config.get("protected", True),
+                        retention=new_agent_retention,
+                    )
+                else:
+                    new_agent_config = self.data.agents[agent_id]
+                    old_agent_retention = new_agent_config.retention
+                    if "protected" in agent_config:
+                        new_agent_config = replace(
+                            new_agent_config, protected=agent_config["protected"]
+                        )
+                    if "retention" in agent_config:
+                        new_agent_config = replace(
+                            new_agent_config, retention=new_agent_retention
+                        )
+                    self.data.agents[agent_id] = new_agent_config
+                if new_agent_retention != old_agent_retention:
+                    # There's a single retention application method
+                    # for both global and agent retention settings.
+                    self.data.retention.apply(self._manager)
         if automatic_backups_configured is not UNDEFINED:
             self.data.automatic_backups_configured = automatic_backups_configured
         if create_backup is not UNDEFINED:
@@ -207,11 +246,24 @@ class AgentConfig:
     """Represent the config for an agent."""
 
     protected: bool
+    """Agent protected configuration.
+
+    If True, the agent backups are password protected.
+    """
+    retention: AgentRetentionConfig | None = None
+    """Agent retention configuration.
+
+    If None, the global retention configuration is used.
+    If not None, the global retention configuration is ignored for this agent.
+    If an agent retention configuration is set and both copies and days are None,
+    backups will be kept forever for that agent.
+    """
 
     def to_dict(self) -> StoredAgentConfig:
         """Convert agent config to a dict."""
         return {
             "protected": self.protected,
+            "retention": self.retention.to_dict() if self.retention else None,
         }
 
 
@@ -219,24 +271,46 @@ class StoredAgentConfig(TypedDict):
     """Represent the stored config for an agent."""
 
     protected: bool
+    retention: StoredRetentionConfig | None
 
 
 class AgentParametersDict(TypedDict, total=False):
     """Represent the parameters for an agent."""
 
     protected: bool
+    retention: RetentionParametersDict | None
 
 
 @dataclass(kw_only=True)
-class RetentionConfig:
-    """Represent the backup retention configuration."""
+class BaseRetentionConfig:
+    """Represent the base backup retention configuration."""
 
     copies: int | None = None
     days: int | None = None
 
+    def to_dict(self) -> StoredRetentionConfig:
+        """Convert backup retention configuration to a dict."""
+        return StoredRetentionConfig(
+            copies=self.copies,
+            days=self.days,
+        )
+
+
+@dataclass(kw_only=True)
+class RetentionConfig(BaseRetentionConfig):
+    """Represent the backup retention configuration."""
+
     def apply(self, manager: BackupManager) -> None:
         """Apply backup retention configuration."""
-        if self.days is not None:
+        agents_retention = {
+            agent_id: agent_config.retention
+            for agent_id, agent_config in manager.config.data.agents.items()
+        }
+
+        if self.days is not None or any(
+            agent_retention and agent_retention.days is not None
+            for agent_retention in agents_retention.values()
+        ):
             LOGGER.debug(
                 "Scheduling next automatic delete of backups older than %s in 1 day",
                 self.days,
@@ -246,13 +320,6 @@ class RetentionConfig:
             LOGGER.debug("Unscheduling next automatic delete")
             self._unschedule_next(manager)
 
-    def to_dict(self) -> StoredRetentionConfig:
-        """Convert backup retention configuration to a dict."""
-        return StoredRetentionConfig(
-            copies=self.copies,
-            days=self.days,
-        )
-
     @callback
     def _schedule_next(
         self,
@@ -271,16 +338,81 @@ class RetentionConfig:
                 """Return backups older than days to delete."""
                 # we need to check here since we await before
                 # this filter is applied
-                if self.days is None:
-                    return {}
-                now = dt_util.utcnow()
-                return {
-                    backup_id: backup
-                    for backup_id, backup in backups.items()
-                    if dt_util.parse_datetime(backup.date, raise_on_error=True)
-                    + timedelta(days=self.days)
-                    < now
+                agents_retention = {
+                    agent_id: agent_config.retention
+                    for agent_id, agent_config in manager.config.data.agents.items()
                 }
+                has_agents_retention = any(
+                    agent_retention for agent_retention in agents_retention.values()
+                )
+                has_agents_retention_days = any(
+                    agent_retention and agent_retention.days is not None
+                    for agent_retention in agents_retention.values()
+                )
+                if (global_days := self.days) is None and not has_agents_retention_days:
+                    # No global retention days and no agent retention days
+                    return {}
+
+                now = dt_util.utcnow()
+                if global_days is not None and not has_agents_retention:
+                    # Return early to avoid the longer filtering below.
+                    return {
+                        backup_id: backup
+                        for backup_id, backup in backups.items()
+                        if dt_util.parse_datetime(backup.date, raise_on_error=True)
+                        + timedelta(days=global_days)
+                        < now
+                    }
+
+                # If there are any agent retention settings, we need to check
+                # the retention settings, for every backup and agent combination.
+
+                backups_to_delete = {}
+
+                for backup_id, backup in backups.items():
+                    backup_date = dt_util.parse_datetime(
+                        backup.date, raise_on_error=True
+                    )
+                    delete_from_agents = set(backup.agents)
+                    for agent_id in backup.agents:
+                        agent_retention = agents_retention.get(agent_id)
+                        if agent_retention is None:
+                            # This agent does not have a retention setting,
+                            # so the global retention setting should be used.
+                            if global_days is None:
+                                # This agent does not have a retention setting
+                                # and the global retention days setting is None,
+                                # so this backup should not be deleted.
+                                delete_from_agents.discard(agent_id)
+                                continue
+                            days = global_days
+                        elif (agent_days := agent_retention.days) is None:
+                            # This agent has a retention setting
+                            # where days is set to None,
+                            # so the backup should not be deleted.
+                            delete_from_agents.discard(agent_id)
+                            continue
+                        else:
+                            # This agent has a retention setting
+                            # where days is set to a number,
+                            # so that setting should be used.
+                            days = agent_days
+                        if backup_date + timedelta(days=days) >= now:
+                            # This backup is not older than the retention days,
+                            # so this agent should not be deleted.
+                            delete_from_agents.discard(agent_id)
+
+                    filtered_backup = replace(
+                        backup,
+                        agents={
+                            agent_id: agent_backup_status
+                            for agent_id, agent_backup_status in backup.agents.items()
+                            if agent_id in delete_from_agents
+                        },
+                    )
+                    backups_to_delete[backup_id] = filtered_backup
+
+                return backups_to_delete
 
             await manager.async_delete_filtered_backups(
                 include_filter=_automatic_backups_filter, delete_filter=_delete_filter
@@ -312,6 +444,10 @@ class RetentionParametersDict(TypedDict, total=False):
     days: int | None
 
 
+class AgentRetentionConfig(BaseRetentionConfig):
+    """Represent an agent retention configuration."""
+
+
 class StoredBackupSchedule(TypedDict):
     """Represent the stored backup schedule configuration."""
 
@@ -554,16 +690,87 @@ async def delete_backups_exceeding_configured_count(manager: BackupManager) -> N
         backups: dict[str, ManagerBackup],
     ) -> dict[str, ManagerBackup]:
         """Return oldest backups more numerous than copies to delete."""
+        agents_retention = {
+            agent_id: agent_config.retention
+            for agent_id, agent_config in manager.config.data.agents.items()
+        }
+        has_agents_retention = any(
+            agent_retention for agent_retention in agents_retention.values()
+        )
+        has_agents_retention_copies = any(
+            agent_retention and agent_retention.copies is not None
+            for agent_retention in agents_retention.values()
+        )
         # we need to check here since we await before
         # this filter is applied
-        if manager.config.data.retention.copies is None:
+        if (
+            global_copies := manager.config.data.retention.copies
+        ) is None and not has_agents_retention_copies:
+            # No global retention copies and no agent retention copies
             return {}
-        return dict(
-            sorted(
-                backups.items(),
-                key=lambda backup_item: backup_item[1].date,
-            )[: max(len(backups) - manager.config.data.retention.copies, 0)]
+        if global_copies is not None and not has_agents_retention:
+            # Return early to avoid the longer filtering below.
+            return dict(
+                sorted(
+                    backups.items(),
+                    key=lambda backup_item: backup_item[1].date,
+                )[: max(len(backups) - global_copies, 0)]
+            )
+
+        backups_by_agent: dict[str, dict[str, ManagerBackup]] = defaultdict(dict)
+        for backup_id, backup in backups.items():
+            for agent_id in backup.agents:
+                backups_by_agent[agent_id][backup_id] = backup
+
+        backups_to_delete_by_agent: dict[str, dict[str, ManagerBackup]] = defaultdict(
+            dict
         )
+        for agent_id, agent_backups in backups_by_agent.items():
+            agent_retention = agents_retention.get(agent_id)
+            if agent_retention is None:
+                # This agent does not have a retention setting,
+                # so the global retention setting should be used.
+                if global_copies is None:
+                    # This agent does not have a retention setting
+                    # and the global retention copies setting is None,
+                    # so backups should not be deleted.
+                    continue
+                # The global retention setting will be used.
+                copies = global_copies
+            elif (agent_copies := agent_retention.copies) is None:
+                # This agent has a retention setting
+                # where copies is set to None,
+                # so backups should not be deleted.
+                continue
+            else:
+                # This agent retention setting will be used.
+                copies = agent_copies
+
+            backups_to_delete_by_agent[agent_id] = dict(
+                sorted(
+                    agent_backups.items(),
+                    key=lambda backup_item: backup_item[1].date,
+                )[: max(len(agent_backups) - copies, 0)]
+            )
+
+        backup_ids_to_delete: dict[str, set[str]] = defaultdict(set)
+        for agent_id, to_delete in backups_to_delete_by_agent.items():
+            for backup_id in to_delete:
+                backup_ids_to_delete[backup_id].add(agent_id)
+        backups_to_delete: dict[str, ManagerBackup] = {}
+        for backup_id, agent_ids in backup_ids_to_delete.items():
+            backup = backups[backup_id]
+            # filter the backup to only include the agents that should be deleted
+            filtered_backup = replace(
+                backup,
+                agents={
+                    agent_id: agent_backup_status
+                    for agent_id, agent_backup_status in backup.agents.items()
+                    if agent_id in agent_ids
+                },
+            )
+            backups_to_delete[backup_id] = filtered_backup
+        return backups_to_delete
 
     await manager.async_delete_filtered_backups(
         include_filter=_automatic_backups_filter, delete_filter=_delete_filter

homeassistant/components/backup/store.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 STORE_DELAY_SAVE = 30
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
-STORAGE_VERSION_MINOR = 5
+STORAGE_VERSION_MINOR = 6
 
 
 class StoredBackupData(TypedDict):
@@ -72,6 +72,10 @@ class _BackupStore(Store[StoredBackupData]):
                 data["config"]["automatic_backups_configured"] = (
                     data["config"]["create_backup"]["password"] is not None
                 )
+            if old_minor_version < 6:
+                # Version 1.6 adds agent retention settings
+                for agent in data["config"]["agents"]:
+                    data["config"]["agents"][agent]["retention"] = None
 
         # Note: We allow reading data with major version 2.
         # Reject if major version is higher than 2.

homeassistant/components/backup/websocket.py

@@ -346,7 +346,28 @@ async def handle_config_info(
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "backup/config/update",
-        vol.Optional("agents"): vol.Schema({str: {"protected": bool}}),
+        vol.Optional("agents"): vol.Schema(
+            {
+                str: {
+                    vol.Optional("protected"): bool,
+                    vol.Optional("retention"): vol.Any(
+                        vol.Schema(
+                            {
+                                # Note: We can't use cv.positive_int because it allows 0 even
+                                # though 0 is not positive.
+                                vol.Optional("copies"): vol.Any(
+                                    vol.All(int, vol.Range(min=1)), None
+                                ),
+                                vol.Optional("days"): vol.Any(
+                                    vol.All(int, vol.Range(min=1)), None
+                                ),
+                            },
+                        ),
+                        None,
+                    ),
+                }
+            }
+        ),
         vol.Optional("automatic_backups_configured"): bool,
         vol.Optional("create_backup"): vol.Schema(
             {

homeassistant/components/bluemaestro/manifest.json

@@ -12,5 +12,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/bluemaestro",
   "iot_class": "local_push",
-  "requirements": ["bluemaestro-ble==0.2.3"]
+  "requirements": ["bluemaestro-ble==0.4.0"]
 }

homeassistant/components/bluetooth/manifest.json

@@ -18,9 +18,9 @@
     "bleak==0.22.3",
     "bleak-retry-connector==3.9.0",
     "bluetooth-adapters==0.21.4",
-    "bluetooth-auto-recovery==1.4.5",
-    "bluetooth-data-tools==1.27.0",
+    "bluetooth-auto-recovery==1.5.1",
+    "bluetooth-data-tools==1.28.1",
     "dbus-fast==2.43.0",
-    "habluetooth==3.39.0"
+    "habluetooth==3.48.2"
   ]
 }

homeassistant/components/bluetooth/storage.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from bluetooth_adapters import (
+from habluetooth import (
     DiscoveredDeviceAdvertisementData,
     DiscoveredDeviceAdvertisementDataDict,
     DiscoveryStorageType,

homeassistant/components/bond/__init__.py

@@ -5,7 +5,7 @@ import logging
 from typing import Any
 
 from aiohttp import ClientError, ClientResponseError, ClientTimeout
-from bond_async import Bond, BPUPSubscriptions, start_bpup
+from bond_async import Bond, BPUPSubscriptions, RequestorUUID, start_bpup
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -49,6 +49,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: BondConfigEntry) -> bool
         token=token,
         timeout=ClientTimeout(total=_API_TIMEOUT),
         session=async_get_clientsession(hass),
+        requestor_uuid=RequestorUUID.HOME_ASSISTANT,
     )
     hub = BondHub(bond, host)
     try:

homeassistant/components/bond/config_flow.py

@@ -8,7 +8,7 @@ import logging
 from typing import Any
 
 from aiohttp import ClientConnectionError, ClientResponseError
-from bond_async import Bond
+from bond_async import Bond, RequestorUUID
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntryState, ConfigFlow, ConfigFlowResult
@@ -34,7 +34,12 @@ TOKEN_SCHEMA = vol.Schema({})
 
 async def async_get_token(hass: HomeAssistant, host: str) -> str | None:
     """Try to fetch the token from the bond device."""
-    bond = Bond(host, "", session=async_get_clientsession(hass))
+    bond = Bond(
+        host,
+        "",
+        session=async_get_clientsession(hass),
+        requestor_uuid=RequestorUUID.HOME_ASSISTANT,
+    )
     response: dict[str, str] = {}
     with contextlib.suppress(ClientConnectionError):
         response = await bond.token()
@@ -45,7 +50,10 @@ async def _validate_input(hass: HomeAssistant, data: dict[str, Any]) -> tuple[st
     """Validate the user input allows us to connect."""
 
     bond = Bond(
-        data[CONF_HOST], data[CONF_ACCESS_TOKEN], session=async_get_clientsession(hass)
+        data[CONF_HOST],
+        data[CONF_ACCESS_TOKEN],
+        session=async_get_clientsession(hass),
+        requestor_uuid=RequestorUUID.HOME_ASSISTANT,
     )
     try:
         hub = BondHub(bond, data[CONF_HOST])

homeassistant/components/cast/strings.json

@@ -10,12 +10,12 @@
           "known_hosts": "Add known host"
         },
         "data_description": {
-          "known_hosts": "Hostnames or IP-addresses of cast devices, use if mDNS discovery is not working"
+          "known_hosts": "Hostnames or IP addresses of cast devices, use if mDNS discovery is not working"
         }
       }
     },
     "error": {
-      "invalid_known_hosts": "Known hosts must be a comma separated list of hosts."
+      "invalid_known_hosts": "Known hosts must be a comma-separated list of hosts."
     }
   },
   "options": {

homeassistant/components/cloud/const.py

@@ -93,3 +93,5 @@ STT_ENTITY_UNIQUE_ID = "cloud-speech-to-text"
 TTS_ENTITY_UNIQUE_ID = "cloud-text-to-speech"
 
 LOGIN_MFA_TIMEOUT = 60
+
+VOICE_STYLE_SEPERATOR = "||"

homeassistant/components/cloud/http_api.py

@@ -18,7 +18,7 @@ from aiohttp import web
 import attr
 from hass_nabucasa import AlreadyConnectedError, Cloud, auth, thingtalk
 from hass_nabucasa.const import STATE_DISCONNECTED
-from hass_nabucasa.voice import TTS_VOICES
+from hass_nabucasa.voice_data import TTS_VOICES
 import voluptuous as vol
 
 from homeassistant.components import websocket_api
@@ -57,6 +57,7 @@ from .const import (
     PREF_REMOTE_ALLOW_REMOTE_ENABLE,
     PREF_TTS_DEFAULT_VOICE,
     REQUEST_TIMEOUT,
+    VOICE_STYLE_SEPERATOR,
 )
 from .google_config import CLOUD_GOOGLE
 from .repairs import async_manage_legacy_subscription_issue
@@ -591,10 +592,21 @@ async def websocket_subscription(
 def validate_language_voice(value: tuple[str, str]) -> tuple[str, str]:
     """Validate language and voice."""
     language, voice = value
+    style: str | None
+    voice, _, style = voice.partition(VOICE_STYLE_SEPERATOR)
+    if not style:
+        style = None
     if language not in TTS_VOICES:
         raise vol.Invalid(f"Invalid language {language}")
-    if voice not in TTS_VOICES[language]:
+    if voice not in (language_info := TTS_VOICES[language]):
         raise vol.Invalid(f"Invalid voice {voice} for language {language}")
+    voice_info = language_info[voice]
+    if style and (
+        isinstance(voice_info, str) or style not in voice_info.get("variants", [])
+    ):
+        raise vol.Invalid(
+            f"Invalid style {style} for voice {voice} in language {language}"
+        )
     return value
 
 
@@ -1012,13 +1024,24 @@ def tts_info(
     msg: dict[str, Any],
 ) -> None:
     """Fetch available tts info."""
-    connection.send_result(
-        msg["id"],
-        {
-            "languages": [
-                (language, voice)
-                for language, voices in TTS_VOICES.items()
-                for voice in voices
-            ]
-        },
-    )
+    result = []
+    for language, voices in TTS_VOICES.items():
+        for voice_id, voice_info in voices.items():
+            if isinstance(voice_info, str):
+                result.append((language, voice_id, voice_info))
+                continue
+
+            name = voice_info["name"]
+            result.append((language, voice_id, name))
+            result.extend(
+                [
+                    (
+                        language,
+                        f"{voice_id}{VOICE_STYLE_SEPERATOR}{variant}",
+                        f"{name} ({variant})",
+                    )
+                    for variant in voice_info.get("variants", [])
+                ]
+            )
+
+    connection.send_result(msg["id"], {"languages": result})

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==0.94.0"],
+  "requirements": ["hass-nabucasa==0.96.0"],
   "single_config_entry": true
 }

homeassistant/components/cloud/tts.py

@@ -6,7 +6,8 @@ import logging
 from typing import Any
 
 from hass_nabucasa import Cloud
-from hass_nabucasa.voice import MAP_VOICE, TTS_VOICES, AudioOutput, Gender, VoiceError
+from hass_nabucasa.voice import MAP_VOICE, AudioOutput, Gender, VoiceError
+from hass_nabucasa.voice_data import TTS_VOICES
 import voluptuous as vol
 
 from homeassistant.components.tts import (
@@ -30,7 +31,13 @@ from homeassistant.setup import async_when_setup
 
 from .assist_pipeline import async_migrate_cloud_pipeline_engine
 from .client import CloudClient
-from .const import DATA_CLOUD, DATA_PLATFORMS_SETUP, DOMAIN, TTS_ENTITY_UNIQUE_ID
+from .const import (
+    DATA_CLOUD,
+    DATA_PLATFORMS_SETUP,
+    DOMAIN,
+    TTS_ENTITY_UNIQUE_ID,
+    VOICE_STYLE_SEPERATOR,
+)
 from .prefs import CloudPreferences
 
 ATTR_GENDER = "gender"
@@ -57,6 +64,7 @@ DEFAULT_VOICES = {
     "ar-SY": "AmanyNeural",
     "ar-TN": "ReemNeural",
     "ar-YE": "MaryamNeural",
+    "as-IN": "PriyomNeural",
     "az-AZ": "BabekNeural",
     "bg-BG": "KalinaNeural",
     "bn-BD": "NabanitaNeural",
@@ -126,6 +134,8 @@ DEFAULT_VOICES = {
     "id-ID": "GadisNeural",
     "is-IS": "GudrunNeural",
     "it-IT": "ElsaNeural",
+    "iu-Cans-CA": "SiqiniqNeural",
+    "iu-Latn-CA": "SiqiniqNeural",
     "ja-JP": "NanamiNeural",
     "jv-ID": "SitiNeural",
     "ka-GE": "EkaNeural",
@@ -147,6 +157,8 @@ DEFAULT_VOICES = {
     "ne-NP": "HemkalaNeural",
     "nl-BE": "DenaNeural",
     "nl-NL": "ColetteNeural",
+    "or-IN": "SubhasiniNeural",
+    "pa-IN": "OjasNeural",
     "pl-PL": "AgnieszkaNeural",
     "ps-AF": "LatifaNeural",
     "pt-BR": "FranciscaNeural",
@@ -158,6 +170,7 @@ DEFAULT_VOICES = {
     "sl-SI": "PetraNeural",
     "so-SO": "UbaxNeural",
     "sq-AL": "AnilaNeural",
+    "sr-Latn-RS": "NicholasNeural",
     "sr-RS": "SophieNeural",
     "su-ID": "TutiNeural",
     "sv-SE": "SofieNeural",
@@ -177,12 +190,9 @@ DEFAULT_VOICES = {
     "vi-VN": "HoaiMyNeural",
     "wuu-CN": "XiaotongNeural",
     "yue-CN": "XiaoMinNeural",
-    "zh-CN": "XiaoxiaoNeural",
     "zh-CN-henan": "YundengNeural",
-    "zh-CN-liaoning": "XiaobeiNeural",
-    "zh-CN-shaanxi": "XiaoniNeural",
     "zh-CN-shandong": "YunxiangNeural",
-    "zh-CN-sichuan": "YunxiNeural",
+    "zh-CN": "XiaoxiaoNeural",
     "zh-HK": "HiuMaanNeural",
     "zh-TW": "HsiaoChenNeural",
     "zu-ZA": "ThandoNeural",
@@ -191,6 +201,39 @@ DEFAULT_VOICES = {
 _LOGGER = logging.getLogger(__name__)
 
 
+@callback
+def _prepare_voice_args(
+    *,
+    hass: HomeAssistant,
+    language: str,
+    voice: str,
+    gender: str | None,
+) -> dict:
+    """Prepare voice arguments."""
+    gender = handle_deprecated_gender(hass, gender)
+    style: str | None
+    original_voice, _, style = voice.partition(VOICE_STYLE_SEPERATOR)
+    if not style:
+        style = None
+    updated_voice = handle_deprecated_voice(hass, original_voice)
+    if updated_voice not in TTS_VOICES[language]:
+        default_voice = DEFAULT_VOICES[language]
+        _LOGGER.debug(
+            "Unsupported voice %s detected, falling back to default %s for %s",
+            voice,
+            default_voice,
+            language,
+        )
+        updated_voice = default_voice
+
+    return {
+        "language": language,
+        "voice": updated_voice,
+        "gender": gender,
+        "style": style,
+    }
+
+
 def _deprecated_platform(value: str) -> str:
     """Validate if platform is deprecated."""
     if value == DOMAIN:
@@ -328,36 +371,61 @@ class CloudTTSEntity(TextToSpeechEntity):
         """Return a list of supported voices for a language."""
         if not (voices := TTS_VOICES.get(language)):
             return None
-        return [Voice(voice, voice) for voice in voices]
+
+        result = []
+
+        for voice_id, voice_info in voices.items():
+            if isinstance(voice_info, str):
+                result.append(
+                    Voice(
+                        voice_id,
+                        voice_info,
+                    )
+                )
+                continue
+
+            name = voice_info["name"]
+
+            result.append(
+                Voice(
+                    voice_id,
+                    name,
+                )
+            )
+            result.extend(
+                [
+                    Voice(
+                        f"{voice_id}{VOICE_STYLE_SEPERATOR}{variant}",
+                        f"{name} ({variant})",
+                    )
+                    for variant in voice_info.get("variants", [])
+                ]
+            )
+
+        return result
 
     async def async_get_tts_audio(
         self, message: str, language: str, options: dict[str, Any]
     ) -> TtsAudioType:
         """Load TTS from Home Assistant Cloud."""
-        gender: Gender | str | None = options.get(ATTR_GENDER)
-        gender = handle_deprecated_gender(self.hass, gender)
-        original_voice: str = options.get(
-            ATTR_VOICE,
-            self._voice if language == self._language else DEFAULT_VOICES[language],
-        )
-        voice = handle_deprecated_voice(self.hass, original_voice)
-        if voice not in TTS_VOICES[language]:
-            default_voice = DEFAULT_VOICES[language]
-            _LOGGER.debug(
-                "Unsupported voice %s detected, falling back to default %s for %s",
-                voice,
-                default_voice,
-                language,
-            )
-            voice = default_voice
         # Process TTS
         try:
             data = await self.cloud.voice.process_tts(
                 text=message,
-                language=language,
-                gender=gender,
-                voice=voice,
                 output=options[ATTR_AUDIO_OUTPUT],
+                **_prepare_voice_args(
+                    hass=self.hass,
+                    language=language,
+                    voice=options.get(
+                        ATTR_VOICE,
+                        (
+                            self._voice
+                            if language == self._language
+                            else DEFAULT_VOICES[language]
+                        ),
+                    ),
+                    gender=options.get(ATTR_GENDER),
+                ),
             )
         except VoiceError as err:
             _LOGGER.error("Voice error: %s", err)
@@ -369,6 +437,8 @@ class CloudTTSEntity(TextToSpeechEntity):
 class CloudProvider(Provider):
     """Home Assistant Cloud speech API provider."""
 
+    has_entity = True
+
     def __init__(self, cloud: Cloud[CloudClient]) -> None:
         """Initialize cloud provider."""
         self.cloud = cloud
@@ -401,7 +471,38 @@ class CloudProvider(Provider):
         """Return a list of supported voices for a language."""
         if not (voices := TTS_VOICES.get(language)):
             return None
-        return [Voice(voice, voice) for voice in voices]
+
+        result = []
+
+        for voice_id, voice_info in voices.items():
+            if isinstance(voice_info, str):
+                result.append(
+                    Voice(
+                        voice_id,
+                        voice_info,
+                    )
+                )
+                continue
+
+            name = voice_info["name"]
+
+            result.append(
+                Voice(
+                    voice_id,
+                    name,
+                )
+            )
+            result.extend(
+                [
+                    Voice(
+                        f"{voice_id}{VOICE_STYLE_SEPERATOR}{variant}",
+                        f"{name} ({variant})",
+                    )
+                    for variant in voice_info.get("variants", [])
+                ]
+            )
+
+        return result
 
     @property
     def default_options(self) -> dict[str, str]:
@@ -415,30 +516,22 @@ class CloudProvider(Provider):
     ) -> TtsAudioType:
         """Load TTS from Home Assistant Cloud."""
         assert self.hass is not None
-        gender: Gender | str | None = options.get(ATTR_GENDER)
-        gender = handle_deprecated_gender(self.hass, gender)
-        original_voice: str = options.get(
-            ATTR_VOICE,
-            self._voice if language == self._language else DEFAULT_VOICES[language],
-        )
-        voice = handle_deprecated_voice(self.hass, original_voice)
-        if voice not in TTS_VOICES[language]:
-            default_voice = DEFAULT_VOICES[language]
-            _LOGGER.debug(
-                "Unsupported voice %s detected, falling back to default %s for %s",
-                voice,
-                default_voice,
-                language,
-            )
-            voice = default_voice
         # Process TTS
         try:
             data = await self.cloud.voice.process_tts(
                 text=message,
-                language=language,
-                gender=gender,
-                voice=voice,
                 output=options[ATTR_AUDIO_OUTPUT],
+                **_prepare_voice_args(
+                    hass=self.hass,
+                    language=language,
+                    voice=options.get(
+                        ATTR_VOICE,
+                        self._voice
+                        if language == self._language
+                        else DEFAULT_VOICES[language],
+                    ),
+                    gender=options.get(ATTR_GENDER),
+                ),
             )
         except VoiceError as err:
             _LOGGER.error("Voice error: %s", err)

homeassistant/components/comelit/__init__.py

@@ -12,6 +12,7 @@ from .coordinator import (
     ComelitSerialBridge,
     ComelitVedoSystem,
 )
+from .utils import async_client_session
 
 BRIDGE_PLATFORMS = [
     Platform.CLIMATE,
@@ -32,6 +33,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ComelitConfigEntry) -> b
     """Set up Comelit platform."""
 
     coordinator: ComelitBaseCoordinator
+
+    session = await async_client_session(hass)
+
     if entry.data.get(CONF_TYPE, BRIDGE) == BRIDGE:
         coordinator = ComelitSerialBridge(
             hass,
@@ -39,6 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ComelitConfigEntry) -> b
             entry.data[CONF_HOST],
             entry.data.get(CONF_PORT, DEFAULT_PORT),
             entry.data[CONF_PIN],
+            session,
         )
         platforms = BRIDGE_PLATFORMS
     else:
@@ -48,6 +53,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ComelitConfigEntry) -> b
             entry.data[CONF_HOST],
             entry.data.get(CONF_PORT, DEFAULT_PORT),
             entry.data[CONF_PIN],
+            session,
         )
         platforms = VEDO_PLATFORMS
 

homeassistant/components/comelit/config_flow.py

@@ -22,6 +22,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 
 from .const import _LOGGER, DEFAULT_PORT, DEVICE_TYPE_LIST, DOMAIN
+from .utils import async_client_session
 
 DEFAULT_HOST = "192.168.1.252"
 DEFAULT_PIN = 111111
@@ -47,10 +48,14 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
     """Validate the user input allows us to connect."""
 
     api: ComelitCommonApi
+
+    session = await async_client_session(hass)
     if data.get(CONF_TYPE, BRIDGE) == BRIDGE:
-        api = ComeliteSerialBridgeApi(data[CONF_HOST], data[CONF_PORT], data[CONF_PIN])
+        api = ComeliteSerialBridgeApi(
+            data[CONF_HOST], data[CONF_PORT], data[CONF_PIN], session
+        )
     else:
-        api = ComelitVedoApi(data[CONF_HOST], data[CONF_PORT], data[CONF_PIN])
+        api = ComelitVedoApi(data[CONF_HOST], data[CONF_PORT], data[CONF_PIN], session)
 
     try:
         await api.login()

homeassistant/components/comelit/coordinator.py

@@ -15,6 +15,7 @@ from aiocomelit.api import (
 )
 from aiocomelit.const import BRIDGE, VEDO
 from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
+from aiohttp import ClientSession
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -95,9 +96,16 @@ class ComelitBaseCoordinator(DataUpdateCoordinator[T]):
             await self.api.login()
             return await self._async_update_system_data()
         except (CannotConnect, CannotRetrieveData) as err:
-            raise UpdateFailed(repr(err)) from err
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_failed",
+                translation_placeholders={"error": repr(err)},
+            ) from err
         except CannotAuthenticate as err:
-            raise ConfigEntryAuthFailed from err
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="cannot_authenticate",
+            ) from err
 
     @abstractmethod
     async def _async_update_system_data(self) -> T:
@@ -119,9 +127,10 @@ class ComelitSerialBridge(
         host: str,
         port: int,
         pin: int,
+        session: ClientSession,
     ) -> None:
         """Initialize the scanner."""
-        self.api = ComeliteSerialBridgeApi(host, port, pin)
+        self.api = ComeliteSerialBridgeApi(host, port, pin, session)
         super().__init__(hass, entry, BRIDGE, host)
 
     async def _async_update_system_data(
@@ -144,9 +153,10 @@ class ComelitVedoSystem(ComelitBaseCoordinator[AlarmDataObject]):
         host: str,
         port: int,
         pin: int,
+        session: ClientSession,
     ) -> None:
         """Initialize the scanner."""
-        self.api = ComelitVedoApi(host, port, pin)
+        self.api = ComelitVedoApi(host, port, pin, session)
         super().__init__(hass, entry, VEDO, host)
 
     async def _async_update_system_data(

homeassistant/components/comelit/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["aiocomelit"],
   "quality_scale": "bronze",
-  "requirements": ["aiocomelit==0.11.3"]
+  "requirements": ["aiocomelit==0.12.0"]
 }

homeassistant/components/comelit/quality_scale.yaml

@@ -70,9 +70,7 @@ rules:
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done
-  exception-translations:
-    status: todo
-    comment: PR in progress
+  exception-translations: done
   icon-translations: done
   reconfiguration-flow:
     status: todo
@@ -86,7 +84,5 @@ rules:
 
   # Platinum
   async-dependency: done
-  inject-websession:
-    status: todo
-    comment: implement aiohttp_client.async_create_clientsession
+  inject-websession: done
   strict-typing: done

homeassistant/components/comelit/strings.json

@@ -74,7 +74,10 @@
       "message": "Error connecting: {error}"
     },
     "cannot_authenticate": {
-      "message": "Error authenticating: {error}"
+      "message": "Error authenticating"
+    },
+    "updated_failed": {
+      "message": "Failed to update data: {error}"
     }
   }
 }

homeassistant/components/comelit/utils.py

@@ -0,0 +1,13 @@
+"""Utils for Comelit."""
+
+from aiohttp import ClientSession, CookieJar
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import aiohttp_client
+
+
+async def async_client_session(hass: HomeAssistant) -> ClientSession:
+    """Return a new aiohttp session."""
+    return aiohttp_client.async_create_clientsession(
+        hass, verify_ssl=False, cookie_jar=CookieJar(unsafe=True)
+    )

homeassistant/components/command_line/__init__.py

@@ -56,7 +56,10 @@ from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.entity_platform import async_get_platforms
 from homeassistant.helpers.reload import async_integration_yaml_config
 from homeassistant.helpers.service import async_register_admin_service
-from homeassistant.helpers.trigger_template_entity import CONF_AVAILABILITY
+from homeassistant.helpers.trigger_template_entity import (
+    CONF_AVAILABILITY,
+    ValueTemplate,
+)
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -91,7 +94,9 @@ BINARY_SENSOR_SCHEMA = vol.Schema(
         vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
         vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
         vol.Optional(CONF_DEVICE_CLASS): BINARY_SENSOR_DEVICE_CLASSES_SCHEMA,
-        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_VALUE_TEMPLATE): vol.All(
+            cv.template, ValueTemplate.from_template
+        ),
         vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
         vol.Optional(CONF_UNIQUE_ID): cv.string,
         vol.Optional(
@@ -108,7 +113,9 @@ COVER_SCHEMA = vol.Schema(
         vol.Optional(CONF_COMMAND_STOP, default="true"): cv.string,
         vol.Required(CONF_NAME): cv.string,
         vol.Optional(CONF_ICON): cv.template,
-        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_VALUE_TEMPLATE): vol.All(
+            cv.template, ValueTemplate.from_template
+        ),
         vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
         vol.Optional(CONF_DEVICE_CLASS): COVER_DEVICE_CLASSES_SCHEMA,
         vol.Optional(CONF_UNIQUE_ID): cv.string,
@@ -134,7 +141,9 @@ SENSOR_SCHEMA = vol.Schema(
         vol.Optional(CONF_NAME, default=SENSOR_DEFAULT_NAME): cv.string,
         vol.Optional(CONF_ICON): cv.template,
         vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
-        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_VALUE_TEMPLATE): vol.All(
+            cv.template, ValueTemplate.from_template
+        ),
         vol.Optional(CONF_UNIQUE_ID): cv.string,
         vol.Optional(CONF_DEVICE_CLASS): SENSOR_DEVICE_CLASSES_SCHEMA,
         vol.Optional(CONF_STATE_CLASS): SENSOR_STATE_CLASSES_SCHEMA,
@@ -150,7 +159,9 @@ SWITCH_SCHEMA = vol.Schema(
         vol.Optional(CONF_COMMAND_ON, default="true"): cv.string,
         vol.Optional(CONF_COMMAND_STATE): cv.string,
         vol.Required(CONF_NAME): cv.string,
-        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_VALUE_TEMPLATE): vol.All(
+            cv.template, ValueTemplate.from_template
+        ),
         vol.Optional(CONF_ICON): cv.template,
         vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
         vol.Optional(CONF_UNIQUE_ID): cv.string,

homeassistant/components/command_line/binary_sensor.py

@@ -18,7 +18,10 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.template import Template
-from homeassistant.helpers.trigger_template_entity import ManualTriggerEntity
+from homeassistant.helpers.trigger_template_entity import (
+    ManualTriggerEntity,
+    ValueTemplate,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
@@ -50,7 +53,7 @@ async def async_setup_platform(
     scan_interval: timedelta = binary_sensor_config.get(
         CONF_SCAN_INTERVAL, SCAN_INTERVAL
     )
-    value_template: Template | None = binary_sensor_config.get(CONF_VALUE_TEMPLATE)
+    value_template: ValueTemplate | None = binary_sensor_config.get(CONF_VALUE_TEMPLATE)
 
     data = CommandSensorData(hass, command, command_timeout)
 
@@ -86,7 +89,7 @@ class CommandBinarySensor(ManualTriggerEntity, BinarySensorEntity):
         config: ConfigType,
         payload_on: str,
         payload_off: str,
-        value_template: Template | None,
+        value_template: ValueTemplate | None,
         scan_interval: timedelta,
     ) -> None:
         """Initialize the Command line binary sensor."""
@@ -133,9 +136,14 @@ class CommandBinarySensor(ManualTriggerEntity, BinarySensorEntity):
         await self.data.async_update()
         value = self.data.value
 
+        variables = self._template_variables_with_value(value)
+        if not self._render_availability_template(variables):
+            self.async_write_ha_state()
+            return
+
         if self._value_template is not None:
-            value = self._value_template.async_render_with_possible_json_value(
-                value, None
+            value = self._value_template.async_render_as_value_template(
+                self.entity_id, variables, None
             )
         self._attr_is_on = None
         if value == self._payload_on:
@@ -143,7 +151,7 @@ class CommandBinarySensor(ManualTriggerEntity, BinarySensorEntity):
         elif value == self._payload_off:
             self._attr_is_on = False
 
-        self._process_manual_data(value)
+        self._process_manual_data(variables)
         self.async_write_ha_state()
 
     async def async_update(self) -> None:

homeassistant/components/command_line/cover.py

@@ -20,7 +20,10 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.template import Template
-from homeassistant.helpers.trigger_template_entity import ManualTriggerEntity
+from homeassistant.helpers.trigger_template_entity import (
+    ManualTriggerEntity,
+    ValueTemplate,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util, slugify
 
@@ -79,7 +82,7 @@ class CommandCover(ManualTriggerEntity, CoverEntity):
         command_close: str,
         command_stop: str,
         command_state: str | None,
-        value_template: Template | None,
+        value_template: ValueTemplate | None,
         timeout: int,
         scan_interval: timedelta,
     ) -> None:
@@ -164,14 +167,20 @@ class CommandCover(ManualTriggerEntity, CoverEntity):
         """Update device state."""
         if self._command_state:
             payload = str(await self._async_query_state())
+
+            variables = self._template_variables_with_value(payload)
+            if not self._render_availability_template(variables):
+                self.async_write_ha_state()
+                return
+
             if self._value_template:
-                payload = self._value_template.async_render_with_possible_json_value(
-                    payload, None
+                payload = self._value_template.async_render_as_value_template(
+                    self.entity_id, variables, None
                 )
             self._state = None
             if payload:
                 self._state = int(payload)
-            self._process_manual_data(payload)
+            self._process_manual_data(variables)
             self.async_write_ha_state()
 
     async def async_update(self) -> None:

homeassistant/components/command_line/sensor.py

@@ -23,7 +23,10 @@ from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.template import Template
-from homeassistant.helpers.trigger_template_entity import ManualTriggerSensorEntity
+from homeassistant.helpers.trigger_template_entity import (
+    ManualTriggerSensorEntity,
+    ValueTemplate,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
@@ -57,7 +60,7 @@ async def async_setup_platform(
     json_attributes: list[str] | None = sensor_config.get(CONF_JSON_ATTRIBUTES)
     json_attributes_path: str | None = sensor_config.get(CONF_JSON_ATTRIBUTES_PATH)
     scan_interval: timedelta = sensor_config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)
-    value_template: Template | None = sensor_config.get(CONF_VALUE_TEMPLATE)
+    value_template: ValueTemplate | None = sensor_config.get(CONF_VALUE_TEMPLATE)
     data = CommandSensorData(hass, command, command_timeout)
 
     trigger_entity_config = {
@@ -88,7 +91,7 @@ class CommandSensor(ManualTriggerSensorEntity):
         self,
         data: CommandSensorData,
         config: ConfigType,
-        value_template: Template | None,
+        value_template: ValueTemplate | None,
         json_attributes: list[str] | None,
         json_attributes_path: str | None,
         scan_interval: timedelta,
@@ -144,6 +147,11 @@ class CommandSensor(ManualTriggerSensorEntity):
         await self.data.async_update()
         value = self.data.value
 
+        variables = self._template_variables_with_value(self.data.value)
+        if not self._render_availability_template(variables):
+            self.async_write_ha_state()
+            return
+
         if self._json_attributes:
             self._attr_extra_state_attributes = {}
             if value:
@@ -168,16 +176,17 @@ class CommandSensor(ManualTriggerSensorEntity):
                     LOGGER.warning("Unable to parse output as JSON: %s", value)
             else:
                 LOGGER.warning("Empty reply found when expecting JSON data")
+
             if self._value_template is None:
                 self._attr_native_value = None
-                self._process_manual_data(value)
+                self._process_manual_data(variables)
+                self.async_write_ha_state()
                 return
 
         self._attr_native_value = None
         if self._value_template is not None and value is not None:
-            value = self._value_template.async_render_with_possible_json_value(
-                value,
-                None,
+            value = self._value_template.async_render_as_value_template(
+                self.entity_id, variables, None
             )
 
         if self.device_class not in {
@@ -190,7 +199,7 @@ class CommandSensor(ManualTriggerSensorEntity):
                 value, self.entity_id, self.device_class
             )
 
-        self._process_manual_data(value)
+        self._process_manual_data(variables)
         self.async_write_ha_state()
 
     async def async_update(self) -> None:

homeassistant/components/command_line/switch.py

@@ -19,7 +19,10 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.template import Template
-from homeassistant.helpers.trigger_template_entity import ManualTriggerEntity
+from homeassistant.helpers.trigger_template_entity import (
+    ManualTriggerEntity,
+    ValueTemplate,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util, slugify
 
@@ -78,7 +81,7 @@ class CommandSwitch(ManualTriggerEntity, SwitchEntity):
         command_on: str,
         command_off: str,
         command_state: str | None,
-        value_template: Template | None,
+        value_template: ValueTemplate | None,
         timeout: int,
         scan_interval: timedelta,
     ) -> None:
@@ -166,15 +169,21 @@ class CommandSwitch(ManualTriggerEntity, SwitchEntity):
         """Update device state."""
         if self._command_state:
             payload = str(await self._async_query_state())
+
+            variables = self._template_variables_with_value(payload)
+            if not self._render_availability_template(variables):
+                self.async_write_ha_state()
+                return
+
             value = None
             if self._value_template:
-                value = self._value_template.async_render_with_possible_json_value(
-                    payload, None
+                value = self._value_template.async_render_as_value_template(
+                    self.entity_id, variables, None
                 )
             self._attr_is_on = None
             if payload or value:
                 self._attr_is_on = (value or payload).lower() == "true"
-            self._process_manual_data(payload)
+            self._process_manual_data(variables)
             self.async_write_ha_state()
 
     async def async_update(self) -> None:

homeassistant/components/conversation/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["hassil==2.2.3", "home-assistant-intents==2025.3.28"]
+  "requirements": ["hassil==2.2.3", "home-assistant-intents==2025.4.30"]
 }

homeassistant/components/deconz/strings.json

@@ -73,7 +73,7 @@
       "remote_moved_any_side": "Device moved with any side up",
       "remote_double_tap_any_side": "Device double tapped on any side",
       "remote_turned_clockwise": "Device turned clockwise",
-      "remote_turned_counter_clockwise": "Device turned counter clockwise",
+      "remote_turned_counter_clockwise": "Device turned counterclockwise",
       "remote_rotate_from_side_1": "Device rotated from \"side 1\" to \"{subtype}\"",
       "remote_rotate_from_side_2": "Device rotated from \"side 2\" to \"{subtype}\"",
       "remote_rotate_from_side_3": "Device rotated from \"side 3\" to \"{subtype}\"",

homeassistant/components/device_tracker/config_entry.py

@@ -218,7 +218,7 @@ class TrackerEntity(
 
     entity_description: TrackerEntityDescription
     _attr_latitude: float | None = None
-    _attr_location_accuracy: int = 0
+    _attr_location_accuracy: float = 0
     _attr_location_name: str | None = None
     _attr_longitude: float | None = None
     _attr_source_type: SourceType = SourceType.GPS
@@ -234,7 +234,7 @@ class TrackerEntity(
         return not self.should_poll
 
     @cached_property
-    def location_accuracy(self) -> int:
+    def location_accuracy(self) -> float:
         """Return the location accuracy of the device.
 
         Value in meters.

homeassistant/components/devolo_home_network/config_flow.py

@@ -7,7 +7,7 @@ import logging
 from typing import Any
 
 from devolo_plc_api.device import Device
-from devolo_plc_api.exceptions.device import DeviceNotFound
+from devolo_plc_api.exceptions.device import DeviceNotFound, DevicePasswordProtected
 import voluptuous as vol
 
 from homeassistant.components import zeroconf
@@ -22,7 +22,9 @@ from .const import DOMAIN, PRODUCT, SERIAL_NUMBER, TITLE
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema({vol.Required(CONF_IP_ADDRESS): str})
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {vol.Required(CONF_IP_ADDRESS): str, vol.Optional(CONF_PASSWORD): str}
+)
 STEP_REAUTH_DATA_SCHEMA = vol.Schema({vol.Optional(CONF_PASSWORD): str})
 
 
@@ -36,7 +38,16 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
 
     device = Device(data[CONF_IP_ADDRESS], zeroconf_instance=zeroconf_instance)
 
+    device.password = data[CONF_PASSWORD]
+
     await device.async_connect(session_instance=async_client)
+
+    # Try a password protected, non-writing device API call that raises, if the password is wrong.
+    # If only the plcnet API is available, we can continue without trying a password as the plcnet
+    # API does not require a password.
+    if device.device:
+        await device.device.async_uptime()
+
     await device.async_disconnect()
 
     return {
@@ -59,23 +70,22 @@ class DevoloHomeNetworkConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle the initial step."""
         errors: dict = {}
 
-        if user_input is None:
-            return self.async_show_form(
-                step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
-            )
-
-        try:
-            info = await validate_input(self.hass, user_input)
-        except DeviceNotFound:
-            errors["base"] = "cannot_connect"
-        except Exception:
-            _LOGGER.exception("Unexpected exception")
-            errors["base"] = "unknown"
-        else:
-            await self.async_set_unique_id(info[SERIAL_NUMBER], raise_on_progress=False)
-            self._abort_if_unique_id_configured()
-            user_input[CONF_PASSWORD] = ""
-            return self.async_create_entry(title=info[TITLE], data=user_input)
+        if user_input is not None:
+            try:
+                info = await validate_input(self.hass, user_input)
+            except DeviceNotFound:
+                errors["base"] = "cannot_connect"
+            except DevicePasswordProtected:
+                errors["base"] = "invalid_auth"
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
+            else:
+                await self.async_set_unique_id(
+                    info[SERIAL_NUMBER], raise_on_progress=False
+                )
+                self._abort_if_unique_id_configured()
+                return self.async_create_entry(title=info[TITLE], data=user_input)
 
         return self.async_show_form(
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
@@ -106,15 +116,27 @@ class DevoloHomeNetworkConfigFlow(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Handle a flow initiated by zeroconf."""
         title = self.context["title_placeholders"][CONF_NAME]
+        errors: dict = {}
+        data_schema: vol.Schema | None = None
+
         if user_input is not None:
             data = {
                 CONF_IP_ADDRESS: self.host,
-                CONF_PASSWORD: "",
+                CONF_PASSWORD: user_input.get(CONF_PASSWORD, ""),
             }
-            return self.async_create_entry(title=title, data=data)
+            try:
+                await validate_input(self.hass, data)
+            except DevicePasswordProtected:
+                errors = {"base": "invalid_auth"}
+                data_schema = STEP_REAUTH_DATA_SCHEMA
+            else:
+                return self.async_create_entry(title=title, data=data)
+
         return self.async_show_form(
             step_id="zeroconf_confirm",
+            data_schema=data_schema,
             description_placeholders={"host_name": title},
+            errors=errors,
         )
 
     async def async_step_reauth(
@@ -134,14 +156,21 @@ class DevoloHomeNetworkConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initiated by reauthentication."""
-        if user_input is None:
-            return self.async_show_form(
-                step_id="reauth_confirm",
-                data_schema=STEP_REAUTH_DATA_SCHEMA,
-            )
+        errors: dict = {}
+        if user_input is not None:
+            data = {
+                CONF_IP_ADDRESS: self.host,
+                CONF_PASSWORD: user_input[CONF_PASSWORD],
+            }
+            try:
+                await validate_input(self.hass, data)
+            except DevicePasswordProtected:
+                errors = {"base": "invalid_auth"}
+            else:
+                return self.async_update_reload_and_abort(self._reauth_entry, data=data)
 
-        data = {
-            CONF_IP_ADDRESS: self.host,
-            CONF_PASSWORD: user_input[CONF_PASSWORD],
-        }
-        return self.async_update_reload_and_abort(self._reauth_entry, data=data)
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            data_schema=STEP_REAUTH_DATA_SCHEMA,
+            errors=errors,
+        )

homeassistant/components/devolo_home_network/sensor.py

@@ -138,7 +138,7 @@ async def async_setup_entry(
                 SENSOR_TYPES[CONNECTED_PLC_DEVICES],
             )
         )
-        network = await device.plcnet.async_get_network_overview()
+        network: LogicalNetwork = coordinators[CONNECTED_PLC_DEVICES].data
         peers = [
             peer.mac_address for peer in network.devices if peer.topology == REMOTE
         ]

homeassistant/components/devolo_home_network/strings.json

@@ -5,10 +5,12 @@
       "user": {
         "description": "[%key:common::config_flow::description::confirm_setup%]",
         "data": {
-          "ip_address": "[%key:common::config_flow::data::ip%]"
+          "ip_address": "[%key:common::config_flow::data::ip%]",
+          "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
-          "ip_address": "IP address of your devolo Home Network device. This can be found in the devolo Home Network App on the device dashboard."
+          "ip_address": "IP address of your devolo Home Network device. This can be found in the devolo Home Network App on the device dashboard.",
+          "password": "Password you protected the device with."
         }
       },
       "reauth_confirm": {
@@ -16,16 +18,23 @@
           "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
-          "password": "Password you protected the device with."
+          "password": "[%key:component::devolo_home_network::config::step::user::data_description::password%]"
         }
       },
       "zeroconf_confirm": {
         "description": "Do you want to add the devolo home network device with the hostname `{host_name}` to Home Assistant?",
-        "title": "Discovered devolo home network device"
+        "title": "Discovered devolo home network device",
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "[%key:component::devolo_home_network::config::step::user::data_description::password%]"
+        }
       }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {

homeassistant/components/dialogflow/strings.json

@@ -2,7 +2,7 @@
   "config": {
     "step": {
       "user": {
-        "title": "Set up the Dialogflow Webhook",
+        "title": "Set up the Dialogflow webhook",
         "description": "Are you sure you want to set up Dialogflow?"
       }
     },
@@ -12,7 +12,7 @@
       "webhook_not_internet_accessible": "[%key:common::config_flow::abort::webhook_not_internet_accessible%]"
     },
     "create_entry": {
-      "default": "To send events to Home Assistant, you will need to set up [webhook integration of Dialogflow]({dialogflow_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nSee [the documentation]({docs_url}) for further details."
+      "default": "To send events to Home Assistant, you will need to set up the [webhook service of Dialogflow]({dialogflow_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nSee [the documentation]({docs_url}) for further details."
     }
   }
 }

homeassistant/components/dnsip/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/dnsip",
   "iot_class": "cloud_polling",
-  "requirements": ["aiodns==3.2.0"]
+  "requirements": ["aiodns==3.3.0"]
 }

homeassistant/components/doorbird/strings.json

@@ -3,10 +3,10 @@
     "step": {
       "init": {
         "data": {
-          "events": "Comma separated list of events."
+          "events": "Comma-separated list of events."
         },
         "data_description": {
-          "events": "Add a comma separated event name for each event you wish to track. After entering them here, use the DoorBird app to assign them to a specific event.\n\nExample: somebody_pressed_the_button, motion"
+          "events": "Add a comma-separated event name for each event you wish to track. After entering them here, use the DoorBird app to assign them to a specific event.\n\nExample: somebody_pressed_the_button, motion"
         }
       }
     }

homeassistant/components/ecovacs/binary_sensor.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass
 from typing import Generic
 
 from deebot_client.capabilities import CapabilityEvent
-from deebot_client.events.water_info import WaterInfoEvent
+from deebot_client.events.water_info import MopAttachedEvent
 
 from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
@@ -32,9 +32,9 @@ class EcovacsBinarySensorEntityDescription(
 
 
 ENTITY_DESCRIPTIONS: tuple[EcovacsBinarySensorEntityDescription, ...] = (
-    EcovacsBinarySensorEntityDescription[WaterInfoEvent](
-        capability_fn=lambda caps: caps.water,
-        value_fn=lambda e: e.mop_attached,
+    EcovacsBinarySensorEntityDescription[MopAttachedEvent](
+        capability_fn=lambda caps: caps.water.mop_attached if caps.water else None,
+        value_fn=lambda e: e.value,
         key="water_mop_attached",
         translation_key="water_mop_attached",
         entity_category=EntityCategory.DIAGNOSTIC,

homeassistant/components/ecovacs/image.py

@@ -1,8 +1,11 @@
 """Ecovacs image entities."""
 
+from typing import cast
+
 from deebot_client.capabilities import CapabilityMap
 from deebot_client.device import Device
 from deebot_client.events.map import CachedMapInfoEvent, MapChangedEvent
+from deebot_client.map import Map
 
 from homeassistant.components.image import ImageEntity
 from homeassistant.core import HomeAssistant
@@ -47,6 +50,7 @@ class EcovacsMap(
         """Initialize entity."""
         super().__init__(device, capability, hass=hass)
         self._attr_extra_state_attributes = {}
+        self._map = cast(Map, self._device.map)
 
     entity_description = EntityDescription(
         key="map",
@@ -55,7 +59,7 @@ class EcovacsMap(
 
     def image(self) -> bytes | None:
         """Return bytes of image or None."""
-        if svg := self._device.map.get_svg_map():
+        if svg := self._map.get_svg_map():
             return svg.encode()
 
         return None
@@ -80,4 +84,4 @@ class EcovacsMap(
         Only used by the generic entity update service.
         """
         await super().async_update()
-        self._device.map.refresh()
+        self._map.refresh()

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.5.0"]
+  "requirements": ["py-sucks==0.9.10", "deebot-client==13.0.1"]
 }

homeassistant/components/ecovacs/select.py

@@ -6,7 +6,8 @@ from typing import Any, Generic
 
 from deebot_client.capabilities import CapabilitySetTypes
 from deebot_client.device import Device
-from deebot_client.events import WaterInfoEvent, WorkModeEvent
+from deebot_client.events import WorkModeEvent
+from deebot_client.events.water_info import WaterAmountEvent
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
@@ -31,9 +32,9 @@ class EcovacsSelectEntityDescription(
 
 
 ENTITY_DESCRIPTIONS: tuple[EcovacsSelectEntityDescription, ...] = (
-    EcovacsSelectEntityDescription[WaterInfoEvent](
-        capability_fn=lambda caps: caps.water,
-        current_option_fn=lambda e: get_name_key(e.amount),
+    EcovacsSelectEntityDescription[WaterAmountEvent](
+        capability_fn=lambda caps: caps.water.amount if caps.water else None,
+        current_option_fn=lambda e: get_name_key(e.value),
         options_fn=lambda water: [get_name_key(amount) for amount in water.types],
         key="water_amount",
         translation_key="water_amount",

homeassistant/components/eheimdigital/__init__.py

@@ -9,7 +9,14 @@ from homeassistant.helpers.device_registry import DeviceEntry
 from .const import DOMAIN
 from .coordinator import EheimDigitalConfigEntry, EheimDigitalUpdateCoordinator
 
-PLATFORMS = [Platform.CLIMATE, Platform.LIGHT, Platform.NUMBER, Platform.SENSOR]
+PLATFORMS = [
+    Platform.CLIMATE,
+    Platform.LIGHT,
+    Platform.NUMBER,
+    Platform.SENSOR,
+    Platform.SWITCH,
+    Platform.TIME,
+]
 
 
 async def async_setup_entry(

homeassistant/components/eheimdigital/icons.json

@@ -30,6 +30,22 @@
           "no_error": "mdi:check-circle"
         }
       }
+    },
+    "switch": {
+      "filter_active": {
+        "default": "mdi:pump",
+        "state": {
+          "off": "mdi:pump-off"
+        }
+      }
+    },
+    "time": {
+      "day_start_time": {
+        "default": "mdi:weather-sunny"
+      },
+      "night_start_time": {
+        "default": "mdi:moon-waning-crescent"
+      }
     }
   }
 }

homeassistant/components/eheimdigital/strings.json

@@ -79,6 +79,14 @@
           "air_in_filter": "Air in filter"
         }
       }
+    },
+    "time": {
+      "day_start_time": {
+        "name": "Day start time"
+      },
+      "night_start_time": {
+        "name": "Night start time"
+      }
     }
   }
 }

homeassistant/components/eheimdigital/switch.py

@@ -0,0 +1,70 @@
+"""EHEIM Digital switches."""
+
+from typing import Any, override
+
+from eheimdigital.classic_vario import EheimDigitalClassicVario
+from eheimdigital.device import EheimDigitalDevice
+
+from homeassistant.components.switch import SwitchEntity
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import EheimDigitalConfigEntry, EheimDigitalUpdateCoordinator
+from .entity import EheimDigitalEntity
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: EheimDigitalConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the callbacks for the coordinator so switches can be added as devices are found."""
+    coordinator = entry.runtime_data
+
+    def async_setup_device_entities(
+        device_address: dict[str, EheimDigitalDevice],
+    ) -> None:
+        """Set up the switch entities for one or multiple devices."""
+        entities: list[SwitchEntity] = []
+        for device in device_address.values():
+            if isinstance(device, EheimDigitalClassicVario):
+                entities.append(EheimDigitalClassicVarioSwitch(coordinator, device))  # noqa: PERF401
+
+        async_add_entities(entities)
+
+    coordinator.add_platform_callback(async_setup_device_entities)
+    async_setup_device_entities(coordinator.hub.devices)
+
+
+class EheimDigitalClassicVarioSwitch(
+    EheimDigitalEntity[EheimDigitalClassicVario], SwitchEntity
+):
+    """Represent an EHEIM Digital classicVARIO switch entity."""
+
+    _attr_translation_key = "filter_active"
+    _attr_name = None
+
+    def __init__(
+        self,
+        coordinator: EheimDigitalUpdateCoordinator,
+        device: EheimDigitalClassicVario,
+    ) -> None:
+        """Initialize an EHEIM Digital classicVARIO switch entity."""
+        super().__init__(coordinator, device)
+        self._attr_unique_id = device.mac_address
+        self._async_update_attrs()
+
+    @override
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        await self._device.set_active(active=False)
+
+    @override
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        await self._device.set_active(active=True)
+
+    @override
+    def _async_update_attrs(self) -> None:
+        self._attr_is_on = self._device.is_active

homeassistant/components/eheimdigital/time.py

@@ -0,0 +1,132 @@
+"""EHEIM Digital time entities."""
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+from datetime import time
+from typing import Generic, TypeVar, final, override
+
+from eheimdigital.classic_vario import EheimDigitalClassicVario
+from eheimdigital.device import EheimDigitalDevice
+from eheimdigital.heater import EheimDigitalHeater
+
+from homeassistant.components.time import TimeEntity, TimeEntityDescription
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import EheimDigitalConfigEntry, EheimDigitalUpdateCoordinator
+from .entity import EheimDigitalEntity
+
+PARALLEL_UPDATES = 0
+
+_DeviceT_co = TypeVar("_DeviceT_co", bound=EheimDigitalDevice, covariant=True)
+
+
+@dataclass(frozen=True, kw_only=True)
+class EheimDigitalTimeDescription(TimeEntityDescription, Generic[_DeviceT_co]):
+    """Class describing EHEIM Digital time entities."""
+
+    value_fn: Callable[[_DeviceT_co], time | None]
+    set_value_fn: Callable[[_DeviceT_co, time], Awaitable[None]]
+
+
+CLASSICVARIO_DESCRIPTIONS: tuple[
+    EheimDigitalTimeDescription[EheimDigitalClassicVario], ...
+] = (
+    EheimDigitalTimeDescription[EheimDigitalClassicVario](
+        key="day_start_time",
+        translation_key="day_start_time",
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda device: device.day_start_time,
+        set_value_fn=lambda device, value: device.set_day_start_time(value),
+    ),
+    EheimDigitalTimeDescription[EheimDigitalClassicVario](
+        key="night_start_time",
+        translation_key="night_start_time",
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda device: device.night_start_time,
+        set_value_fn=lambda device, value: device.set_night_start_time(value),
+    ),
+)
+
+HEATER_DESCRIPTIONS: tuple[EheimDigitalTimeDescription[EheimDigitalHeater], ...] = (
+    EheimDigitalTimeDescription[EheimDigitalHeater](
+        key="day_start_time",
+        translation_key="day_start_time",
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda device: device.day_start_time,
+        set_value_fn=lambda device, value: device.set_day_start_time(value),
+    ),
+    EheimDigitalTimeDescription[EheimDigitalHeater](
+        key="night_start_time",
+        translation_key="night_start_time",
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda device: device.night_start_time,
+        set_value_fn=lambda device, value: device.set_night_start_time(value),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: EheimDigitalConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the callbacks for the coordinator so times can be added as devices are found."""
+    coordinator = entry.runtime_data
+
+    def async_setup_device_entities(
+        device_address: dict[str, EheimDigitalDevice],
+    ) -> None:
+        """Set up the time entities for one or multiple devices."""
+        entities: list[EheimDigitalTime[EheimDigitalDevice]] = []
+        for device in device_address.values():
+            if isinstance(device, EheimDigitalClassicVario):
+                entities.extend(
+                    EheimDigitalTime[EheimDigitalClassicVario](
+                        coordinator, device, description
+                    )
+                    for description in CLASSICVARIO_DESCRIPTIONS
+                )
+            if isinstance(device, EheimDigitalHeater):
+                entities.extend(
+                    EheimDigitalTime[EheimDigitalHeater](
+                        coordinator, device, description
+                    )
+                    for description in HEATER_DESCRIPTIONS
+                )
+
+        async_add_entities(entities)
+
+    coordinator.add_platform_callback(async_setup_device_entities)
+    async_setup_device_entities(coordinator.hub.devices)
+
+
+@final
+class EheimDigitalTime(
+    EheimDigitalEntity[_DeviceT_co], TimeEntity, Generic[_DeviceT_co]
+):
+    """Represent an EHEIM Digital time entity."""
+
+    entity_description: EheimDigitalTimeDescription[_DeviceT_co]
+
+    def __init__(
+        self,
+        coordinator: EheimDigitalUpdateCoordinator,
+        device: _DeviceT_co,
+        description: EheimDigitalTimeDescription[_DeviceT_co],
+    ) -> None:
+        """Initialize an EHEIM Digital time entity."""
+        super().__init__(coordinator, device)
+        self.entity_description = description
+        self._attr_unique_id = f"{device.mac_address}_{description.key}"
+
+    @override
+    async def async_set_value(self, value: time) -> None:
+        """Change the time."""
+        return await self.entity_description.set_value_fn(self._device, value)
+
+    @override
+    def _async_update_attrs(self) -> None:
+        """Update the entity attributes."""
+        self._attr_native_value = self.entity_description.value_fn(self._device)

homeassistant/components/enphase_envoy/coordinator.py

@@ -9,12 +9,14 @@ import logging
 from typing import Any
 
 from pyenphase import Envoy, EnvoyError, EnvoyTokenAuth
+from pyenphase.models.home import EnvoyInterfaceInformation
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.event import async_call_later, async_track_time_interval
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
@@ -26,7 +28,7 @@ TOKEN_REFRESH_CHECK_INTERVAL = timedelta(days=1)
 STALE_TOKEN_THRESHOLD = timedelta(days=30).total_seconds()
 NOTIFICATION_ID = "enphase_envoy_notification"
 FIRMWARE_REFRESH_INTERVAL = timedelta(hours=4)
-
+MAC_VERIFICATION_DELAY = timedelta(seconds=34)
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -39,6 +41,7 @@ class EnphaseUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     envoy_serial_number: str
     envoy_firmware: str
     config_entry: EnphaseConfigEntry
+    interface: EnvoyInterfaceInformation | None
 
     def __init__(
         self, hass: HomeAssistant, envoy: Envoy, entry: EnphaseConfigEntry
@@ -50,8 +53,10 @@ class EnphaseUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         self.password = entry_data[CONF_PASSWORD]
         self._setup_complete = False
         self.envoy_firmware = ""
+        self.interface = None
         self._cancel_token_refresh: CALLBACK_TYPE | None = None
         self._cancel_firmware_refresh: CALLBACK_TYPE | None = None
+        self._cancel_mac_verification: CALLBACK_TYPE | None = None
         super().__init__(
             hass,
             _LOGGER,
@@ -121,6 +126,66 @@ class EnphaseUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
                 self.hass.config_entries.async_reload(self.config_entry.entry_id)
             )
 
+    def _schedule_mac_verification(
+        self, delay: timedelta = MAC_VERIFICATION_DELAY
+    ) -> None:
+        """Schedule one time job to verify envoy mac address."""
+        self.async_cancel_mac_verification()
+        self._cancel_mac_verification = async_call_later(
+            self.hass,
+            delay,
+            self._async_verify_mac,
+        )
+
+    @callback
+    def _async_verify_mac(self, now: datetime.datetime) -> None:
+        """Verify Envoy active interface mac address in background."""
+        self.hass.async_create_background_task(
+            self._async_fetch_and_compare_mac(), "{name} verify envoy mac address"
+        )
+
+    async def _async_fetch_and_compare_mac(self) -> None:
+        """Get Envoy interface information and update mac in device connections."""
+        interface: (
+            EnvoyInterfaceInformation | None
+        ) = await self.envoy.interface_settings()
+        if interface is None:
+            _LOGGER.debug("%s: interface information returned None", self.name)
+            return
+        # remember interface information so diagnostics can include in report
+        self.interface = interface
+
+        # Add to or update device registry connections as needed
+        device_registry = dr.async_get(self.hass)
+        envoy_device = device_registry.async_get_device(
+            identifiers={
+                (
+                    DOMAIN,
+                    self.envoy_serial_number,
+                )
+            }
+        )
+        if envoy_device is None:
+            _LOGGER.error(
+                "No envoy device found in device registry: %s %s",
+                DOMAIN,
+                self.envoy_serial_number,
+            )
+            return
+
+        connection = (dr.CONNECTION_NETWORK_MAC, interface.mac)
+        if connection in envoy_device.connections:
+            _LOGGER.debug(
+                "connection verified as existing: %s in %s", connection, self.name
+            )
+            return
+
+        device_registry.async_update_device(
+            device_id=envoy_device.id,
+            new_connections={connection},
+        )
+        _LOGGER.debug("added connection: %s to %s", connection, self.name)
+
     @callback
     def _async_mark_setup_complete(self) -> None:
         """Mark setup as complete and setup firmware checks and token refresh if needed."""
@@ -132,6 +197,7 @@ class EnphaseUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             FIRMWARE_REFRESH_INTERVAL,
             cancel_on_shutdown=True,
         )
+        self._schedule_mac_verification()
         self.async_cancel_token_refresh()
         if not isinstance(self.envoy.auth, EnvoyTokenAuth):
             return
@@ -252,3 +318,10 @@ class EnphaseUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         if self._cancel_firmware_refresh:
             self._cancel_firmware_refresh()
             self._cancel_firmware_refresh = None
+
+    @callback
+    def async_cancel_mac_verification(self) -> None:
+        """Cancel mac verification."""
+        if self._cancel_mac_verification:
+            self._cancel_mac_verification()
+            self._cancel_mac_verification = None

homeassistant/components/enphase_envoy/diagnostics.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import copy
+from datetime import datetime
 from typing import TYPE_CHECKING, Any
 
 from attr import asdict
@@ -63,6 +64,7 @@ async def _get_fixture_collection(envoy: Envoy, serial: str) -> dict[str, Any]:
         "/ivp/ensemble/generator",
         "/ivp/meters",
         "/ivp/meters/readings",
+        "/home,",
     ]
 
     for end_point in end_points:
@@ -146,11 +148,25 @@ async def async_get_config_entry_diagnostics(
         "inverters": envoy_data.inverters,
         "tariff": envoy_data.tariff,
     }
+    # Add Envoy active interface information to report
+    active_interface: dict[str, Any] = {}
+    if coordinator.interface:
+        active_interface = {
+            "name": (interface := coordinator.interface).primary_interface,
+            "interface type": interface.interface_type,
+            "mac": interface.mac,
+            "uses dhcp": interface.dhcp,
+            "firmware build date": datetime.fromtimestamp(
+                interface.software_build_epoch
+            ).strftime("%Y-%m-%d %H:%M:%S"),
+            "envoy timezone": interface.timezone,
+        }
 
     envoy_properties: dict[str, Any] = {
         "envoy_firmware": envoy.firmware,
         "part_number": envoy.part_number,
         "envoy_model": envoy.envoy_model,
+        "active interface": active_interface,
         "supported_features": [feature.name for feature in envoy.supported_features],
         "phase_mode": envoy.phase_mode,
         "phase_count": envoy.phase_count,

homeassistant/components/enphase_envoy/manifest.json

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

homeassistant/components/enphase_envoy/strings.json

@@ -128,7 +128,7 @@
       "storage_mode": {
         "name": "Storage mode",
         "state": {
-          "self_consumption": "Self consumption",
+          "self_consumption": "Self-consumption",
           "backup": "Full backup",
           "savings": "Savings mode"
         }
@@ -393,7 +393,7 @@
   },
   "exceptions": {
     "unexpected_device": {
-      "message": "Unexpected Envoy serial-number found at {host}; expected {expected_serial}, found {actual_serial}"
+      "message": "Unexpected Envoy serial number found at {host}; expected {expected_serial}, found {actual_serial}"
     },
     "authentication_error": {
       "message": "Envoy authentication failure on {host}: {args}"

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.10.1"]
+  "requirements": ["env-canada==0.10.2"]
 }

homeassistant/components/environment_canada/strings.json

@@ -86,7 +86,7 @@
         "name": "AQHI"
       },
       "advisories": {
-        "name": "Advisory"
+        "name": "Advisories"
       },
       "endings": {
         "name": "Endings"

homeassistant/components/ephember/climate.py

@@ -94,6 +94,7 @@ class EphEmberThermostat(ClimateEntity):
         self._ember = ember
         self._zone_name = zone_name(zone)
         self._zone = zone
+        self._attr_unique_id = zone["zoneid"]
 
         # hot water = true, is immersive device without target temperature control.
         self._hot_water = zone_is_hotwater(zone)

homeassistant/components/eq3btsmart/manifest.json

@@ -22,5 +22,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["eq3btsmart"],
-  "requirements": ["eq3btsmart==1.4.1", "bleak-esphome==2.13.1"]
+  "requirements": ["eq3btsmart==1.4.1", "bleak-esphome==2.15.1"]
 }

homeassistant/components/esphome/assist_satellite.py

@@ -42,7 +42,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import EsphomeAssistEntity, convert_api_error_ha_error
-from .entry_data import ESPHomeConfigEntry, RuntimeEntryData
+from .entry_data import ESPHomeConfigEntry
 from .enum_mapper import EsphomeEnumMapper
 from .ffmpeg_proxy import async_create_proxy_url
 
@@ -96,7 +96,7 @@ async def async_setup_entry(
     if entry_data.device_info.voice_assistant_feature_flags_compat(
         entry_data.api_version
     ):
-        async_add_entities([EsphomeAssistSatellite(entry, entry_data)])
+        async_add_entities([EsphomeAssistSatellite(entry)])
 
 
 class EsphomeAssistSatellite(
@@ -108,17 +108,12 @@ class EsphomeAssistSatellite(
         key="assist_satellite", translation_key="assist_satellite"
     )
 
-    def __init__(
-        self,
-        config_entry: ESPHomeConfigEntry,
-        entry_data: RuntimeEntryData,
-    ) -> None:
+    def __init__(self, entry: ESPHomeConfigEntry) -> None:
         """Initialize satellite."""
-        super().__init__(entry_data)
+        super().__init__(entry.runtime_data)
 
-        self.config_entry = config_entry
-        self.entry_data = entry_data
-        self.cli = self.entry_data.client
+        self.config_entry = entry
+        self.cli = self._entry_data.client
 
         self._is_running: bool = True
         self._pipeline_task: asyncio.Task | None = None
@@ -134,23 +129,23 @@ class EsphomeAssistSatellite(
     @property
     def pipeline_entity_id(self) -> str | None:
         """Return the entity ID of the pipeline to use for the next conversation."""
-        assert self.entry_data.device_info is not None
+        assert self._entry_data.device_info is not None
         ent_reg = er.async_get(self.hass)
         return ent_reg.async_get_entity_id(
             Platform.SELECT,
             DOMAIN,
-            f"{self.entry_data.device_info.mac_address}-pipeline",
+            f"{self._entry_data.device_info.mac_address}-pipeline",
         )
 
     @property
     def vad_sensitivity_entity_id(self) -> str | None:
         """Return the entity ID of the VAD sensitivity to use for the next conversation."""
-        assert self.entry_data.device_info is not None
+        assert self._entry_data.device_info is not None
         ent_reg = er.async_get(self.hass)
         return ent_reg.async_get_entity_id(
             Platform.SELECT,
             DOMAIN,
-            f"{self.entry_data.device_info.mac_address}-vad_sensitivity",
+            f"{self._entry_data.device_info.mac_address}-vad_sensitivity",
         )
 
     @callback
@@ -196,16 +191,16 @@ class EsphomeAssistSatellite(
         _LOGGER.debug("Received satellite configuration: %s", self._satellite_config)
 
         # Inform listeners that config has been updated
-        self.entry_data.async_assist_satellite_config_updated(self._satellite_config)
+        self._entry_data.async_assist_satellite_config_updated(self._satellite_config)
 
     async def async_added_to_hass(self) -> None:
         """Run when entity about to be added to hass."""
         await super().async_added_to_hass()
 
-        assert self.entry_data.device_info is not None
+        assert self._entry_data.device_info is not None
         feature_flags = (
-            self.entry_data.device_info.voice_assistant_feature_flags_compat(
-                self.entry_data.api_version
+            self._entry_data.device_info.voice_assistant_feature_flags_compat(
+                self._entry_data.api_version
             )
         )
         if feature_flags & VoiceAssistantFeature.API_AUDIO:
@@ -261,7 +256,7 @@ class EsphomeAssistSatellite(
 
         # Update wake word select when config is updated
         self.async_on_remove(
-            self.entry_data.async_register_assist_satellite_set_wake_word_callback(
+            self._entry_data.async_register_assist_satellite_set_wake_word_callback(
                 self.async_set_wake_word
             )
         )
@@ -283,7 +278,7 @@ class EsphomeAssistSatellite(
 
         data_to_send: dict[str, Any] = {}
         if event_type == VoiceAssistantEventType.VOICE_ASSISTANT_STT_START:
-            self.entry_data.async_set_assist_pipeline_state(True)
+            self._entry_data.async_set_assist_pipeline_state(True)
         elif event_type == VoiceAssistantEventType.VOICE_ASSISTANT_STT_END:
             assert event.data is not None
             data_to_send = {"text": event.data["stt_output"]["text"]}
@@ -305,10 +300,10 @@ class EsphomeAssistSatellite(
                 url = async_process_play_media_url(self.hass, path)
                 data_to_send = {"url": url}
 
-                assert self.entry_data.device_info is not None
+                assert self._entry_data.device_info is not None
                 feature_flags = (
-                    self.entry_data.device_info.voice_assistant_feature_flags_compat(
-                        self.entry_data.api_version
+                    self._entry_data.device_info.voice_assistant_feature_flags_compat(
+                        self._entry_data.api_version
                     )
                 )
                 if feature_flags & VoiceAssistantFeature.SPEAKER and (
@@ -344,7 +339,7 @@ class EsphomeAssistSatellite(
         elif event_type == VoiceAssistantEventType.VOICE_ASSISTANT_RUN_END:
             if self._tts_streaming_task is None:
                 # No TTS
-                self.entry_data.async_set_assist_pipeline_state(False)
+                self._entry_data.async_set_assist_pipeline_state(False)
 
         self.cli.send_voice_assistant_event(event_type, data_to_send)
 
@@ -386,7 +381,7 @@ class EsphomeAssistSatellite(
             # Route media through the proxy
             format_to_use: MediaPlayerSupportedFormat | None = None
             for supported_format in chain(
-                *self.entry_data.media_player_formats.values()
+                *self._entry_data.media_player_formats.values()
             ):
                 if supported_format.purpose == MediaPlayerFormatPurpose.ANNOUNCEMENT:
                     format_to_use = supported_format
@@ -444,10 +439,10 @@ class EsphomeAssistSatellite(
 
         # API or UDP output audio
         port: int = 0
-        assert self.entry_data.device_info is not None
+        assert self._entry_data.device_info is not None
         feature_flags = (
-            self.entry_data.device_info.voice_assistant_feature_flags_compat(
-                self.entry_data.api_version
+            self._entry_data.device_info.voice_assistant_feature_flags_compat(
+                self._entry_data.api_version
             )
         )
         if (feature_flags & VoiceAssistantFeature.SPEAKER) and not (
@@ -548,7 +543,7 @@ class EsphomeAssistSatellite(
 
     def _update_tts_format(self) -> None:
         """Update the TTS format from the first media player."""
-        for supported_format in chain(*self.entry_data.media_player_formats.values()):
+        for supported_format in chain(*self._entry_data.media_player_formats.values()):
             # Find first announcement format
             if supported_format.purpose == MediaPlayerFormatPurpose.ANNOUNCEMENT:
                 self._attr_tts_options = {
@@ -634,7 +629,7 @@ class EsphomeAssistSatellite(
 
         # State change
         self.tts_response_finished()
-        self.entry_data.async_set_assist_pipeline_state(False)
+        self._entry_data.async_set_assist_pipeline_state(False)
 
     async def _wrap_audio_stream(self) -> AsyncIterable[bytes]:
         """Yield audio chunks from the queue until None."""

homeassistant/components/esphome/binary_sensor.py

@@ -2,50 +2,22 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from functools import partial
 
 from aioesphomeapi import BinarySensorInfo, BinarySensorState, EntityInfo
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
-    BinarySensorEntityDescription,
 )
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import issue_registry as ir
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.core import callback
 from homeassistant.util.enum import try_parse_enum
 
-from .const import DOMAIN
-from .entity import EsphomeAssistEntity, EsphomeEntity, platform_async_setup_entry
-from .entry_data import ESPHomeConfigEntry
+from .entity import EsphomeEntity, platform_async_setup_entry
 
 PARALLEL_UPDATES = 0
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ESPHomeConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up ESPHome binary sensors based on a config entry."""
-    await platform_async_setup_entry(
-        hass,
-        entry,
-        async_add_entities,
-        info_type=BinarySensorInfo,
-        entity_type=EsphomeBinarySensor,
-        state_type=BinarySensorState,
-    )
-
-    entry_data = entry.runtime_data
-    assert entry_data.device_info is not None
-    if entry_data.device_info.voice_assistant_feature_flags_compat(
-        entry_data.api_version
-    ):
-        async_add_entities([EsphomeAssistInProgressBinarySensor(entry_data)])
-
-
 class EsphomeBinarySensor(
     EsphomeEntity[BinarySensorInfo, BinarySensorState], BinarySensorEntity
 ):
@@ -76,50 +48,9 @@ class EsphomeBinarySensor(
         return self._static_info.is_status_binary_sensor or super().available
 
 
-class EsphomeAssistInProgressBinarySensor(EsphomeAssistEntity, BinarySensorEntity):
-    """A binary sensor implementation for ESPHome for use with assist_pipeline."""
-
-    entity_description = BinarySensorEntityDescription(
-        entity_registry_enabled_default=False,
-        key="assist_in_progress",
-        translation_key="assist_in_progress",
-    )
-
-    async def async_added_to_hass(self) -> None:
-        """Create issue."""
-        await super().async_added_to_hass()
-        if TYPE_CHECKING:
-            assert self.registry_entry is not None
-        ir.async_create_issue(
-            self.hass,
-            DOMAIN,
-            f"assist_in_progress_deprecated_{self.registry_entry.id}",
-            breaks_in_ha_version="2025.4",
-            data={
-                "entity_id": self.entity_id,
-                "entity_uuid": self.registry_entry.id,
-                "integration_name": "ESPHome",
-            },
-            is_fixable=True,
-            severity=ir.IssueSeverity.WARNING,
-            translation_key="assist_in_progress_deprecated",
-            translation_placeholders={
-                "integration_name": "ESPHome",
-            },
-        )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Remove issue."""
-        await super().async_will_remove_from_hass()
-        if TYPE_CHECKING:
-            assert self.registry_entry is not None
-        ir.async_delete_issue(
-            self.hass,
-            DOMAIN,
-            f"assist_in_progress_deprecated_{self.registry_entry.id}",
-        )
-
-    @property
-    def is_on(self) -> bool | None:
-        """Return true if the binary sensor is on."""
-        return self._entry_data.assist_pipeline_state
+async_setup_entry = partial(
+    platform_async_setup_entry,
+    info_type=BinarySensorInfo,
+    entity_type=EsphomeBinarySensor,
+    state_type=BinarySensorState,
+)

homeassistant/components/esphome/config_flow.py

@@ -22,6 +22,7 @@ import voluptuous as vol
 
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import (
+    SOURCE_IGNORE,
     SOURCE_REAUTH,
     SOURCE_RECONFIGURE,
     ConfigEntry,
@@ -31,6 +32,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import callback
+from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.hassio import HassioServiceInfo
@@ -177,7 +179,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         )
 
     async def async_step_reconfigure(
-        self, entry_data: Mapping[str, Any]
+        self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initialized by a reconfig request."""
         self._reconfig_entry = self._get_reconfigure_entry()
@@ -302,7 +304,15 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
             )
         ):
             return
+        if entry.source == SOURCE_IGNORE:
+            # Don't call _fetch_device_info() for ignored entries
+            raise AbortFlow("already_configured")
+        configured_host: str | None = entry.data.get(CONF_HOST)
         configured_port: int | None = entry.data.get(CONF_PORT)
+        if configured_host == host and configured_port == port:
+            # Don't probe to verify the mac is correct since
+            # the host and port matches.
+            raise AbortFlow("already_configured")
         configured_psk: str | None = entry.data.get(CONF_NOISE_PSK)
         await self._fetch_device_info(host, port or configured_port, configured_psk)
         updates: dict[str, Any] = {}
@@ -323,7 +333,9 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         ):
             return
         assert conflict_entry.unique_id is not None
-        if updates:
+        if self.source == SOURCE_RECONFIGURE:
+            error = "reconfigure_already_configured"
+        elif updates:
             error = "already_configured_updates"
         else:
             error = "already_configured_detailed"

homeassistant/components/esphome/coordinator.py

@@ -5,43 +5,38 @@ from __future__ import annotations
 from datetime import timedelta
 import logging
 
-import aiohttp
 from awesomeversion import AwesomeVersion
 from esphome_dashboard_api import ConfiguredDevice, ESPHomeDashboardAPI
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 MIN_VERSION_SUPPORTS_UPDATE = AwesomeVersion("2023.1.0")
+REFRESH_INTERVAL = timedelta(minutes=5)
 
 
 class ESPHomeDashboardCoordinator(DataUpdateCoordinator[dict[str, ConfiguredDevice]]):
     """Class to interact with the ESPHome dashboard."""
 
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        addon_slug: str,
-        url: str,
-        session: aiohttp.ClientSession,
-    ) -> None:
-        """Initialize."""
+    def __init__(self, hass: HomeAssistant, addon_slug: str, url: str) -> None:
+        """Initialize the dashboard coordinator."""
         super().__init__(
             hass,
             _LOGGER,
             config_entry=None,
             name="ESPHome Dashboard",
-            update_interval=timedelta(minutes=5),
+            update_interval=REFRESH_INTERVAL,
             always_update=False,
         )
         self.addon_slug = addon_slug
         self.url = url
-        self.api = ESPHomeDashboardAPI(url, session)
+        self.api = ESPHomeDashboardAPI(url, async_get_clientsession(hass))
         self.supports_update: bool | None = None
 
-    async def _async_update_data(self) -> dict:
+    async def _async_update_data(self) -> dict[str, ConfiguredDevice]:
         """Fetch device data."""
         devices = await self.api.get_devices()
         configured_devices = devices["configured"]

homeassistant/components/esphome/dashboard.py

@@ -9,7 +9,6 @@ from typing import Any
 from homeassistant.config_entries import SOURCE_REAUTH
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.singleton import singleton
 from homeassistant.helpers.storage import Store
@@ -104,9 +103,7 @@ class ESPHomeDashboardManager:
                 self._cancel_shutdown = None
             self._current_dashboard = None
 
-        dashboard = ESPHomeDashboardCoordinator(
-            hass, addon_slug, url, async_get_clientsession(hass)
-        )
+        dashboard = ESPHomeDashboardCoordinator(hass, addon_slug, url)
         await dashboard.async_request_refresh()
 
         self._current_dashboard = dashboard

homeassistant/components/esphome/diagnostics.py

@@ -10,10 +10,18 @@ from homeassistant.const import CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 
 from . import CONF_NOISE_PSK
+from .const import CONF_DEVICE_NAME
 from .dashboard import async_get_dashboard
 from .entry_data import ESPHomeConfigEntry
 
 REDACT_KEYS = {CONF_NOISE_PSK, CONF_PASSWORD, "mac_address", "bluetooth_mac_address"}
+CONFIGURED_DEVICE_KEYS = (
+    "configuration",
+    "current_version",
+    "deployed_version",
+    "loaded_integrations",
+    "target_platform",
+)
 
 
 async def async_get_config_entry_diagnostics(
@@ -26,6 +34,9 @@ async def async_get_config_entry_diagnostics(
 
     entry_data = config_entry.runtime_data
     device_info = entry_data.device_info
+    device_name: str | None = (
+        device_info.name if device_info else config_entry.data.get(CONF_DEVICE_NAME)
+    )
 
     if (storage_data := await entry_data.store.async_load()) is not None:
         diag["storage_data"] = storage_data
@@ -45,7 +56,19 @@ async def async_get_config_entry_diagnostics(
             "scanner": await scanner.async_diagnostics(),
         }
 
+    diag_dashboard: dict[str, Any] = {"configured": False}
+    diag["dashboard"] = diag_dashboard
     if dashboard := async_get_dashboard(hass):
-        diag["dashboard"] = dashboard.addon_slug
+        diag_dashboard["configured"] = True
+        diag_dashboard["supports_update"] = dashboard.supports_update
+        diag_dashboard["last_update_success"] = dashboard.last_update_success
+        diag_dashboard["last_exception"] = dashboard.last_exception
+        diag_dashboard["addon"] = dashboard.addon_slug
+        if device_name and dashboard.data:
+            diag_dashboard["has_matching_name"] = device_name in dashboard.data
+            if data := dashboard.data.get(device_name):
+                diag_dashboard["device"] = {
+                    key: data.get(key) for key in CONFIGURED_DEVICE_KEYS
+                }
 
     return async_redact_data(diag, REDACT_KEYS)

homeassistant/components/esphome/light.py

@@ -109,7 +109,7 @@ def _mired_to_kelvin(mired_temperature: float) -> int:
 def _color_mode_to_ha(mode: int) -> str:
     """Convert an esphome color mode to a HA color mode constant.
 
-    Chose the color mode that best matches the feature-set.
+    Choose the color mode that best matches the feature-set.
     """
     candidates = []
     for ha_mode, cap_lists in _COLOR_MODE_MAPPING.items():

homeassistant/components/esphome/manager.py

@@ -49,6 +49,7 @@ from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
     entity_registry as er,
+    issue_registry as ir,
     template,
 )
 from homeassistant.helpers.device_registry import format_mac
@@ -654,6 +655,30 @@ class ESPHomeManager:
         ):
             self._async_subscribe_logs(new_log_level)
 
+    @callback
+    def _async_cleanup(self) -> None:
+        """Cleanup stale issues and entities."""
+        assert self.entry_data.device_info is not None
+        ent_reg = er.async_get(self.hass)
+        # Cleanup stale assist_in_progress entity and issue,
+        # Remove this after 2026.4
+        if not (
+            stale_entry_entity_id := ent_reg.async_get_entity_id(
+                DOMAIN,
+                Platform.BINARY_SENSOR,
+                f"{self.entry_data.device_info.mac_address}-assist_in_progress",
+            )
+        ):
+            return
+        stale_entry = ent_reg.async_get(stale_entry_entity_id)
+        assert stale_entry is not None
+        ent_reg.async_remove(stale_entry_entity_id)
+        issue_reg = ir.async_get(self.hass)
+        if issue := issue_reg.async_get_issue(
+            DOMAIN, f"assist_in_progress_deprecated_{stale_entry.id}"
+        ):
+            issue_reg.async_delete(DOMAIN, issue.issue_id)
+
     async def async_start(self) -> None:
         """Start the esphome connection manager."""
         hass = self.hass
@@ -696,6 +721,7 @@ class ESPHomeManager:
         _setup_services(hass, entry_data, services)
 
         if (device_info := entry_data.device_info) is not None:
+            self._async_cleanup()
             if device_info.name:
                 reconnect_logic.name = device_info.name
             if (

homeassistant/components/esphome/manifest.json

@@ -15,10 +15,11 @@
   "iot_class": "local_push",
   "loggers": ["aioesphomeapi", "noiseprotocol", "bleak_esphome"],
   "mqtt": ["esphome/discover/#"],
+  "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==30.0.1",
+    "aioesphomeapi==30.1.0",
     "esphome-dashboard-api==1.3.0",
-    "bleak-esphome==2.13.1"
+    "bleak-esphome==2.15.1"
   ],
   "zeroconf": ["_esphomelib._tcp.local."]
 }

homeassistant/components/esphome/media_player.py

@@ -96,7 +96,7 @@ class EsphomeMediaPlayer(
 
     @property
     @esphome_float_state_property
-    def volume_level(self) -> float | None:
+    def volume_level(self) -> float:
         """Volume level of the media player (0..1)."""
         return self._state.volume
 

homeassistant/components/esphome/quality_scale.yaml

@@ -0,0 +1,85 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      Since actions are defined per device, rather than per integration,
+      they are specific to the device's YAML configuration. Additionally,
+      ESPHome allows for user-defined actions, making it impossible to
+      set them up until the device is connected as they vary by device. For more
+      information, see: https://esphome.io/components/api.html#user-defined-actions
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      Since actions are defined per device, rather than per integration,
+      they are specific to the device's YAML configuration. Additionally,
+      ESPHome allows for user-defined actions, making it difficult to provide
+      standard documentation since these actions vary by device. For more
+      information, see: https://esphome.io/components/api.html#user-defined-actions
+  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:
+    status: exempt
+    comment: |
+      ESPHome relies on sleepy devices and fast reconnect logic, so we
+      can't raise `ConfigEntryNotReady`. Instead, we need to utilize the
+      reconnect logic in `aioesphomeapi` to determine the right moment
+      to trigger the connection.
+  unique-config-entry: done
+  # Silver
+  action-exceptions: done
+  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: done
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery-update-info: done
+  discovery: done
+  docs-data-update: done
+  docs-examples:
+    status: exempt
+    comment: |
+      Since ESPHome is a framework for creating custom devices, the
+      possibilities are virtually limitless. As a result, example
+      automations would likely only be relevant to the specific user
+      of the device and not generally useful to others.
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices: done
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: done
+  repair-issues: done
+  stale-devices: done
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done

homeassistant/components/esphome/repairs.py

@@ -7,9 +7,6 @@ from typing import cast
 import voluptuous as vol
 
 from homeassistant import data_entry_flow
-from homeassistant.components.assist_pipeline.repair_flows import (
-    AssistInProgressDeprecatedRepairFlow,
-)
 from homeassistant.components.repairs import RepairsFlow
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import issue_registry as ir
@@ -99,8 +96,6 @@ async def async_create_fix_flow(
     data: dict[str, str | int | float | None] | None,
 ) -> RepairsFlow:
     """Create flow."""
-    if issue_id.startswith("assist_in_progress_deprecated"):
-        return AssistInProgressDeprecatedRepairFlow(data)
     if issue_id.startswith("device_conflict"):
         return DeviceConflictRepair(data)
     # If ESPHome adds confirm-only repairs in the future, this should be changed

homeassistant/components/esphome/select.py

@@ -52,7 +52,7 @@ async def async_setup_entry(
             [
                 EsphomeAssistPipelineSelect(hass, entry_data),
                 EsphomeVadSensitivitySelect(hass, entry_data),
-                EsphomeAssistSatelliteWakeWordSelect(hass, entry_data),
+                EsphomeAssistSatelliteWakeWordSelect(entry_data),
             ]
         )
 
@@ -107,11 +107,10 @@ class EsphomeAssistSatelliteWakeWordSelect(
         translation_key="wake_word",
         entity_category=EntityCategory.CONFIG,
     )
-    _attr_should_poll = False
     _attr_current_option: str | None = None
     _attr_options: list[str] = []
 
-    def __init__(self, hass: HomeAssistant, entry_data: RuntimeEntryData) -> None:
+    def __init__(self, entry_data: RuntimeEntryData) -> None:
         """Initialize a wake word selector."""
         EsphomeAssistEntity.__init__(self, entry_data)
 

homeassistant/components/esphome/strings.json

@@ -4,6 +4,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "already_configured_detailed": "A device `{name}`, with MAC address `{mac}` is already configured as `{title}`.",
       "already_configured_updates": "A device `{name}`, with MAC address `{mac}` is already configured as `{title}`; the existing configuration will be updated with the validated data.",
+      "reconfigure_already_configured": "A device `{name}` with MAC address `{mac}` is already configured as `{title}`. Reconfiguration was aborted because the new configuration appears to refer to a different device.",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "mdns_missing_mac": "Missing MAC address in mDNS properties.",
@@ -102,11 +103,6 @@
         "name": "[%key:component::assist_satellite::entity_component::_::name%]"
       }
     },
-    "binary_sensor": {
-      "assist_in_progress": {
-        "name": "[%key:component::assist_pipeline::entity::binary_sensor::assist_in_progress::name%]"
-      }
-    },
     "select": {
       "pipeline": {
         "name": "[%key:component::assist_pipeline::entity::select::pipeline::name%]",
@@ -199,7 +195,10 @@
       "message": "Error compiling {configuration}; Try again in ESPHome dashboard for more information."
     },
     "error_uploading": {
-      "message": "Error during OTA of {configuration}; Try again in ESPHome dashboard for more information."
+      "message": "Error during OTA (Over-The-Air) of {configuration}; Try again in ESPHome dashboard for more information."
+    },
+    "ota_in_progress": {
+      "message": "An OTA (Over-The-Air) update is already in progress for {configuration}."
     }
   }
 }

homeassistant/components/esphome/switch.py

@@ -36,7 +36,7 @@ class EsphomeSwitch(EsphomeEntity[SwitchInfo, SwitchState], SwitchEntity):
 
     @property
     @esphome_state_property
-    def is_on(self) -> bool | None:
+    def is_on(self) -> bool:
         """Return true if the switch is on."""
         return self._state.state
 

homeassistant/components/esphome/update.py

@@ -29,7 +29,6 @@ from homeassistant.util.enum import try_parse_enum
 from .const import DOMAIN
 from .coordinator import ESPHomeDashboardCoordinator
 from .dashboard import async_get_dashboard
-from .domain_data import DomainData
 from .entity import (
     EsphomeEntity,
     convert_api_error_ha_error,
@@ -62,7 +61,7 @@ async def async_setup_entry(
 
     if (dashboard := async_get_dashboard(hass)) is None:
         return
-    entry_data = DomainData.get(hass).get_entry_data(entry)
+    entry_data = entry.runtime_data
     assert entry_data.device_info is not None
     device_name = entry_data.device_info.name
     unsubs: list[CALLBACK_TYPE] = []
@@ -70,7 +69,6 @@ async def async_setup_entry(
     @callback
     def _async_setup_update_entity() -> None:
         """Set up the update entity."""
-        nonlocal unsubs
         assert dashboard is not None
         # Keep listening until device is available
         if not entry_data.available or not dashboard.last_update_success:
@@ -95,10 +93,12 @@ async def async_setup_entry(
         _async_setup_update_entity()
         return
 
-    unsubs = [
-        entry_data.async_subscribe_device_updated(_async_setup_update_entity),
-        dashboard.async_add_listener(_async_setup_update_entity),
-    ]
+    unsubs.extend(
+        [
+            entry_data.async_subscribe_device_updated(_async_setup_update_entity),
+            dashboard.async_add_listener(_async_setup_update_entity),
+        ]
+    )
 
 
 class ESPHomeDashboardUpdateEntity(
@@ -109,7 +109,6 @@ class ESPHomeDashboardUpdateEntity(
     _attr_has_entity_name = True
     _attr_device_class = UpdateDeviceClass.FIRMWARE
     _attr_title = "ESPHome"
-    _attr_name = "Firmware"
     _attr_release_url = "https://esphome.io/changelog/"
     _attr_entity_registry_enabled_default = False
 
@@ -126,21 +125,17 @@ class ESPHomeDashboardUpdateEntity(
                 (dr.CONNECTION_NETWORK_MAC, entry_data.device_info.mac_address)
             }
         )
+        self._install_lock = asyncio.Lock()
+        self._available_future: asyncio.Future[None] | None = None
         self._update_attrs()
 
     @callback
     def _update_attrs(self) -> None:
         """Update the supported features."""
-        # If the device has deep sleep, we can't assume we can install updates
-        # as the ESP will not be connectable (by design).
         coordinator = self.coordinator
         device_info = self._device_info
         # Install support can change at run time
-        if (
-            coordinator.last_update_success
-            and coordinator.supports_update
-            and not device_info.has_deep_sleep
-        ):
+        if coordinator.last_update_success and coordinator.supports_update:
             self._attr_supported_features = UpdateEntityFeature.INSTALL
         else:
             self._attr_supported_features = NO_FEATURES
@@ -179,6 +174,13 @@ class ESPHomeDashboardUpdateEntity(
         self, static_info: list[EntityInfo] | None = None
     ) -> None:
         """Handle updated data from the device."""
+        if (
+            self._entry_data.available
+            and self._available_future
+            and not self._available_future.done()
+        ):
+            self._available_future.set_result(None)
+            self._available_future = None
         self._update_attrs()
         self.async_write_ha_state()
 
@@ -193,17 +195,46 @@ class ESPHomeDashboardUpdateEntity(
             entry_data.async_subscribe_device_updated(self._handle_device_update)
         )
 
+    async def async_will_remove_from_hass(self) -> None:
+        """Handle entity about to be removed from Home Assistant."""
+        if self._available_future and not self._available_future.done():
+            self._available_future.cancel()
+            self._available_future = None
+
+    async def _async_wait_available(self) -> None:
+        """Wait until the device is available."""
+        # If the device has deep sleep, we need to wait for it to wake up
+        # and connect to the network to be able to install the update.
+        if self._entry_data.available:
+            return
+        self._available_future = self.hass.loop.create_future()
+        try:
+            await self._available_future
+        finally:
+            self._available_future = None
+
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
     ) -> None:
         """Install an update."""
-        async with self.hass.data.setdefault(KEY_UPDATE_LOCK, asyncio.Lock()):
-            coordinator = self.coordinator
-            api = coordinator.api
-            device = coordinator.data.get(self._device_info.name)
-            assert device is not None
-            configuration = device["configuration"]
-            try:
+        if self._install_lock.locked():
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="ota_in_progress",
+                translation_placeholders={
+                    "configuration": self._device_info.name,
+                },
+            )
+
+        # Ensure only one OTA per device at a time
+        async with self._install_lock:
+            # Ensure only one compile at a time for ALL devices
+            async with self.hass.data.setdefault(KEY_UPDATE_LOCK, asyncio.Lock()):
+                coordinator = self.coordinator
+                api = coordinator.api
+                device = coordinator.data.get(self._device_info.name)
+                assert device is not None
+                configuration = device["configuration"]
                 if not await api.compile(configuration):
                     raise HomeAssistantError(
                         translation_domain=DOMAIN,
@@ -212,14 +243,25 @@ class ESPHomeDashboardUpdateEntity(
                             "configuration": configuration,
                         },
                     )
-                if not await api.upload(configuration, "OTA"):
-                    raise HomeAssistantError(
-                        translation_domain=DOMAIN,
-                        translation_key="error_uploading",
-                        translation_placeholders={
-                            "configuration": configuration,
-                        },
-                    )
+
+            # If the device uses deep sleep, there's a small chance it goes
+            # to sleep right after the dashboard connects but before the OTA
+            # starts. In that case, the update won't go through, so we try
+            # again to catch it on its next wakeup.
+            attempts = 2 if self._device_info.has_deep_sleep else 1
+            try:
+                for attempt in range(1, attempts + 1):
+                    await self._async_wait_available()
+                    if await api.upload(configuration, "OTA"):
+                        break
+                    if attempt == attempts:
+                        raise HomeAssistantError(
+                            translation_domain=DOMAIN,
+                            translation_key="error_uploading",
+                            translation_placeholders={
+                                "configuration": configuration,
+                            },
+                        )
             finally:
                 await self.coordinator.async_request_refresh()
 
@@ -242,7 +284,7 @@ class ESPHomeUpdateEntity(EsphomeEntity[UpdateInfo, UpdateState], UpdateEntity):
 
     @property
     @esphome_state_property
-    def installed_version(self) -> str | None:
+    def installed_version(self) -> str:
         """Return the installed version."""
         return self._state.current_version
 
@@ -260,19 +302,19 @@ class ESPHomeUpdateEntity(EsphomeEntity[UpdateInfo, UpdateState], UpdateEntity):
 
     @property
     @esphome_state_property
-    def release_summary(self) -> str | None:
+    def release_summary(self) -> str:
         """Return the release summary."""
         return self._state.release_summary
 
     @property
     @esphome_state_property
-    def release_url(self) -> str | None:
+    def release_url(self) -> str:
         """Return the release URL."""
         return self._state.release_url
 
     @property
     @esphome_state_property
-    def title(self) -> str | None:
+    def title(self) -> str:
         """Return the title of the update."""
         return self._state.title
 

homeassistant/components/esphome/valve.py

@@ -65,7 +65,7 @@ class EsphomeValve(EsphomeEntity[ValveInfo, ValveState], ValveEntity):
 
     @property
     @esphome_state_property
-    def current_valve_position(self) -> int | None:
+    def current_valve_position(self) -> int:
         """Return current position of valve. 0 is closed, 100 is open."""
         return round(self._state.position * 100.0)
 

homeassistant/components/fritz/__init__.py

@@ -15,6 +15,8 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
+    CONF_FEATURE_DEVICE_TRACKING,
+    DEFAULT_CONF_FEATURE_DEVICE_TRACKING,
     DEFAULT_SSL,
     DOMAIN,
     FRITZ_AUTH_EXCEPTIONS,
@@ -38,6 +40,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 async def async_setup_entry(hass: HomeAssistant, entry: FritzConfigEntry) -> bool:
     """Set up fritzboxtools from config entry."""
     _LOGGER.debug("Setting up FRITZ!Box Tools component")
+
     avm_wrapper = AvmWrapper(
         hass=hass,
         config_entry=entry,
@@ -46,6 +49,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: FritzConfigEntry) -> boo
         username=entry.data[CONF_USERNAME],
         password=entry.data[CONF_PASSWORD],
         use_tls=entry.data.get(CONF_SSL, DEFAULT_SSL),
+        device_discovery_enabled=entry.options.get(
+            CONF_FEATURE_DEVICE_TRACKING, DEFAULT_CONF_FEATURE_DEVICE_TRACKING
+        ),
     )
 
     try:
@@ -62,6 +68,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: FritzConfigEntry) -> boo
         raise ConfigEntryAuthFailed("Missing UPnP configuration")
 
     await avm_wrapper.async_config_entry_first_refresh()
+    await avm_wrapper.async_trigger_cleanup()
 
     entry.runtime_data = avm_wrapper
 

homeassistant/components/fritz/config_flow.py

@@ -35,7 +35,9 @@ from homeassistant.helpers.service_info.ssdp import (
 from homeassistant.helpers.typing import VolDictType
 
 from .const import (
+    CONF_FEATURE_DEVICE_TRACKING,
     CONF_OLD_DISCOVERY,
+    DEFAULT_CONF_FEATURE_DEVICE_TRACKING,
     DEFAULT_CONF_OLD_DISCOVERY,
     DEFAULT_HOST,
     DEFAULT_HTTP_PORT,
@@ -72,7 +74,8 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
         """Initialize FRITZ!Box Tools flow."""
         self._name: str = ""
         self._password: str = ""
-        self._use_tls: bool = False
+        self._use_tls: bool = DEFAULT_SSL
+        self._feature_device_discovery: bool = DEFAULT_CONF_FEATURE_DEVICE_TRACKING
         self._port: int | None = None
         self._username: str = ""
         self._model: str = ""
@@ -141,6 +144,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
             options={
                 CONF_CONSIDER_HOME: DEFAULT_CONSIDER_HOME.total_seconds(),
                 CONF_OLD_DISCOVERY: DEFAULT_CONF_OLD_DISCOVERY,
+                CONF_FEATURE_DEVICE_TRACKING: self._feature_device_discovery,
             },
         )
 
@@ -204,6 +208,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
         self._username = user_input[CONF_USERNAME]
         self._password = user_input[CONF_PASSWORD]
         self._use_tls = user_input[CONF_SSL]
+        self._feature_device_discovery = user_input[CONF_FEATURE_DEVICE_TRACKING]
         self._port = self._determine_port(user_input)
 
         error = await self.async_fritz_tools_init()
@@ -234,6 +239,10 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
                     vol.Required(CONF_USERNAME): str,
                     vol.Required(CONF_PASSWORD): str,
                     vol.Optional(CONF_SSL, default=DEFAULT_SSL): bool,
+                    vol.Required(
+                        CONF_FEATURE_DEVICE_TRACKING,
+                        default=DEFAULT_CONF_FEATURE_DEVICE_TRACKING,
+                    ): bool,
                 }
             ),
             errors=errors or {},
@@ -250,6 +259,10 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
                     vol.Required(CONF_USERNAME): str,
                     vol.Required(CONF_PASSWORD): str,
                     vol.Optional(CONF_SSL, default=DEFAULT_SSL): bool,
+                    vol.Required(
+                        CONF_FEATURE_DEVICE_TRACKING,
+                        default=DEFAULT_CONF_FEATURE_DEVICE_TRACKING,
+                    ): bool,
                 }
             ),
             description_placeholders={"name": self._name},
@@ -405,7 +418,7 @@ class FritzBoxToolsOptionsFlowHandler(OptionsFlow):
         """Handle options flow."""
 
         if user_input is not None:
-            return self.async_create_entry(title="", data=user_input)
+            return self.async_create_entry(data=user_input)
 
         options = self.config_entry.options
         data_schema = vol.Schema(
@@ -420,6 +433,13 @@ class FritzBoxToolsOptionsFlowHandler(OptionsFlow):
                     CONF_OLD_DISCOVERY,
                     default=options.get(CONF_OLD_DISCOVERY, DEFAULT_CONF_OLD_DISCOVERY),
                 ): bool,
+                vol.Optional(
+                    CONF_FEATURE_DEVICE_TRACKING,
+                    default=options.get(
+                        CONF_FEATURE_DEVICE_TRACKING,
+                        DEFAULT_CONF_FEATURE_DEVICE_TRACKING,
+                    ),
+                ): bool,
             }
         )
         return self.async_show_form(step_id="init", data_schema=data_schema)

homeassistant/components/fritz/const.py

@@ -40,6 +40,9 @@ PLATFORMS = [
 CONF_OLD_DISCOVERY = "old_discovery"
 DEFAULT_CONF_OLD_DISCOVERY = False
 
+CONF_FEATURE_DEVICE_TRACKING = "feature_device_tracking"
+DEFAULT_CONF_FEATURE_DEVICE_TRACKING = True
+
 DSL_CONNECTION: Literal["dsl"] = "dsl"
 
 DEFAULT_DEVICE_NAME = "Unknown device"

homeassistant/components/fritz/coordinator.py

@@ -39,6 +39,7 @@ from homeassistant.util.hass_dict import HassKey
 
 from .const import (
     CONF_OLD_DISCOVERY,
+    DEFAULT_CONF_FEATURE_DEVICE_TRACKING,
     DEFAULT_CONF_OLD_DISCOVERY,
     DEFAULT_HOST,
     DEFAULT_SSL,
@@ -175,6 +176,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         username: str = DEFAULT_USERNAME,
         host: str = DEFAULT_HOST,
         use_tls: bool = DEFAULT_SSL,
+        device_discovery_enabled: bool = DEFAULT_CONF_FEATURE_DEVICE_TRACKING,
     ) -> None:
         """Initialize FritzboxTools class."""
         super().__init__(
@@ -202,6 +204,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         self.port = port
         self.username = username
         self.use_tls = use_tls
+        self.device_discovery_enabled = device_discovery_enabled
         self.has_call_deflections: bool = False
         self._model: str | None = None
         self._current_firmware: str | None = None
@@ -332,10 +335,15 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
             "entity_states": {},
         }
         try:
-            await self.async_scan_devices()
+            await self.async_update_device_info()
+
+            if self.device_discovery_enabled:
+                await self.async_scan_devices()
+
             entity_data["entity_states"] = await self.hass.async_add_executor_job(
                 self._entity_states_update
             )
+
             if self.has_call_deflections:
                 entity_data[
                     "call_deflections"
@@ -521,7 +529,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         return {}
 
     def manage_device_info(
-        self, dev_info: Device, dev_mac: str, consider_home: bool
+        self, dev_info: Device, dev_mac: str, consider_home: float
     ) -> bool:
         """Update device lists and return if device is new."""
         _LOGGER.debug("Client dev_info: %s", dev_info)
@@ -551,12 +559,8 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         if new_device:
             async_dispatcher_send(self.hass, self.signal_device_new)
 
-    async def async_scan_devices(self, now: datetime | None = None) -> None:
-        """Scan for new devices and return a list of found device ids."""
-
-        if self.hass.is_stopping:
-            _ha_is_stopping("scan devices")
-            return
+    async def async_update_device_info(self, now: datetime | None = None) -> None:
+        """Update own device information."""
 
         _LOGGER.debug("Checking host info for FRITZ!Box device %s", self.host)
         (
@@ -565,6 +569,13 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
             self._release_url,
         ) = await self._async_update_device_info()
 
+    async def async_scan_devices(self, now: datetime | None = None) -> None:
+        """Scan for new network devices."""
+
+        if self.hass.is_stopping:
+            _ha_is_stopping("scan devices")
+            return
+
         _LOGGER.debug("Checking devices for FRITZ!Box device %s", self.host)
         _default_consider_home = DEFAULT_CONSIDER_HOME.total_seconds()
         if self._options:
@@ -683,7 +694,10 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
 
     async def async_trigger_cleanup(self) -> None:
         """Trigger device trackers cleanup."""
-        device_hosts = await self._async_update_hosts_info()
+        _LOGGER.debug("Device tracker cleanup triggered")
+        device_hosts = {self.mac: Device(True, "", "", "", "", None)}
+        if self.device_discovery_enabled:
+            device_hosts = await self._async_update_hosts_info()
         entity_reg: er.EntityRegistry = er.async_get(self.hass)
         config_entry = self.config_entry
 

homeassistant/components/fritz/strings.json

@@ -4,7 +4,9 @@
     "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."
+    "data_description_ssl": "Use SSL to connect to the FRITZ!Box.",
+    "data_description_feature_device_tracking": "Enable or disable the network device tracking feature.",
+    "data_feature_device_tracking": "Enable network device tracking"
   },
   "config": {
     "flow_title": "{name}",
@@ -15,12 +17,14 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "ssl": "[%key:common::config_flow::data::ssl%]"
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "feature_device_tracking": "[%key:component::fritz::common::data_feature_device_tracking%]"
         },
         "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%]"
+          "ssl": "[%key:component::fritz::common::data_description_ssl%]",
+          "feature_device_tracking": "[%key:component::fritz::common::data_description_feature_device_tracking%]"
         }
       },
       "reauth_confirm": {
@@ -57,14 +61,16 @@
           "port": "[%key:common::config_flow::data::port%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "ssl": "[%key:common::config_flow::data::ssl%]"
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "feature_device_tracking": "[%key:component::fritz::common::data_feature_device_tracking%]"
         },
         "data_description": {
           "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%]"
+          "ssl": "[%key:component::fritz::common::data_description_ssl%]",
+          "feature_device_tracking": "[%key:component::fritz::common::data_description_feature_device_tracking%]"
         }
       }
     },
@@ -89,11 +95,13 @@
       "init": {
         "data": {
           "consider_home": "Seconds to consider a device at 'home'",
-          "old_discovery": "Enable old discovery method"
+          "old_discovery": "Enable old discovery method",
+          "feature_device_tracking": "[%key:component::fritz::common::data_feature_device_tracking%]"
         },
         "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."
+          "old_discovery": "Enable old discovery method. This is needed for some scenarios.",
+          "feature_device_tracking": "[%key:component::fritz::common::data_description_feature_device_tracking%]"
         }
       }
     }

homeassistant/components/fritzbox/binary_sensor.py

@@ -22,19 +22,14 @@ from .entity import FritzBoxDeviceEntity
 from .model import FritzEntityDescriptionMixinBase
 
 
-@dataclass(frozen=True)
-class FritzEntityDescriptionMixinBinarySensor(FritzEntityDescriptionMixinBase):
-    """BinarySensor description mixin for Fritz!Smarthome entities."""
-
-    is_on: Callable[[FritzhomeDevice], bool | None]
-
-
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class FritzBinarySensorEntityDescription(
-    BinarySensorEntityDescription, FritzEntityDescriptionMixinBinarySensor
+    BinarySensorEntityDescription, FritzEntityDescriptionMixinBase
 ):
     """Description for Fritz!Smarthome binary sensor entities."""
 
+    is_on: Callable[[FritzhomeDevice], bool | None]
+
 
 BINARY_SENSOR_TYPES: Final[tuple[FritzBinarySensorEntityDescription, ...]] = (
     FritzBinarySensorEntityDescription(
@@ -60,6 +55,32 @@ BINARY_SENSOR_TYPES: Final[tuple[FritzBinarySensorEntityDescription, ...]] = (
         suitable=lambda device: device.device_lock is not None,
         is_on=lambda device: not device.device_lock,
     ),
+    FritzBinarySensorEntityDescription(
+        key="battery_low",
+        device_class=BinarySensorDeviceClass.BATTERY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        suitable=lambda device: device.battery_low is not None,
+        is_on=lambda device: device.battery_low,
+        entity_registry_enabled_default=False,
+    ),
+    FritzBinarySensorEntityDescription(
+        key="holiday_active",
+        translation_key="holiday_active",
+        suitable=lambda device: device.holiday_active is not None,
+        is_on=lambda device: device.holiday_active,
+    ),
+    FritzBinarySensorEntityDescription(
+        key="summer_active",
+        translation_key="summer_active",
+        suitable=lambda device: device.summer_active is not None,
+        is_on=lambda device: device.summer_active,
+    ),
+    FritzBinarySensorEntityDescription(
+        key="window_open",
+        translation_key="window_open",
+        suitable=lambda device: device.window_open is not None,
+        is_on=lambda device: device.window_open,
+    ),
 )
 
 

homeassistant/components/fritzbox/climate.py

@@ -144,6 +144,7 @@ class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
+        self.check_active_or_lock_mode()
         if kwargs.get(ATTR_HVAC_MODE) is HVACMode.OFF:
             await self.async_set_hkr_state("off")
         elif (target_temp := kwargs.get(ATTR_TEMPERATURE)) is not None:
@@ -168,11 +169,7 @@ class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new operation mode."""
-        if self.data.holiday_active or self.data.summer_active:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="change_hvac_while_active_mode",
-            )
+        self.check_active_or_lock_mode()
         if self.hvac_mode is hvac_mode:
             LOGGER.debug(
                 "%s is already in requested hvac mode %s", self.name, hvac_mode
@@ -204,16 +201,13 @@ class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set preset mode."""
-        if self.data.holiday_active or self.data.summer_active:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="change_preset_while_active_mode",
-            )
+        self.check_active_or_lock_mode()
         await self.async_set_hkr_state(PRESET_API_HKR_STATE_MAPPING[preset_mode])
 
     @property
     def extra_state_attributes(self) -> ClimateExtraAttributes:
         """Return the device specific state attributes."""
+        # deprecated with #143394, can be removed in 2025.11
         attrs: ClimateExtraAttributes = {
             ATTR_STATE_BATTERY_LOW: self.data.battery_low,
         }
@@ -229,3 +223,17 @@ class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
             attrs[ATTR_STATE_WINDOW_OPEN] = self.data.window_open
 
         return attrs
+
+    def check_active_or_lock_mode(self) -> None:
+        """Check if in summer/vacation mode or lock enabled."""
+        if self.data.holiday_active or self.data.summer_active:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="change_settings_while_active_mode",
+            )
+
+        if self.data.lock:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="change_settings_while_lock_enabled",
+            )