homeassistant 2025.12.0__py3-none-any.whl → 2025.12.0b2__py3-none-any.whl

homeassistant/components/homeassistant_connect_zbt2/translations/tr.json

@@ -1,162 +1,17 @@
 {
     "config": {
-        "abort": {
-            "addon_already_running": "{addon_name} eklentisi zaten \u00e7al\u0131\u015ft\u0131\u011f\u0131ndan ba\u015flat\u0131lamad\u0131.",
-            "addon_info_failed": "{addon_name} eklenti bilgisi al\u0131namad\u0131.",
-            "addon_install_failed": "{addon_name} eklentisi y\u00fcklenemedi.",
-            "addon_set_config_failed": "{addon_name} yap\u0131land\u0131rmas\u0131 ayarlanamad\u0131.",
-            "addon_start_failed": "{addon_name} eklentisi ba\u015flat\u0131lamad\u0131.",
-            "not_hassio": "Donan\u0131m se\u00e7enekleri yaln\u0131zca Home Assistant OS kurulumlar\u0131nda yap\u0131land\u0131r\u0131labilir.",
-            "otbr_addon_already_running": "OpenThread Border Router eklentisi zaten \u00e7al\u0131\u015f\u0131yor, tekrar y\u00fcklenemez.",
-            "otbr_still_using_stick": "Bu {model} OpenThread Border Router eklentisi taraf\u0131ndan kullan\u0131l\u0131yor. Thread a\u011f\u0131n\u0131 kullan\u0131yorsan\u0131z alternatif border router'lar\u0131n\u0131z oldu\u011fundan emin olun. Eklentiyi kald\u0131r\u0131n ve tekrar deneyin.",
-            "unsupported_firmware": "{model} cihaz\u0131n\u0131zdaki radyo yaz\u0131l\u0131m\u0131 belirlenemedi. \u015eu anda cihazla ileti\u015fim kurmaya \u00e7al\u0131\u015fan ba\u015fka bir entegrasyon veya eklenti olmad\u0131\u011f\u0131ndan emin olun. Home Assistant OS'yi sanal bir makinede veya Docker'da \u00e7al\u0131\u015ft\u0131r\u0131yorsan\u0131z, l\u00fctfen cihaz i\u00e7in izinlerin do\u011fru \u015fekilde ayarland\u0131\u011f\u0131ndan emin olun.",
-            "zha_migration_failed": "ZHA ge\u00e7i\u015fi ba\u015far\u0131l\u0131 olmad\u0131.",
-            "zha_still_using_stick": "Bu {model} Zigbee Ev Otomasyonu entegrasyonu taraf\u0131ndan kullan\u0131l\u0131yor. L\u00fctfen Zigbee a\u011f\u0131n\u0131z\u0131 ba\u015fka bir adapt\u00f6re ta\u015f\u0131y\u0131n veya entegrasyonu silin ve tekrar deneyin."
-        },
-        "flow_title": "{model}",
-        "progress": {
-            "install_addon": "{addon_name} eklentisinin kurulumu tamamlanana kadar l\u00fctfen bekleyin. Bu birka\u00e7 dakika s\u00fcrebilir.",
-            "install_firmware": "Kurulum {firmware_name} firmware. \n \n Bu i\u015flem tamamlanana kadar donan\u0131m\u0131n\u0131zda veya yaz\u0131l\u0131m\u0131n\u0131zda herhangi bir de\u011fi\u015fiklik yapmay\u0131n.",
-            "install_otbr_addon": "Eklenti y\u00fckleniyor"
-        },
         "step": {
-            "install_thread_firmware": {
-                "title": "Ba\u011fda\u015ft\u0131r\u0131c\u0131 g\u00fcncelleniyor"
-            },
-            "install_zigbee_firmware": {
-                "title": "Ba\u011fda\u015ft\u0131r\u0131c\u0131 g\u00fcncelleniyor"
-            },
-            "pick_firmware": {
-                "menu_option_descriptions": {
-                    "pick_firmware_thread": "Genellikle Matter over Thread cihazlar\u0131nda kullan\u0131l\u0131r.",
-                    "pick_firmware_thread_migrate": "Bu, Thread Border Router'\u0131n\u0131z\u0131 yeni adapt\u00f6re ta\u015f\u0131yacakt\u0131r.",
-                    "pick_firmware_zigbee": "En yayg\u0131n protokol.",
-                    "pick_firmware_zigbee_migrate": "Bu, Zigbee a\u011f\u0131n\u0131z\u0131 yeni adapt\u00f6re ta\u015f\u0131yacakt\u0131r."
-                },
-                "menu_options": {
-                    "pick_firmware_thread_migrate": "Thread'i yeni bir adapt\u00f6re ta\u015f\u0131y\u0131n",
-                    "pick_firmware_zigbee_migrate": "Zigbee'yi yeni bir adapt\u00f6re ta\u015f\u0131y\u0131n"
-                }
-            },
             "show_z2m_docs_url": {
                 "description": "Senin {model} \u015eu anda en son Zigbee ayg\u0131t yaz\u0131l\u0131m\u0131n\u0131 \u00e7al\u0131\u015ft\u0131r\u0131yor. \n L\u00fctfen EmberZNet ba\u011fda\u015ft\u0131r\u0131c\u0131lar\u0131 i\u00e7in Zigbee2MQTT belgelerini okuyun ve yap\u0131land\u0131rmay\u0131 kopyalay\u0131n. {model}: {z2m_docs_url}",
                 "title": "Zigbee2MQTT'yi kurun"
-            },
-            "zigbee_installation_type": {
-                "description": "Zigbee adapt\u00f6r\u00fc i\u00e7in kurulum t\u00fcr\u00fcn\u00fc se\u00e7in.",
-                "menu_option_descriptions": {
-                    "zigbee_intent_custom": "\u00d6rne\u011fin Zigbee2MQTT ile Zigbee'yi manuel olarak kurun ve yap\u0131land\u0131r\u0131n.",
-                    "zigbee_intent_recommended": "Zigbee'yi otomatik olarak kurun ve yap\u0131land\u0131r\u0131n."
-                },
-                "menu_options": {
-                    "zigbee_intent_custom": "Ki\u015fiselle\u015ftirilmi\u015f",
-                    "zigbee_intent_recommended": "\u00d6nerilen kurulum"
-                },
-                "title": "Zigbee'yi kurun"
-            },
-            "zigbee_integration": {
-                "menu_option_descriptions": {
-                    "zigbee_integration_other": "\u00d6rne\u011fin adapt\u00f6r\u00fc Zigbee2MQTT ile kullanmak istiyorsan\u0131z.",
-                    "zigbee_integration_zha": "Home Assistant'\u0131n Zigbee a\u011f\u0131n\u0131 kontrol etmesini sa\u011flar."
-                },
-                "menu_options": {
-                    "zigbee_integration_other": "Di\u011fer",
-                    "zigbee_integration_zha": "Zigbee Ev Otomasyonu"
-                },
-                "title": "Zigbee y\u00f6ntemini se\u00e7in"
-            }
-        }
-    },
-    "entity": {
-        "switch": {
-            "beta_firmware": {
-                "name": "Beta \u00fcr\u00fcn yaz\u0131l\u0131m\u0131 g\u00fcncellemeleri"
             }
         }
     },
     "options": {
-        "abort": {
-            "zha_migration_failed": "ZHA ge\u00e7i\u015fi ba\u015far\u0131l\u0131 olmad\u0131.",
-            "zha_still_using_stick": "Bu {model} Zigbee Ev Otomasyonu entegrasyonu taraf\u0131ndan kullan\u0131l\u0131yor. L\u00fctfen Zigbee a\u011f\u0131n\u0131z\u0131 ba\u015fka bir adapt\u00f6re ta\u015f\u0131y\u0131n veya entegrasyonu silin ve tekrar deneyin."
-        },
-        "error": {
-            "unknown": "Beklenmeyen hata"
-        },
-        "progress": {
-            "install_addon": "{addon_name} eklentisinin kurulumu tamamlanana kadar l\u00fctfen bekleyin. Bu birka\u00e7 dakika s\u00fcrebilir.",
-            "install_firmware": "Kurulum {firmware_name} firmware. \n \n Bu i\u015flem tamamlanana kadar donan\u0131m\u0131n\u0131zda veya yaz\u0131l\u0131m\u0131n\u0131zda herhangi bir de\u011fi\u015fiklik yapmay\u0131n.",
-            "install_otbr_addon": "Eklenti y\u00fckleniyor",
-            "start_addon": "{addon_name} eklentisinin ba\u015flat\u0131lmas\u0131 tamamlanana kadar l\u00fctfen bekleyin. Bu birka\u00e7 saniye s\u00fcrebilir.",
-            "start_otbr_addon": "Eklenti ba\u015flat\u0131l\u0131yor"
-        },
         "step": {
-            "addon_installed_other_device": {
-                "title": "Ba\u015fka bir cihaz i\u00e7in \u00e7oklu protokol deste\u011fi zaten etkin"
-            },
-            "addon_menu": {
-                "menu_options": {
-                    "reconfigure_addon": "IEEE 802.15.4 radyo \u00e7oklu protokol deste\u011fini yeniden yap\u0131land\u0131r\u0131n",
-                    "uninstall_addon": "IEEE 802.15.4 radyo \u00e7oklu protokol deste\u011fini kald\u0131r\u0131n"
-                }
-            },
-            "addon_not_installed": {
-                "data": {
-                    "enable_multi_pan": "\u00c7oklu protokol deste\u011fini etkinle\u015ftir"
-                },
-                "description": "\u00c7oklu protokol deste\u011fi etkinle\u015ftirildi\u011finde, {hardware_name} cihaz\u0131n\u0131n IEEE 802.15.4 radyosu ayn\u0131 anda hem Zigbee hem de Thread (Matter taraf\u0131ndan kullan\u0131l\u0131r) i\u00e7in kullan\u0131labilir. Telsiz zaten ZHA Zigbee entegrasyonu taraf\u0131ndan kullan\u0131l\u0131yorsa, ZHA \u00e7oklu protokol bellenimini kullanmak \u00fczere yeniden yap\u0131land\u0131r\u0131lacakt\u0131r. \n\n Not: Bu deneysel bir \u00f6zelliktir.",
-                "title": "IEEE 802.15.4 radyosunda \u00e7oklu protokol deste\u011fini etkinle\u015ftirin"
-            },
-            "change_channel": {
-                "data": {
-                    "channel": "Kanal"
-                },
-                "description": "Zigbee ve Thread a\u011flar\u0131n\u0131z i\u00e7in bir kanal de\u011fi\u015fikli\u011fi ba\u015flat\u0131n. \n\n Not: Bu geli\u015fmi\u015f bir i\u015flemdir ve yeni kanal t\u0131kan\u0131rsa Thread ve Zigbee a\u011flar\u0131n\u0131z\u0131 \u00e7al\u0131\u015fmaz hale getirebilir. Mevcut a\u011f ko\u015fullar\u0131na ba\u011fl\u0131 olarak, cihazlar\u0131n\u0131z\u0131n \u00e7o\u011fu yeni kanala ta\u015f\u0131nmayabilir ve tekrar \u00e7al\u0131\u015fmaya ba\u015flamadan \u00f6nce yeniden kat\u0131lmalar\u0131 gerekebilir. Dikkatle kullan\u0131n. \n\n **G\u00f6nder**'i se\u00e7ti\u011finizde, kanal de\u011fi\u015fikli\u011fi arka planda sessizce ba\u015flar ve birka\u00e7 dakika sonra tamamlan\u0131r.",
-                "title": "IEEE 802.15.4 radyo \u00e7oklu protokol deste\u011fini yeniden yap\u0131land\u0131r\u0131n"
-            },
-            "confirm_otbr": {
-                "title": "OpenThread Border Router kurulumu tamamland\u0131"
-            },
-            "confirm_zigbee": {
-                "title": "Zigbee kurulumu tamamland\u0131"
-            },
-            "install_addon": {
-                "title": "Silicon Labs Multiprotocol eklenti kurulumu ba\u015flad\u0131"
-            },
-            "install_thread_firmware": {
-                "title": "Ba\u011fda\u015ft\u0131r\u0131c\u0131 g\u00fcncelleniyor"
-            },
-            "install_zigbee_firmware": {
-                "title": "Ba\u011fda\u015ft\u0131r\u0131c\u0131 g\u00fcncelleniyor"
-            },
-            "notify_channel_change": {
-                "description": "Bir Zigbee ve Konu kanal\u0131 de\u011fi\u015fikli\u011fi ba\u015flat\u0131ld\u0131 ve {delay_minutes} dakika i\u00e7inde tamamlanacak.",
-                "title": "Kanal de\u011fi\u015fikli\u011fi ba\u015flat\u0131ld\u0131"
-            },
-            "notify_unknown_multipan_user": {
-                "description": "Home Assistant, OTBR ve ZHA i\u00e7in kanallar\u0131 otomatik olarak de\u011fi\u015ftirebilir. Radyo kullanmak i\u00e7in ba\u015fka bir entegrasyon yap\u0131land\u0131rd\u0131ysan\u0131z, \u00f6rne\u011fin Zigbee2MQTT, bu k\u0131lavuzu tamamlad\u0131ktan sonra o entegrasyondaki kanal\u0131 yeniden yap\u0131land\u0131rman\u0131z gerekecektir.",
-                "title": "Manuel yap\u0131land\u0131rma gerekebilir"
-            },
-            "otbr_failed": {
-                "description": "OpenThread Border Router eklentisi kurulumu ba\u015far\u0131s\u0131z oldu. Ba\u015fka hi\u00e7bir yaz\u0131l\u0131m\u0131n {model} ile ileti\u015fim kurmaya \u00e7al\u0131\u015fmad\u0131\u011f\u0131ndan, \u0130nternete eri\u015fiminiz oldu\u011fundan ve di\u011fer eklentileri kurabildi\u011finizden emin olun ve tekrar deneyin. Sorun devam ederse Supervisor g\u00fcnl\u00fcklerini kontrol edin."
-            },
-            "pick_firmware": {
-                "menu_option_descriptions": {
-                    "pick_firmware_thread": "Genellikle Matter over Thread cihazlar\u0131nda kullan\u0131l\u0131r.",
-                    "pick_firmware_thread_migrate": "Bu, Thread Border Router'\u0131n\u0131z\u0131 yeni adapt\u00f6re ta\u015f\u0131yacakt\u0131r.",
-                    "pick_firmware_zigbee": "En yayg\u0131n protokol.",
-                    "pick_firmware_zigbee_migrate": "Bu, Zigbee a\u011f\u0131n\u0131z\u0131 yeni adapt\u00f6re ta\u015f\u0131yacakt\u0131r."
-                },
-                "menu_options": {
-                    "pick_firmware_thread_migrate": "Thread'i yeni bir adapt\u00f6re ta\u015f\u0131y\u0131n",
-                    "pick_firmware_zigbee_migrate": "Zigbee'yi yeni bir adapt\u00f6re ta\u015f\u0131y\u0131n"
-                }
-            },
             "show_z2m_docs_url": {
                 "description": "Senin {model} \u015eu anda en son Zigbee ayg\u0131t yaz\u0131l\u0131m\u0131n\u0131 \u00e7al\u0131\u015ft\u0131r\u0131yor. \n L\u00fctfen EmberZNet ba\u011fda\u015ft\u0131r\u0131c\u0131lar\u0131 i\u00e7in Zigbee2MQTT belgelerini okuyun ve yap\u0131land\u0131rmay\u0131 kopyalay\u0131n. {model}: {z2m_docs_url}",
                 "title": "Zigbee2MQTT'yi kurun"
-            },
-            "zigbee_integration": {
-                "title": "Zigbee y\u00f6ntemini se\u00e7in"
             }
         }
     }

homeassistant/components/homeassistant_hardware/firmware_config_flow.py

@@ -33,14 +33,13 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.hassio import is_hassio
 
-from .const import DOMAIN, OTBR_DOMAIN, Z2M_EMBER_DOCS_URL, ZHA_DOMAIN
+from .const import OTBR_DOMAIN, Z2M_EMBER_DOCS_URL, ZHA_DOMAIN
 from .util import (
     ApplicationType,
     FirmwareInfo,
     OwningAddon,
     OwningIntegration,
     ResetTarget,
-    async_firmware_flashing_context,
     async_flash_silabs_firmware,
     get_otbr_addon_manager,
     guess_firmware_info,
@@ -229,95 +228,83 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         # Keep track of the firmware we're working with, for error messages
         self.installing_firmware_name = firmware_name
 
-        # For the duration of firmware flashing, hint to other integrations (i.e. ZHA)
-        # that the hardware is in use and should not be accessed. This is separate from
-        # locking the serial port itself, since a momentary release of the port may
-        # still allow for ZHA to reclaim the device.
-        async with async_firmware_flashing_context(self.hass, self._device, DOMAIN):
-            # Installing new firmware is only truly required if the wrong type is
-            # installed: upgrading to the latest release of the current firmware type
-            # isn't strictly necessary for functionality.
-            self._probed_firmware_info = await probe_silabs_firmware_info(
-                self._device,
-                bootloader_reset_methods=self.BOOTLOADER_RESET_METHODS,
-                application_probe_methods=self.APPLICATION_PROBE_METHODS,
-            )
+        # Installing new firmware is only truly required if the wrong type is
+        # installed: upgrading to the latest release of the current firmware type
+        # isn't strictly necessary for functionality.
+        self._probed_firmware_info = await probe_silabs_firmware_info(
+            self._device,
+            bootloader_reset_methods=self.BOOTLOADER_RESET_METHODS,
+            application_probe_methods=self.APPLICATION_PROBE_METHODS,
+        )
+
+        firmware_install_required = self._probed_firmware_info is None or (
+            self._probed_firmware_info.firmware_type != expected_installed_firmware_type
+        )
 
-            firmware_install_required = self._probed_firmware_info is None or (
-                self._probed_firmware_info.firmware_type
-                != expected_installed_firmware_type
+        session = async_get_clientsession(self.hass)
+        client = FirmwareUpdateClient(fw_update_url, session)
+
+        try:
+            manifest = await client.async_update_data()
+            fw_manifest = next(
+                fw for fw in manifest.firmwares if fw.filename.startswith(fw_type)
             )
+        except (StopIteration, TimeoutError, ClientError, ManifestMissing) as err:
+            _LOGGER.warning("Failed to fetch firmware update manifest", exc_info=True)
 
-            session = async_get_clientsession(self.hass)
-            client = FirmwareUpdateClient(fw_update_url, session)
+            # Not having internet access should not prevent setup
+            if not firmware_install_required:
+                _LOGGER.debug("Skipping firmware upgrade due to index download failure")
+                return
 
-            try:
-                manifest = await client.async_update_data()
-                fw_manifest = next(
-                    fw for fw in manifest.firmwares if fw.filename.startswith(fw_type)
-                )
-            except (StopIteration, TimeoutError, ClientError, ManifestMissing) as err:
-                _LOGGER.warning(
-                    "Failed to fetch firmware update manifest", exc_info=True
-                )
+            raise AbortFlow(
+                reason="fw_download_failed",
+                description_placeholders=self._get_translation_placeholders(),
+            ) from err
 
-                # Not having internet access should not prevent setup
-                if not firmware_install_required:
-                    _LOGGER.debug(
-                        "Skipping firmware upgrade due to index download failure"
-                    )
-                    return
+        if not firmware_install_required:
+            assert self._probed_firmware_info is not None
 
-                raise AbortFlow(
-                    reason="fw_download_failed",
-                    description_placeholders=self._get_translation_placeholders(),
-                ) from err
+            # Make sure we do not downgrade the firmware
+            fw_metadata = NabuCasaMetadata.from_json(fw_manifest.metadata)
+            fw_version = fw_metadata.get_public_version()
+            probed_fw_version = Version(self._probed_firmware_info.firmware_version)
 
+            if probed_fw_version >= fw_version:
+                _LOGGER.debug(
+                    "Not downgrading firmware, installed %s is newer than available %s",
+                    probed_fw_version,
+                    fw_version,
+                )
+                return
+
+        try:
+            fw_data = await client.async_fetch_firmware(fw_manifest)
+        except (TimeoutError, ClientError, ValueError) as err:
+            _LOGGER.warning("Failed to fetch firmware update", exc_info=True)
+
+            # If we cannot download new firmware, we shouldn't block setup
             if not firmware_install_required:
-                assert self._probed_firmware_info is not None
-
-                # Make sure we do not downgrade the firmware
-                fw_metadata = NabuCasaMetadata.from_json(fw_manifest.metadata)
-                fw_version = fw_metadata.get_public_version()
-                probed_fw_version = Version(self._probed_firmware_info.firmware_version)
-
-                if probed_fw_version >= fw_version:
-                    _LOGGER.debug(
-                        "Not downgrading firmware, installed %s is newer than available %s",
-                        probed_fw_version,
-                        fw_version,
-                    )
-                    return
+                _LOGGER.debug("Skipping firmware upgrade due to image download failure")
+                return
 
-            try:
-                fw_data = await client.async_fetch_firmware(fw_manifest)
-            except (TimeoutError, ClientError, ValueError) as err:
-                _LOGGER.warning("Failed to fetch firmware update", exc_info=True)
+            # Otherwise, fail
+            raise AbortFlow(
+                reason="fw_download_failed",
+                description_placeholders=self._get_translation_placeholders(),
+            ) from err
 
-                # If we cannot download new firmware, we shouldn't block setup
-                if not firmware_install_required:
-                    _LOGGER.debug(
-                        "Skipping firmware upgrade due to image download failure"
-                    )
-                    return
-
-                # Otherwise, fail
-                raise AbortFlow(
-                    reason="fw_download_failed",
-                    description_placeholders=self._get_translation_placeholders(),
-                ) from err
-
-            self._probed_firmware_info = await async_flash_silabs_firmware(
-                hass=self.hass,
-                device=self._device,
-                fw_data=fw_data,
-                expected_installed_firmware_type=expected_installed_firmware_type,
-                bootloader_reset_methods=self.BOOTLOADER_RESET_METHODS,
-                application_probe_methods=self.APPLICATION_PROBE_METHODS,
-                progress_callback=lambda offset, total: self.async_update_progress(
-                    offset / total
-                ),
-            )
+        self._probed_firmware_info = await async_flash_silabs_firmware(
+            hass=self.hass,
+            device=self._device,
+            fw_data=fw_data,
+            expected_installed_firmware_type=expected_installed_firmware_type,
+            bootloader_reset_methods=self.BOOTLOADER_RESET_METHODS,
+            application_probe_methods=self.APPLICATION_PROBE_METHODS,
+            progress_callback=lambda offset, total: self.async_update_progress(
+                offset / total
+            ),
+        )
 
     async def _configure_and_start_otbr_addon(self) -> None:
         """Configure and start the OTBR addon."""
@@ -457,6 +444,10 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         # This step is necessary to prevent `user_input` from being passed through
         return await self.async_step_continue_zigbee()
 
+    def _extra_zha_hardware_options(self) -> dict[str, Any]:
+        """Return extra ZHA hardware options."""
+        return {}
+
     async def async_step_continue_zigbee(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -479,6 +470,7 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
                 },
                 "radio_type": "ezsp",
                 "flow_strategy": self._zigbee_flow_strategy,
+                **self._extra_zha_hardware_options(),
             },
         )
         return self._continue_zha_flow(result)

homeassistant/components/homeassistant_hardware/translations/es.json

@@ -53,10 +53,6 @@
                     },
                     "title": "Elige tu protocolo"
                 },
-                "show_z2m_docs_url": {
-                    "description": "Tu {model} ahora est\u00e1 ejecutando el \u00faltimo firmware Zigbee. \nPor favor, lee la documentaci\u00f3n de Zigbee2MQTT para los adaptadores EmberZNet y copia la configuraci\u00f3n para tu {model}: {z2m_docs_url}",
-                    "title": "Configurar Zigbee2MQTT"
-                },
                 "start_otbr_addon": {
                     "title": "Configuraci\u00f3n de Thread"
                 },

homeassistant/components/homeassistant_hardware/translations/ga.json

@@ -44,10 +44,6 @@
                         "pick_firmware_zigbee_migrate": "Aistrigh Zigbee chuig oiri\u00fant\u00f3ir nua"
                     }
                 },
-                "show_z2m_docs_url": {
-                    "description": "T\u00e1 an fhirmchl\u00e1r Zigbee is d\u00e9ana\u00ed \u00e1 rith ar do {model} anois.\nL\u00e9igh an doicim\u00e9ad\u00fa Zigbee2MQTT le haghaidh oiri\u00fanaitheoir\u00ed EmberZNet agus c\u00f3ipe\u00e1il an chumra\u00edocht do do {model}: {z2m_docs_url}",
-                    "title": "Socraigh Zigbee2MQTT"
-                },
                 "zigbee_installation_type": {
                     "description": "Roghnaigh an cine\u00e1l suite\u00e1la don oiri\u00fant\u00f3ir Zigbee.",
                     "menu_option_descriptions": {

homeassistant/components/homeassistant_hardware/translations/tr.json

@@ -8,9 +8,7 @@
                 "zha_still_using_stick": "Bu {model} Zigbee Ev Otomasyonu entegrasyonu taraf\u0131ndan kullan\u0131l\u0131yor. L\u00fctfen Zigbee a\u011f\u0131n\u0131z\u0131 ba\u015fka bir adapt\u00f6re ta\u015f\u0131y\u0131n veya entegrasyonu silin ve tekrar deneyin."
             },
             "progress": {
-                "install_firmware": "Kurulum {firmware_name} firmware. \n \n Bu i\u015flem tamamlanana kadar donan\u0131m\u0131n\u0131zda veya yaz\u0131l\u0131m\u0131n\u0131zda herhangi bir de\u011fi\u015fiklik yapmay\u0131n.",
-                "install_otbr_addon": "Eklenti y\u00fckleniyor",
-                "start_otbr_addon": "Eklenti ba\u015flat\u0131l\u0131yor"
+                "install_firmware": "Kurulum {firmware_name} firmware. \n \n Bu i\u015flem tamamlanana kadar donan\u0131m\u0131n\u0131zda veya yaz\u0131l\u0131m\u0131n\u0131zda herhangi bir de\u011fi\u015fiklik yapmay\u0131n."
             },
             "step": {
                 "confirm_otbr": {
@@ -19,53 +17,12 @@
                 "confirm_zigbee": {
                     "title": "Zigbee kurulumu tamamland\u0131"
                 },
-                "install_thread_firmware": {
-                    "title": "Ba\u011fda\u015ft\u0131r\u0131c\u0131 g\u00fcncelleniyor"
-                },
-                "install_zigbee_firmware": {
-                    "title": "Ba\u011fda\u015ft\u0131r\u0131c\u0131 g\u00fcncelleniyor"
-                },
                 "otbr_failed": {
                     "description": "OpenThread Border Router eklentisi kurulumu ba\u015far\u0131s\u0131z oldu. Ba\u015fka hi\u00e7bir yaz\u0131l\u0131m\u0131n {model} ile ileti\u015fim kurmaya \u00e7al\u0131\u015fmad\u0131\u011f\u0131ndan, \u0130nternete eri\u015fiminiz oldu\u011fundan ve di\u011fer eklentileri kurabildi\u011finizden emin olun ve tekrar deneyin. Sorun devam ederse Supervisor g\u00fcnl\u00fcklerini kontrol edin."
                 },
-                "pick_firmware": {
-                    "menu_option_descriptions": {
-                        "pick_firmware_thread": "Genellikle Matter over Thread cihazlar\u0131nda kullan\u0131l\u0131r.",
-                        "pick_firmware_thread_migrate": "Bu, Thread Border Router'\u0131n\u0131z\u0131 yeni adapt\u00f6re ta\u015f\u0131yacakt\u0131r.",
-                        "pick_firmware_zigbee": "En yayg\u0131n protokol.",
-                        "pick_firmware_zigbee_migrate": "Bu, Zigbee a\u011f\u0131n\u0131z\u0131 yeni adapt\u00f6re ta\u015f\u0131yacakt\u0131r."
-                    },
-                    "menu_options": {
-                        "pick_firmware_thread_migrate": "Thread'i yeni bir adapt\u00f6re ta\u015f\u0131y\u0131n",
-                        "pick_firmware_zigbee_migrate": "Zigbee'yi yeni bir adapt\u00f6re ta\u015f\u0131y\u0131n"
-                    }
-                },
                 "show_z2m_docs_url": {
                     "description": "Senin {model} \u015eu anda en son Zigbee ayg\u0131t yaz\u0131l\u0131m\u0131n\u0131 \u00e7al\u0131\u015ft\u0131r\u0131yor. \n L\u00fctfen EmberZNet ba\u011fda\u015ft\u0131r\u0131c\u0131lar\u0131 i\u00e7in Zigbee2MQTT belgelerini okuyun ve yap\u0131land\u0131rmay\u0131 kopyalay\u0131n. {model}: {z2m_docs_url}",
                     "title": "Zigbee2MQTT'yi kurun"
-                },
-                "zigbee_installation_type": {
-                    "description": "Zigbee adapt\u00f6r\u00fc i\u00e7in kurulum t\u00fcr\u00fcn\u00fc se\u00e7in.",
-                    "menu_option_descriptions": {
-                        "zigbee_intent_custom": "\u00d6rne\u011fin Zigbee2MQTT ile Zigbee'yi manuel olarak kurun ve yap\u0131land\u0131r\u0131n.",
-                        "zigbee_intent_recommended": "Zigbee'yi otomatik olarak kurun ve yap\u0131land\u0131r\u0131n."
-                    },
-                    "menu_options": {
-                        "zigbee_intent_custom": "Ki\u015fiselle\u015ftirilmi\u015f",
-                        "zigbee_intent_recommended": "\u00d6nerilen kurulum"
-                    },
-                    "title": "Zigbee'yi kurun"
-                },
-                "zigbee_integration": {
-                    "menu_option_descriptions": {
-                        "zigbee_integration_other": "\u00d6rne\u011fin adapt\u00f6r\u00fc Zigbee2MQTT ile kullanmak istiyorsan\u0131z.",
-                        "zigbee_integration_zha": "Home Assistant'\u0131n Zigbee a\u011f\u0131n\u0131 kontrol etmesini sa\u011flar."
-                    },
-                    "menu_options": {
-                        "zigbee_integration_other": "Di\u011fer",
-                        "zigbee_integration_zha": "Zigbee Ev Otomasyonu"
-                    },
-                    "title": "Zigbee y\u00f6ntemini se\u00e7in"
                 }
             }
         }

homeassistant/components/homeassistant_hardware/update.py

@@ -26,7 +26,6 @@ from .util import (
     ApplicationType,
     FirmwareInfo,
     ResetTarget,
-    async_firmware_flashing_context,
     async_flash_silabs_firmware,
 )
 
@@ -275,18 +274,16 @@ class BaseFirmwareUpdateEntity(
         )
 
         try:
-            async with async_firmware_flashing_context(
-                self.hass, self._current_device, self._config_entry.domain
-            ):
-                firmware_info = await async_flash_silabs_firmware(
-                    hass=self.hass,
-                    device=self._current_device,
-                    fw_data=fw_data,
-                    expected_installed_firmware_type=self.entity_description.expected_firmware_type,
-                    bootloader_reset_methods=self.BOOTLOADER_RESET_METHODS,
-                    application_probe_methods=self.APPLICATION_PROBE_METHODS,
-                    progress_callback=self._update_progress,
-                )
+            firmware_info = await async_flash_silabs_firmware(
+                hass=self.hass,
+                device=self._current_device,
+                fw_data=fw_data,
+                expected_installed_firmware_type=self.entity_description.expected_firmware_type,
+                bootloader_reset_methods=self.BOOTLOADER_RESET_METHODS,
+                application_probe_methods=self.APPLICATION_PROBE_METHODS,
+                progress_callback=self._update_progress,
+                domain=self._config_entry.domain,
+            )
         finally:
             self._attr_in_progress = False
             self.async_write_ha_state()

homeassistant/components/homeassistant_hardware/util.py

@@ -26,6 +26,7 @@ from homeassistant.helpers.singleton import singleton
 
 from . import DATA_COMPONENT
 from .const import (
+    DOMAIN,
     OTBR_ADDON_MANAGER_DATA,
     OTBR_ADDON_NAME,
     OTBR_ADDON_SLUG,
@@ -365,22 +366,6 @@ async def probe_silabs_firmware_type(
     return fw_info.firmware_type
 
 
-@asynccontextmanager
-async def async_firmware_flashing_context(
-    hass: HomeAssistant, device: str, source_domain: str
-) -> AsyncIterator[None]:
-    """Register a device as having its firmware being actively interacted with."""
-    async with async_firmware_update_context(hass, device, source_domain):
-        firmware_info = await guess_firmware_info(hass, device)
-        _LOGGER.debug("Guessed firmware info before update: %s", firmware_info)
-
-        async with AsyncExitStack() as stack:
-            for owner in firmware_info.owners:
-                await stack.enter_async_context(owner.temporarily_stop(hass))
-
-            yield
-
-
 async def async_flash_silabs_firmware(
     hass: HomeAssistant,
     device: str,
@@ -389,11 +374,10 @@ async def async_flash_silabs_firmware(
     bootloader_reset_methods: Sequence[ResetTarget],
     application_probe_methods: Sequence[tuple[ApplicationType, int]],
     progress_callback: Callable[[int, int], None] | None = None,
+    *,
+    domain: str = DOMAIN,
 ) -> FirmwareInfo:
-    """Flash firmware to the SiLabs device.
-
-    This function is meant to be used within a firmware update context.
-    """
+    """Flash firmware to the SiLabs device."""
     if not any(
         method == expected_installed_firmware_type
         for method, _ in application_probe_methods
@@ -403,44 +387,54 @@ async def async_flash_silabs_firmware(
             f" not in application probe methods {application_probe_methods!r}"
         )
 
-    fw_image = await hass.async_add_executor_job(parse_firmware_image, fw_data)
-
-    flasher = Flasher(
-        device=device,
-        probe_methods=tuple(
-            (m.as_flasher_application_type(), baudrate)
-            for m, baudrate in application_probe_methods
-        ),
-        bootloader_reset=tuple(
-            m.as_flasher_reset_target() for m in bootloader_reset_methods
-        ),
-    )
-
-    try:
-        # Enter the bootloader with indeterminate progress
-        await flasher.enter_bootloader()
-
-        # Flash the firmware, with progress
-        await flasher.flash_firmware(fw_image, progress_callback=progress_callback)
-    except PermissionError as err:
-        raise HomeAssistantError(
-            "Failed to flash firmware: Device is used by another application"
-        ) from err
-    except Exception as err:
-        raise HomeAssistantError("Failed to flash firmware") from err
-
-    probed_firmware_info = await probe_silabs_firmware_info(
-        device,
-        bootloader_reset_methods=bootloader_reset_methods,
-        # Only probe for the expected installed firmware type
-        application_probe_methods=[
-            (method, baudrate)
-            for method, baudrate in application_probe_methods
-            if method == expected_installed_firmware_type
-        ],
-    )
+    async with async_firmware_update_context(hass, device, domain):
+        firmware_info = await guess_firmware_info(hass, device)
+        _LOGGER.debug("Identified firmware info: %s", firmware_info)
+
+        fw_image = await hass.async_add_executor_job(parse_firmware_image, fw_data)
+
+        flasher = Flasher(
+            device=device,
+            probe_methods=tuple(
+                (m.as_flasher_application_type(), baudrate)
+                for m, baudrate in application_probe_methods
+            ),
+            bootloader_reset=tuple(
+                m.as_flasher_reset_target() for m in bootloader_reset_methods
+            ),
+        )
 
-    if probed_firmware_info is None:
-        raise HomeAssistantError("Failed to probe the firmware after flashing")
+        async with AsyncExitStack() as stack:
+            for owner in firmware_info.owners:
+                await stack.enter_async_context(owner.temporarily_stop(hass))
 
-    return probed_firmware_info
+            try:
+                # Enter the bootloader with indeterminate progress
+                await flasher.enter_bootloader()
+
+                # Flash the firmware, with progress
+                await flasher.flash_firmware(
+                    fw_image, progress_callback=progress_callback
+                )
+            except PermissionError as err:
+                raise HomeAssistantError(
+                    "Failed to flash firmware: Device is used by another application"
+                ) from err
+            except Exception as err:
+                raise HomeAssistantError("Failed to flash firmware") from err
+
+            probed_firmware_info = await probe_silabs_firmware_info(
+                device,
+                bootloader_reset_methods=bootloader_reset_methods,
+                # Only probe for the expected installed firmware type
+                application_probe_methods=[
+                    (method, baudrate)
+                    for method, baudrate in application_probe_methods
+                    if method == expected_installed_firmware_type
+                ],
+            )
+
+        if probed_firmware_info is None:
+            raise HomeAssistantError("Failed to probe the firmware after flashing")
+
+        return probed_firmware_info