homeassistant 2025.9.0b0__py3-none-any.whl → 2025.9.0b2__py3-none-any.whl

homeassistant/components/webostv/translations/ru.json

@@ -4,7 +4,8 @@
             "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant",
             "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f",
             "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e",
-            "reconfigure_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e"
+            "reconfigure_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e",
+            "wrong_device": "\u041d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0435\u0442 \u0441 \u043d\u0430\u0439\u0434\u0435\u043d\u043d\u044b\u043c \u043f\u043e \u0434\u0430\u043d\u043d\u043e\u043c\u0443 \u0438\u043c\u0435\u043d\u0438 \u0445\u043e\u0441\u0442\u0430 \u0438\u043b\u0438 IP-\u0430\u0434\u0440\u0435\u0441\u0443."
         },
         "error": {
             "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435, \u0432\u043a\u043b\u044e\u0447\u0435\u043d \u043b\u0438 \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440 \u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443.",
@@ -50,6 +51,9 @@
         "device_off": {
             "message": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u044b\u0437\u043e\u0432\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 {func} \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435 {name}: \u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043e \u0438 \u0438\u043c \u043d\u0435\u043b\u044c\u0437\u044f \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c."
         },
+        "invalid_entity_id": {
+            "message": "\u041e\u0431\u044a\u0435\u043a\u0442 {entity_id} \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u043c webOS TV."
+        },
         "notify_communication_error": {
             "message": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u0432\u044f\u0437\u0438 \u043f\u0440\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0435 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e {name}: {error}"
         },
@@ -96,6 +100,7 @@
                     "name": "\u041a\u043d\u043e\u043f\u043a\u0430"
                 },
                 "entity_id": {
+                    "description": "\u0418\u043c\u0435\u043d\u0430 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 webOS TV, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0431\u0443\u0434\u0435\u0442 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0442\u044c\u0441\u044f \u043c\u0435\u0442\u043e\u0434 API.",
                     "name": "\u041e\u0431\u044a\u0435\u043a\u0442"
                 }
             },
@@ -109,10 +114,11 @@
                     "name": "\u041a\u043e\u043c\u0430\u043d\u0434\u0430"
                 },
                 "entity_id": {
-                    "description": "\u0418\u043c\u0435\u043d\u0430 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 webostv, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0431\u0443\u0434\u0435\u0442 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0442\u044c\u0441\u044f \u043c\u0435\u0442\u043e\u0434 API.",
+                    "description": "\u0418\u043c\u0435\u043d\u0430 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 webOS TV, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0431\u0443\u0434\u0435\u0442 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0442\u044c\u0441\u044f \u043c\u0435\u0442\u043e\u0434 API.",
                     "name": "\u041e\u0431\u044a\u0435\u043a\u0442"
                 },
                 "payload": {
+                    "description": "\u041d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u043f\u043e\u043b\u0435\u0437\u043d\u0430\u044f \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0430, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u043c\u0430\u044f \u043a\u043e\u043d\u0435\u0447\u043d\u043e\u0439 \u0442\u043e\u0447\u043a\u0435 \u0432 \u0444\u043e\u0440\u043c\u0430\u0442\u0435 \u043f\u0430\u0440\u044b \u043a\u043b\u044e\u0447-\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435.",
                     "name": "\u041f\u043e\u043b\u0435\u0437\u043d\u0430\u044f \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0430"
                 }
             },
@@ -122,6 +128,7 @@
             "description": "\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u0442 \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440\u0443 \u043a\u043e\u043c\u0430\u043d\u0434\u0443 \u043d\u0430 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u0437\u0432\u0443\u043a\u043e\u0432\u043e\u0433\u043e \u0432\u044b\u0445\u043e\u0434\u0430.",
             "fields": {
                 "entity_id": {
+                    "description": "\u0418\u043c\u0435\u043d\u0430 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 webOS TV, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0437\u0432\u0443\u043a\u043e\u0432\u043e\u0439 \u0432\u044b\u0445\u043e\u0434.",
                     "name": "\u041e\u0431\u044a\u0435\u043a\u0442"
                 },
                 "sound_output": {

homeassistant/components/websocket_api/http.py

@@ -37,6 +37,7 @@ from .messages import message_to_json_bytes
 from .util import describe_request
 
 CLOSE_MSG_TYPES = {WSMsgType.CLOSE, WSMsgType.CLOSED, WSMsgType.CLOSING}
+AUTH_MESSAGE_TIMEOUT = 10  # seconds
 
 if TYPE_CHECKING:
     from .connection import ActiveConnection
@@ -389,9 +390,11 @@ class WebSocketHandler:
 
         # Auth Phase
         try:
-            msg = await self._wsock.receive(10)
+            msg = await self._wsock.receive(AUTH_MESSAGE_TIMEOUT)
         except TimeoutError as err:
-            raise Disconnect("Did not receive auth message within 10 seconds") from err
+            raise Disconnect(
+                f"Did not receive auth message within {AUTH_MESSAGE_TIMEOUT} seconds"
+            ) from err
 
         if msg.type in (WSMsgType.CLOSE, WSMsgType.CLOSED, WSMsgType.CLOSING):
             raise Disconnect("Received close message during auth phase")
@@ -538,6 +541,14 @@ class WebSocketHandler:
             finally:
                 if disconnect_warn is None:
                     logger.debug("%s: Disconnected", self.description)
+                elif connection is None:
+                    # Auth phase disconnects (connection is None) should be logged at debug level
+                    # as they can be from random port scanners or non-legitimate connections
+                    logger.debug(
+                        "%s: Disconnected during auth phase: %s",
+                        self.description,
+                        disconnect_warn,
+                    )
                 else:
                     logger.warning(
                         "%s: Disconnected: %s", self.description, disconnect_warn

homeassistant/components/withings/translations/sk.json

@@ -1,6 +1,6 @@
 {
     "application_credentials": {
-        "description": "Aby ste sa mohli prihl\u00e1si\u0165 do syst\u00e9mu Withings, potrebujeme klientske ID a tajomstvo. Ak ich chcete z\u00edska\u0165, postupujte pod\u013ea nasleduj\u00facich krokov. 1. Prejdite na [Withings Developer Dashboard]({developer_dashboard_url}) a uistite sa, \u017ee ste vybrali Public Cloud (Verejn\u00fd cloud). 1. Prejdite na [Withings Developer Dashboard]( ). Prihl\u00e1ste sa pomocou svojho \u00fa\u010dtu Withings. 1. Vyberte polo\u017eku **Vytvori\u0165 aplik\u00e1ciu**. 1. Vyberte polo\u017eku **Vytvori\u0165 aplik\u00e1ciu**. 2. Za\u010diarknite pol\u00ed\u010dko **Verejn\u00e1 integr\u00e1cia API**. 1. Za\u010diarknite pol\u00ed\u010dko **Verejn\u00e1 integr\u00e1cia API**. Ako cie\u013eov\u00e9 prostredie vyberte **V\u00fdvoj**. 1. Vypl\u0148te n\u00e1zov a popis aplik\u00e1cie pod\u013ea vlastn\u00e9ho v\u00fdberu. 1. Vypl\u0148te `{redirect_url}` pre registrovan\u00fa adresu URL. Uistite sa, \u017ee nestla\u010d\u00edte tla\u010didlo na testovanie. 1. Kliknite na tla\u010didlo . Vypl\u0148te ID klienta a tajn\u00e9 \u00fadaje, ktor\u00e9 s\u00fa teraz k dispoz\u00edcii."
+        "description": "Aby ste sa mohli prihl\u00e1si\u0165 do syst\u00e9mu Withings, potrebujeme klientske ID a tajomstvo. Ak ich chcete z\u00edska\u0165, postupujte pod\u013ea nasleduj\u00facich krokov. \n\n1. Prejdite na [Withings Developer Dashboard]({developer_dashboard_url}) a uistite sa, \u017ee ste vybrali Verejn\u00fd cloud. \n1. Prejdite na [Withings Developer Dashboard]( ). Prihl\u00e1ste sa pomocou svojho \u00fa\u010dtu Withings. \n1. Vyberte polo\u017eku **Vytvori\u0165 aplik\u00e1ciu**. \n1. Vyberte polo\u017eku **Vytvori\u0165 aplik\u00e1ciu**. \n1. Za\u010diarknite pol\u00ed\u010dko **Verejn\u00e1 integr\u00e1cia API**. \n1. Za\u010diarknite pol\u00ed\u010dko **Verejn\u00e1 integr\u00e1cia API**. Ako cie\u013eov\u00e9 prostredie vyberte **V\u00fdvoj**. \n1. Vypl\u0148te n\u00e1zov a popis aplik\u00e1cie pod\u013ea vlastn\u00e9ho v\u00fdberu. \n1. Vypl\u0148te `{redirect_url}` pre registrovan\u00fa adresu URL. Uistite sa, \u017ee nestla\u010d\u00edte tla\u010didlo na testovanie. \n1. Kliknite na tla\u010didlo . Vypl\u0148te ID klienta a tajn\u00e9 \u00fadaje, ktor\u00e9 s\u00fa teraz k dispoz\u00edcii."
     },
     "config": {
         "abort": {

homeassistant/components/xiaomi_miio/translations/lt.json

@@ -280,6 +280,9 @@
             "anion": {
                 "name": "Jonizatorius"
             },
+            "auto_detect": {
+                "name": "Automatinis aptikimas"
+            },
             "buzzer": {
                 "name": "Skambutis"
             },

homeassistant/components/yalexs_ble/__init__.py

@@ -19,6 +19,7 @@ from homeassistant.const import CONF_ADDRESS, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import CALLBACK_TYPE, CoreState, Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 
+from .config_cache import async_get_validated_config
 from .const import (
     CONF_ALWAYS_CONNECTED,
     CONF_KEY,
@@ -96,13 +97,30 @@ async def async_setup_entry(hass: HomeAssistant, entry: YALEXSBLEConfigEntry) ->
     )
 
     try:
-        await push_lock.wait_for_first_update(DEVICE_TIMEOUT)
-    except AuthError as ex:
-        raise ConfigEntryAuthFailed(str(ex)) from ex
-    except (YaleXSBLEError, TimeoutError) as ex:
-        raise ConfigEntryNotReady(
-            f"{ex}; Try moving the Bluetooth adapter closer to {local_name}"
-        ) from ex
+        await _async_wait_for_first_update(push_lock, local_name)
+    except ConfigEntryAuthFailed:
+        # If key has rotated, try to fetch it from the cache
+        # and update
+        if (validated_config := async_get_validated_config(hass, address)) and (
+            validated_config.key != entry.data[CONF_KEY]
+            or validated_config.slot != entry.data[CONF_SLOT]
+        ):
+            assert shutdown_callback is not None
+            shutdown_callback()
+            push_lock.set_lock_key(validated_config.key, validated_config.slot)
+            shutdown_callback = await push_lock.start()
+            await _async_wait_for_first_update(push_lock, local_name)
+            # If we can use the cached key and slot, update the entry.
+            hass.config_entries.async_update_entry(
+                entry,
+                data={
+                    **entry.data,
+                    CONF_KEY: validated_config.key,
+                    CONF_SLOT: validated_config.slot,
+                },
+            )
+        else:
+            raise
 
     entry.runtime_data = YaleXSBLEData(entry.title, push_lock, always_connected)
 
@@ -147,6 +165,18 @@ async def _async_update_listener(
         await hass.config_entries.async_reload(entry.entry_id)
 
 
+async def _async_wait_for_first_update(push_lock: PushLock, local_name: str) -> None:
+    """Wait for the first update from the push lock."""
+    try:
+        await push_lock.wait_for_first_update(DEVICE_TIMEOUT)
+    except AuthError as ex:
+        raise ConfigEntryAuthFailed(str(ex)) from ex
+    except (YaleXSBLEError, TimeoutError) as ex:
+        raise ConfigEntryNotReady(
+            f"{ex}; Try moving the Bluetooth adapter closer to {local_name}"
+        ) from ex
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: YALEXSBLEConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/yalexs_ble/config_cache.py

@@ -0,0 +1,31 @@
+"""The Yale Access Bluetooth integration."""
+
+from __future__ import annotations
+
+from yalexs_ble import ValidatedLockConfig
+
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.util.hass_dict import HassKey
+
+CONFIG_CACHE: HassKey[dict[str, ValidatedLockConfig]] = HassKey(
+    "yalexs_ble_config_cache"
+)
+
+
+@callback
+def async_add_validated_config(
+    hass: HomeAssistant,
+    address: str,
+    config: ValidatedLockConfig,
+) -> None:
+    """Add a validated config."""
+    hass.data.setdefault(CONFIG_CACHE, {})[address] = config
+
+
+@callback
+def async_get_validated_config(
+    hass: HomeAssistant,
+    address: str,
+) -> ValidatedLockConfig | None:
+    """Get the config for a specific address."""
+    return hass.data.get(CONFIG_CACHE, {}).get(address)

homeassistant/components/yalexs_ble/config_flow.py

@@ -33,6 +33,7 @@ from homeassistant.core import callback
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.helpers.typing import DiscoveryInfoType
 
+from .config_cache import async_add_validated_config, async_get_validated_config
 from .const import CONF_ALWAYS_CONNECTED, CONF_KEY, CONF_LOCAL_NAME, CONF_SLOT, DOMAIN
 from .util import async_find_existing_service_info, human_readable_name
 
@@ -92,7 +93,10 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
                 None, discovery_info.name, discovery_info.address
             ),
         }
-        return await self.async_step_user()
+        if lock_cfg := async_get_validated_config(self.hass, discovery_info.address):
+            self._lock_cfg = lock_cfg
+            return await self.async_step_integration_discovery_confirm()
+        return await self.async_step_key_slot()
 
     async def async_step_integration_discovery(
         self, discovery_info: DiscoveryInfoType
@@ -105,6 +109,7 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
             discovery_info["key"],
             discovery_info["slot"],
         )
+        async_add_validated_config(self.hass, lock_cfg.address, lock_cfg)
 
         address = lock_cfg.address
         self.local_name = lock_cfg.local_name
@@ -232,22 +237,28 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    async def async_step_user(
+    async def async_step_key_slot(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle the user step to pick discovered device."""
+        """Handle the key and slot step."""
         errors: dict[str, str] = {}
+        discovery_info = self._discovery_info
+        assert discovery_info is not None
+        address = discovery_info.address
+        validated_config = async_get_validated_config(self.hass, address)
 
-        if user_input is not None:
-            self.active = True
-            address = user_input[CONF_ADDRESS]
-            discovery_info = self._discovered_devices[address]
+        if user_input is not None or validated_config:
             local_name = discovery_info.name
-            key = user_input[CONF_KEY]
-            slot = user_input[CONF_SLOT]
-            await self.async_set_unique_id(
-                discovery_info.address, raise_on_progress=False
-            )
+            if validated_config:
+                key = validated_config.key
+                slot = validated_config.slot
+                title = validated_config.name
+            else:
+                assert user_input is not None
+                key = user_input[CONF_KEY]
+                slot = user_input[CONF_SLOT]
+                title = human_readable_name(None, local_name, address)
+            await self.async_set_unique_id(address, raise_on_progress=False)
             self._abort_if_unique_id_configured()
             if not (
                 errors := await async_validate_lock_or_error(
@@ -255,7 +266,7 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
                 )
             ):
                 return self.async_create_entry(
-                    title=local_name,
+                    title=title,
                     data={
                         CONF_LOCAL_NAME: discovery_info.name,
                         CONF_ADDRESS: discovery_info.address,
@@ -264,24 +275,48 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
                     },
                 )
 
-        if discovery := self._discovery_info:
+        return self.async_show_form(
+            step_id="key_slot",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_KEY): str,
+                    vol.Required(CONF_SLOT): int,
+                }
+            ),
+            errors=errors,
+            description_placeholders={
+                "address": address,
+                "title": self._async_get_name_from_address(address),
+            },
+        )
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the user step to pick discovered device."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            self.active = True
+            address = user_input[CONF_ADDRESS]
+            self._discovery_info = self._discovered_devices[address]
+            return await self.async_step_key_slot()
+
+        current_addresses = self._async_current_ids(include_ignore=False)
+        current_unique_names = {
+            entry.data.get(CONF_LOCAL_NAME)
+            for entry in self._async_current_entries()
+            if local_name_is_unique(entry.data.get(CONF_LOCAL_NAME))
+        }
+        for discovery in async_discovered_service_info(self.hass):
+            if (
+                discovery.address in current_addresses
+                or discovery.name in current_unique_names
+                or discovery.address in self._discovered_devices
+                or YALE_MFR_ID not in discovery.manufacturer_data
+            ):
+                continue
             self._discovered_devices[discovery.address] = discovery
-        else:
-            current_addresses = self._async_current_ids(include_ignore=False)
-            current_unique_names = {
-                entry.data.get(CONF_LOCAL_NAME)
-                for entry in self._async_current_entries()
-                if local_name_is_unique(entry.data.get(CONF_LOCAL_NAME))
-            }
-            for discovery in async_discovered_service_info(self.hass):
-                if (
-                    discovery.address in current_addresses
-                    or discovery.name in current_unique_names
-                    or discovery.address in self._discovered_devices
-                    or YALE_MFR_ID not in discovery.manufacturer_data
-                ):
-                    continue
-                self._discovered_devices[discovery.address] = discovery
 
         if not self._discovered_devices:
             return self.async_abort(reason="no_devices_found")
@@ -290,14 +325,12 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
             {
                 vol.Required(CONF_ADDRESS): vol.In(
                     {
-                        service_info.address: (
-                            f"{service_info.name} ({service_info.address})"
+                        service_info.address: self._async_get_name_from_address(
+                            service_info.address
                         )
                         for service_info in self._discovered_devices.values()
                     }
-                ),
-                vol.Required(CONF_KEY): str,
-                vol.Required(CONF_SLOT): int,
+                )
             }
         )
         return self.async_show_form(
@@ -306,6 +339,18 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
+    @callback
+    def _async_get_name_from_address(self, address: str) -> str:
+        """Get the name of a device from its address."""
+        if validated_config := async_get_validated_config(self.hass, address):
+            return f"{validated_config.name} ({address})"
+        if address in self._discovered_devices:
+            service_info = self._discovered_devices[address]
+            return f"{service_info.name} ({service_info.address})"
+        assert self._discovery_info is not None
+        assert self._discovery_info.address == address
+        return f"{self._discovery_info.name} ({address})"
+
     @staticmethod
     @callback
     def async_get_options_flow(

homeassistant/components/yalexs_ble/strings.json

@@ -3,18 +3,23 @@
     "flow_title": "{name}",
     "step": {
       "user": {
-        "description": "Check the documentation for how to find the offline key. If you are using the August cloud integration to obtain the key, you may need to reload the August cloud integration while the lock is in Bluetooth range.",
+        "description": "Select the device you want to set up over Bluetooth.",
+        "data": {
+          "address": "Bluetooth address"
+        }
+      },
+      "key_slot": {
+        "description": "Enter the key for the {title} lock with address {address}. If you are using the August or Yale cloud integration to obtain the key, you may be able to avoid this manual setup by reloading the August or Yale cloud integration while the lock is in Bluetooth range.",
         "data": {
-          "address": "Bluetooth address",
           "key": "Offline Key (32-byte hex string)",
           "slot": "Offline Key Slot (Integer between 0 and 255)"
         }
       },
       "reauth_validate": {
-        "description": "Enter the updated key for the {title} lock with address {address}. If you are using the August cloud integration to obtain the key, you may be able to avoid manual reauthentication by reloading the August cloud integration while the lock is in Bluetooth range.",
+        "description": "Enter the updated key for the {title} lock with address {address}. If you are using the August or Yale cloud integration to obtain the key, you may be able to avoid manual re-authentication by reloading the August or Yale cloud integration while the lock is in Bluetooth range.",
         "data": {
-          "key": "[%key:component::yalexs_ble::config::step::user::data::key%]",
-          "slot": "[%key:component::yalexs_ble::config::step::user::data::slot%]"
+          "key": "[%key:component::yalexs_ble::config::step::key_slot::data::key%]",
+          "slot": "[%key:component::yalexs_ble::config::step::key_slot::data::slot%]"
         }
       },
       "integration_discovery_confirm": {

homeassistant/components/yalexs_ble/translations/bg.json

@@ -17,15 +17,9 @@
             "integration_discovery_confirm": {
                 "description": "\u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u0435 {name} \u043f\u0440\u0435\u0437 Bluetooth \u0441 \u0430\u0434\u0440\u0435\u0441 {address}?"
             },
-            "reauth_validate": {
-                "data": {
-                    "key": "\u041e\u0444\u043b\u0430\u0439\u043d \u043a\u043b\u044e\u0447 (32-\u0431\u0430\u0439\u0442\u043e\u0432 hex \u043d\u0438\u0437)"
-                }
-            },
             "user": {
                 "data": {
-                    "address": "Bluetooth \u0430\u0434\u0440\u0435\u0441",
-                    "key": "\u041e\u0444\u043b\u0430\u0439\u043d \u043a\u043b\u044e\u0447 (32-\u0431\u0430\u0439\u0442\u043e\u0432 hex \u043d\u0438\u0437)"
+                    "address": "Bluetooth \u0430\u0434\u0440\u0435\u0441"
                 }
             }
         }

homeassistant/components/yalexs_ble/translations/ca.json

@@ -19,20 +19,10 @@
             "integration_discovery_confirm": {
                 "description": "Vols configurar {name} per Bluetooth amb l'adre\u00e7a {address}?"
             },
-            "reauth_validate": {
-                "data": {
-                    "key": "Clau fora de l\u00ednia (cadena hexadecimal de 32 bytes)",
-                    "slot": "'Slot' de clau fora de l\u00ednia (nombre enter entre 0 i 255)"
-                },
-                "description": "Introdueix la clau actualitzada del pany {title} amb adre\u00e7a {address}. Si utilitzes la integraci\u00f3 al n\u00favol August per obtenir la clau, \u00e9s possible que puguis evitar la re-autenticaci\u00f3 manual tornant a carregar la integraci\u00f3 August mentre el pany estigui a l'abast del Bluetooth."
-            },
             "user": {
                 "data": {
-                    "address": "Adre\u00e7a Bluetooth",
-                    "key": "Clau fora de l\u00ednia (cadena hexadecimal de 32 bytes)",
-                    "slot": "'Slot' de clau fora de l\u00ednia (nombre enter entre 0 i 255)"
-                },
-                "description": "Consulta la documentaci\u00f3 per saber com trobar la clau de fora de l\u00ednia. Si est\u00e0s utilitzant la integraci\u00f3 al n\u00favol August per obtenir la clau, \u00e9s possible que hagis de reiniciar la integraci\u00f3 August mentre el pany estigui a l'abast del Bluetooth."
+                    "address": "Adre\u00e7a Bluetooth"
+                }
             }
         }
     },

homeassistant/components/yalexs_ble/translations/cs.json

@@ -19,20 +19,10 @@
             "integration_discovery_confirm": {
                 "description": "Chcete nastavit {name} p\u0159es Bluetooth s adresou {address}?"
             },
-            "reauth_validate": {
-                "data": {
-                    "key": "Offline kl\u00ed\u010d (32bajtov\u00fd hexadecim\u00e1ln\u00ed \u0159et\u011bzec)",
-                    "slot": "Offline kl\u00ed\u010dov\u00fd slot (cel\u00e9 \u010d\u00edslo mezi 0 a 255)"
-                },
-                "description": "Zadejte aktualizovan\u00fd kl\u00ed\u010d pro z\u00e1mek {title} s adresou {address}. Pokud k z\u00edsk\u00e1n\u00ed kl\u00ed\u010de pou\u017e\u00edv\u00e1te srpnovou cloudovou integraci, mo\u017en\u00e1 se budete moci vyhnout ru\u010dn\u00edmu op\u011btovn\u00e9mu ov\u011b\u0159en\u00ed t\u00edm, \u017ee znovu na\u010dtete srpnovou cloudovou integraci, kdy\u017e je z\u00e1mek v dosahu Bluetooth."
-            },
             "user": {
                 "data": {
-                    "address": "Adresa Bluetooth",
-                    "key": "Offline kl\u00ed\u010d (32bajtov\u00fd hexadecim\u00e1ln\u00ed \u0159et\u011bzec)",
-                    "slot": "Offline kl\u00ed\u010dov\u00fd slot (cel\u00e9 \u010d\u00edslo mezi 0 a 255)"
-                },
-                "description": "Pod\u00edvejte se do dokumentace, jak naj\u00edt offline kl\u00ed\u010d. Pokud k z\u00edsk\u00e1n\u00ed kl\u00ed\u010de pou\u017e\u00edv\u00e1te srpnovou cloudovou integraci, mo\u017en\u00e1 budete muset znovu na\u010d\u00edst srpnovou cloudovou integraci, kdy\u017e je z\u00e1mek v dosahu Bluetooth."
+                    "address": "Adresa Bluetooth"
+                }
             }
         }
     },

homeassistant/components/yalexs_ble/translations/de.json

@@ -19,20 +19,25 @@
             "integration_discovery_confirm": {
                 "description": "M\u00f6chtest du {name} \u00fcber Bluetooth mit der Adresse {address} einrichten?"
             },
-            "reauth_validate": {
+            "key_slot": {
                 "data": {
                     "key": "Offline-Schl\u00fcssel (32 Byte Hex-Zeichenfolge)",
                     "slot": "Offline-Schl\u00fcssel-Slot (Ganzzahl zwischen 0 und 255)"
                 },
-                "description": "Gib den aktualisierten Schl\u00fcssel f\u00fcr das {title} Schloss mit der Adresse {address} ein. Wenn du die August-Cloud-Integration verwendest, um den Schl\u00fcssel zu erhalten, kannst du m\u00f6glicherweise eine manuelle Neuauthentifizierung vermeiden, indem du die August-Cloud-Integration neu l\u00e4dst, w\u00e4hrend sich das Schloss in Bluetooth-Reichweite befindet."
+                "description": "Gib den Schl\u00fcssel f\u00fcr das {title} Schloss mit der Adresse {address} ein. Wenn du zum Abrufen des Schl\u00fcssels die August- oder Yale-Cloud-Integration verwendest, kannst du m\u00f6glicherweise diese manuelle Einrichtung vermeiden, indem du die August- oder Yale-Cloud-Integration neu l\u00e4dst, w\u00e4hrend sich das Schloss in Bluetooth-Reichweite befindet."
             },
-            "user": {
+            "reauth_validate": {
                 "data": {
-                    "address": "Bluetooth-Adresse",
                     "key": "Offline-Schl\u00fcssel (32 Byte Hex-Zeichenfolge)",
                     "slot": "Offline-Schl\u00fcssel-Slot (Ganzzahl zwischen 0 und 255)"
                 },
-                "description": "Lies in der Dokumentation nach, wie du den Offline-Schl\u00fcssel finden kannst. Wenn du die August-Cloud-Integration verwendest, um den Schl\u00fcssel zu erhalten, musst du die August-Cloud-Integration m\u00f6glicherweise neu laden, w\u00e4hrend sich das Schloss in Bluetooth-Reichweite befindet."
+                "description": "Gib den aktualisierten Schl\u00fcssel f\u00fcr das {title} Schloss mit der Adresse {address} ein. Wenn du zum Abrufen des Schl\u00fcssels die August- oder Yale-Cloud-Integration verwendest, kannst du m\u00f6glicherweise eine manuelle Neuauthentifizierung vermeiden, indem du die August- oder Yale-Cloud-Integration neu l\u00e4dst, w\u00e4hrend sich das Schloss in Bluetooth-Reichweite befindet."
+            },
+            "user": {
+                "data": {
+                    "address": "Bluetooth-Adresse"
+                },
+                "description": "W\u00e4hle das Ger\u00e4t aus, das du \u00fcber Bluetooth einrichten m\u00f6chtest."
             }
         }
     },

homeassistant/components/yalexs_ble/translations/el.json

@@ -19,20 +19,10 @@
             "integration_discovery_confirm": {
                 "description": "\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf {name} \u03bc\u03ad\u03c3\u03c9 Bluetooth \u03bc\u03b5 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 {address};"
             },
-            "reauth_validate": {
-                "data": {
-                    "key": "\u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03ba\u03c4\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2 (\u03b4\u03b5\u03ba\u03b1\u03b5\u03be\u03b1\u03b4\u03b9\u03ba\u03ae \u03c3\u03c5\u03bc\u03b2\u03bf\u03bb\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac 32 byte)",
-                    "slot": "\u03a5\u03c0\u03bf\u03b4\u03bf\u03c7\u03ae \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03bf\u03cd \u03b5\u03ba\u03c4\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2 (\u0391\u03ba\u03ad\u03c1\u03b1\u03b9\u03bf\u03c2 \u03b1\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03bc\u03b5\u03c4\u03b1\u03be\u03cd 0 \u03ba\u03b1\u03b9 255)"
-                },
-                "description": "\u0395\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b5\u03bd\u03b7\u03bc\u03b5\u03c1\u03c9\u03bc\u03ad\u03bd\u03bf \u03ba\u03bb\u03b5\u03b9\u03b4\u03af \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03ba\u03bb\u03b5\u03b9\u03b4\u03b1\u03c1\u03b9\u03ac {title} \u03bc\u03b5 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 {address}. \u0395\u03ac\u03bd \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 \u03c4\u03bf\u03c5 cloud \u03c4\u03b7\u03c2 August \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03bb\u03ac\u03b2\u03b5\u03c4\u03b5 \u03c4\u03bf \u03ba\u03bb\u03b5\u03b9\u03b4\u03af, \u03af\u03c3\u03c9\u03c2 \u03bc\u03c0\u03bf\u03c1\u03ad\u03c3\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b1\u03c0\u03bf\u03c6\u03cd\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b5\u03ba \u03bd\u03ad\u03bf\u03c5 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03c7\u03b5\u03b9\u03c1\u03bf\u03ba\u03af\u03bd\u03b7\u03c4\u03b1, \u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03c4\u03ce\u03bd\u03bf\u03bd\u03c4\u03b1\u03c2 \u03c4\u03b7\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 \u03c4\u03bf\u03c5 cloud \u03c4\u03b7\u03c2 August \u03b5\u03bd\u03ce \u03b7 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b1\u03c1\u03b9\u03ac \u03b2\u03c1\u03af\u03c3\u03ba\u03b5\u03c4\u03b1\u03b9 \u03c3\u03b5 \u03b5\u03bc\u03b2\u03ad\u03bb\u03b5\u03b9\u03b1 Bluetooth."
-            },
             "user": {
                 "data": {
-                    "address": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 Bluetooth",
-                    "key": "\u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03ba\u03c4\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2 (\u03b4\u03b5\u03ba\u03b1\u03b5\u03be\u03b1\u03b4\u03b9\u03ba\u03ae \u03c3\u03c5\u03bc\u03b2\u03bf\u03bb\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac 32 byte)",
-                    "slot": "\u03a5\u03c0\u03bf\u03b4\u03bf\u03c7\u03ae \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03bf\u03cd \u03b5\u03ba\u03c4\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2 (\u0391\u03ba\u03ad\u03c1\u03b1\u03b9\u03bf\u03c2 \u03b1\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03bc\u03b5\u03c4\u03b1\u03be\u03cd 0 \u03ba\u03b1\u03b9 255)"
-                },
-                "description": "\u0395\u03bb\u03ad\u03b3\u03be\u03c4\u03b5 \u03c4\u03b7\u03bd \u03c4\u03b5\u03ba\u03bc\u03b7\u03c1\u03af\u03c9\u03c3\u03b7 \u03b3\u03b9\u03b1 \u03c4\u03bf\u03bd \u03c4\u03c1\u03cc\u03c0\u03bf \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7\u03c2 \u03c4\u03bf\u03c5 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03bf\u03cd \u03b5\u03ba\u03c4\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2. \u0395\u03ac\u03bd \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 cloud \u03c4\u03b7\u03c2 August \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03bb\u03ac\u03b2\u03b5\u03c4\u03b5 \u03c4\u03bf \u03ba\u03bb\u03b5\u03b9\u03b4\u03af, \u03b5\u03bd\u03b4\u03ad\u03c7\u03b5\u03c4\u03b1\u03b9 \u03bd\u03b1 \u03c7\u03c1\u03b5\u03b9\u03b1\u03c3\u03c4\u03b5\u03af \u03bd\u03b1 \u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03c4\u03ce\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 cloud \u03c4\u03b7\u03c2 August \u03b5\u03bd\u03ce \u03b7 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b1\u03c1\u03b9\u03ac \u03b2\u03c1\u03af\u03c3\u03ba\u03b5\u03c4\u03b1\u03b9 \u03c3\u03b5 \u03b5\u03bc\u03b2\u03ad\u03bb\u03b5\u03b9\u03b1 Bluetooth."
+                    "address": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 Bluetooth"
+                }
             }
         }
     },

homeassistant/components/yalexs_ble/translations/en-GB.json

@@ -19,6 +19,13 @@
             "integration_discovery_confirm": {
                 "description": "Do you want to set up {name} over Bluetooth with address {address}?"
             },
+            "key_slot": {
+                "data": {
+                    "key": "Offline Key (32-byte hex string)",
+                    "slot": "Offline Key Slot (Integer between 0 and 255)"
+                },
+                "description": "Enter the key for the {title} lock with address {address}. If you are using the August or Yale cloud integration to obtain the key, you may be able to avoid this manual setup by reloading the August or Yale cloud integration while the lock is in Bluetooth range."
+            },
             "reauth_validate": {
                 "data": {
                     "key": "Offline Key (32-byte hex string)",
@@ -28,11 +35,9 @@
             },
             "user": {
                 "data": {
-                    "address": "Bluetooth address",
-                    "key": "Offline Key (32-byte hex string)",
-                    "slot": "Offline Key Slot (Integer between 0 and 255)"
+                    "address": "Bluetooth address"
                 },
-                "description": "Check the documentation for how to find the offline key. If you are using the August cloud integration to obtain the key, you may need to reload the August cloud integration while the lock is in Bluetooth range."
+                "description": "Select the device you want to set up over Bluetooth."
             }
         }
     },

homeassistant/components/yalexs_ble/translations/en.json

@@ -19,20 +19,25 @@
             "integration_discovery_confirm": {
                 "description": "Do you want to set up {name} over Bluetooth with address {address}?"
             },
-            "reauth_validate": {
+            "key_slot": {
                 "data": {
                     "key": "Offline Key (32-byte hex string)",
                     "slot": "Offline Key Slot (Integer between 0 and 255)"
                 },
-                "description": "Enter the updated key for the {title} lock with address {address}. If you are using the August cloud integration to obtain the key, you may be able to avoid manual reauthentication by reloading the August cloud integration while the lock is in Bluetooth range."
+                "description": "Enter the key for the {title} lock with address {address}. If you are using the August or Yale cloud integration to obtain the key, you may be able to avoid this manual setup by reloading the August or Yale cloud integration while the lock is in Bluetooth range."
             },
-            "user": {
+            "reauth_validate": {
                 "data": {
-                    "address": "Bluetooth address",
                     "key": "Offline Key (32-byte hex string)",
                     "slot": "Offline Key Slot (Integer between 0 and 255)"
                 },
-                "description": "Check the documentation for how to find the offline key. If you are using the August cloud integration to obtain the key, you may need to reload the August cloud integration while the lock is in Bluetooth range."
+                "description": "Enter the updated key for the {title} lock with address {address}. If you are using the August or Yale cloud integration to obtain the key, you may be able to avoid manual re-authentication by reloading the August or Yale cloud integration while the lock is in Bluetooth range."
+            },
+            "user": {
+                "data": {
+                    "address": "Bluetooth address"
+                },
+                "description": "Select the device you want to set up over Bluetooth."
             }
         }
     },

homeassistant/components/yalexs_ble/translations/es.json

@@ -19,20 +19,10 @@
             "integration_discovery_confirm": {
                 "description": "\u00bfQuieres configurar {name} a trav\u00e9s de Bluetooth con la direcci\u00f3n {address}?"
             },
-            "reauth_validate": {
-                "data": {
-                    "key": "Clave sin conexi\u00f3n (cadena hexadecimal de 32 bytes)",
-                    "slot": "Ranura de clave sin conexi\u00f3n (entero entre 0 y 255)"
-                },
-                "description": "Introduce la clave actualizada para la cerradura {title} con la direcci\u00f3n {address}. Si est\u00e1s utilizando la integraci\u00f3n de la nube de August para obtener la clave, es posible que puedas evitar volver a autenticar manualmente recargando la integraci\u00f3n de la nube de August mientras la cerradura est\u00e1 dentro del alcance Bluetooth."
-            },
             "user": {
                 "data": {
-                    "address": "Direcci\u00f3n Bluetooth",
-                    "key": "Clave sin conexi\u00f3n (cadena hexadecimal de 32 bytes)",
-                    "slot": "Ranura de clave sin conexi\u00f3n (entero entre 0 y 255)"
-                },
-                "description": "Consulta la documentaci\u00f3n para saber c\u00f3mo encontrar la clave sin conexi\u00f3n. Si est\u00e1s utilizando la integraci\u00f3n de la nube de August para obtener la clave, es posible que debas volver a cargar la integraci\u00f3n mientras la cerradura est\u00e1 dentro del alcance Bluetooth."
+                    "address": "Direcci\u00f3n Bluetooth"
+                }
             }
         }
     },