evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use futures instead of asyncio.Event for async_get_integrations (#93060)

Browse source 
Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
This commit is contained in:
J. Nick Koston 2023-05-14 14:42:04 -05:00 • committed by GitHub
parent b95405a7e9
commit d5a0824924
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
homeassistant/loader.py
View file

@ -889,39 +889,41 @@ async def async_get_integrations(
cache = hass.data[DATA_INTEGRATIONS] = {}
results: dict[str, Integration | Exception] = {}
needed: dict[str, asyncio.Event] = {}
in_progress: dict[str, asyncio.Event] = {}
needed: dict[str, asyncio.Future[None]] = {}
in_progress: dict[str, asyncio.Future[None]] = {}
for domain in domains:
int_or_evt: Integration | asyncio.Event | None = cache.get(domain, _UNDEF)
if isinstance(int_or_evt, asyncio.Event):
in_progress[domain] = int_or_evt
elif int_or_evt is not _UNDEF:
results[domain] = cast(Integration, int_or_evt)
int_or_fut: Integration | asyncio.Future[None] | None = cache.get(
domain, _UNDEF
)
if isinstance(int_or_fut, asyncio.Future):
in_progress[domain] = int_or_fut
elif int_or_fut is not _UNDEF:
results[domain] = cast(Integration, int_or_fut)
elif "." in domain:
results[domain] = ValueError(f"Invalid domain {domain}")
else:
needed[domain] = cache[domain] = asyncio.Event()
needed[domain] = cache[domain] = hass.loop.create_future()
if in_progress:
await asyncio.gather(*[event.wait() for event in in_progress.values()])
await asyncio.gather(*in_progress.values())
for domain in in_progress:
# When we have waited and it's _UNDEF, it doesn't exist
# We don't cache that it doesn't exist, or else people can't fix it
# and then restart, because their config will never be valid.
if (int_or_evt := cache.get(domain, _UNDEF)) is _UNDEF:
if (int_or_fut := cache.get(domain, _UNDEF)) is _UNDEF:
results[domain] = IntegrationNotFound(domain)
else:
results[domain] = cast(Integration, int_or_evt)
results[domain] = cast(Integration, int_or_fut)
# First we look for custom components
if needed:
# Instead of using resolve_from_root we use the cache of custom
# components to find the integration.
custom = await async_get_custom_components(hass)
for domain, event in needed.items():
for domain, future in needed.items():
if integration := custom.get(domain):
results[domain] = cache[domain] = integration
event.set()
future.set_result(None)
for domain in results:
if domain in needed:
@ -934,7 +936,7 @@ async def async_get_integrations(
integrations = await hass.async_add_executor_job(
_resolve_integrations_from_root, hass, components, list(needed)
)
for domain, event in needed.items():
for domain, future in needed.items():
int_or_exc = integrations.get(domain)
if not int_or_exc:
cache.pop(domain)
@ -946,7 +948,7 @@ async def async_get_integrations(
results[domain] = exc
else:
results[domain] = cache[domain] = int_or_exc
event.set()
future.set_result(None)
return results