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

Small speed ups to async_get_integration (#116900)

Browse source
This commit is contained in:
J. Nick Koston 2024-05-06 12:08:33 -05:00 • committed by GitHub
parent 71d65e38b5
commit f3b08e89a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/loader.py
View file

@ -1322,6 +1322,10 @@ def async_get_loaded_integration(hass: HomeAssistant, domain: str) -> Integratio
async def async_get_integration(hass: HomeAssistant, domain: str) -> Integration: async def async_get_integration(hass: HomeAssistant, domain: str) -> Integration:
"""Get integration.""" """Get integration."""
cache: dict[str, Integration | asyncio.Future[None]]
cache = hass.data[DATA_INTEGRATIONS]
if type(int_or_fut := cache.get(domain, _UNDEF)) is Integration:
return int_or_fut
integrations_or_excs = await async_get_integrations(hass, [domain]) integrations_or_excs = await async_get_integrations(hass, [domain])
int_or_exc = integrations_or_excs[domain] int_or_exc = integrations_or_excs[domain]
if isinstance(int_or_exc, Integration): if isinstance(int_or_exc, Integration):
@ -1333,12 +1337,11 @@ async def async_get_integrations(
hass: HomeAssistant, domains: Iterable[str] hass: HomeAssistant, domains: Iterable[str]
) -> dict[str, Integration | Exception]: ) -> dict[str, Integration | Exception]:
"""Get integrations.""" """Get integrations."""
cache: dict[str, Integration | asyncio.Future[None]]
cache = hass.data[DATA_INTEGRATIONS] cache = hass.data[DATA_INTEGRATIONS]
results: dict[str, Integration | Exception] = {} results: dict[str, Integration | Exception] = {}
needed: dict[str, asyncio.Future[None]] = {} needed: dict[str, asyncio.Future[None]] = {}
in_progress: dict[str, asyncio.Future[None]] = {} in_progress: dict[str, asyncio.Future[None]] = {}
if TYPE_CHECKING:
cache = cast(dict[str, Integration | asyncio.Future[None]], cache)
for domain in domains: for domain in domains:
int_or_fut = cache.get(domain, _UNDEF) int_or_fut = cache.get(domain, _UNDEF)
# Integration is never subclassed, so we can check for type # Integration is never subclassed, so we can check for type
@ -1352,7 +1355,7 @@ async def async_get_integrations(
needed[domain] = cache[domain] = hass.loop.create_future() needed[domain] = cache[domain] = hass.loop.create_future()
if in_progress: if in_progress:
await asyncio.gather(*in_progress.values()) await asyncio.wait(in_progress.values())
for domain in in_progress: for domain in in_progress:
# When we have waited and it's _UNDEF, it doesn't exist # 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 # We don't cache that it doesn't exist, or else people can't fix it