jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-08-05 19:48:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add reconfigure support to ESPHome

Browse Source
This commit is contained in:
J. Nick Koston 2025-04-16 18:55:25 -10:00
parent bf69d4e0a8
commit 3a7adb41d3
No known key found for this signature in database
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
homeassistant/components/esphome/config_flow.py
View File

@ -23,6 +23,7 @@ import voluptuous as vol
from homeassistant.components import zeroconf
from homeassistant.config_entries import (
SOURCE_REAUTH,
SOURCE_RECONFIGURE,
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
@ -62,6 +63,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
VERSION = 1
_reauth_entry: ConfigEntry
_reconfig_entry: ConfigEntry
def __init__(self) -> None:
"""Initialize flow."""
@ -171,6 +173,15 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
description_placeholders={"name": self._name},
)
async def async_step_reconfig(
self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult:
"""Handle a flow initialized by a reconfig request."""
self._reconfig_entry = self._get_reconfigure_entry()
self._host = entry_data[CONF_HOST]
self._port = entry_data[CONF_PORT]
return await self._async_step_user_base()
@property
def _name(self) -> str:
return self.__name or "ESPHome"
@ -420,7 +431,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
async def _async_get_entry_or_resolve_conflict(self) -> ConfigFlowResult:
"""Return the entry or resolve a conflict."""
if self.source != SOURCE_REAUTH:
if self.source not in (SOURCE_REAUTH, SOURCE_RECONFIGURE):
for entry in self._async_current_entries(include_ignore=False):
if entry.data.get(CONF_DEVICE_NAME) == self._device_name:
self._entry_with_name_conflict = entry
@ -440,6 +451,23 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
config_options = {
CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
}
if self.source == SOURCE_RECONFIGURE:
assert self.unique_id is not None
assert self._reconfig_entry is not None
assert self._reconfig_entry.unique_id is not None
if self._reauth_entry.unique_id != format_mac(self.unique_id):
return self.async_abort(
reason="reconfigure_unique_id_changed",
description_placeholders={
"name": self._reconfig_entry.title,
"expected_mac": format_mac(self._reconfig_entry.unique_id),
"unexpected_device_name": self._device_name or "",
"unexpected_mac": format_mac(self.unique_id),
},
)
return self.async_update_reload_and_abort(
self._reconfig_entry, data=self._reauth_entry.data | config_data
)
if self.source == SOURCE_REAUTH:
return self.async_update_reload_and_abort(
self._reauth_entry, data=self._reauth_entry.data | config_data
@ -540,7 +568,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
assert self._device_info is not None
mac_address = format_mac(self._device_info.mac_address)
await self.async_set_unique_id(mac_address, raise_on_progress=False)
if self.source != SOURCE_REAUTH:
if self.source not in (SOURCE_REAUTH, SOURCE_RECONFIGURE):
self._abort_if_unique_id_configured(
updates={CONF_HOST: self._host, CONF_PORT: self._port}
)

3
homeassistant/components/esphome/strings.json
View File

@ -10,7 +10,8 @@
"mqtt_missing_api": "Missing API port in MQTT properties.",
"mqtt_missing_ip": "Missing IP address in MQTT properties.",
"mqtt_missing_payload": "Missing MQTT Payload.",
"name_conflict_migrated": "The configuration for `{name}` has been migrated to a new device with MAC address `{mac}` from `{existing_mac}`."
"name_conflict_migrated": "The configuration for `{name}` has been migrated to a new device with MAC address `{mac}` from `{existing_mac}`.",
"reconfigure_unique_id_changed": "**Reconfiguration of `{name}` was aborted** because the provided connection settings refer to a different device: `{unexpected_device_name}` (MAC: `{unexpected_mac}`) instead of the expected device (MAC: `{expected_mac}`)."
},
"error": {
"resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address",