Skip to content

Commit

Permalink
ESPHome select for assist pipeline selection (home-assistant#91526)
Browse files Browse the repository at this point in the history
* ESPHome: Add assist pipeline select entity

* Add translation strings

* Tests
  • Loading branch information
jesserockz authored Apr 18, 2023
1 parent ef7e3e2 commit aeb1983
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 33 deletions.
1 change: 1 addition & 0 deletions homeassistant/components/esphome/entry_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ async def async_update_static_infos(

if self.device_info is not None and self.device_info.voice_assistant_version:
needed_platforms.add(Platform.BINARY_SENSOR)
needed_platforms.add(Platform.SELECT)

for info in infos:
for info_type, platform in INFO_TYPE_TO_PLATFORM.items():
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/esphome/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"domain": "esphome",
"name": "ESPHome",
"after_dependencies": ["zeroconf", "tag", "assist_pipeline"],
"after_dependencies": ["zeroconf", "tag"],
"codeowners": ["@OttoWinter", "@jesserockz"],
"config_flow": true,
"dependencies": ["bluetooth"],
"dependencies": ["assist_pipeline", "bluetooth"],
"dhcp": [
{
"registered_devices": true
Expand Down
24 changes: 23 additions & 1 deletion homeassistant/components/esphome/select.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@

from aioesphomeapi import SelectInfo, SelectState

from homeassistant.components.assist_pipeline.select import AssistPipelineSelect
from homeassistant.components.select import SelectEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback

from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
from . import (
EsphomeAssistEntity,
EsphomeEntity,
esphome_state_property,
platform_async_setup_entry,
)
from .domain_data import DomainData
from .entry_data import RuntimeEntryData


async def async_setup_entry(
Expand All @@ -27,6 +35,11 @@ async def async_setup_entry(
state_type=SelectState,
)

entry_data = DomainData.get(hass).get_entry_data(entry)
assert entry_data.device_info is not None
if entry_data.device_info.voice_assistant_version:
async_add_entities([EsphomeAssistPipelineSelect(hass, entry_data)])


class EsphomeSelect(EsphomeEntity[SelectInfo, SelectState], SelectEntity):
"""A select implementation for esphome."""
Expand All @@ -47,3 +60,12 @@ def current_option(self) -> str | None:
async def async_select_option(self, option: str) -> None:
"""Change the selected option."""
await self._client.select_command(self._static_info.key, option)


class EsphomeAssistPipelineSelect(EsphomeAssistEntity, AssistPipelineSelect):
"""Pipeline selector for esphome devices."""

def __init__(self, hass: HomeAssistant, entry_data: RuntimeEntryData) -> None:
"""Initialize a pipeline selector."""
EsphomeAssistEntity.__init__(self, entry_data)
AssistPipelineSelect.__init__(self, hass, self._device_info.mac_address)
8 changes: 8 additions & 0 deletions homeassistant/components/esphome/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@
"call_active": {
"name": "Call Active"
}
},
"select": {
"pipeline": {
"name": "[%key:component::assist_pipeline::entity::select::pipeline::name%]",
"state": {
"preferred": "[%key:component::assist_pipeline::entity::select::pipeline::state::preferred%]"
}
}
}
},
"issues": {
Expand Down
35 changes: 35 additions & 0 deletions tests/components/esphome/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,38 @@ async def mock_dashboard(hass):
hass, DASHBOARD_SLUG, DASHBOARD_HOST, DASHBOARD_PORT
)
yield data


@pytest.fixture
async def mock_voice_assistant_v1_entry(
hass: HomeAssistant,
mock_client,
) -> MockConfigEntry:
"""Set up an ESPHome entry with voice assistant."""
entry = MockConfigEntry(
domain=DOMAIN,
data={
CONF_HOST: "test.local",
CONF_PORT: 6053,
CONF_PASSWORD: "",
},
)
entry.add_to_hass(hass)

device_info = DeviceInfo(
name="test",
friendly_name="Test",
voice_assistant_version=1,
mac_address="11:22:33:44:55:aa",
esphome_version="1.0.0",
)

mock_client.device_info = AsyncMock(return_value=device_info)
mock_client.subscribe_voice_assistant = AsyncMock(return_value=Mock())

await hass.config_entries.async_setup(entry.entry_id)
await hass.async_block_till_done()
await hass.async_block_till_done()
await hass.async_block_till_done()

return entry
34 changes: 4 additions & 30 deletions tests/components/esphome/test_binary_sensor.py
Original file line number Diff line number Diff line change
@@ -1,43 +1,17 @@
"""Test ESPHome binary sensors."""
from unittest.mock import AsyncMock, Mock

from aioesphomeapi import DeviceInfo

from homeassistant.components.esphome import DOMAIN, DomainData
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
from homeassistant.components.esphome import DomainData
from homeassistant.core import HomeAssistant

from tests.common import MockConfigEntry


async def test_call_active(
hass: HomeAssistant,
mock_client,
mock_voice_assistant_v1_entry,
) -> None:
"""Test call active binary sensor."""
entry = MockConfigEntry(
domain=DOMAIN,
data={CONF_HOST: "test.local", CONF_PORT: 6053, CONF_PASSWORD: ""},
)
entry.add_to_hass(hass)

device_info = DeviceInfo(
name="test",
friendly_name="Test",
voice_assistant_version=1,
mac_address="11:22:33:44:55:aa",
esphome_version="1.0.0",
)

mock_client.device_info = AsyncMock(return_value=device_info)
mock_client.subscribe_voice_assistant = AsyncMock(return_value=Mock())

await hass.config_entries.async_setup(entry.entry_id)
await hass.async_block_till_done()
await hass.async_block_till_done()
await hass.async_block_till_done()

entry_data = DomainData.get(hass).get_entry_data(entry)

entry_data = DomainData.get(hass).get_entry_data(mock_voice_assistant_v1_entry)

state = hass.states.get("binary_sensor.test_call_active")
assert state is not None
Expand Down
15 changes: 15 additions & 0 deletions tests/components/esphome/test_select.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
"""Test ESPHome selects."""


from homeassistant.core import HomeAssistant


async def test_pipeline_selector(
hass: HomeAssistant,
mock_voice_assistant_v1_entry,
) -> None:
"""Test assist pipeline selector."""

state = hass.states.get("select.test_assist_pipeline")
assert state is not None
assert state.state == "preferred"

0 comments on commit aeb1983

Please sign in to comment.