Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-12-24 12:59:34 +00:00
Code Activity

Ensure setup loads top level component before platforms (#112057)

Browse Source
This commit is contained in:
J. Nick Koston
2024-03-03 11:42:16 -10:00
committed by GitHub
parent 3c960b7d4e
commit d6cbadba3e
2 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
homeassistant/setup.py
View File

@@ -482,8 +482,21 @@ async def async_prepare_setup_platform(
log_error(str(err))
return None
# Platforms cannot exist on their own, they are part of their integration.
# If the integration is not set up yet, and can be set up, set it up.
#
# We do this before we import the platform so the platform already knows
# where the top level component is.
#
if load_top_level_component := integration.domain not in hass.config.components:
try:
component = await integration.async_get_component()
except ImportError as exc:
log_error(f"Unable to import the component ({exc}).")
return None
try:
platform = integration.get_platform(domain)
platform = await integration.async_get_platform(domain)
except ImportError as exc:
log_error(f"Platform not found ({exc}).")
return None
@@ -494,13 +507,7 @@ async def async_prepare_setup_platform(
# Platforms cannot exist on their own, they are part of their integration.
# If the integration is not set up yet, and can be set up, set it up.
if integration.domain not in hass.config.components:
try:
component = integration.get_component()
except ImportError as exc:
log_error(f"Unable to import the component ({exc}).")
return None
if load_top_level_component:
if (
hasattr(component, "setup") or hasattr(component, "async_setup")
) and not await async_setup_component(hass, integration.domain, hass_config):