Bump version to 2026.6.0b0

.claude/skills/ha-integration-knowledge/SKILL.md

@@ -24,7 +24,6 @@ The following platforms have extra guidelines:
 ## Entity platforms
 
 - Ensure `async_added_to_hass()` and `async_will_remove_from_hass()` have symmetrical behavior. For example, if a subscription is created in `async_added_to_hass()`, it should be unsubscribed in `async_will_remove_from_hass()`. Also, if something is torn down in `async_will_remove_from_hass()`, it should be set up in `async_added_to_hass()`.
-- Entity base class (e.g. `SensorEntity`, `TrackerEntity`) provide a stable API for child classes to inherit from. Do not suggest redeclaring or duplicating attributes, properties, or methods the base class already provides, and do not add guards against the parent's behavior changing — rely on the base class instead.
 
 ## Integration Quality Scale
 

.github/instructions/integrations.instructions.md

@@ -27,7 +27,6 @@ The following platforms have extra guidelines:
 ## Entity platforms
 
 - Ensure `async_added_to_hass()` and `async_will_remove_from_hass()` have symmetrical behavior. For example, if a subscription is created in `async_added_to_hass()`, it should be unsubscribed in `async_will_remove_from_hass()`. Also, if something is torn down in `async_will_remove_from_hass()`, it should be set up in `async_added_to_hass()`.
-- Entity base class (e.g. `SensorEntity`, `TrackerEntity`) provide a stable API for child classes to inherit from. Do not suggest redeclaring or duplicating attributes, properties, or methods the base class already provides, and do not add guards against the parent's behavior changing — rely on the base class instead.
 
 ## Integration Quality Scale
 

.github/workflows/builder.yml

@@ -344,13 +344,13 @@ jobs:
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -523,14 +523,14 @@ jobs:
           persist-credentials: false
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -543,7 +543,7 @@ jobs:
       - name: Push Docker image
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
         id: push
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile

.github/workflows/check-requirements.lock.yml

@@ -36,7 +36,7 @@
 #   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
 #   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
 #   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-#   - github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
+#   - github/gh-aw-actions/setup@d3abfe96a194bce3a523ed2093ddedd5704cdf62 # v0.74.4
 #
 # Container images used:
 #   - ghcr.io/github/gh-aw-firewall/agent:0.25.46
@@ -90,7 +90,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
+        uses: github/gh-aw-actions/setup@d3abfe96a194bce3a523ed2093ddedd5704cdf62 # v0.74.4
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -352,7 +352,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
+        uses: github/gh-aw-actions/setup@d3abfe96a194bce3a523ed2093ddedd5704cdf62 # v0.74.4
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -961,7 +961,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
+        uses: github/gh-aw-actions/setup@d3abfe96a194bce3a523ed2093ddedd5704cdf62 # v0.74.4
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1100,7 +1100,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
+        uses: github/gh-aw-actions/setup@d3abfe96a194bce3a523ed2093ddedd5704cdf62 # v0.74.4
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1325,7 +1325,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
+        uses: github/gh-aw-actions/setup@d3abfe96a194bce3a523ed2093ddedd5704cdf62 # v0.74.4
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1383,7 +1383,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@318d7f4901f78b85e25b91709cf0109ac9b425f6 # v0.74.9
+        uses: github/gh-aw-actions/setup@d3abfe96a194bce3a523ed2093ddedd5704cdf62 # v0.74.4
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}

.github/workflows/ci.yaml

@@ -39,7 +39,7 @@ on:
 env:
   CACHE_VERSION: 3
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.7"
+  HA_SHORT_VERSION: "2026.6"
   ADDITIONAL_PYTHON_VERSIONS: "[]"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)

.github/workflows/codeql.yml

@@ -28,11 +28,11 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
         with:
           category: "/language:python"

.github/workflows/lock.yml

@@ -20,7 +20,7 @@ jobs:
       issues: write # To lock issues
       pull-requests: write # To lock pull requests
     steps:
-      - uses: dessant/lock-threads@851cffe46851ddd2051ea7147ebdc995113241c3 # v6.0.1
+      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: "30"

homeassistant/backup_restore.py

@@ -92,7 +92,8 @@ def _extract_backup(
     ):
         ostf.tar.extractall(
             path=Path(tempdir, "extracted"),
-            filter="tar",
+            members=securetar.secure_path(ostf.tar),
+            filter="fully_trusted",
         )
         backup_meta_file = Path(tempdir, "extracted", "backup.json")
         backup_meta = json.loads(backup_meta_file.read_text(encoding="utf8"))
@@ -118,7 +119,8 @@ def _extract_backup(
         ) as istf:
             istf.extractall(
                 path=Path(tempdir, "homeassistant"),
-                filter="tar",
+                members=securetar.secure_path(istf),
+                filter="fully_trusted",
             )
             if restore_content.restore_homeassistant:
                 keep = list(KEEP_BACKUPS)

homeassistant/brands/lg.json

@@ -6,7 +6,6 @@
     "lg_netcast",
     "lg_soundbar",
     "lg_thinq",
-    "lg_tv_rs232",
     "webostv"
   ]
 }

homeassistant/components/alexa_devices/event.py

@@ -53,7 +53,7 @@ class AlexaVoiceEvent(AmazonEntity, EventEntity):
 
     _attr_event_types = [EVENT_TYPE]
     coordinator: AmazonDevicesCoordinator
-    _last_seen_timestamp: int = 0  #  January 1, 1970 at 12:00:00 AM
+    _last_seen_timestamp: int | None = None
 
     @callback
     def _handle_coordinator_update(self) -> None:
@@ -71,8 +71,7 @@ class AlexaVoiceEvent(AmazonEntity, EventEntity):
             )
             return
 
-        if vocal_record.timestamp <= self._last_seen_timestamp:
-            # Discard old events that have already been processed
+        if vocal_record.timestamp == self._last_seen_timestamp:
             return
 
         self._last_seen_timestamp = vocal_record.timestamp

homeassistant/components/alexa_devices/manifest.json

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

homeassistant/components/analytics/__init__.py

@@ -5,12 +5,8 @@ from typing import Any
 import voluptuous as vol
 
 from homeassistant.components import labs, websocket_api
-from homeassistant.components.hassio import HassioNotReadyError
-from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntry
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import discovery_flow
-from homeassistant.helpers.start import async_at_started
+from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
+from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
 
@@ -53,7 +49,6 @@ CONFIG_SCHEMA = vol.Schema(
 )
 
 DATA_COMPONENT: HassKey[Analytics] = HassKey(DOMAIN)
-_DATA_SNAPSHOTS_URL: HassKey[str | None] = HassKey(f"{DOMAIN}_snapshots_url")
 
 LABS_SNAPSHOT_FEATURE = "snapshots"
 
@@ -62,39 +57,18 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the analytics integration."""
     analytics_config = config.get(DOMAIN, {})
 
-    snapshots_url: str | None = None
     if CONF_SNAPSHOTS_URL in analytics_config:
         await labs.async_update_preview_feature(
             hass, DOMAIN, LABS_SNAPSHOT_FEATURE, enabled=True
         )
         snapshots_url = analytics_config[CONF_SNAPSHOTS_URL]
+    else:
+        snapshots_url = None
 
-    hass.data[_DATA_SNAPSHOTS_URL] = snapshots_url
-
-    discovery_flow.async_create_flow(
-        hass, DOMAIN, context={"source": SOURCE_SYSTEM}, data={}
-    )
-
-    websocket_api.async_register_command(hass, websocket_analytics)
-    websocket_api.async_register_command(hass, websocket_analytics_preferences)
-
-    hass.http.register_view(AnalyticsDevicesView)
-
-    return True
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Analytics from a config entry."""
-    snapshots_url = hass.data[_DATA_SNAPSHOTS_URL]
     analytics = Analytics(hass, snapshots_url)
 
-    try:
-        await analytics.load()
-    except HassioNotReadyError as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="supervisor_not_ready",
-        ) from err
+    # Load stored data
+    await analytics.load()
 
     started = False
 
@@ -106,8 +80,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         if started:
             await analytics.async_schedule()
 
-    async def start_schedule(hass: HomeAssistant) -> None:
-        """Start the send schedule once Home Assistant has started."""
+    async def start_schedule(_event: Event) -> None:
+        """Start the send schedule after the started event."""
         nonlocal started
         started = True
         await analytics.async_schedule()
@@ -115,7 +89,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     labs.async_subscribe_preview_feature(
         hass, DOMAIN, LABS_SNAPSHOT_FEATURE, _async_handle_labs_update
     )
-    async_at_started(hass, start_schedule)
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, start_schedule)
+
+    websocket_api.async_register_command(hass, websocket_analytics)
+    websocket_api.async_register_command(hass, websocket_analytics_preferences)
+
+    hass.http.register_view(AnalyticsDevicesView)
 
     hass.data[DATA_COMPONENT] = analytics
     return True
@@ -130,9 +109,7 @@ def websocket_analytics(
     msg: dict[str, Any],
 ) -> None:
     """Return analytics preferences."""
-    if (analytics := hass.data.get(DATA_COMPONENT)) is None:
-        connection.send_error(msg["id"], websocket_api.ERR_NOT_FOUND, "Not loaded")
-        return
+    analytics = hass.data[DATA_COMPONENT]
     connection.send_result(
         msg["id"],
         {ATTR_PREFERENCES: analytics.preferences, ATTR_ONBOARDED: analytics.onboarded},
@@ -153,10 +130,8 @@ async def websocket_analytics_preferences(
     msg: dict[str, Any],
 ) -> None:
     """Update analytics preferences."""
-    if (analytics := hass.data.get(DATA_COMPONENT)) is None:
-        connection.send_error(msg["id"], websocket_api.ERR_NOT_FOUND, "Not loaded")
-        return
     preferences = msg[ATTR_PREFERENCES]
+    analytics = hass.data[DATA_COMPONENT]
 
     await analytics.save_preferences(preferences)
     await analytics.async_schedule()

homeassistant/components/analytics/analytics.py

@@ -299,8 +299,12 @@ class Analytics:
             self._data = AnalyticsData.from_dict(stored)
 
         if self.supervisor and not self.onboarded:
-            # This may raise HassioNotReadyError if Supervisor was unreachable.
-            # The caller is responsible for handling this and triggering a retry.
+            # This may raise HassioNotReadyError if Supervisor was unreachable
+            # during setup of the Supervisor integration. That will fail setup
+            # of this integration. However there is no better option at this time
+            # since we need to get the diagnostic setting from Supervisor to correctly
+            # setup this integration and we can't raise ConfigEntryNotReady to
+            # trigger a retry from async_setup.
             supervisor_info = hassio.get_supervisor_info(self._hass)
 
             # User have not configured analytics, get this setting from the supervisor
@@ -345,10 +349,10 @@ class Analytics:
             await self._save()
 
         if self.supervisor:
-            # Try to pull Supervisor information, but don't fail if some or all
-            # of it is unavailable due to setup failures in the hassio integration.
-            with contextlib.suppress(hassio.HassioNotReadyError):
-                supervisor_info = hassio.get_supervisor_info(hass)
+            # get_supervisor_info was called during setup so we can't get here
+            # if it raised. The others may raise HassioNotReadyError if only some
+            # data was successfully fetched from Supervisor
+            supervisor_info = hassio.get_supervisor_info(hass)
             with contextlib.suppress(hassio.HassioNotReadyError):
                 operating_system_info = hassio.get_os_info(hass)
             with contextlib.suppress(hassio.HassioNotReadyError):

homeassistant/components/analytics/config_flow.py

@@ -1,19 +0,0 @@
-"""Config flow for Analytics integration."""
-
-from typing import Any
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-
-from .const import DOMAIN
-
-
-class AnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Analytics."""
-
-    VERSION = 1
-
-    async def async_step_system(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        return self.async_create_entry(title="Analytics", data={})

homeassistant/components/analytics/manifest.json

@@ -3,7 +3,6 @@
   "name": "Analytics",
   "after_dependencies": ["energy", "hassio", "recorder"],
   "codeowners": ["@home-assistant/core"],
-  "config_flow": true,
   "dependencies": ["api", "websocket_api", "http"],
   "documentation": "https://www.home-assistant.io/integrations/analytics",
   "integration_type": "system",
@@ -15,6 +14,5 @@
       "report_issue_url": "https://github.com/OHF-Device-Database/device-database/issues/new"
     }
   },
-  "quality_scale": "internal",
-  "single_config_entry": true
+  "quality_scale": "internal"
 }

homeassistant/components/analytics/strings.json

@@ -1,9 +1,4 @@
 {
-  "exceptions": {
-    "supervisor_not_ready": {
-      "message": "Supervisor was not ready during setup, will retry"
-    }
-  },
   "preview_features": {
     "snapshots": {
       "description": "We're creating the [Open Home Foundation Device Database](https://www.home-assistant.io/blog/2026/02/02/about-device-database/): a free, open source community-powered resource to help users find practical information about how smart home devices perform in real installations.\n\nYou can help us build it by opting in to share anonymized data about your devices. This data will only ever include device-specific details (like model or manufacturer) – never personally identifying information (like the names you assign).\n\nFind out how we process your data (should you choose to contribute) in our [Data Use Statement](https://www.openhomefoundation.org/device-database-data-use-statement).",

homeassistant/components/apple_tv/media_player.py

@@ -38,13 +38,11 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import AppleTvConfigEntry, AppleTVManager
 from .browse_media import build_app_list
-from .const import DOMAIN
 from .entity import AppleTVEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -128,6 +126,7 @@ class AppleTvMediaPlayer(
     @callback
     def async_device_connected(self, atv: AppleTV) -> None:
         """Handle when connection is made to device."""
+        # NB: Do not use _is_feature_available here as it only works when playing
         if atv.features.in_state(FeatureState.Available, FeatureName.PushUpdates):
             atv.push_updater.listener = self
             atv.push_updater.start()
@@ -353,41 +352,21 @@ class AppleTvMediaPlayer(
                 media_id = async_process_play_media_url(self.hass, play_item.url)
             media_type = MediaType.MUSIC
 
-        use_stream_file = self._is_feature_available(FeatureName.StreamFile) and (
+        if self._is_feature_available(FeatureName.StreamFile) and (
             media_type == MediaType.MUSIC or await is_streamable(media_id)
-        )
-
-        try:
-            if use_stream_file:
-                _LOGGER.debug("Streaming %s via RAOP", media_id)
-                await self.atv.stream.stream_file(media_id)
-            elif self._is_feature_available(FeatureName.PlayUrl) and (
-                (parsed_url := URL(media_id)).is_absolute() and parsed_url.host
-            ):
-                _LOGGER.debug("Playing %s via AirPlay", media_id)
-                await self.atv.stream.play_url(media_id)
-            else:
-                raise HomeAssistantError(
-                    translation_domain=DOMAIN,
-                    translation_key="streaming_not_supported",
-                )
-        except exceptions.NotSupportedError as ex:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="streaming_not_supported",
-            ) from ex
-        except (
-            exceptions.BlockedStateError,
-            exceptions.ConnectionLostError,
-            exceptions.InvalidStateError,
-            exceptions.OperationTimeoutError,
-            exceptions.PlaybackError,
-            exceptions.ProtocolError,
-        ) as ex:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="stream_failed",
-            ) from ex
+        ):
+            _LOGGER.debug("Streaming %s via RAOP", media_id)
+            await self.atv.stream.stream_file(media_id)
+        elif self._is_feature_available(FeatureName.PlayUrl) and (
+            (parsed_url := URL(media_id)).is_absolute() and parsed_url.host
+        ):
+            _LOGGER.debug("Playing %s via AirPlay", media_id)
+            await self.atv.stream.play_url(media_id)
+        else:
+            _LOGGER.error(
+                "Media streaming is not possible with current configuration for %s",
+                media_id,
+            )
 
     @property
     def media_image_hash(self) -> str | None:
@@ -481,7 +460,7 @@ class AppleTvMediaPlayer(
 
     def _is_feature_available(self, feature: FeatureName) -> bool:
         """Return if a feature is available."""
-        if self.atv:
+        if self.atv and self._playing:
             return self.atv.features.in_state(FeatureState.Available, feature)
         return False
 

homeassistant/components/apple_tv/strings.json

@@ -81,12 +81,6 @@
     },
     "not_connected": {
       "message": "Apple TV is not connected"
-    },
-    "stream_failed": {
-      "message": "Failed to stream media to the Apple TV"
-    },
-    "streaming_not_supported": {
-      "message": "Streaming the requested media is not supported"
     }
   },
   "options": {

homeassistant/components/august/manifest.json

@@ -30,5 +30,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==9.2.1", "yalexs-ble==3.3.0"]
+  "requirements": ["yalexs==9.2.0", "yalexs-ble==3.3.0"]
 }

homeassistant/components/backup/backup.py

@@ -11,7 +11,7 @@ from homeassistant.helpers.hassio import is_hassio
 
 from .agent import BackupAgent, LocalBackupAgent, OnProgressCallback
 from .const import DOMAIN, LOGGER
-from .models import AgentBackup, BackupNotFound, InvalidBackupFilename
+from .models import AgentBackup, BackupNotFound
 from .util import read_backup, suggested_filename
 
 
@@ -54,13 +54,7 @@ class CoreLocalBackupAgent(LocalBackupAgent):
             try:
                 backup = read_backup(backup_path)
                 backups[backup.backup_id] = (backup, backup_path)
-            except (
-                OSError,
-                TarError,
-                json.JSONDecodeError,
-                KeyError,
-                InvalidBackupFilename,
-            ) as err:
+            except (OSError, TarError, json.JSONDecodeError, KeyError) as err:
                 LOGGER.warning("Unable to read backup %s: %s", backup_path, err)
         return backups
 
@@ -128,14 +122,7 @@ class CoreLocalBackupAgent(LocalBackupAgent):
 
     def get_new_backup_path(self, backup: AgentBackup) -> Path:
         """Return the local path to a new backup."""
-        candidate = self._backup_dir / suggested_filename(backup)
-        # suggested_filename does not strip separators; refuse paths that would
-        # land outside the backup directory.
-        if candidate.parent != self._backup_dir:
-            raise InvalidBackupFilename(
-                f"Refusing to write outside {self._backup_dir}: {candidate}"
-            )
-        return candidate
+        return self._backup_dir / suggested_filename(backup)
 
     async def async_delete_backup(self, backup_id: str, **kwargs: Any) -> None:
         """Delete a backup file."""

homeassistant/components/backup/manager.py

@@ -1978,13 +1978,7 @@ class CoreBackupReaderWriter(BackupReaderWriter):
 
         try:
             backup = await async_add_executor_job(read_backup, temp_file)
-        except (
-            OSError,
-            tarfile.TarError,
-            json.JSONDecodeError,
-            KeyError,
-            InvalidBackupFilename,
-        ) as err:
+        except (OSError, tarfile.TarError, json.JSONDecodeError, KeyError) as err:
             LOGGER.warning("Unable to parse backup %s: %s", temp_file, err)
             raise
 

homeassistant/components/backup/util.py

@@ -6,7 +6,7 @@ import copy
 from dataclasses import dataclass, replace
 from io import BytesIO
 import json
-from pathlib import Path, PurePath, PureWindowsPath
+from pathlib import Path, PurePath
 from queue import SimpleQueue
 import tarfile
 import threading
@@ -34,7 +34,7 @@ from homeassistant.util.async_iterator import (
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
 from .const import BUF_SIZE, LOGGER, SECURETAR_CREATE_VERSION
-from .models import AddonInfo, AgentBackup, Folder, InvalidBackupFilename
+from .models import AddonInfo, AgentBackup, Folder
 
 
 class DecryptError(HomeAssistantError):
@@ -109,13 +109,6 @@ def read_backup(backup_path: Path) -> AgentBackup:
         extra_metadata = cast(dict[str, bool | str], data.get("extra", {}))
         date = extra_metadata.get("supervisor.backup_request_date", data["date"])
 
-        name = cast(str, data["name"])
-        # The name is used to derive the on-disk filename via suggested_filename;
-        # reject anything that could escape the backup directory.
-        safe_name = PureWindowsPath(name).name
-        if safe_name != name or name in ("", ".", ".."):
-            raise InvalidBackupFilename(f"Invalid backup name: {name!r}")
-
         return AgentBackup(
             addons=addons,
             backup_id=cast(str, data["slug"]),
@@ -125,7 +118,7 @@ def read_backup(backup_path: Path) -> AgentBackup:
             folders=folders,
             homeassistant_included=homeassistant_included,
             homeassistant_version=homeassistant_version,
-            name=name,
+            name=cast(str, data["name"]),
             protected=cast(bool, data.get("protected", False)),
             size=backup_path.stat().st_size,
         )

homeassistant/components/bluetooth/manifest.json

@@ -20,7 +20,7 @@
     "bluetooth-adapters==2.3.0",
     "bluetooth-auto-recovery==1.6.4",
     "bluetooth-data-tools==1.29.18",
-    "dbus-fast==5.0.16",
+    "dbus-fast==5.0.15",
     "habluetooth==6.7.9"
   ]
 }

homeassistant/components/broadlink/radio_frequency.py

@@ -92,7 +92,7 @@ class BroadlinkRadioFrequency(BroadlinkEntity, RadioFrequencyTransmitterEntity):
     """Representation of a Broadlink RF transmitter."""
 
     _attr_has_entity_name = True
-    _attr_translation_key = "rf_transmitter"
+    _attr_name = None
 
     def __init__(self, device: BroadlinkDevice) -> None:
         """Initialize the entity."""

homeassistant/components/broadlink/strings.json

@@ -54,11 +54,6 @@
         "name": "IR emitter"
       }
     },
-    "radio_frequency": {
-      "rf_transmitter": {
-        "name": "RF transmitter"
-      }
-    },
     "select": {
       "day_of_week": {
         "name": "Day of week",

homeassistant/components/caldav/api.py

@@ -3,7 +3,6 @@
 import logging
 
 import caldav
-from caldav.lib.error import DAVError
 
 from homeassistant.core import HomeAssistant
 
@@ -27,7 +26,7 @@ async def async_get_calendars(
         for calendar in client.principal().calendars():
             try:
                 supported_components = calendar.get_supported_components()
-            except KeyError, DAVError:
+            except KeyError:
                 needs_warning.append((str(calendar.url), calendar.name, component))
 
                 if component in ASSUMED_COMPONENTS:

homeassistant/components/device_tracker/device_trigger.py

@@ -12,19 +12,13 @@ from homeassistant.const import (
     CONF_DOMAIN,
     CONF_ENTITY_ID,
     CONF_EVENT,
-    CONF_OPTIONS,
     CONF_PLATFORM,
     CONF_TYPE,
     CONF_ZONE,
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.trigger import (
-    TriggerActionType,
-    TriggerInfo,
-    #  protected, but only used for legacy triggers
-    _async_attach_trigger_cls,
-)
+from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
@@ -85,18 +79,16 @@ async def async_attach_trigger(
         event = zone.EVENT_ENTER
     else:
         event = zone.EVENT_LEAVE
-    zone_config = await zone.LegacyZoneTrigger.async_validate_config(
-        hass,
-        {
-            CONF_OPTIONS: {
-                CONF_ENTITY_ID: [config[CONF_ENTITY_ID]],
-                CONF_ZONE: config[CONF_ZONE],
-                CONF_EVENT: event,
-            }
-        },
-    )
-    return await _async_attach_trigger_cls(
-        hass, zone.LegacyZoneTrigger, "device", zone_config, action, trigger_info
+
+    zone_config = {
+        CONF_PLATFORM: ZONE_DOMAIN,
+        CONF_ENTITY_ID: config[CONF_ENTITY_ID],
+        CONF_ZONE: config[CONF_ZONE],
+        CONF_EVENT: event,
+    }
+    zone_config = await zone.async_validate_trigger_config(hass, zone_config)
+    return await zone.async_attach_trigger(
+        hass, zone_config, action, trigger_info, platform_type="device"
     )
 
 

homeassistant/components/device_tracker/entity.py

@@ -1,7 +1,6 @@
 """Provide functionality to keep track of devices."""
 
 import asyncio
-import logging
 from typing import TYPE_CHECKING, Any, final
 
 from propcache.api import cached_property
@@ -23,7 +22,6 @@ from homeassistant.core import (
     EventStateChangedData,
     HomeAssistant,
     State,
-    async_get_hass_or_none,
     callback,
 )
 from homeassistant.helpers import (
@@ -39,7 +37,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_platform import EntityPlatform
 from homeassistant.helpers.event import async_track_state_change_event
-from homeassistant.loader import async_suggest_report_issue
 from homeassistant.util.hass_dict import HassKey
 
 from .const import (
@@ -55,8 +52,6 @@ from .const import (
     SourceType,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_KEY: HassKey[dict[str, tuple[str, str]]] = HassKey(f"{DOMAIN}_mac")
 
 
@@ -169,35 +164,11 @@ class BaseTrackerEntity(Entity):
     _attr_entity_category = EntityCategory.DIAGNOSTIC
     _attr_source_type: SourceType
 
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        """Post initialisation processing."""
-        super().__init_subclass__(**kwargs)
-        if "battery_level" in cls.__dict__:
-            if cls.__module__.startswith("homeassistant.components."):
-                # Don't ask users to report issue for built in integrations,
-                # they already have issues opened on them.
-                return
-            report_issue = async_suggest_report_issue(
-                async_get_hass_or_none(), module=cls.__module__
-            )
-            _LOGGER.warning(
-                (
-                    "%s::%s is overriding the deprecated battery_level property on "
-                    "a subclass of BaseTrackerEntity, this will be unsupported from "
-                    "Home Assistant 2027.7, please %s"
-                ),
-                cls.__module__,
-                cls.__name__,
-                report_issue,
-            )
-
     @cached_property
     def battery_level(self) -> int | None:
         """Return the battery level of the device.
 
         Percentage from 0-100.
-
-        The property is deprecated and will be removed in Home Assistant 2027.7.
         """
         return None
 
@@ -241,38 +212,13 @@ class TrackerEntity(
     _attr_in_zones: list[str] | None = None
     _attr_latitude: float | None = None
     _attr_location_accuracy: float = 0
-    # _attr_location_name is deprecated and will be removed in Home Assistant 2027.7
     _attr_location_name: str | None = None
     _attr_longitude: float | None = None
     _attr_source_type: SourceType = SourceType.GPS
 
     __active_zone: State | None = None
-    # If we reported setting deprecated _attr_location_name
-    __deprecated_attr_location_name_reported = False
     __in_zones: list[str] | None = None
 
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        """Post initialisation processing."""
-        super().__init_subclass__(**kwargs)
-        if "location_name" in cls.__dict__:
-            if cls.__module__.startswith("homeassistant.components."):
-                # Don't ask users to report issue for built in integrations,
-                # they already have issues opened on them.
-                return
-            report_issue = async_suggest_report_issue(
-                async_get_hass_or_none(), module=cls.__module__
-            )
-            _LOGGER.warning(
-                (
-                    "%s::%s is overriding the deprecated location_name property on "
-                    "an instance of TrackerEntity, this will be unsupported from "
-                    "Home Assistant 2027.7, please %s"
-                ),
-                cls.__module__,
-                cls.__name__,
-                report_issue,
-            )
-
     @cached_property
     def should_poll(self) -> bool:
         """No polling for entities that have location pushed."""
@@ -303,32 +249,7 @@ class TrackerEntity(
 
     @cached_property
     def location_name(self) -> str | None:
-        """Return a location name for the current location of the device.
-
-        The property is deprecated and will be removed in Home Assistant 2027.7.
-        """
-        if (location_name := self._attr_location_name) is not None:
-            if (
-                not self.__deprecated_attr_location_name_reported
-                and not self.__class__.__module__.startswith(
-                    "homeassistant.components."
-                )
-            ):
-                report_issue = async_suggest_report_issue(
-                    self.hass, module=self.__class__.__module__
-                )
-                _LOGGER.warning(
-                    (
-                        "%s::%s is setting the deprecated _attr_location_name attribute "
-                        "on an instance of TrackerEntity, this will be unsupported from "
-                        "Home Assistant 2027.7, please %s"
-                    ),
-                    self.__class__.__module__,
-                    self.__class__.__name__,
-                    report_issue,
-                )
-                self.__deprecated_attr_location_name_reported = True
-            return location_name
+        """Return a location name for the current location of the device."""
         return self._attr_location_name
 
     @cached_property

homeassistant/components/duckdns/coordinator.py

@@ -50,7 +50,7 @@ class DuckDnsUpdateCoordinator(DataUpdateCoordinator[None]):
         """Update Duck DNS."""
 
         retry_after = BACKOFF_INTERVALS[
-            min(self.failed, len(BACKOFF_INTERVALS) - 1)
+            min(self.failed, len(BACKOFF_INTERVALS))
         ].total_seconds()
 
         try:

homeassistant/components/duco/coordinator.py

@@ -86,6 +86,7 @@ class DucoCoordinator(DataUpdateCoordinator[DucoData]):
         """Fetch node data from the Duco box."""
         try:
             nodes = await self.client.async_get_nodes()
+            lan_info = await self.client.async_get_lan_info()
         except DucoConnectionError as err:
             raise UpdateFailed(
                 translation_domain=DOMAIN,
@@ -99,18 +100,7 @@ class DucoCoordinator(DataUpdateCoordinator[DucoData]):
                 translation_placeholders={"error": repr(err)},
             ) from err
 
-        # LAN info only backs the diagnostic RSSI sensor, so failures on this
-        # supplemental endpoint, including connection failures, should not make
-        # the primary node entities unavailable.
-        rssi_wifi = self.data.rssi_wifi if self.data else None
-        try:
-            lan_info = await self.client.async_get_lan_info()
-        except DucoError as err:
-            _LOGGER.debug("Could not fetch Duco LAN info", exc_info=err)
-        else:
-            rssi_wifi = lan_info.rssi_wifi
-
         return DucoData(
             nodes={node.node_id: node for node in nodes},
-            rssi_wifi=rssi_wifi,
+            rssi_wifi=lan_info.rssi_wifi,
         )

homeassistant/components/environment_canada/__init__.py

@@ -3,7 +3,7 @@
 from datetime import timedelta
 import logging
 
-from env_canada import ECAirQuality, ECMap, ECWeather
+from env_canada import ECAirQuality, ECRadar, ECWeather
 
 from homeassistant.const import CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE, Platform
 from homeassistant.core import HomeAssistant
@@ -43,7 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ECConfigEntry) ->
         errors = errors + 1
         _LOGGER.warning("Unable to retrieve Environment Canada weather")
 
-    radar_data = ECMap(coordinates=(lat, lon), layer="precip_type", legend=False)
+    radar_data = ECRadar(coordinates=(lat, lon))
     radar_coordinator = ECDataUpdateCoordinator(
         hass, config_entry, radar_data, "radar", DEFAULT_RADAR_UPDATE_INTERVAL
     )

homeassistant/components/environment_canada/camera.py

@@ -1,6 +1,6 @@
 """Support for the Environment Canada radar imagery."""
 
-from env_canada import ECMap
+from env_canada import ECRadar
 import voluptuous as vol
 
 from homeassistant.components.camera import Camera
@@ -11,20 +11,13 @@ from homeassistant.helpers.entity_platform import (
 )
 from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util import dt as dt_util
 
 from .const import ATTR_OBSERVATION_TIME
 from .coordinator import ECConfigEntry, ECDataUpdateCoordinator
 
 SERVICE_SET_RADAR_TYPE = "set_radar_type"
 SET_RADAR_TYPE_SCHEMA: VolDictType = {
-    vol.Required("radar_type"): vol.In(["Auto", "Rain", "Snow", "Precipitation type"]),
-}
-
-_RADAR_TYPE_TO_LAYER: dict[str, str] = {
-    "Rain": "rain",
-    "Snow": "snow",
-    "Precipitation type": "precip_type",
+    vol.Required("radar_type"): vol.In(["Auto", "Rain", "Snow"]),
 }
 
 
@@ -45,13 +38,13 @@ async def async_setup_entry(
     )
 
 
-class ECCameraEntity(CoordinatorEntity[ECDataUpdateCoordinator[ECMap]], Camera):
+class ECCameraEntity(CoordinatorEntity[ECDataUpdateCoordinator[ECRadar]], Camera):
     """Implementation of an Environment Canada radar camera."""
 
     _attr_has_entity_name = True
     _attr_translation_key = "radar"
 
-    def __init__(self, coordinator: ECDataUpdateCoordinator[ECMap]) -> None:
+    def __init__(self, coordinator: ECDataUpdateCoordinator[ECRadar]) -> None:
         """Initialize the camera."""
         super().__init__(coordinator)
         Camera.__init__(self)
@@ -83,13 +76,6 @@ class ECCameraEntity(CoordinatorEntity[ECDataUpdateCoordinator[ECMap]], Camera):
 
     async def async_set_radar_type(self, radar_type: str) -> None:
         """Set the type of radar to retrieve."""
-        if radar_type == "Auto":
-            # Choose rain for months April through October, snow otherwise
-            layer = "rain" if dt_util.now().month in range(4, 11) else "snow"
-        else:
-            layer = _RADAR_TYPE_TO_LAYER[radar_type]
-
-        # Apply new layer and clear cache to force refresh
-        self.radar_object.layer = layer
         self.radar_object.clear_cache()
-        await self.coordinator.async_request_refresh()
+        self.radar_object.precip_type = radar_type.lower()
+        await self.radar_object.update()

homeassistant/components/environment_canada/coordinator.py

@@ -5,7 +5,7 @@ from datetime import timedelta
 import logging
 import xml.etree.ElementTree as ET
 
-from env_canada import ECAirQuality, ECMap, ECWeather, ECWeatherUpdateFailed, ec_exc
+from env_canada import ECAirQuality, ECRadar, ECWeather, ECWeatherUpdateFailed, ec_exc
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -17,7 +17,7 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 type ECConfigEntry = ConfigEntry[ECRuntimeData]
-type ECDataType = ECAirQuality | ECMap | ECWeather
+type ECDataType = ECAirQuality | ECRadar | ECWeather
 
 
 @dataclass
@@ -25,7 +25,7 @@ class ECRuntimeData:
     """Class to hold EC runtime data."""
 
     aqhi_coordinator: ECDataUpdateCoordinator[ECAirQuality]
-    radar_coordinator: ECDataUpdateCoordinator[ECMap]
+    radar_coordinator: ECDataUpdateCoordinator[ECRadar]
     weather_coordinator: ECDataUpdateCoordinator[ECWeather]
 
 

homeassistant/components/environment_canada/services.yaml

@@ -12,11 +12,10 @@ set_radar_type:
   fields:
     radar_type:
       required: true
-      example: Rain
+      example: Snow
       selector:
         select:
           options:
             - "Auto"
             - "Rain"
             - "Snow"
-            - "Precipitation type"

homeassistant/components/frontend/manifest.json

@@ -21,5 +21,5 @@
   "integration_type": "system",
   "preview_features": { "winter_mode": {} },
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260527.1"]
+  "requirements": ["home-assistant-frontend==20260527.0"]
 }

homeassistant/components/google_assistant/const.py

@@ -199,7 +199,6 @@ DEVICE_CLASS_TO_GOOGLE_TYPES = {
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.RECEIVER): TYPE_RECEIVER,
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.SPEAKER): TYPE_SPEAKER,
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.TV): TYPE_TV,
-    (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.PROJECTOR): TYPE_TV,
     (sensor.DOMAIN, sensor.SensorDeviceClass.AQI): TYPE_SENSOR,
     (sensor.DOMAIN, sensor.SensorDeviceClass.HUMIDITY): TYPE_SENSOR,
     (sensor.DOMAIN, sensor.SensorDeviceClass.TEMPERATURE): TYPE_SENSOR,

homeassistant/components/google_assistant/trait.py

@@ -2728,11 +2728,7 @@ class ChannelTrait(_Trait):
         if (
             domain == media_player.DOMAIN
             and (features & MediaPlayerEntityFeature.PLAY_MEDIA)
-            and device_class
-            in (
-                media_player.MediaPlayerDeviceClass.TV,
-                media_player.MediaPlayerDeviceClass.PROJECTOR,
-            )
+            and device_class == media_player.MediaPlayerDeviceClass.TV
         ):
             return True
 

homeassistant/components/homekit/accessories.py

@@ -202,10 +202,7 @@ def get_accessory(  # noqa: C901
 
         if device_class == MediaPlayerDeviceClass.RECEIVER:
             a_type = "ReceiverMediaPlayer"
-        elif device_class in (
-            MediaPlayerDeviceClass.TV,
-            MediaPlayerDeviceClass.PROJECTOR,
-        ):
+        elif device_class == MediaPlayerDeviceClass.TV:
             a_type = "TelevisionMediaPlayer"
         elif validate_media_player_features(state, feature_list):
             a_type = "MediaPlayer"

homeassistant/components/homekit/util.py

@@ -695,11 +695,7 @@ def state_needs_accessory_mode(state: State) -> bool:
     return (
         state.domain == MEDIA_PLAYER_DOMAIN
         and state.attributes.get(ATTR_DEVICE_CLASS)
-        in (
-            MediaPlayerDeviceClass.TV,
-            MediaPlayerDeviceClass.RECEIVER,
-            MediaPlayerDeviceClass.PROJECTOR,
-        )
+        in (MediaPlayerDeviceClass.TV, MediaPlayerDeviceClass.RECEIVER)
     ) or (
         state.domain == REMOTE_DOMAIN
         and state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)

homeassistant/components/hue/v2/light.py

@@ -178,21 +178,17 @@ class HueLight(HueBaseEntity, LightEntity):
     @property
     def max_color_temp_mireds(self) -> int:
         """Return the warmest color_temp in mireds that this light supports."""
-        if (color_temp := self.resource.color_temperature) and (
-            mirek_max := color_temp.mirek_schema.mirek_maximum
-        ):
-            return mirek_max
-        # return a fallback value if the light doesn't provide valid limits
+        if color_temp := self.resource.color_temperature:
+            return color_temp.mirek_schema.mirek_maximum
+        # return a fallback value if the light doesn't provide limits
         return FALLBACK_MAX_MIREDS
 
     @property
     def min_color_temp_mireds(self) -> int:
         """Return the coldest color_temp in mireds that this light supports."""
-        if (color_temp := self.resource.color_temperature) and (
-            mirek_min := color_temp.mirek_schema.mirek_minimum
-        ):
-            return mirek_min
-        # return a fallback value if the light doesn't provide valid limits
+        if color_temp := self.resource.color_temperature:
+            return color_temp.mirek_schema.mirek_minimum
+        # return a fallback value if the light doesn't provide limits
         return FALLBACK_MIN_MIREDS
 
     @property

homeassistant/components/iometer/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["iometer==1.0.1"],
+  "requirements": ["iometer==0.4.0"],
   "zeroconf": ["_iometer._tcp.local."]
 }

homeassistant/components/izone/climate.py

@@ -94,7 +94,7 @@ async def async_setup_entry(
         async_add_entities(device.zones.values())
 
     # create any components not yet created
-    for controller in (await disco.pi_disco.fetch_controllers()).values():
+    for controller in disco.pi_disco.controllers.values():
         init_controller(controller)
 
     # connect to register any further components

homeassistant/components/izone/config_flow.py

@@ -29,13 +29,12 @@ async def _async_has_devices(hass: HomeAssistant) -> bool:
         async with asyncio.timeout(TIMEOUT_DISCOVERY):
             await controller_ready.wait()
 
-    controllers = await disco.pi_disco.fetch_controllers()
-    if not controllers:
+    if not disco.pi_disco.controllers:
         await async_stop_discovery_service(hass)
         _LOGGER.debug("No controllers found")
         return False
 
-    _LOGGER.debug("Controllers %s", controllers)
+    _LOGGER.debug("Controllers %s", disco.pi_disco.controllers)
     return True
 
 

homeassistant/components/lg_thinq/entity.py

@@ -105,7 +105,10 @@ class ThinQEntity(CoordinatorEntity[DeviceDataUpdateCoordinator]):
         except ThinQAPIException as exc:
             if on_fail_method:
                 on_fail_method()
-            raise ServiceValidationError(exc.message) from exc
+            # pylint: disable-next=home-assistant-exception-message-with-translation
+            raise ServiceValidationError(
+                exc.message, translation_domain=DOMAIN, translation_key=exc.code
+            ) from exc
         except ValueError as exc:
             if on_fail_method:
                 on_fail_method()

homeassistant/components/matter/binary_sensor.py

@@ -556,48 +556,4 @@ DISCOVERY_SCHEMAS = [
         featuremap_contains=clusters.Thermostat.Bitmaps.Feature.kOccupancy,
         allow_multi=True,
     ),
-    # GeneralDiagnostics active fault sensors
-    MatterDiscoverySchema(
-        platform=Platform.BINARY_SENSOR,
-        entity_description=MatterBinarySensorEntityDescription(
-            key="GeneralDiagnosticsActiveHardwareFaults",
-            translation_key="active_hardware_faults",
-            device_class=BinarySensorDeviceClass.PROBLEM,
-            entity_category=EntityCategory.DIAGNOSTIC,
-            entity_registry_enabled_default=False,
-            device_to_ha=bool,
-        ),
-        entity_class=MatterBinarySensor,
-        required_attributes=(
-            clusters.GeneralDiagnostics.Attributes.ActiveHardwareFaults,
-        ),
-    ),
-    MatterDiscoverySchema(
-        platform=Platform.BINARY_SENSOR,
-        entity_description=MatterBinarySensorEntityDescription(
-            key="GeneralDiagnosticsActiveRadioFaults",
-            translation_key="active_radio_faults",
-            device_class=BinarySensorDeviceClass.PROBLEM,
-            entity_category=EntityCategory.DIAGNOSTIC,
-            entity_registry_enabled_default=False,
-            device_to_ha=bool,
-        ),
-        entity_class=MatterBinarySensor,
-        required_attributes=(clusters.GeneralDiagnostics.Attributes.ActiveRadioFaults,),
-    ),
-    MatterDiscoverySchema(
-        platform=Platform.BINARY_SENSOR,
-        entity_description=MatterBinarySensorEntityDescription(
-            key="GeneralDiagnosticsActiveNetworkFaults",
-            translation_key="active_network_faults",
-            device_class=BinarySensorDeviceClass.PROBLEM,
-            entity_category=EntityCategory.DIAGNOSTIC,
-            entity_registry_enabled_default=False,
-            device_to_ha=bool,
-        ),
-        entity_class=MatterBinarySensor,
-        required_attributes=(
-            clusters.GeneralDiagnostics.Attributes.ActiveNetworkFaults,
-        ),
-    ),
 ]

homeassistant/components/matter/ble_proxy.py

@@ -108,7 +108,5 @@ def create_matter_ble_proxy(hass: HomeAssistant, ws_url: str) -> MatterBleProxy:
         ws_url=ws_url,
         scan_source=HaBluetoothScanSource(hass),
         device_resolver=HaBluetoothDeviceResolver(hass),
-        task_factory=lambda coro: hass.async_create_background_task(
-            coro, name="matter_ble_proxy"
-        ),
+        task_factory=hass.async_create_task,
     )

homeassistant/components/matter/light.py

@@ -457,14 +457,7 @@ class MatterLight(MatterEntity, LightEntity):
             self._transitions_disabled = True
             LOGGER.warning(
                 "Detected a device that has been reported to have firmware issues "
-                "with light transitions. Transitions will be disabled for this "
-                "light: %s %s (vendor_id: %s, product_id: %s, hw: %s, sw: %s)",
-                device_info.vendorName,
-                device_info.productName,
-                device_info.vendorID,
-                device_info.productID,
-                device_info.hardwareVersionString,
-                device_info.softwareVersionString,
+                "with light transitions. Transitions will be disabled for this light"
             )
 
 

homeassistant/components/matter/sensor.py

@@ -137,17 +137,6 @@ RVC_OPERATIONAL_STATE_ERROR_MAP = {
     _rvc_err.kNavigationSensorObscured: ("navigation_sensor_obscured"),
 }
 
-BOOT_REASON_MAP = {
-    clusters.GeneralDiagnostics.Enums.BootReasonEnum.kUnspecified: "unspecified",
-    clusters.GeneralDiagnostics.Enums.BootReasonEnum.kPowerOnReboot: "power_on_reboot",
-    clusters.GeneralDiagnostics.Enums.BootReasonEnum.kBrownOutReset: "brown_out_reset",
-    clusters.GeneralDiagnostics.Enums.BootReasonEnum.kSoftwareWatchdogReset: "software_watchdog_reset",
-    clusters.GeneralDiagnostics.Enums.BootReasonEnum.kHardwareWatchdogReset: "hardware_watchdog_reset",
-    clusters.GeneralDiagnostics.Enums.BootReasonEnum.kSoftwareUpdateCompleted: "software_update_completed",
-    clusters.GeneralDiagnostics.Enums.BootReasonEnum.kSoftwareReset: "software_reset",
-    clusters.GeneralDiagnostics.Enums.BootReasonEnum.kUnknownEnumValue: None,
-}
-
 BOOST_STATE_MAP = {
     clusters.WaterHeaterManagement.Enums.BoostStateEnum.kInactive: "inactive",
     clusters.WaterHeaterManagement.Enums.BoostStateEnum.kActive: "active",
@@ -439,19 +428,6 @@ DISCOVERY_SCHEMAS = [
         ),
         allow_multi=True,  # also used for climate entity
     ),
-    MatterDiscoverySchema(
-        platform=Platform.SENSOR,
-        entity_description=MatterSensorEntityDescription(
-            key="SoilMoistureSensor",
-            native_unit_of_measurement=PERCENTAGE,
-            device_class=SensorDeviceClass.MOISTURE,
-            state_class=SensorStateClass.MEASUREMENT,
-        ),
-        entity_class=MatterSensor,
-        required_attributes=(
-            clusters.SoilMeasurement.Attributes.SoilMoistureMeasuredValue,
-        ),
-    ),
     MatterDiscoverySchema(
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
@@ -1599,46 +1575,4 @@ DISCOVERY_SCHEMAS = [
         required_attributes=(clusters.DoorLock.Attributes.DoorClosedEvents,),
         featuremap_contains=clusters.DoorLock.Bitmaps.Feature.kDoorPositionSensor,
     ),
-    # GeneralDiagnostics cluster sensors
-    MatterDiscoverySchema(
-        platform=Platform.SENSOR,
-        entity_description=MatterSensorEntityDescription(
-            key="GeneralDiagnosticsRebootCount",
-            translation_key="reboot_count",
-            entity_category=EntityCategory.DIAGNOSTIC,
-            entity_registry_enabled_default=False,
-            state_class=SensorStateClass.TOTAL_INCREASING,
-        ),
-        entity_class=MatterSensor,
-        required_attributes=(clusters.GeneralDiagnostics.Attributes.RebootCount,),
-    ),
-    MatterDiscoverySchema(
-        platform=Platform.SENSOR,
-        entity_description=MatterSensorEntityDescription(
-            key="GeneralDiagnosticsUpTime",
-            translation_key="uptime",
-            device_class=SensorDeviceClass.UPTIME,
-            entity_category=EntityCategory.DIAGNOSTIC,
-            entity_registry_enabled_default=False,
-            device_to_ha=lambda uptime: dt_util.utcnow() - timedelta(seconds=uptime),
-        ),
-        entity_class=MatterSensor,
-        required_attributes=(clusters.GeneralDiagnostics.Attributes.UpTime,),
-    ),
-    MatterDiscoverySchema(
-        platform=Platform.SENSOR,
-        entity_description=MatterSensorEntityDescription(
-            key="GeneralDiagnosticsBootReason",
-            translation_key="boot_reason",
-            device_class=SensorDeviceClass.ENUM,
-            entity_category=EntityCategory.DIAGNOSTIC,
-            entity_registry_enabled_default=False,
-            options=[
-                reason for reason in BOOT_REASON_MAP.values() if reason is not None
-            ],
-            device_to_ha=BOOT_REASON_MAP.get,
-        ),
-        entity_class=MatterSensor,
-        required_attributes=(clusters.GeneralDiagnostics.Attributes.BootReason,),
-    ),
 ]

homeassistant/components/matter/strings.json

@@ -47,15 +47,6 @@
   },
   "entity": {
     "binary_sensor": {
-      "active_hardware_faults": {
-        "name": "Hardware faults"
-      },
-      "active_network_faults": {
-        "name": "Network faults"
-      },
-      "active_radio_faults": {
-        "name": "Radio faults"
-      },
       "actuator": {
         "name": "Actuator"
       },
@@ -417,18 +408,6 @@
       "battery_voltage": {
         "name": "Battery voltage"
       },
-      "boot_reason": {
-        "name": "Boot reason",
-        "state": {
-          "brown_out_reset": "Brownout reset",
-          "hardware_watchdog_reset": "Hardware watchdog reset",
-          "power_on_reboot": "Power-on reboot",
-          "software_reset": "Software reset",
-          "software_update_completed": "Software update completed",
-          "software_watchdog_reset": "Software watchdog reset",
-          "unspecified": "Unspecified"
-        }
-      },
       "contamination_state": {
         "name": "Contamination state",
         "state": {
@@ -597,9 +576,6 @@
       "reactive_current": {
         "name": "Reactive current"
       },
-      "reboot_count": {
-        "name": "Reboot count"
-      },
       "rms_current": {
         "name": "Effective current"
       },
@@ -624,9 +600,6 @@
           "medium": "[%key:common::state::medium%]"
         }
       },
-      "uptime": {
-        "name": "Uptime"
-      },
       "valve_position": {
         "name": "Valve position"
       },

homeassistant/components/media_player/__init__.py

@@ -155,7 +155,6 @@ class MediaPlayerDeviceClass(StrEnum):
     TV = "tv"
     SPEAKER = "speaker"
     RECEIVER = "receiver"
-    PROJECTOR = "projector"
 
 
 DEVICE_CLASSES_SCHEMA = vol.All(vol.Lower, vol.Coerce(MediaPlayerDeviceClass))

homeassistant/components/media_player/icons.json

@@ -34,12 +34,6 @@
         "playing": "mdi:cast-connected"
       }
     },
-    "projector": {
-      "default": "mdi:projector",
-      "state": {
-        "off": "mdi:projector-off"
-      }
-    },
     "receiver": {
       "default": "mdi:audio-video",
       "state": {

homeassistant/components/media_player/strings.json

@@ -261,9 +261,6 @@
         }
       }
     },
-    "projector": {
-      "name": "Projector"
-    },
     "receiver": {
       "name": "Receiver"
     },

homeassistant/components/mqtt/config_flow.py

@@ -5457,6 +5457,7 @@ async def async_get_broker_settings(
         or current_client_certificate
         or current_client_key
         or current_tls_insecure
+        or current_protocol != DEFAULT_PROTOCOL
         or current_config.get(SET_CA_CERT, "off") != "off"
         or current_config.get(SET_CLIENT_CERT)
         or current_transport == TRANSPORT_WEBSOCKETS
@@ -5465,12 +5466,6 @@ async def async_get_broker_settings(
     # Build form
     fields[vol.Required(CONF_BROKER, default=current_broker)] = TEXT_SELECTOR
     fields[vol.Required(CONF_PORT, default=current_port)] = PORT_SELECTOR
-    fields[
-        vol.Optional(
-            CONF_PROTOCOL,
-            description={"suggested_value": current_protocol},
-        )
-    ] = PROTOCOL_SELECTOR
     fields[
         vol.Optional(
             CONF_USERNAME,
@@ -5561,6 +5556,12 @@ async def async_get_broker_settings(
             description={"suggested_value": current_tls_insecure},
         )
     ] = BOOLEAN_SELECTOR
+    fields[
+        vol.Optional(
+            CONF_PROTOCOL,
+            description={"suggested_value": current_protocol},
+        )
+    ] = PROTOCOL_SELECTOR
     fields[
         vol.Optional(
             CONF_TRANSPORT,

homeassistant/components/mqtt/device_tracker.py

@@ -2,17 +2,12 @@
 
 from collections.abc import Callable
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
 from homeassistant.components import device_tracker
-from homeassistant.components.device_tracker import (
-    ATTR_LOCATION_NAME,
-    SourceType,
-    TrackerEntity,
-)
-from homeassistant.components.zone import ENTITY_ID_HOME
+from homeassistant.components.device_tracker import SourceType, TrackerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_GPS_ACCURACY,
@@ -85,8 +80,6 @@ DISCOVERY_SCHEMA = vol.All(
     PLATFORM_SCHEMA_MODERN_BASE.extend({}, extra=vol.REMOVE_EXTRA), valid_config
 )
 
-MQTT_DEVICE_TRACKER_ATTRIBUTES_BLOCKED = frozenset({ATTR_LOCATION_NAME})
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -112,7 +105,6 @@ class MqttDeviceTracker(MqttEntity, TrackerEntity):
     _entity_id_format = device_tracker.ENTITY_ID_FORMAT
     _location_name: str | None = None
     _value_template: Callable[[ReceivePayloadType], ReceivePayloadType]
-    _attributes_extra_blocked = MQTT_DEVICE_TRACKER_ATTRIBUTES_BLOCKED
 
     @staticmethod
     def config_schema() -> VolSchemaType:
@@ -129,7 +121,7 @@ class MqttDeviceTracker(MqttEntity, TrackerEntity):
     @callback
     def _tracker_message_received(self, msg: ReceiveMessage) -> None:
         """Handle new MQTT messages."""
-        payload = str(self._value_template(msg.payload))
+        payload = self._value_template(msg.payload)
         if not payload.strip():  # No output from template, ignore
             _LOGGER.debug(
                 "Ignoring empty payload '%s' after rendering for topic %s",
@@ -138,45 +130,21 @@ class MqttDeviceTracker(MqttEntity, TrackerEntity):
             )
             return
         if payload == self._config[CONF_PAYLOAD_HOME]:
-            self._attr_in_zones = [ENTITY_ID_HOME]
-            self._location_name = payload
-            self._attr_latitude = None
-            self._attr_longitude = None
+            self._attr_location_name = STATE_HOME
         elif payload == self._config[CONF_PAYLOAD_NOT_HOME]:
-            self._attr_in_zones = []
-            self._location_name = payload
-            self._attr_latitude = None
-            self._attr_longitude = None
+            self._attr_location_name = STATE_NOT_HOME
         elif payload == self._config[CONF_PAYLOAD_RESET]:
-            self._attr_in_zones = None
-            self._location_name = None
-            self._attr_latitude = None
-            self._attr_longitude = None
+            self._attr_location_name = None
         else:
-            self._attr_in_zones = []
-            self._location_name = payload
-            self._attr_latitude = None
-            self._attr_longitude = None
-        if self._location_name is not None:
-            self._attr_extra_state_attributes = (
-                dict(self.extra_state_attributes)
-                if self.extra_state_attributes is not None
-                else {}
-            ) | {ATTR_LOCATION_NAME: self._location_name}
-            return
-        if (
-            extra_state_attributes := self.extra_state_attributes
-        ) is not None and ATTR_LOCATION_NAME in extra_state_attributes:
-            self._attr_extra_state_attributes = dict(extra_state_attributes)
-            self._attr_extra_state_attributes.pop(ATTR_LOCATION_NAME)
+            if TYPE_CHECKING:
+                assert isinstance(msg.payload, str)
+            self._attr_location_name = msg.payload
 
     @callback
     def _prepare_subscribe_topics(self) -> None:
         """(Re)Subscribe to topics."""
         self.add_subscription(
-            CONF_STATE_TOPIC,
-            self._tracker_message_received,
-            {"_attr_in_zones", "_attr_latitude", "_attr_longitude", "_location_name"},
+            CONF_STATE_TOPIC, self._tracker_message_received, {"_attr_location_name"}
         )
 
     async def _subscribe_topics(self) -> None:
@@ -202,8 +170,6 @@ class MqttDeviceTracker(MqttEntity, TrackerEntity):
             ):
                 self._attr_latitude = latitude
                 self._attr_longitude = longitude
-                self._attr_in_zones = None
-                self._location_name = None
             else:
                 # Invalid or incomplete coordinates, reset location
                 self._attr_latitude = None
@@ -236,9 +202,6 @@ class MqttDeviceTracker(MqttEntity, TrackerEntity):
             else:
                 self._attr_location_accuracy = 0
 
-        if self._location_name is not None:
-            extra_state_attributes[ATTR_LOCATION_NAME] = self._location_name
-
         self._attr_extra_state_attributes = {
             attribute: value
             for attribute, value in extra_state_attributes.items()

homeassistant/components/mqtt/entity.py

@@ -532,7 +532,7 @@ class MqttAttributesMixin(Entity):
                             "_attr_extra_state_attributes",
                             "_attr_gps_accuracy",
                             "_attr_latitude",
-                            "_attr_in_zones",
+                            "_attr_location_name",
                             "_attr_longitude",
                         },
                     ),

homeassistant/components/mqtt/strings.json

@@ -1140,7 +1140,7 @@
         },
         "step": {
           "confirm": {
-            "description": "Home Assistant needs to migrate to MQTT protocol version 5. The currently configured protocol version for broker {broker} is {protocol}. This protocol version is deprecated, and support for it will be removed.\n\nSubmitting this form will attempt to migrate your MQTT broker configuration to use protocol version 5 to fix this issue. If the broker cannot be reached using MQTT protocol version 5, for example because it does not support it, the migration will be aborted.",
+            "description": "Home Assistant is migrating to MQTT protocol version 5. The currently configured protocol version for broker {broker} is {protocol}. This protocol version is deprecated, and support for it will be removed.\n\nSubmitting this form will try to migrate your MQTT broker configuration to use protocol version 5 to fix this issue.",
             "title": "MQTT protocol change required"
           }
         }

homeassistant/components/mqtt/valve.py

@@ -271,7 +271,7 @@ class MqttValve(MqttEntity, ValveEntity):
                     self._range, float(position_payload)
                 )
             except ValueError:
-                _LOGGER.debug(
+                _LOGGER.warning(
                     "Ignoring non numeric payload '%s' received on topic '%s'",
                     position_payload,
                     msg.topic,
@@ -279,9 +279,9 @@ class MqttValve(MqttEntity, ValveEntity):
             else:
                 percentage_payload = min(max(percentage_payload, 0), 100)
                 self._attr_current_valve_position = percentage_payload
-                # Reset opening/closing when a position update is received
-                # without an explicit opening/closing transitional state.
-                state = state or RESET_CLOSING_OPENING
+                # Reset closing and opening if the valve is fully opened or fully closed
+                if state is None and percentage_payload in (0, 100):
+                    state = RESET_CLOSING_OPENING
                 position_set = True
         if state_payload and state is None and not position_set:
             _LOGGER.warning(
@@ -291,6 +291,8 @@ class MqttValve(MqttEntity, ValveEntity):
                 state_payload,
             )
             return
+        if state is None:
+            return
         self._update_state(state)
 
     @callback

homeassistant/components/omie/sensor.py

@@ -52,11 +52,6 @@ class OMIEPriceSensor(CoordinatorEntity[OMIECoordinator], SensorEntity):
         self._attr_unique_id = pyomie_series_name
         self._pyomie_series_name = pyomie_series_name
 
-    async def async_added_to_hass(self) -> None:
-        """Call when entity is added to hass."""
-        await super().async_added_to_hass()
-        self._handle_coordinator_update()
-
     @callback
     def _handle_coordinator_update(self) -> None:
         """Update this sensor's state from the coordinator results."""

homeassistant/components/onvif/manifest.json

@@ -14,7 +14,7 @@
   "iot_class": "local_push",
   "loggers": ["onvif", "wsdiscovery", "zeep"],
   "requirements": [
-    "onvif-zeep-async==4.1.1",
+    "onvif-zeep-async==4.1.0",
     "onvif_parsers==2.3.0",
     "WSDiscovery==2.1.2"
   ]

homeassistant/components/overkiz/climate/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py

@@ -57,7 +57,6 @@ OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.STANDBY: HVACMode.OFF,  # main command
     OverkizCommandParam.AUTO: HVACMode.AUTO,
     OverkizCommandParam.EXTERNAL: HVACMode.AUTO,
-    OverkizCommandParam.PROG: HVACMode.AUTO,
     OverkizCommandParam.INTERNAL: HVACMode.AUTO,  # main command
 }
 

homeassistant/components/ovhcloud_ai_endpoints/__init__.py

@@ -1,12 +1,6 @@
 """The OVHcloud AI Endpoints integration."""
 
-from openai import (
-    AsyncOpenAI,
-    AuthenticationError,
-    BadRequestError,
-    OpenAIError,
-    PermissionDeniedError,
-)
+from openai import AsyncOpenAI, AuthenticationError, BadRequestError, OpenAIError
 from openai.types.chat import ChatCompletionUserMessageParam
 
 from homeassistant.config_entries import ConfigEntry
@@ -58,7 +52,7 @@ async def async_setup_entry(
 
     try:
         await _validate_api_key(client)
-    except (AuthenticationError, PermissionDeniedError) as err:
+    except AuthenticationError as err:
         raise ConfigEntryAuthFailed(err) from err
     except OpenAIError as err:
         raise ConfigEntryNotReady(err) from err

homeassistant/components/ovhcloud_ai_endpoints/config_flow.py

@@ -1,10 +1,9 @@
 """Config flow for the OVHcloud AI Endpoints integration."""
 
-from collections.abc import Mapping
 import logging
 from typing import Any
 
-from openai import AsyncOpenAI, AuthenticationError, OpenAIError, PermissionDeniedError
+from openai import AsyncOpenAI, AuthenticationError, OpenAIError
 import voluptuous as vol
 
 from homeassistant.config_entries import (
@@ -31,8 +30,6 @@ from .const import CONF_PROMPT, DOMAIN, RECOMMENDED_CONVERSATION_OPTIONS
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_REAUTH_DATA_SCHEMA = vol.Schema({vol.Required(CONF_API_KEY): str})
-
 
 class OVHcloudAIEndpointsConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for OVHcloud AI Endpoints."""
@@ -58,7 +55,7 @@ class OVHcloudAIEndpointsConfigFlow(ConfigFlow, domain=DOMAIN):
             client = _create_client(self.hass, user_input[CONF_API_KEY])
             try:
                 await _validate_api_key(client)
-            except AuthenticationError, PermissionDeniedError:
+            except AuthenticationError:
                 errors["base"] = "invalid_auth"
             except OpenAIError:
                 errors["base"] = "cannot_connect"
@@ -80,39 +77,6 @@ class OVHcloudAIEndpointsConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Perform reauth upon an API authentication error."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm reauthentication dialog."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            client = _create_client(self.hass, user_input[CONF_API_KEY])
-            try:
-                await _validate_api_key(client)
-            except AuthenticationError, PermissionDeniedError:
-                errors["base"] = "invalid_auth"
-            except OpenAIError:
-                errors["base"] = "cannot_connect"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                return self.async_update_reload_and_abort(
-                    self._get_reauth_entry(),
-                    data_updates=user_input,
-                )
-        return self.async_show_form(
-            step_id="reauth_confirm",
-            data_schema=STEP_REAUTH_DATA_SCHEMA,
-            errors=errors,
-        )
-
 
 class ConversationFlowHandler(ConfigSubentryFlow):
     """Handle conversation subentry flow."""

homeassistant/components/ovhcloud_ai_endpoints/conversation.py

@@ -12,8 +12,6 @@ from . import OVHcloudAIEndpointsConfigEntry
 from .const import DOMAIN
 from .entity import OVHcloudAIEndpointsEntity
 
-PARALLEL_UPDATES = 0
-
 
 async def async_setup_entry(
     hass: HomeAssistant,

homeassistant/components/ovhcloud_ai_endpoints/diagnostics.py

@@ -1,46 +0,0 @@
-"""Diagnostics support for OVHcloud AI Endpoints."""
-
-from typing import TYPE_CHECKING, Any
-
-from openai import __title__, __version__
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_API_KEY, CONF_PROMPT
-from homeassistant.helpers import entity_registry as er
-
-if TYPE_CHECKING:
-    from homeassistant.core import HomeAssistant
-
-    from . import OVHcloudAIEndpointsConfigEntry
-
-
-TO_REDACT = {CONF_API_KEY, CONF_PROMPT}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: OVHcloudAIEndpointsConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    return {
-        "client": f"{__title__}=={__version__}",
-        "title": entry.title,
-        "entry_id": entry.entry_id,
-        "entry_version": f"{entry.version}.{entry.minor_version}",
-        "state": entry.state.value,
-        "data": async_redact_data(entry.data, TO_REDACT),
-        "options": async_redact_data(entry.options, TO_REDACT),
-        "subentries": {
-            subentry.subentry_id: {
-                "title": subentry.title,
-                "subentry_type": subentry.subentry_type,
-                "data": async_redact_data(subentry.data, TO_REDACT),
-            }
-            for subentry in entry.subentries.values()
-        },
-        "entities": {
-            entity_entry.entity_id: entity_entry.extended_dict
-            for entity_entry in er.async_entries_for_config_entry(
-                er.async_get(hass), entry.entry_id
-            )
-        },
-    }

homeassistant/components/ovhcloud_ai_endpoints/manifest.json

@@ -8,6 +8,6 @@
   "documentation": "https://www.home-assistant.io/integrations/ovhcloud_ai_endpoints",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "quality_scale": "silver",
+  "quality_scale": "bronze",
   "requirements": ["openai==2.21.0"]
 }

homeassistant/components/ovhcloud_ai_endpoints/quality_scale.yaml

@@ -30,9 +30,7 @@ rules:
   unique-config-entry: done
 
   # Silver
-  action-exceptions:
-    status: exempt
-    comment: This integration does not register custom actions.
+  action-exceptions: done
   config-entry-unloading: done
   docs-configuration-parameters:
     status: exempt
@@ -45,13 +43,13 @@ rules:
   log-when-unavailable:
     status: exempt
     comment: the integration only integrates stateless entities
-  parallel-updates: done
-  reauthentication-flow: done
+  parallel-updates: todo
+  reauthentication-flow: todo
   test-coverage: done
 
   # Gold
   devices: done
-  diagnostics: done
+  diagnostics: todo
   discovery-update-info:
     status: exempt
     comment: Service can't be discovered

homeassistant/components/ovhcloud_ai_endpoints/strings.json

@@ -1,8 +1,7 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -10,15 +9,6 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
-      "reauth_confirm": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]"
-        },
-        "data_description": {
-          "api_key": "[%key:component::ovhcloud_ai_endpoints::config::step::user::data_description::api_key%]"
-        },
-        "description": "The OVHcloud AI Endpoints API key is no longer valid. Please enter a new one."
-      },
       "user": {
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"

homeassistant/components/portainer/services.py

@@ -73,26 +73,20 @@ async def _get_endpoint_id(
     device_reg = dr.async_get(call.hass)
     device_id = call.data[ATTR_DEVICE_ID]
     device = device_reg.async_get(device_id)
-
-    if device is None:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_target",
-        )
-
+    assert device
     coordinator = config_entry.runtime_data
 
+    endpoint_data = None
     for data in coordinator.data.values():
         if (
             DOMAIN,
             f"{config_entry.entry_id}_{data.endpoint.id}",
         ) in device.identifiers:
-            return data.endpoint.id
+            endpoint_data = data
+            break
 
-    raise ServiceValidationError(
-        translation_domain=DOMAIN,
-        translation_key="invalid_target",
-    )
+    assert endpoint_data
+    return endpoint_data.endpoint.id
 
 
 async def _get_container_and_endpoint_ids(
@@ -101,7 +95,6 @@ async def _get_container_and_endpoint_ids(
     """Get config entry, endpoint ID and container ID from the container device ID."""
     device_reg = dr.async_get(call.hass)
     device = device_reg.async_get(call.data[ATTR_CONTAINER_DEVICE_ID])
-
     if device is None:
         raise ServiceValidationError(
             translation_domain=DOMAIN,

homeassistant/components/roomba/entity.py

@@ -29,11 +29,7 @@ class IRobotEntity(Entity):
             model=self.vacuum_state.get("sku"),
             name=str(self.vacuum_state.get("name")),
             sw_version=self.vacuum_state.get("softwareVer"),
-            hw_version=(
-                str(hw_rev)
-                if (hw_rev := self.vacuum_state.get("hardwareRev")) is not None
-                else None
-            ),
+            hw_version=self.vacuum_state.get("hardwareRev"),
         )
 
         if mac_address := self.vacuum_state.get("hwPartsRev", {}).get(

homeassistant/components/samsung_infrared/__init__.py

@@ -4,7 +4,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-PLATFORMS = [Platform.BUTTON, Platform.MEDIA_PLAYER]
+PLATFORMS = [Platform.MEDIA_PLAYER]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:

homeassistant/components/samsung_infrared/button.py

@@ -1,176 +0,0 @@
-"""Button platform for Samsung IR integration."""
-
-from dataclasses import dataclass
-
-from infrared_protocols.codes.samsung.tv import SamsungTVCode
-
-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.components.infrared import InfraredEmitterConsumerEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import CONF_DEVICE_TYPE, CONF_INFRARED_EMITTER_ENTITY_ID, SamsungDeviceType
-from .entity import SamsungIrEntity
-
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class SamsungIrButtonEntityDescription(ButtonEntityDescription):
-    """Describes Samsung IR button entity."""
-
-    command_code: SamsungTVCode
-
-
-TV_BUTTON_DESCRIPTIONS: tuple[SamsungIrButtonEntityDescription, ...] = (
-    SamsungIrButtonEntityDescription(
-        key="power", translation_key="power", command_code=SamsungTVCode.POWER
-    ),
-    SamsungIrButtonEntityDescription(
-        key="source", translation_key="source", command_code=SamsungTVCode.SOURCE
-    ),
-    SamsungIrButtonEntityDescription(
-        key="settings", translation_key="settings", command_code=SamsungTVCode.SETTINGS
-    ),
-    SamsungIrButtonEntityDescription(
-        key="info", translation_key="info", command_code=SamsungTVCode.INFO
-    ),
-    SamsungIrButtonEntityDescription(
-        key="exit", translation_key="exit", command_code=SamsungTVCode.EXIT
-    ),
-    SamsungIrButtonEntityDescription(
-        key="return", translation_key="return", command_code=SamsungTVCode.RETURN
-    ),
-    SamsungIrButtonEntityDescription(
-        key="home", translation_key="home", command_code=SamsungTVCode.HOME
-    ),
-    SamsungIrButtonEntityDescription(
-        key="red", translation_key="red", command_code=SamsungTVCode.RED
-    ),
-    SamsungIrButtonEntityDescription(
-        key="green", translation_key="green", command_code=SamsungTVCode.GREEN
-    ),
-    SamsungIrButtonEntityDescription(
-        key="yellow", translation_key="yellow", command_code=SamsungTVCode.YELLOW
-    ),
-    SamsungIrButtonEntityDescription(
-        key="blue", translation_key="blue", command_code=SamsungTVCode.BLUE
-    ),
-    SamsungIrButtonEntityDescription(
-        key="up", translation_key="up", command_code=SamsungTVCode.NAV_UP
-    ),
-    SamsungIrButtonEntityDescription(
-        key="down", translation_key="down", command_code=SamsungTVCode.NAV_DOWN
-    ),
-    SamsungIrButtonEntityDescription(
-        key="left", translation_key="left", command_code=SamsungTVCode.NAV_LEFT
-    ),
-    SamsungIrButtonEntityDescription(
-        key="right", translation_key="right", command_code=SamsungTVCode.NAV_RIGHT
-    ),
-    SamsungIrButtonEntityDescription(
-        key="ok", translation_key="ok", command_code=SamsungTVCode.OK
-    ),
-    SamsungIrButtonEntityDescription(
-        key="previous_channel",
-        translation_key="previous_channel",
-        command_code=SamsungTVCode.PREVIOUS_CHANNEL,
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_0", translation_key="num_0", command_code=SamsungTVCode.NUM_0
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_1", translation_key="num_1", command_code=SamsungTVCode.NUM_1
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_2", translation_key="num_2", command_code=SamsungTVCode.NUM_2
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_3", translation_key="num_3", command_code=SamsungTVCode.NUM_3
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_4", translation_key="num_4", command_code=SamsungTVCode.NUM_4
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_5", translation_key="num_5", command_code=SamsungTVCode.NUM_5
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_6", translation_key="num_6", command_code=SamsungTVCode.NUM_6
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_7", translation_key="num_7", command_code=SamsungTVCode.NUM_7
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_8", translation_key="num_8", command_code=SamsungTVCode.NUM_8
-    ),
-    SamsungIrButtonEntityDescription(
-        key="num_9", translation_key="num_9", command_code=SamsungTVCode.NUM_9
-    ),
-    SamsungIrButtonEntityDescription(
-        key="fast_forward",
-        translation_key="fast_forward",
-        command_code=SamsungTVCode.FAST_FORWARD,
-    ),
-    SamsungIrButtonEntityDescription(
-        key="rewind", translation_key="rewind", command_code=SamsungTVCode.REWIND
-    ),
-    SamsungIrButtonEntityDescription(
-        key="record", translation_key="record", command_code=SamsungTVCode.RECORD
-    ),
-    SamsungIrButtonEntityDescription(
-        key="tools", translation_key="tools", command_code=SamsungTVCode.TOOLS
-    ),
-    SamsungIrButtonEntityDescription(
-        key="browser", translation_key="browser", command_code=SamsungTVCode.BROWSER
-    ),
-    SamsungIrButtonEntityDescription(
-        key="ad_subtitle",
-        translation_key="ad_subtitle",
-        command_code=SamsungTVCode.AD_SUBTITLE,
-    ),
-    SamsungIrButtonEntityDescription(
-        key="e_manual",
-        translation_key="e_manual",
-        command_code=SamsungTVCode.E_MANUAL,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Samsung IR buttons from config entry."""
-    infrared_emitter_entity_id = entry.data[CONF_INFRARED_EMITTER_ENTITY_ID]
-    device_type = entry.data[CONF_DEVICE_TYPE]
-    if device_type != SamsungDeviceType.TV:
-        return
-    async_add_entities(
-        [
-            SamsungIrButton(entry, infrared_emitter_entity_id, description)
-            for description in TV_BUTTON_DESCRIPTIONS
-        ]
-    )
-
-
-class SamsungIrButton(SamsungIrEntity, InfraredEmitterConsumerEntity, ButtonEntity):
-    """Samsung IR button entity."""
-
-    entity_description: SamsungIrButtonEntityDescription
-
-    def __init__(
-        self,
-        entry: ConfigEntry,
-        infrared_emitter_entity_id: str,
-        description: SamsungIrButtonEntityDescription,
-    ) -> None:
-        """Initialize Samsung IR button."""
-        super().__init__(entry, unique_id_suffix=description.key)
-        self._infrared_emitter_entity_id = infrared_emitter_entity_id
-        self.entity_description = description
-
-    async def async_press(self) -> None:
-        """Press the button."""
-        await self._send_command(self.entity_description.command_code.to_command())

homeassistant/components/samsung_infrared/strings.json

@@ -19,112 +19,6 @@
       }
     }
   },
-  "entity": {
-    "button": {
-      "ad_subtitle": {
-        "name": "AD/Subtitle"
-      },
-      "blue": {
-        "name": "Blue"
-      },
-      "browser": {
-        "name": "Browser"
-      },
-      "down": {
-        "name": "[%key:common::entity::button::down::name%]"
-      },
-      "e_manual": {
-        "name": "E-Manual"
-      },
-      "exit": {
-        "name": "[%key:common::entity::button::exit::name%]"
-      },
-      "fast_forward": {
-        "name": "Fast forward"
-      },
-      "green": {
-        "name": "Green"
-      },
-      "home": {
-        "name": "[%key:common::entity::button::home::name%]"
-      },
-      "info": {
-        "name": "[%key:common::entity::button::info::name%]"
-      },
-      "left": {
-        "name": "[%key:common::entity::button::left::name%]"
-      },
-      "num_0": {
-        "name": "[%key:common::entity::button::num_0::name%]"
-      },
-      "num_1": {
-        "name": "[%key:common::entity::button::num_1::name%]"
-      },
-      "num_2": {
-        "name": "[%key:common::entity::button::num_2::name%]"
-      },
-      "num_3": {
-        "name": "[%key:common::entity::button::num_3::name%]"
-      },
-      "num_4": {
-        "name": "[%key:common::entity::button::num_4::name%]"
-      },
-      "num_5": {
-        "name": "[%key:common::entity::button::num_5::name%]"
-      },
-      "num_6": {
-        "name": "[%key:common::entity::button::num_6::name%]"
-      },
-      "num_7": {
-        "name": "[%key:common::entity::button::num_7::name%]"
-      },
-      "num_8": {
-        "name": "[%key:common::entity::button::num_8::name%]"
-      },
-      "num_9": {
-        "name": "[%key:common::entity::button::num_9::name%]"
-      },
-      "ok": {
-        "name": "[%key:common::entity::button::ok::name%]"
-      },
-      "power": {
-        "name": "[%key:common::entity::button::power::name%]"
-      },
-      "previous_channel": {
-        "name": "Previous channel"
-      },
-      "record": {
-        "name": "Record"
-      },
-      "red": {
-        "name": "Red"
-      },
-      "return": {
-        "name": "Return"
-      },
-      "rewind": {
-        "name": "Rewind"
-      },
-      "right": {
-        "name": "[%key:common::entity::button::right::name%]"
-      },
-      "settings": {
-        "name": "Settings"
-      },
-      "source": {
-        "name": "Source"
-      },
-      "tools": {
-        "name": "Tools"
-      },
-      "up": {
-        "name": "[%key:common::entity::button::up::name%]"
-      },
-      "yellow": {
-        "name": "Yellow"
-      }
-    }
-  },
   "selector": {
     "device_type": {
       "options": {

homeassistant/components/samsungtv/manifest.json

@@ -38,7 +38,7 @@
   "requirements": [
     "getmac==0.9.5",
     "samsungctl[websocket]==0.7.1",
-    "samsungtvws[async,encrypted]==3.0.5",
+    "samsungtvws[async,encrypted]==2.7.2",
     "wakeonlan==3.3.0",
     "async-upnp-client==0.46.2"
   ],

homeassistant/components/sense/__init__.py

@@ -6,7 +6,6 @@ import logging
 
 from sense_energy import (
     ASyncSenseable,
-    SenseAPIException,
     SenseAuthenticationException,
     SenseMFARequiredException,
 )
@@ -89,10 +88,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: SenseConfigEntry) -> boo
         ) from err
     except SENSE_WEBSOCKET_EXCEPTIONS as err:
         raise ConfigEntryNotReady(str(err) or "Error during realtime update") from err
-    except SenseAPIException as err:
-        raise ConfigEntryNotReady(
-            str(err) or "API error retrieving realtime data"
-        ) from err
 
     trends_coordinator = SenseTrendCoordinator(hass, entry, gateway)
     realtime_coordinator = SenseRealtimeCoordinator(hass, entry, gateway)

homeassistant/components/sense/coordinator.py

@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING
 
 from sense_energy import (
     ASyncSenseable,
-    SenseAPIException,
     SenseAuthenticationException,
     SenseMFARequiredException,
 )
@@ -94,8 +93,6 @@ class SenseRealtimeCoordinator(SenseCoordinator):
         try:
             await self._gateway.update_realtime()
         except SENSE_TIMEOUT_EXCEPTIONS as ex:
-            raise UpdateFailed(f"Timeout retrieving realtime data: {ex}") from ex
+            _LOGGER.error("Timeout retrieving data: %s", ex)
         except SENSE_WEBSOCKET_EXCEPTIONS as ex:
-            raise UpdateFailed(f"Failed to update realtime data: {ex}") from ex
-        except SenseAPIException as ex:
-            raise UpdateFailed(f"API error retrieving realtime data: {ex}") from ex
+            _LOGGER.error("Failed to update data: %s", ex)

homeassistant/components/shelly/repairs.py

@@ -132,9 +132,6 @@ def async_manage_outbound_websocket_incorrectly_enabled_issue(
 
     device = entry.runtime_data.rpc.device
 
-    if not device.initialized:
-        return
-
     if (
         (ws_config := device.config.get("ws"))
         and ws_config["enable"]
@@ -172,9 +169,6 @@ def async_manage_open_wifi_ap_issue(
 
     device = entry.runtime_data.rpc.device
 
-    if not device.initialized:
-        return
-
     # Check if WiFi AP is enabled and is open (no password)
     if (
         (wifi_config := device.config.get("wifi"))

homeassistant/components/smartthings/light.py

@@ -72,10 +72,8 @@ async def async_setup_entry(
         for device in entry_data.devices.values()
         for component in device.status
         if (
-            Capability.SWITCH in device.status[component]
-            and any(
-                capability in device.status[component] for capability in CAPABILITIES
-            )
+            Capability.SWITCH in device.status[MAIN]
+            and any(capability in device.status[MAIN] for capability in CAPABILITIES)
             and Capability.SAMSUNG_CE_LAMP not in device.status[component]
         )
     ]

homeassistant/components/smartthings/media_player.py

@@ -50,7 +50,6 @@ DEVICE_CLASS_MAP: dict[Category | str, MediaPlayerDeviceClass] = {
     Category.SPEAKER: MediaPlayerDeviceClass.SPEAKER,
     Category.TELEVISION: MediaPlayerDeviceClass.TV,
     Category.RECEIVER: MediaPlayerDeviceClass.RECEIVER,
-    Category.PROJECTOR: MediaPlayerDeviceClass.PROJECTOR,
 }
 
 VALUE_TO_STATE = {

homeassistant/components/tado/config_flow.py

@@ -40,8 +40,6 @@ class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
     login_task: asyncio.Task | None = None
     refresh_token: str | None = None
     tado: Tado | None = None
-    tado_device_url: str = ""
-    user_code: str = ""
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
@@ -71,8 +69,8 @@ class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
                 _LOGGER.exception("Error while initiating Tado")
                 return self.async_abort(reason="cannot_connect")
             assert self.tado is not None
-            self.tado_device_url = self.tado.device_verification_url()
-            self.user_code = URL(self.tado_device_url).query["user_code"]
+            tado_device_url = self.tado.device_verification_url()
+            user_code = URL(tado_device_url).query["user_code"]
 
         async def _wait_for_login() -> None:
             """Wait for the user to login."""
@@ -121,8 +119,8 @@ class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
             step_id="user",
             progress_action="wait_for_device",
             description_placeholders={
-                "url": self.tado_device_url,
-                "code": self.user_code,
+                "url": tado_device_url,
+                "code": user_code,
             },
             progress_task=self.login_task,
         )

homeassistant/components/tesla_fleet/device_tracker.py

@@ -2,6 +2,7 @@
 
 from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import STATE_HOME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -82,3 +83,11 @@ class TeslaFleetDeviceTrackerRouteEntity(TeslaFleetDeviceTrackerEntity):
             self.get("drive_state_active_route_longitude", False) is None
             or self.get("drive_state_active_route_latitude", False) is None
         )
+
+    @property
+    def location_name(self) -> str | None:
+        """Return a location name for the current location of the device."""
+        location = self.get("drive_state_active_route_destination")
+        if location == "Home":
+            return STATE_HOME
+        return location

homeassistant/components/tesla_fleet/sensor.py

@@ -280,10 +280,6 @@ VEHICLE_DESCRIPTIONS: tuple[TeslaFleetSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfLength.MILES,
         device_class=SensorDeviceClass.DISTANCE,
     ),
-    TeslaFleetSensorEntityDescription(
-        key="drive_state_active_route_destination",
-        entity_registry_enabled_default=False,
-    ),
 )
 
 

homeassistant/components/teslemetry/device_tracker.py

@@ -11,6 +11,7 @@ from homeassistant.components.device_tracker import (
     TrackerEntity,
     TrackerEntityDescription,
 )
+from homeassistant.const import STATE_HOME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -30,6 +31,12 @@ class TeslemetryDeviceTrackerEntityDescription(TrackerEntityDescription):
         [TeslemetryStreamVehicle, Callable[[TeslaLocation | None], None]],
         Callable[[], None],
     ]
+    name_listener: (
+        Callable[
+            [TeslemetryStreamVehicle, Callable[[str | None], None]], Callable[[], None]
+        ]
+        | None
+    ) = None
     streaming_firmware: str
     polling_prefix: str | None = None
 
@@ -47,6 +54,9 @@ DESCRIPTIONS: tuple[TeslemetryDeviceTrackerEntityDescription, ...] = (
         value_listener=lambda vehicle, callback: vehicle.listen_DestinationLocation(
             callback
         ),
+        name_listener=lambda vehicle, callback: vehicle.listen_DestinationName(
+            callback
+        ),
         streaming_firmware="2024.26",
     ),
     TeslemetryDeviceTrackerEntityDescription(
@@ -116,6 +126,11 @@ class TeslemetryVehiclePollingDeviceTrackerEntity(
         self._attr_longitude = self.get(
             f"{self.entity_description.polling_prefix}_longitude"
         )
+        self._attr_location_name = self.get(
+            f"{self.entity_description.polling_prefix}_destination"
+        )
+        if self._attr_location_name == "Home":
+            self._attr_location_name = STATE_HOME
         self._attr_available = (
             self._attr_latitude is not None and self._attr_longitude is not None
         )
@@ -143,14 +158,28 @@ class TeslemetryStreamingDeviceTrackerEntity(
         if (state := await self.async_get_last_state()) is not None:
             self._attr_latitude = state.attributes.get("latitude")
             self._attr_longitude = state.attributes.get("longitude")
+            self._attr_location_name = state.attributes.get("location_name")
         self.async_on_remove(
             self.entity_description.value_listener(
                 self.vehicle.stream_vehicle, self._location_callback
             )
         )
+        if self.entity_description.name_listener:
+            self.async_on_remove(
+                self.entity_description.name_listener(
+                    self.vehicle.stream_vehicle, self._name_callback
+                )
+            )
 
     def _location_callback(self, location: TeslaLocation | None) -> None:
         """Update the value of the entity."""
         self._attr_latitude = None if location is None else location.latitude
         self._attr_longitude = None if location is None else location.longitude
         self.async_write_ha_state()
+
+    def _name_callback(self, name: str | None) -> None:
+        """Update the value of the entity."""
+        self._attr_location_name = name
+        if self._attr_location_name == "Home":
+            self._attr_location_name = STATE_HOME
+        self.async_write_ha_state()

homeassistant/components/teslemetry/sensor.py

@@ -510,14 +510,6 @@ VEHICLE_DESCRIPTIONS: tuple[TeslemetryVehicleSensorEntityDescription, ...] = (
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    TeslemetryVehicleSensorEntityDescription(
-        key="drive_state_active_route_destination",
-        polling=True,
-        streaming_listener=lambda vehicle, callback: vehicle.listen_DestinationName(
-            callback
-        ),
-        entity_registry_enabled_default=False,
-    ),
     TeslemetryVehicleSensorEntityDescription(
         key="drive_state_active_route_traffic_minutes_delay",
         polling=True,

homeassistant/components/wiim/manifest.json

@@ -8,6 +8,6 @@
   "iot_class": "local_push",
   "loggers": ["wiim.sdk", "async_upnp_client"],
   "quality_scale": "bronze",
-  "requirements": ["wiim==0.1.4"],
+  "requirements": ["wiim==0.1.2"],
   "zeroconf": ["_linkplay._tcp.local."]
 }

homeassistant/components/wiim/media_player.py

@@ -349,12 +349,15 @@ class WiimMediaPlayerEntity(WiimBaseEntity, MediaPlayerEntity):
                     sdk_status_str,
                 )
             else:
+                self._device.playing_status = sdk_status
                 if sdk_status == SDKPlayingStatus.STOPPED:
                     LOGGER.debug(
                         "Device %s: TransportState is STOPPED."
                         " Resetting media position and metadata",
                         self.entity_id,
                     )
+                    self._device.current_position = 0
+                    self._device.current_track_duration = 0
                     self._attr_media_position_updated_at = None
                     self._attr_media_duration = None
                     self._attr_media_position = None

homeassistant/components/wyoming/assist_satellite.py

@@ -468,7 +468,7 @@ class WyomingAssistSatellite(WyomingSatelliteEntity, AssistSatelliteEntity):
 
     async def on_restart(self) -> None:
         """Block until pipeline loop will be restarted."""
-        _LOGGER.debug(
+        _LOGGER.warning(
             "Satellite has been disconnected. Reconnecting in %s second(s)",
             _RECONNECT_SECONDS,
         )

homeassistant/components/yale/manifest.json

@@ -14,5 +14,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["socketio", "engineio", "yalexs"],
-  "requirements": ["yalexs==9.2.1", "yalexs-ble==3.3.0"]
+  "requirements": ["yalexs==9.2.0", "yalexs-ble==3.3.0"]
 }

homeassistant/components/yamaha_musiccast/entity.py

@@ -63,7 +63,7 @@ class MusicCastDeviceEntity(MusicCastEntity):
             },
             manufacturer=BRAND,
             model=self.coordinator.data.model_name,
-            sw_version=str(self.coordinator.data.system_version),
+            sw_version=self.coordinator.data.system_version,
         )
 
         if self._zone_id == DEFAULT_ZONE:

homeassistant/components/zha/alarm_control_panel.py

@@ -80,31 +80,31 @@ class ZHAAlarmControlPanel(ZHAEntity, AlarmControlPanelEntity):
         """Whether the code is required for arm actions."""
         return self.entity_data.entity.code_arm_required
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
         await self.entity_data.entity.async_alarm_disarm(code)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
         await self.entity_data.entity.async_alarm_arm_home(code)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
         await self.entity_data.entity.async_alarm_arm_away(code)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
         await self.entity_data.entity.async_alarm_arm_night(code)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_alarm_trigger(self, code: str | None = None) -> None:
         """Send alarm trigger command."""
         await self.entity_data.entity.async_alarm_trigger(code)

homeassistant/components/zha/button.py

@@ -52,7 +52,7 @@ class ZHAButton(ZHAEntity, ButtonEntity):
                 self.entity_data.entity.info_object.device_class
             )
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_press(self) -> None:
         """Send out a update command."""
         await self.entity_data.entity.async_press()

homeassistant/components/zha/climate.py

@@ -203,25 +203,25 @@ class Thermostat(ZHAEntity, ClimateEntity):
         )
         super()._handle_entity_events(event)
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set fan mode."""
         await self.entity_data.entity.async_set_fan_mode(fan_mode=fan_mode)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target operation mode."""
         await self.entity_data.entity.async_set_hvac_mode(hvac_mode=hvac_mode)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set new preset mode."""
         await self.entity_data.entity.async_set_preset_mode(preset_mode=preset_mode)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         await self.entity_data.entity.async_set_temperature(

homeassistant/components/zha/const.py

@@ -75,7 +75,3 @@ MFG_CLUSTER_ID_START = 0xFC00
 
 ZHA_ALARM_OPTIONS = "zha_alarm_options"
 ZHA_OPTIONS = "zha_options"
-
-# Dispatcher signal carrying device reconfigure progress events (bind result,
-# attribute reporting result, configure complete) to the websocket subscriber.
-SIGNAL_DEVICE_RECONFIGURE_EVENT = "zha_device_reconfigure_event"

homeassistant/components/zha/cover.py

@@ -122,31 +122,31 @@ class ZhaCover(ZHAEntity, CoverEntity):
         """Return the current tilt position of the cover."""
         return self.entity_data.entity.current_cover_tilt_position
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
         await self.entity_data.entity.async_open_cover()
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_open_cover_tilt(self, **kwargs: Any) -> None:
         """Open the cover tilt."""
         await self.entity_data.entity.async_open_cover_tilt()
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close the cover."""
         await self.entity_data.entity.async_close_cover()
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_close_cover_tilt(self, **kwargs: Any) -> None:
         """Close the cover tilt."""
         await self.entity_data.entity.async_close_cover_tilt()
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
         await self.entity_data.entity.async_set_cover_position(
@@ -154,7 +154,7 @@ class ZhaCover(ZHAEntity, CoverEntity):
         )
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
         """Move the cover tilt to a specific position."""
         await self.entity_data.entity.async_set_cover_tilt_position(
@@ -162,13 +162,13 @@ class ZhaCover(ZHAEntity, CoverEntity):
         )
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
         await self.entity_data.entity.async_stop_cover()
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_stop_cover_tilt(self, **kwargs: Any) -> None:
         """Stop the cover tilt."""
         await self.entity_data.entity.async_stop_cover_tilt()

homeassistant/components/zha/device_action.py

@@ -3,26 +3,36 @@
 from typing import Any
 
 import voluptuous as vol
-from zhaquirks.inovelli.types import AllLEDEffectType, SingleLEDEffectType
-from zigpy.zcl.clusters.security import IasWd
+from zha.exceptions import ZHAException
+from zha.zigbee.cluster_handlers.const import (
+    CLUSTER_HANDLER_IAS_WD,
+    CLUSTER_HANDLER_INOVELLI,
+)
+from zha.zigbee.cluster_handlers.manufacturerspecific import (
+    AllLEDEffectType,
+    SingleLEDEffectType,
+)
 
 from homeassistant.components.device_automation import InvalidDeviceAutomationConfig
 from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN, CONF_TYPE
 from homeassistant.core import Context, HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
 from .const import DOMAIN
-from .helpers import async_get_zha_device_proxy, convert_zha_error_to_ha_error
+from .helpers import async_get_zha_device_proxy
 from .websocket_api import SERVICE_WARNING_DEVICE_SQUAWK, SERVICE_WARNING_DEVICE_WARN
 
 # mypy: disallow-any-generics
 
-INOVELLI_CLUSTER_ID = 0xFC31
-
 ACTION_SQUAWK = "squawk"
 ACTION_WARN = "warn"
+ATTR_DATA = "data"
 ATTR_IEEE = "ieee"
+CONF_ZHA_ACTION_TYPE = "zha_action_type"
+ZHA_ACTION_TYPE_SERVICE_CALL = "service_call"
+ZHA_ACTION_TYPE_CLUSTER_HANDLER_COMMAND = "cluster_handler_command"
 INOVELLI_ALL_LED_EFFECT = "issue_all_led_effect"
 INOVELLI_INDIVIDUAL_LED_EFFECT = "issue_individual_led_effect"
 
@@ -63,18 +73,24 @@ ACTION_SCHEMA = vol.Any(
     DEFAULT_ACTION_SCHEMA,
 )
 
-# Maps a cluster_id the device must expose to the available actions.
-DEVICE_ACTIONS_BY_CLUSTER_ID: dict[int, list[dict[str, str]]] = {
-    IasWd.cluster_id: [
+DEVICE_ACTIONS = {
+    CLUSTER_HANDLER_IAS_WD: [
         {CONF_TYPE: ACTION_SQUAWK, CONF_DOMAIN: DOMAIN},
         {CONF_TYPE: ACTION_WARN, CONF_DOMAIN: DOMAIN},
     ],
-    INOVELLI_CLUSTER_ID: [
+    CLUSTER_HANDLER_INOVELLI: [
         {CONF_TYPE: INOVELLI_ALL_LED_EFFECT, CONF_DOMAIN: DOMAIN},
         {CONF_TYPE: INOVELLI_INDIVIDUAL_LED_EFFECT, CONF_DOMAIN: DOMAIN},
     ],
 }
 
+DEVICE_ACTION_TYPES = {
+    ACTION_SQUAWK: ZHA_ACTION_TYPE_SERVICE_CALL,
+    ACTION_WARN: ZHA_ACTION_TYPE_SERVICE_CALL,
+    INOVELLI_ALL_LED_EFFECT: ZHA_ACTION_TYPE_CLUSTER_HANDLER_COMMAND,
+    INOVELLI_INDIVIDUAL_LED_EFFECT: ZHA_ACTION_TYPE_CLUSTER_HANDLER_COMMAND,
+}
+
 DEVICE_ACTION_SCHEMAS = {
     INOVELLI_ALL_LED_EFFECT: vol.Schema(
         {
@@ -100,6 +116,11 @@ SERVICE_NAMES = {
     ACTION_WARN: SERVICE_WARNING_DEVICE_WARN,
 }
 
+CLUSTER_HANDLER_MAPPINGS = {
+    INOVELLI_ALL_LED_EFFECT: CLUSTER_HANDLER_INOVELLI,
+    INOVELLI_INDIVIDUAL_LED_EFFECT: CLUSTER_HANDLER_INOVELLI,
+}
+
 
 async def async_call_action_from_config(
     hass: HomeAssistant,
@@ -108,9 +129,9 @@ async def async_call_action_from_config(
     context: Context | None,
 ) -> None:
     """Perform an action based on configuration."""
-    action_type = config[CONF_TYPE]
-    handler = ACTION_HANDLERS[action_type]
-    await handler(hass, config, context)
+    await ZHA_ACTION_TYPES[DEVICE_ACTION_TYPES[config[CONF_TYPE]]](
+        hass, config, variables, context
+    )
 
 
 async def async_validate_action_config(
@@ -129,18 +150,19 @@ async def async_get_actions(
         zha_device = async_get_zha_device_proxy(hass, device_id).device
     except KeyError, AttributeError:
         return []
-    cluster_ids = {
-        cluster_id
-        for ep_id, endpoint in zha_device.device.endpoints.items()
-        if ep_id != 0
-        for cluster_id in endpoint.in_clusters
-    }
-    actions: list[dict[str, str]] = []
-    for required_cluster_id, cluster_actions in DEVICE_ACTIONS_BY_CLUSTER_ID.items():
-        if required_cluster_id in cluster_ids:
-            actions.extend(
-                {**action, CONF_DEVICE_ID: device_id} for action in cluster_actions
-            )
+    cluster_handlers = [
+        ch.name
+        for endpoint in zha_device.endpoints.values()
+        for ch in endpoint.claimed_cluster_handlers.values()
+    ]
+    actions = [
+        action
+        for cluster_handler, cluster_handler_actions in DEVICE_ACTIONS.items()
+        for action in cluster_handler_actions
+        if cluster_handler in cluster_handlers
+    ]
+    for action in actions:
+        action[CONF_DEVICE_ID] = device_id
     return actions
 
 
@@ -153,75 +175,69 @@ async def async_get_action_capabilities(
     return {"extra_fields": fields}
 
 
-async def _execute_siren_service(
+async def _execute_service_based_action(
     hass: HomeAssistant,
     config: dict[str, Any],
+    variables: TemplateVarsType,
     context: Context | None,
 ) -> None:
+    action_type = config[CONF_TYPE]
+    service_name = SERVICE_NAMES[action_type]
     try:
         zha_device = async_get_zha_device_proxy(hass, config[CONF_DEVICE_ID]).device
     except KeyError, AttributeError:
         return
+
+    service_data = {ATTR_IEEE: str(zha_device.ieee)}
+
     await hass.services.async_call(
-        DOMAIN,
-        SERVICE_NAMES[config[CONF_TYPE]],
-        {ATTR_IEEE: str(zha_device.ieee)},
-        blocking=True,
-        context=context,
+        DOMAIN, service_name, service_data, blocking=True, context=context
     )
 
 
-def _find_inovelli_cluster(hass: HomeAssistant, config: dict[str, Any]) -> Any:
+async def _execute_cluster_handler_command_based_action(
+    hass: HomeAssistant,
+    config: dict[str, Any],
+    variables: TemplateVarsType,
+    context: Context | None,
+) -> None:
+    action_type = config[CONF_TYPE]
+    cluster_handler_name = CLUSTER_HANDLER_MAPPINGS[action_type]
     try:
         zha_device = async_get_zha_device_proxy(hass, config[CONF_DEVICE_ID]).device
-    except (KeyError, AttributeError) as err:
+    except KeyError, AttributeError:
+        return
+
+    action_cluster_handler = None
+    for endpoint in zha_device.endpoints.values():
+        for cluster_handler in endpoint.all_cluster_handlers.values():
+            if cluster_handler.name == cluster_handler_name:
+                action_cluster_handler = cluster_handler
+                break
+
+    if action_cluster_handler is None:
         raise InvalidDeviceAutomationConfig(
-            f"ZHA device {config[CONF_DEVICE_ID]} not found"
-        ) from err
+            f"Unable to execute cluster handler action -"
+            f" cluster handler: {cluster_handler_name} action:"
+            f" {action_type}"
+        )
+
+    if not hasattr(action_cluster_handler, action_type):
+        raise InvalidDeviceAutomationConfig(
+            f"Unable to execute cluster handler -"
+            f" cluster handler: {cluster_handler_name} action:"
+            f" {action_type}"
+        )
+
     try:
-        return zha_device.device.find_cluster(cluster_id=INOVELLI_CLUSTER_ID)
-    except ValueError as err:
-        raise InvalidDeviceAutomationConfig(
-            f"Device does not expose Inovelli cluster 0x{INOVELLI_CLUSTER_ID:04x}"
-        ) from err
+        await getattr(action_cluster_handler, action_type)(**config)
+    except ZHAException as err:
+        raise HomeAssistantError(err) from err
 
 
-async def _execute_inovelli_all_led_effect(
-    hass: HomeAssistant,
-    config: dict[str, Any],
-    context: Context | None,
-) -> None:
-    cluster = _find_inovelli_cluster(hass, config)
-
-    async with convert_zha_error_to_ha_error():
-        await cluster.led_effect(
-            led_effect=config["effect_type"],
-            led_color=config["color"],
-            led_level=config["level"],
-            led_duration=config["duration"],
-        )
-
-
-async def _execute_inovelli_individual_led_effect(
-    hass: HomeAssistant,
-    config: dict[str, Any],
-    context: Context | None,
-) -> None:
-    cluster = _find_inovelli_cluster(hass, config)
-
-    async with convert_zha_error_to_ha_error():
-        await cluster.individual_led_effect(
-            led_effect=config["effect_type"],
-            led_color=config["color"],
-            led_level=config["level"],
-            led_duration=config["duration"],
-            led_number=config["led_number"],
-        )
-
-
-ACTION_HANDLERS = {
-    ACTION_SQUAWK: _execute_siren_service,
-    ACTION_WARN: _execute_siren_service,
-    INOVELLI_ALL_LED_EFFECT: _execute_inovelli_all_led_effect,
-    INOVELLI_INDIVIDUAL_LED_EFFECT: _execute_inovelli_individual_led_effect,
+ZHA_ACTION_TYPES = {
+    ZHA_ACTION_TYPE_SERVICE_CALL: _execute_service_based_action,
+    ZHA_ACTION_TYPE_CLUSTER_HANDLER_COMMAND: (
+        _execute_cluster_handler_command_based_action
+    ),
 }

homeassistant/components/zha/entity.py

@@ -206,7 +206,7 @@ class ZHAEntity(LogMixin, RestoreEntity, Entity):
         await super().async_will_remove_from_hass()
         self.remove_future.set_result(True)
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_update(self) -> None:
         """Update the entity."""
         await self.entity_data.entity.async_update()

homeassistant/components/zha/fan.py

@@ -92,7 +92,7 @@ class ZhaFan(FanEntity, ZHAEntity):
         """Return the number of speeds the fan supports."""
         return self.entity_data.entity.speed_count
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_turn_on(
         self,
         percentage: int | None = None,
@@ -105,19 +105,19 @@ class ZhaFan(FanEntity, ZHAEntity):
         )
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
         await self.entity_data.entity.async_turn_off()
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_percentage(self, percentage: int) -> None:
         """Set the speed percentage of the fan."""
         await self.entity_data.entity.async_set_percentage(percentage=percentage)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set the preset mode for the fan."""
         await self.entity_data.entity.async_set_preset_mode(preset_mode=preset_mode)

homeassistant/components/zha/helpers.py

@@ -2,23 +2,23 @@
 
 import asyncio
 import collections
-from collections.abc import AsyncGenerator, Callable, Mapping
-from contextlib import asynccontextmanager
+from collections.abc import Awaitable, Callable, Coroutine, Mapping
 import copy
 import dataclasses
 import enum
+import functools
 import itertools
 import logging
 import queue
 import re
 import time
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, NamedTuple, cast
+from typing import TYPE_CHECKING, Any, Concatenate, NamedTuple, cast
 from zoneinfo import ZoneInfo
 
 import voluptuous as vol
-from zha.application import Platform as ZhaPlatform
 from zha.application.const import (
+    ATTR_CLUSTER_ID,
     ATTR_DEVICE_IEEE,
     ATTR_TYPE,
     ATTR_UNIQUE_ID,
@@ -28,6 +28,11 @@ from zha.application.const import (
     CONF_DEFAULT_CONSIDER_UNAVAILABLE_MAINS,
     UNKNOWN_MANUFACTURER,
     UNKNOWN_MODEL,
+    ZHA_CLUSTER_HANDLER_CFG_DONE,
+    ZHA_CLUSTER_HANDLER_MSG,
+    ZHA_CLUSTER_HANDLER_MSG_BIND,
+    ZHA_CLUSTER_HANDLER_MSG_CFG_RPT,
+    ZHA_CLUSTER_HANDLER_MSG_DATA,
     ZHA_EVENT,
     ZHA_GW_MSG,
     ZHA_GW_MSG_DEVICE_FULL_INIT,
@@ -66,11 +71,10 @@ from zha.application.platforms import GroupEntity, PlatformEntity
 from zha.event import EventBase
 from zha.exceptions import ZHAException
 from zha.mixins import LogMixin
+from zha.zigbee.cluster_handlers import ClusterBindEvent, ClusterConfigureReportingEvent
 from zha.zigbee.device import (
-    ClusterBindEvent,
-    ClusterConfigureReportingEvent,
+    ClusterHandlerConfigurationComplete,
     Device,
-    DeviceConfiguredEvent,
     DeviceEntityAddedEvent,
     DeviceEntityRemovedEvent,
     DeviceFirmwareInfoUpdatedEvent,
@@ -122,7 +126,9 @@ from homeassistant.util.logging import HomeAssistantQueueHandler
 
 from .const import (
     ATTR_ACTIVE_COORDINATOR,
+    ATTR_ATTRIBUTES,
     ATTR_AVAILABLE,
+    ATTR_CLUSTER_NAME,
     ATTR_DEVICE_TYPE,
     ATTR_ENDPOINT_NAMES,
     ATTR_EXPOSES_FEATURES,
@@ -138,6 +144,7 @@ from .const import (
     ATTR_ROUTES,
     ATTR_RSSI,
     ATTR_SIGNATURE,
+    ATTR_SUCCESS,
     CONF_ALARM_ARM_REQUIRES_CODE,
     CONF_ALARM_FAILED_TRIES,
     CONF_ALARM_MASTER_CODE,
@@ -161,7 +168,6 @@ from .const import (
     DEFAULT_DATABASE_NAME,
     DEVICE_PAIRING_STATUS,
     DOMAIN,
-    SIGNAL_DEVICE_RECONFIGURE_EVENT,
     ZHA_ALARM_OPTIONS,
     ZHA_OPTIONS,
 )
@@ -444,46 +450,50 @@ class ZHADeviceProxy(EventBase):
         )
 
     @callback
-    def handle_zha_cluster_bind(self, event: ClusterBindEvent) -> None:
-        """Forward a cluster bind result to the reconfigure websocket."""
-        async_dispatcher_send(
-            self.gateway_proxy.hass,
-            SIGNAL_DEVICE_RECONFIGURE_EVENT,
-            {
-                "type": "zha_channel_bind",
-                "zha_channel_msg_data": {
-                    "cluster_name": event.cluster_name,
-                    "cluster_id": event.cluster_id,
-                    "success": event.success,
-                },
-            },
-        )
-
-    @callback
-    def handle_zha_cluster_configure_reporting(
+    def handle_zha_channel_configure_reporting(
         self, event: ClusterConfigureReportingEvent
     ) -> None:
-        """Forward a cluster reporting-configured result to the reconfigure websocket."""
+        """Handle a ZHA cluster configure reporting event."""
         async_dispatcher_send(
             self.gateway_proxy.hass,
-            SIGNAL_DEVICE_RECONFIGURE_EVENT,
+            ZHA_CLUSTER_HANDLER_MSG,
             {
-                "type": "zha_channel_configure_reporting",
-                "zha_channel_msg_data": {
-                    "cluster_name": event.cluster_name,
-                    "cluster_id": event.cluster_id,
-                    "attributes": event.attributes,
+                ATTR_TYPE: ZHA_CLUSTER_HANDLER_MSG_CFG_RPT,
+                ZHA_CLUSTER_HANDLER_MSG_DATA: {
+                    ATTR_CLUSTER_NAME: event.cluster_name,
+                    ATTR_CLUSTER_ID: event.cluster_id,
+                    ATTR_ATTRIBUTES: event.attributes,
                 },
             },
         )
 
     @callback
-    def handle_zha_device_configured(self, event: DeviceConfiguredEvent) -> None:
-        """Forward the device configuration-complete signal to the reconfigure websocket."""
+    def handle_zha_channel_cfg_done(
+        self, event: ClusterHandlerConfigurationComplete
+    ) -> None:
+        """Handle a ZHA cluster configure reporting event."""
         async_dispatcher_send(
             self.gateway_proxy.hass,
-            SIGNAL_DEVICE_RECONFIGURE_EVENT,
-            {"type": "zha_channel_cfg_done"},
+            ZHA_CLUSTER_HANDLER_MSG,
+            {
+                ATTR_TYPE: ZHA_CLUSTER_HANDLER_CFG_DONE,
+            },
+        )
+
+    @callback
+    def handle_zha_channel_bind(self, event: ClusterBindEvent) -> None:
+        """Handle a ZHA cluster bind event."""
+        async_dispatcher_send(
+            self.gateway_proxy.hass,
+            ZHA_CLUSTER_HANDLER_MSG,
+            {
+                ATTR_TYPE: ZHA_CLUSTER_HANDLER_MSG_BIND,
+                ZHA_CLUSTER_HANDLER_MSG_DATA: {
+                    ATTR_CLUSTER_NAME: event.cluster_name,
+                    ATTR_CLUSTER_ID: event.cluster_id,
+                    ATTR_SUCCESS: event.success,
+                },
+            },
         )
 
     @callback
@@ -491,9 +501,6 @@ class ZHADeviceProxy(EventBase):
         self, event: DeviceEntityAddedEvent
     ) -> None:
         """Handle a new entity being added to a device at runtime."""
-        if event.platform is ZhaPlatform.VIRTUAL:
-            return
-
         key = (event.platform, event.unique_id)
         if (entity := self.device.platform_entities.get(key)) is None:
             return
@@ -508,9 +515,6 @@ class ZHADeviceProxy(EventBase):
         self, event: DeviceEntityRemovedEvent
     ) -> None:
         """Handle an entity being removed from a device at runtime."""
-        if event.platform is ZhaPlatform.VIRTUAL:
-            return
-
         if not event.remove:
             # Soft remove: signal the entity to unload; registry entry stays
             async_dispatcher_send(
@@ -907,9 +911,6 @@ class ZHAGatewayProxy(EventBase):
 
         if isinstance(proxy_object, ZHADeviceProxy):
             for entity in proxy_object.device.platform_entities.values():
-                if entity.PLATFORM is ZhaPlatform.VIRTUAL:
-                    continue
-
                 ha_zha_data.platforms[Platform(entity.PLATFORM)].append(
                     EntityData(
                         entity=entity, device_proxy=proxy_object, group_proxy=None
@@ -917,9 +918,6 @@ class ZHAGatewayProxy(EventBase):
                 )
         else:
             for entity in proxy_object.group.group_entities.values():
-                if entity.PLATFORM is ZhaPlatform.VIRTUAL:
-                    continue
-
                 ha_zha_data.platforms[Platform(entity.PLATFORM)].append(
                     EntityData(
                         entity=entity,
@@ -1388,24 +1386,19 @@ def create_zha_config(hass: HomeAssistant, ha_zha_data: HAZHAData) -> ZHAData:
     )
 
 
-@asynccontextmanager
-async def convert_zha_error_to_ha_error() -> AsyncGenerator[None]:
+def convert_zha_error_to_ha_error[**_P, _EntityT: ZHAEntity](
+    func: Callable[Concatenate[_EntityT, _P], Awaitable[None]],
+) -> Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, None]]:
     """Decorate ZHA commands and re-raises ZHAException as HomeAssistantError."""
-    try:
-        yield
-    except TimeoutError as exc:
-        raise HomeAssistantError(
-            "Failed to send request: device did not respond"
-        ) from exc
-    except zigpy.exceptions.ZigbeeException as exc:
-        message = "Failed to send request"
 
-        if str(exc):
-            message = f"{message}: {exc}"
+    @functools.wraps(func)
+    async def handler(self: _EntityT, *args: _P.args, **kwargs: _P.kwargs) -> None:
+        try:
+            return await func(self, *args, **kwargs)
+        except ZHAException as err:
+            raise HomeAssistantError(err) from err
 
-        raise HomeAssistantError(message) from exc
-    except ZHAException as err:
-        raise HomeAssistantError(err) from err
+    return handler
 
 
 def exclude_none_values(obj: Mapping[str, Any]) -> dict[str, Any]:

homeassistant/components/zha/light.py

@@ -171,7 +171,7 @@ class Light(LightEntity, ZHAEntity):
         """Return the current effect."""
         return self.entity_data.entity.effect
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the entity on."""
         color_temp = (
@@ -189,7 +189,7 @@ class Light(LightEntity, ZHAEntity):
         )
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
         await self.entity_data.entity.async_turn_off(

homeassistant/components/zha/lock.py

@@ -94,19 +94,19 @@ class ZhaDoorLock(ZHAEntity, LockEntity):
         """Return true if entity is locked."""
         return self.entity_data.entity.is_locked
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the lock."""
         await self.entity_data.entity.async_lock()
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the lock."""
         await self.entity_data.entity.async_unlock()
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_set_lock_user_code(self, code_slot: int, user_code: str) -> None:
         """Set the user_code to index X on the lock."""
         await self.entity_data.entity.async_set_lock_user_code(
@@ -114,19 +114,19 @@ class ZhaDoorLock(ZHAEntity, LockEntity):
         )
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_enable_lock_user_code(self, code_slot: int) -> None:
         """Enable user_code at index X on the lock."""
         await self.entity_data.entity.async_enable_lock_user_code(code_slot=code_slot)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_disable_lock_user_code(self, code_slot: int) -> None:
         """Disable user_code at index X on the lock."""
         await self.entity_data.entity.async_disable_lock_user_code(code_slot=code_slot)
         self.async_write_ha_state()
 
-    @convert_zha_error_to_ha_error()
+    @convert_zha_error_to_ha_error
     async def async_clear_lock_user_code(self, code_slot: int) -> None:
         """Clear the user_code at index X on the lock."""
         await self.entity_data.entity.async_clear_lock_user_code(code_slot=code_slot)

homeassistant/components/zha/manifest.json

@@ -23,7 +23,7 @@
     "universal_silabs_flasher",
     "serialx"
   ],
-  "requirements": ["zha==1.4.0"],
+  "requirements": ["zha==1.3.1"],
   "usb": [
     {
       "description": "*2652*",