From 6ed221de5d963e187c43010c52a79e75c9d95c65 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Tue, 20 Feb 2024 03:41:38 -0600 Subject: [PATCH] Handle empty name in powerview config flow (#110969) fixes ``` 2024-02-19 13:51:58.128 ERROR (MainThread) [homeassistant] Error doing job: Task exception was never retrieved: File "/Users/bdraco/home-assistant/venv/bin/hass", line 8, in sys.exit(main()) File "/Users/bdraco/home-assistant/homeassistant/__main__.py", line 209, in main exit_code = runner.run(runtime_conf) File "/Users/bdraco/home-assistant/homeassistant/runner.py", line 188, in run return loop.run_until_complete(setup_and_run_hass(runtime_config)) File "/opt/homebrew/Cellar/python@3.12/3.12.1/Frameworks/Python.framework/Versions/3.12/lib/python3.12/asyncio/base_events.py", line 673, in run_until_complete self.run_forever() File "/opt/homebrew/Cellar/python@3.12/3.12.1/Frameworks/Python.framework/Versions/3.12/lib/python3.12/asyncio/base_events.py", line 640, in run_forever self._run_once() File "/opt/homebrew/Cellar/python@3.12/3.12.1/Frameworks/Python.framework/Versions/3.12/lib/python3.12/asyncio/base_events.py", line 1965, in _run_once handle._run() File "/opt/homebrew/Cellar/python@3.12/3.12.1/Frameworks/Python.framework/Versions/3.12/lib/python3.12/asyncio/events.py", line 84, in _run self._context.run(self._callback, *self._args) File "/Users/bdraco/home-assistant/homeassistant/helpers/entity_platform.py", line 610, in async_add_entities await add_func(coros, entities, timeout) File "/Users/bdraco/home-assistant/homeassistant/helpers/entity_platform.py", line 561, in _async_add_entities await coro File "/Users/bdraco/home-assistant/homeassistant/helpers/entity_platform.py", line 652, in _async_add_entity entity.add_to_platform_start( File "/Users/bdraco/home-assistant/homeassistant/components/device_tracker/config_entry.py", line 356, in add_to_platform_start _async_connected_device_registered( File "/Users/bdraco/home-assistant/homeassistant/components/device_tracker/config_entry.py", line 94, in _async_connected_device_registered async_dispatcher_send( File "/Users/bdraco/home-assistant/homeassistant/helpers/dispatcher.py", line 227, in async_dispatcher_send hass.async_run_hass_job(job, *args) File "/Users/bdraco/home-assistant/homeassistant/core.py", line 701, in async_run_hass_job hassjob.target(*args) File "/Users/bdraco/home-assistant/homeassistant/util/logging.py", line 133, in _callback_wrapper func(*args) File "/Users/bdraco/home-assistant/homeassistant/components/dhcp/__init__.py", line 392, in _async_process_device_data self.async_process_client(ip_address, hostname, mac_address) File "/Users/bdraco/home-assistant/homeassistant/components/dhcp/__init__.py", line 268, in async_process_client discovery_flow.async_create_flow( File "/Users/bdraco/home-assistant/homeassistant/helpers/discovery_flow.py", line 32, in async_create_flow hass.async_create_task(init_coro, f"discovery flow {domain} {context}") File "/Users/bdraco/home-assistant/homeassistant/core.py", line 634, in async_create_task task = self.loop.create_task(target, name=name) Traceback (most recent call last): File "/Users/bdraco/home-assistant/homeassistant/config_entries.py", line 1017, in async_init flow, result = await self._async_init(flow_id, handler, context, data) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/bdraco/home-assistant/homeassistant/config_entries.py", line 1047, in _async_init result = await self._async_handle_step(flow, flow.init_step, data) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/bdraco/home-assistant/homeassistant/data_entry_flow.py", line 501, in _async_handle_step result: FlowResult = await getattr(flow, method)(user_input) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/bdraco/home-assistant/homeassistant/components/hunterdouglas_powerview/config_flow.py", line 127, in async_step_dhcp return await self.async_step_discovery_confirm() ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/bdraco/home-assistant/homeassistant/components/hunterdouglas_powerview/config_flow.py", line 152, in async_step_discovery_confirm assert self.discovered_ip and self.discovered_name AssertionError ``` --- .../components/hunterdouglas_powerview/config_flow.py | 10 +++++++--- tests/components/hunterdouglas_powerview/const.py | 11 +++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/hunterdouglas_powerview/config_flow.py b/homeassistant/components/hunterdouglas_powerview/config_flow.py index 359edfb340e..97e04b7d522 100644 --- a/homeassistant/components/hunterdouglas_powerview/config_flow.py +++ b/homeassistant/components/hunterdouglas_powerview/config_flow.py @@ -149,7 +149,7 @@ class PowerviewConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): """Confirm dhcp or homekit discovery.""" # If we already have the host configured do # not open connections to it if we can avoid it. - assert self.discovered_ip and self.discovered_name + assert self.discovered_ip and self.discovered_name is not None self.context[CONF_HOST] = self.discovered_ip for progress in self._async_in_progress(): if progress.get("context", {}).get(CONF_HOST) == self.discovered_ip: @@ -159,15 +159,19 @@ class PowerviewConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): info, error = await self._async_validate_or_error(self.discovered_ip) if error: return self.async_abort(reason=error) - assert info is not None + + api_version = info[CONF_API_VERSION] + if not self.discovered_name: + self.discovered_name = f"Powerview Generation {api_version}" + await self.async_set_unique_id(info["unique_id"], raise_on_progress=False) self._abort_if_unique_id_configured({CONF_HOST: self.discovered_ip}) self.powerview_config = { CONF_HOST: self.discovered_ip, CONF_NAME: self.discovered_name, - CONF_API_VERSION: info[CONF_API_VERSION], + CONF_API_VERSION: api_version, } return await self.async_step_link() diff --git a/tests/components/hunterdouglas_powerview/const.py b/tests/components/hunterdouglas_powerview/const.py index 7254c179edf..5a912a63a17 100644 --- a/tests/components/hunterdouglas_powerview/const.py +++ b/tests/components/hunterdouglas_powerview/const.py @@ -53,6 +53,12 @@ DHCP_DISCOVERY_GEN2 = dhcp.DhcpServiceInfo( macaddress="aabbccddeeff", ) +DHCP_DISCOVERY_GEN2_NO_NAME = dhcp.DhcpServiceInfo( + hostname="", + ip="1.2.3.4", + macaddress="aabbccddeeff", +) + DHCP_DISCOVERY_GEN3 = dhcp.DhcpServiceInfo( hostname="Powerview Generation 3", ip="1.2.3.4", @@ -82,6 +88,11 @@ DHCP_DATA = [ DHCP_DISCOVERY_GEN3, 3, ), + ( + config_entries.SOURCE_DHCP, + DHCP_DISCOVERY_GEN2_NO_NAME, + 2, + ), ] ZEROCONF_DATA = [ (