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

Add support for entity aliases to Google Assistant (#84405)

Browse Source
This commit is contained in:
Franck Nijhof 2022-12-21 23:52:01 +01:00 committed by GitHub
parent 0d874899ea
commit 1f0ea73463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/google_assistant/helpers.py
View File

@ -52,7 +52,11 @@ LOCAL_SDK_MIN_VERSION = AwesomeVersion("2.1.5")
@callback @callback
def _get_registry_entries( def _get_registry_entries(
hass: HomeAssistant, entity_id: str hass: HomeAssistant, entity_id: str
) -> tuple[device_registry.DeviceEntry | None, area_registry.AreaEntry | None]: ) -> tuple[
entity_registry.RegistryEntry | None,
device_registry.DeviceEntry | None,
area_registry.AreaEntry | None,
]:
"""Get registry entries.""" """Get registry entries."""
ent_reg = entity_registry.async_get(hass) ent_reg = entity_registry.async_get(hass)
dev_reg = device_registry.async_get(hass) dev_reg = device_registry.async_get(hass)
@ -75,7 +79,7 @@ def _get_registry_entries(
else: else:
area_entry = None area_entry = None
return device_entry, area_entry return entity_entry, device_entry, area_entry
class AbstractConfig(ABC): class AbstractConfig(ABC):
@ -588,7 +592,9 @@ class GoogleEntity:
name = (entity_config.get(CONF_NAME) or state.name).strip() name = (entity_config.get(CONF_NAME) or state.name).strip()
# Find entity/device/area registry entries # Find entity/device/area registry entries
device_entry, area_entry = _get_registry_entries(self.hass, self.entity_id) entity_entry, device_entry, area_entry = _get_registry_entries(
self.hass, self.entity_id
)
# Build the device info # Build the device info
device = { device = {
@ -603,8 +609,12 @@ class GoogleEntity:
} }
# Add aliases # Add aliases
if aliases := entity_config.get(CONF_ALIASES): if (config_aliases := entity_config.get(CONF_ALIASES, [])) or (
device["name"]["nicknames"] = [name] + aliases entity_entry and entity_entry.aliases
):
device["name"]["nicknames"] = [name] + config_aliases
if entity_entry:
device["name"]["nicknames"].extend(entity_entry.aliases)
# Add local SDK info if enabled # Add local SDK info if enabled
if self.config.is_local_sdk_active and self.should_expose_local(): if self.config.is_local_sdk_active and self.should_expose_local():

31
tests/components/google_assistant/test_smart_home.py
View File

@ -3,6 +3,7 @@ import asyncio
from unittest.mock import ANY, call, patch from unittest.mock import ANY, call, patch
import pytest import pytest
from pytest_unordered import unordered
from homeassistant.components import camera from homeassistant.components import camera
from homeassistant.components.climate import ATTR_MAX_TEMP, ATTR_MIN_TEMP, HVACMode from homeassistant.components.climate import ATTR_MAX_TEMP, ATTR_MIN_TEMP, HVACMode
@ -101,10 +102,21 @@ async def test_async_handle_message(hass):
await hass.async_block_till_done() await hass.async_block_till_done()
async def test_sync_message(hass): async def test_sync_message(hass, registries):
"""Test a sync message.""" """Test a sync message."""
entity = registries.entity.async_get_or_create(
"light",
"test",
"unique-demo-light",
suggested_object_id="demo_light",
)
registries.entity.async_update_entity(
entity.entity_id,
aliases={"Stay", "Healthy"},
)
light = DemoLight( light = DemoLight(
None, "unique-demo-light",
"Demo Light", "Demo Light",
state=False, state=False,
hs_color=(180, 75), hs_color=(180, 75),
@ -150,7 +162,15 @@ async def test_sync_message(hass):
"id": "light.demo_light", "id": "light.demo_light",
"name": { "name": {
"name": "Demo Light", "name": "Demo Light",
"nicknames": ["Demo Light", "Hello", "World"], "nicknames": unordered(
[
"Demo Light",
"Hello",
"World",
"Stay",
"Healthy",
]
),
}, },
"traits": [ "traits": [
trait.TRAIT_BRIGHTNESS, trait.TRAIT_BRIGHTNESS,
@ -181,7 +201,10 @@ async def test_sync_message(hass):
{ {
"setting_name": "none", "setting_name": "none",
"setting_values": [ "setting_values": [
{"lang": "en", "setting_synonym": ["none"]} {
"lang": "en",
"setting_synonym": ["none"],
}
], ],
}, },
], ],