jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 15:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename async_resolve_entity_ids to async_validate_entity_ids (#67603)

Browse Source
This commit is contained in:
Erik Montnemery 2022-03-04 09:51:53 +01:00 committed by GitHub
parent fbc39d1206
commit cd25769667
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/homeassistant/triggers/numeric_state.py
View File

@ -74,7 +74,7 @@ async def async_validate_trigger_config(
"""Validate trigger config.""" """Validate trigger config."""
config = _TRIGGER_SCHEMA(config) config = _TRIGGER_SCHEMA(config)
registry = er.async_get(hass) registry = er.async_get(hass)
config[CONF_ENTITY_ID] = er.async_resolve_entity_ids( config[CONF_ENTITY_ID] = er.async_validate_entity_ids(
registry, cv.entity_ids_or_uuids(config[CONF_ENTITY_ID]) registry, cv.entity_ids_or_uuids(config[CONF_ENTITY_ID])
) )
return config return config

2
homeassistant/components/homeassistant/triggers/state.py
View File

@ -77,7 +77,7 @@ async def async_validate_trigger_config(
config = TRIGGER_STATE_SCHEMA(config) config = TRIGGER_STATE_SCHEMA(config)
registry = er.async_get(hass) registry = er.async_get(hass)
config[CONF_ENTITY_ID] = er.async_resolve_entity_ids( config[CONF_ENTITY_ID] = er.async_validate_entity_ids(
registry, cv.entity_ids_or_uuids(config[CONF_ENTITY_ID]) registry, cv.entity_ids_or_uuids(config[CONF_ENTITY_ID])
) )

2
homeassistant/components/zone/trigger.py
View File

@ -49,7 +49,7 @@ async def async_validate_trigger_config(
"""Validate trigger config.""" """Validate trigger config."""
config = _TRIGGER_SCHEMA(config) config = _TRIGGER_SCHEMA(config)
registry = er.async_get(hass) registry = er.async_get(hass)
config[CONF_ENTITY_ID] = er.async_resolve_entity_ids( config[CONF_ENTITY_ID] = er.async_validate_entity_ids(
registry, config[CONF_ENTITY_ID] registry, config[CONF_ENTITY_ID]
) )
return config return config

4
homeassistant/helpers/condition.py
View File

@ -897,7 +897,7 @@ def numeric_state_validate_config(
registry = er.async_get(hass) registry = er.async_get(hass)
config = dict(config) config = dict(config)
config[CONF_ENTITY_ID] = er.async_resolve_entity_ids( config[CONF_ENTITY_ID] = er.async_validate_entity_ids(
registry, cv.entity_ids_or_uuids(config[CONF_ENTITY_ID]) registry, cv.entity_ids_or_uuids(config[CONF_ENTITY_ID])
) )
return config return config
@ -908,7 +908,7 @@ def state_validate_config(hass: HomeAssistant, config: ConfigType) -> ConfigType
registry = er.async_get(hass) registry = er.async_get(hass)
config = dict(config) config = dict(config)
config[CONF_ENTITY_ID] = er.async_resolve_entity_ids( config[CONF_ENTITY_ID] = er.async_validate_entity_ids(
registry, cv.entity_ids_or_uuids(config[CONF_ENTITY_ID]) registry, cv.entity_ids_or_uuids(config[CONF_ENTITY_ID])
) )
return config return config

19
homeassistant/helpers/entity_registry.py
View File

@ -924,13 +924,22 @@ async def async_migrate_entries(
@callback @callback
def async_resolve_entity_ids( def async_validate_entity_ids(
registry: EntityRegistry, entity_ids_or_uuids: list[str] registry: EntityRegistry, entity_ids_or_uuids: list[str]
) -> list[str]: ) -> list[str]:
"""Resolve a list of entity ids or UUIDs to a list of entity ids.""" """Validate and resolve a list of entity ids or UUIDs to a list of entity ids.
def resolve_entity(entity_id_or_uuid: str) -> str | None: Returns a list with UUID resolved to entity_ids.
"""Resolve an entity id or UUID to an entity id or None.""" Raises vol.Invalid if any item is invalid, or if any a UUID is not associated with
an entity registry item.
"""
def async_validate_entity_id(entity_id_or_uuid: str) -> str | None:
"""Resolve an entity id or UUID to an entity id.
Raises vol.Invalid if the entity or UUID is invalid, or if the UUID is not
associated with an entity registry item.
"""
if valid_entity_id(entity_id_or_uuid): if valid_entity_id(entity_id_or_uuid):
return entity_id_or_uuid return entity_id_or_uuid
if (entry := registry.entities.get_entry(entity_id_or_uuid)) is None: if (entry := registry.entities.get_entry(entity_id_or_uuid)) is None:
@ -940,6 +949,6 @@ def async_resolve_entity_ids(
tmp = [ tmp = [
resolved_item resolved_item
for item in entity_ids_or_uuids for item in entity_ids_or_uuids
if (resolved_item := resolve_entity(item)) is not None if (resolved_item := async_validate_entity_id(item)) is not None
] ]
return tmp return tmp

2
homeassistant/helpers/service.py
View File

@ -218,7 +218,7 @@ def async_prepare_call_from_config(
if CONF_ENTITY_ID in target: if CONF_ENTITY_ID in target:
registry = entity_registry.async_get(hass) registry = entity_registry.async_get(hass)
target[CONF_ENTITY_ID] = entity_registry.async_resolve_entity_ids( target[CONF_ENTITY_ID] = entity_registry.async_validate_entity_ids(
registry, cv.comp_entity_ids_or_uuids(target[CONF_ENTITY_ID]) registry, cv.comp_entity_ids_or_uuids(target[CONF_ENTITY_ID])
) )
except TemplateError as ex: except TemplateError as ex:

10
tests/helpers/test_entity_registry.py
View File

@ -1174,19 +1174,19 @@ async def test_resolve_entity_ids(hass, registry):
assert entry2.entity_id == "light.milk" assert entry2.entity_id == "light.milk"
expected = ["light.beer", "light.milk"] expected = ["light.beer", "light.milk"]
assert er.async_resolve_entity_ids(registry, [entry1.id, entry2.id]) == expected assert er.async_validate_entity_ids(registry, [entry1.id, entry2.id]) == expected
expected = ["light.beer", "light.milk"] expected = ["light.beer", "light.milk"]
assert er.async_resolve_entity_ids(registry, ["light.beer", entry2.id]) == expected assert er.async_validate_entity_ids(registry, ["light.beer", entry2.id]) == expected
with pytest.raises(vol.Invalid): with pytest.raises(vol.Invalid):
er.async_resolve_entity_ids(registry, ["light.beer", "bad_uuid"]) er.async_validate_entity_ids(registry, ["light.beer", "bad_uuid"])
expected = ["light.unknown"] expected = ["light.unknown"]
assert er.async_resolve_entity_ids(registry, ["light.unknown"]) == expected assert er.async_validate_entity_ids(registry, ["light.unknown"]) == expected
with pytest.raises(vol.Invalid): with pytest.raises(vol.Invalid):
er.async_resolve_entity_ids(registry, ["unknown_uuid"]) er.async_validate_entity_ids(registry, ["unknown_uuid"])
def test_entity_registry_items(): def test_entity_registry_items():