Add humidifier support to google_assistant (#37157)
This commit is contained in:
1 parent
01ba578016
commit
06e977b444
6 files changed
+334
-12
No files matched your search
@@ -250,6 +250,40 @@ DEMO_DEVICES = [
|
||||
"type": "action.devices.types.THERMOSTAT",
|
||||
"willReportState": False,
|
||||
},
|
||||
{
|
||||
"id": "humidifier.humidifier",
|
||||
"name": {"name": "Humidifier"},
|
||||
"traits": [
|
||||
"action.devices.traits.HumiditySetting",
|
||||
"action.devices.traits.OnOff",
|
||||
],
|
||||
"type": "action.devices.types.HUMIDIFIER",
|
||||
"willReportState": False,
|
||||
"attributes": {"humiditySetpointRange": {"minPercent": 0, "maxPercent": 100}},
|
||||
},
|
||||
{
|
||||
"id": "humidifier.dehumidifier",
|
||||
"name": {"name": "Dehumidifier"},
|
||||
"traits": [
|
||||
"action.devices.traits.HumiditySetting",
|
||||
"action.devices.traits.OnOff",
|
||||
],
|
||||
"type": "action.devices.types.DEHUMIDIFIER",
|
||||
"willReportState": False,
|
||||
"attributes": {"humiditySetpointRange": {"minPercent": 0, "maxPercent": 100}},
|
||||
},
|
||||
{
|
||||
"id": "humidifier.hygrostat",
|
||||
"name": {"name": "Hygrostat"},
|
||||
"traits": [
|
||||
"action.devices.traits.HumiditySetting",
|
||||
"action.devices.traits.Modes",
|
||||
"action.devices.traits.OnOff",
|
||||
],
|
||||
"type": "action.devices.types.HUMIDIFIER",
|
||||
"willReportState": False,
|
||||
"attributes": {"humiditySetpointRange": {"minPercent": 0, "maxPercent": 100}},
|
||||
},
|
||||
{
|
||||
"id": "lock.front_door",
|
||||
"name": {"name": "Front Door"},
|
||||
|
||||
@@ -17,6 +17,7 @@ from homeassistant.components import (
|
||||
switch,
|
||||
)
|
||||
from homeassistant.components.climate import const as climate
|
||||
from homeassistant.components.humidifier import const as humidifier
|
||||
from homeassistant.const import CLOUD_NEVER_EXPOSED_ENTITIES
|
||||
|
||||
from . import DEMO_DEVICES
|
||||
@@ -96,6 +97,12 @@ def hass_fixture(loop, hass):
|
||||
)
|
||||
)
|
||||
|
||||
loop.run_until_complete(
|
||||
setup.async_setup_component(
|
||||
hass, humidifier.DOMAIN, {"humidifier": [{"platform": "demo"}]}
|
||||
)
|
||||
)
|
||||
|
||||
loop.run_until_complete(
|
||||
setup.async_setup_component(hass, lock.DOMAIN, {"lock": [{"platform": "demo"}]})
|
||||
)
|
||||
@@ -292,6 +299,52 @@ async def test_query_climate_request_f(hass_fixture, assistant_client, auth_head
|
||||
hass_fixture.config.units.temperature_unit = const.TEMP_CELSIUS
|
||||
|
||||
|
||||
async def test_query_humidifier_request(hass_fixture, assistant_client, auth_header):
|
||||
"""Test a query request."""
|
||||
reqid = "5711642932632160984"
|
||||
data = {
|
||||
"requestId": reqid,
|
||||
"inputs": [
|
||||
{
|
||||
"intent": "action.devices.QUERY",
|
||||
"payload": {
|
||||
"devices": [
|
||||
{"id": "humidifier.humidifier"},
|
||||
{"id": "humidifier.dehumidifier"},
|
||||
{"id": "humidifier.hygrostat"},
|
||||
]
|
||||
},
|
||||
}
|
||||
],
|
||||
}
|
||||
result = await assistant_client.post(
|
||||
ga.const.GOOGLE_ASSISTANT_API_ENDPOINT,
|
||||
data=json.dumps(data),
|
||||
headers=auth_header,
|
||||
)
|
||||
assert result.status == 200
|
||||
body = await result.json()
|
||||
assert body.get("requestId") == reqid
|
||||
devices = body["payload"]["devices"]
|
||||
assert len(devices) == 3
|
||||
assert devices["humidifier.humidifier"] == {
|
||||
"on": True,
|
||||
"online": True,
|
||||
"humiditySetpointPercent": 68,
|
||||
}
|
||||
assert devices["humidifier.dehumidifier"] == {
|
||||
"on": True,
|
||||
"online": True,
|
||||
"humiditySetpointPercent": 54,
|
||||
}
|
||||
assert devices["humidifier.hygrostat"] == {
|
||||
"on": True,
|
||||
"online": True,
|
||||
"humiditySetpointPercent": 50,
|
||||
"currentModeSettings": {"mode": "home"},
|
||||
}
|
||||
|
||||
|
||||
async def test_execute_request(hass_fixture, assistant_client, auth_header):
|
||||
"""Test an execute request."""
|
||||
reqid = "5711642932632160985"
|
||||
@@ -346,6 +399,33 @@ async def test_execute_request(hass_fixture, assistant_client, auth_header):
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
"devices": [{"id": "humidifier.humidifier"}],
|
||||
"execution": [
|
||||
{
|
||||
"command": "action.devices.commands.OnOff",
|
||||
"params": {"on": False},
|
||||
}
|
||||
],
|
||||
},
|
||||
{
|
||||
"devices": [{"id": "humidifier.dehumidifier"}],
|
||||
"execution": [
|
||||
{
|
||||
"command": "action.devices.commands.SetHumidity",
|
||||
"params": {"humidity": 45},
|
||||
}
|
||||
],
|
||||
},
|
||||
{
|
||||
"devices": [{"id": "humidifier.hygrostat"}],
|
||||
"execution": [
|
||||
{
|
||||
"command": "action.devices.commands.SetModes",
|
||||
"params": {"updateModeSettings": {"mode": "eco"}},
|
||||
}
|
||||
],
|
||||
},
|
||||
]
|
||||
},
|
||||
}
|
||||
@@ -360,7 +440,7 @@ async def test_execute_request(hass_fixture, assistant_client, auth_header):
|
||||
body = await result.json()
|
||||
assert body.get("requestId") == reqid
|
||||
commands = body["payload"]["commands"]
|
||||
assert len(commands) == 6
|
||||
assert len(commands) == 9
|
||||
|
||||
assert not any(result["status"] == "ERROR" for result in commands)
|
||||
|
||||
@@ -381,3 +461,12 @@ async def test_execute_request(hass_fixture, assistant_client, auth_header):
|
||||
|
||||
lounge = hass_fixture.states.get("media_player.lounge_room")
|
||||
assert lounge.state == "off"
|
||||
|
||||
humidifier_state = hass_fixture.states.get("humidifier.humidifier")
|
||||
assert humidifier_state.state == "off"
|
||||
|
||||
dehumidifier = hass_fixture.states.get("humidifier.dehumidifier")
|
||||
assert dehumidifier.attributes.get(humidifier.ATTR_HUMIDITY) == 45
|
||||
|
||||
hygrostat = hass_fixture.states.get("humidifier.hygrostat")
|
||||
assert hygrostat.attributes.get(humidifier.ATTR_MODE) == "eco"
|
||||
@@ -24,6 +24,7 @@ from homeassistant.components import (
|
||||
)
|
||||
from homeassistant.components.climate import const as climate
|
||||
from homeassistant.components.google_assistant import const, error, helpers, trait
|
||||
from homeassistant.components.humidifier import const as humidifier
|
||||
from homeassistant.config import async_process_ha_core_config
|
||||
from homeassistant.const import (
|
||||
ATTR_ASSUMED_STATE,
|
||||
@@ -294,6 +295,33 @@ async def test_onoff_media_player(hass):
|
||||
assert off_calls[0].data == {ATTR_ENTITY_ID: "media_player.bla"}
|
||||
|
||||
|
||||
async def test_onoff_humidifier(hass):
|
||||
"""Test OnOff trait support for humidifier domain."""
|
||||
assert helpers.get_google_type(humidifier.DOMAIN, None) is not None
|
||||
assert trait.OnOffTrait.supported(humidifier.DOMAIN, 0, None)
|
||||
|
||||
trt_on = trait.OnOffTrait(hass, State("humidifier.bla", STATE_ON), BASIC_CONFIG)
|
||||
|
||||
assert trt_on.sync_attributes() == {}
|
||||
|
||||
assert trt_on.query_attributes() == {"on": True}
|
||||
|
||||
trt_off = trait.OnOffTrait(hass, State("humidifier.bla", STATE_OFF), BASIC_CONFIG)
|
||||
|
||||
assert trt_off.query_attributes() == {"on": False}
|
||||
|
||||
on_calls = async_mock_service(hass, humidifier.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, BASIC_DATA, {"on": True}, {})
|
||||
assert len(on_calls) == 1
|
||||
assert on_calls[0].data == {ATTR_ENTITY_ID: "humidifier.bla"}
|
||||
|
||||
off_calls = async_mock_service(hass, humidifier.DOMAIN, SERVICE_TURN_OFF)
|
||||
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, BASIC_DATA, {"on": False}, {})
|
||||
assert len(off_calls) == 1
|
||||
assert off_calls[0].data == {ATTR_ENTITY_ID: "humidifier.bla"}
|
||||
|
||||
|
||||
async def test_dock_vacuum(hass):
|
||||
"""Test dock trait support for vacuum domain."""
|
||||
assert helpers.get_google_type(vacuum.DOMAIN, None) is not None
|
||||
@@ -780,6 +808,42 @@ async def test_temperature_setting_climate_setpoint_auto(hass):
|
||||
assert calls[0].data == {ATTR_ENTITY_ID: "climate.bla", ATTR_TEMPERATURE: 19}
|
||||
|
||||
|
||||
async def test_humidity_setting_humidifier_setpoint(hass):
|
||||
"""Test HumiditySetting trait support for humidifier domain - setpoint."""
|
||||
assert helpers.get_google_type(humidifier.DOMAIN, None) is not None
|
||||
assert trait.HumiditySettingTrait.supported(humidifier.DOMAIN, 0, None)
|
||||
|
||||
trt = trait.HumiditySettingTrait(
|
||||
hass,
|
||||
State(
|
||||
"humidifier.bla",
|
||||
STATE_ON,
|
||||
{
|
||||
humidifier.ATTR_MIN_HUMIDITY: 20,
|
||||
humidifier.ATTR_MAX_HUMIDITY: 90,
|
||||
humidifier.ATTR_HUMIDITY: 38,
|
||||
},
|
||||
),
|
||||
BASIC_CONFIG,
|
||||
)
|
||||
assert trt.sync_attributes() == {
|
||||
"humiditySetpointRange": {"minPercent": 20, "maxPercent": 90}
|
||||
}
|
||||
assert trt.query_attributes() == {
|
||||
"humiditySetpointPercent": 38,
|
||||
}
|
||||
assert trt.can_execute(trait.COMMAND_SET_HUMIDITY, {})
|
||||
|
||||
calls = async_mock_service(hass, humidifier.DOMAIN, humidifier.SERVICE_SET_HUMIDITY)
|
||||
|
||||
await trt.execute(trait.COMMAND_SET_HUMIDITY, BASIC_DATA, {"humidity": 32}, {})
|
||||
assert len(calls) == 1
|
||||
assert calls[0].data == {
|
||||
ATTR_ENTITY_ID: "humidifier.bla",
|
||||
humidifier.ATTR_HUMIDITY: 32,
|
||||
}
|
||||
|
||||
|
||||
async def test_lock_unlock_lock(hass):
|
||||
"""Test LockUnlock trait locking support for lock domain."""
|
||||
assert helpers.get_google_type(lock.DOMAIN, None) is not None
|
||||
@@ -1238,7 +1302,6 @@ async def test_fan_speed(hass):
|
||||
assert trt.query_attributes() == {
|
||||
"currentFanSpeedSetting": "low",
|
||||
"on": True,
|
||||
"online": True,
|
||||
}
|
||||
|
||||
assert trt.can_execute(trait.COMMAND_FANSPEED, params={"fanSpeed": "medium"})
|
||||
@@ -1313,7 +1376,6 @@ async def test_modes_media_player(hass):
|
||||
assert trt.query_attributes() == {
|
||||
"currentModeSettings": {"input source": "game"},
|
||||
"on": True,
|
||||
"online": True,
|
||||
}
|
||||
|
||||
assert trt.can_execute(
|
||||
@@ -1382,7 +1444,6 @@ async def test_modes_input_select(hass):
|
||||
assert trt.query_attributes() == {
|
||||
"currentModeSettings": {"option": "abc"},
|
||||
"on": True,
|
||||
"online": True,
|
||||
}
|
||||
|
||||
assert trt.can_execute(
|
||||
@@ -1400,6 +1461,80 @@ async def test_modes_input_select(hass):
|
||||
assert calls[0].data == {"entity_id": "input_select.bla", "option": "xyz"}
|
||||
|
||||
|
||||
async def test_modes_humidifier(hass):
|
||||
"""Test Humidifier Mode trait."""
|
||||
assert helpers.get_google_type(humidifier.DOMAIN, None) is not None
|
||||
assert trait.ModesTrait.supported(humidifier.DOMAIN, humidifier.SUPPORT_MODES, None)
|
||||
|
||||
trt = trait.ModesTrait(
|
||||
hass,
|
||||
State(
|
||||
"humidifier.humidifier",
|
||||
STATE_OFF,
|
||||
attributes={
|
||||
humidifier.ATTR_AVAILABLE_MODES: [
|
||||
humidifier.MODE_NORMAL,
|
||||
humidifier.MODE_AUTO,
|
||||
humidifier.MODE_AWAY,
|
||||
],
|
||||
ATTR_SUPPORTED_FEATURES: humidifier.SUPPORT_MODES,
|
||||
humidifier.ATTR_MIN_HUMIDITY: 30,
|
||||
humidifier.ATTR_MAX_HUMIDITY: 99,
|
||||
humidifier.ATTR_HUMIDITY: 50,
|
||||
humidifier.ATTR_MODE: humidifier.MODE_AUTO,
|
||||
},
|
||||
),
|
||||
BASIC_CONFIG,
|
||||
)
|
||||
|
||||
attribs = trt.sync_attributes()
|
||||
assert attribs == {
|
||||
"availableModes": [
|
||||
{
|
||||
"name": "mode",
|
||||
"name_values": [{"name_synonym": ["mode"], "lang": "en"}],
|
||||
"settings": [
|
||||
{
|
||||
"setting_name": "normal",
|
||||
"setting_values": [
|
||||
{"setting_synonym": ["normal"], "lang": "en"}
|
||||
],
|
||||
},
|
||||
{
|
||||
"setting_name": "auto",
|
||||
"setting_values": [{"setting_synonym": ["auto"], "lang": "en"}],
|
||||
},
|
||||
{
|
||||
"setting_name": "away",
|
||||
"setting_values": [{"setting_synonym": ["away"], "lang": "en"}],
|
||||
},
|
||||
],
|
||||
"ordered": False,
|
||||
},
|
||||
]
|
||||
}
|
||||
|
||||
assert trt.query_attributes() == {
|
||||
"currentModeSettings": {"mode": "auto"},
|
||||
"on": False,
|
||||
}
|
||||
|
||||
assert trt.can_execute(
|
||||
trait.COMMAND_MODES, params={"updateModeSettings": {"mode": "away"}}
|
||||
)
|
||||
|
||||
calls = async_mock_service(hass, humidifier.DOMAIN, humidifier.SERVICE_SET_MODE)
|
||||
await trt.execute(
|
||||
trait.COMMAND_MODES, BASIC_DATA, {"updateModeSettings": {"mode": "away"}}, {},
|
||||
)
|
||||
|
||||
assert len(calls) == 1
|
||||
assert calls[0].data == {
|
||||
"entity_id": "humidifier.humidifier",
|
||||
"mode": "away",
|
||||
}
|
||||
|
||||
|
||||
async def test_sound_modes(hass):
|
||||
"""Test Mode trait."""
|
||||
assert helpers.get_google_type(media_player.DOMAIN, None) is not None
|
||||
@@ -1450,7 +1585,6 @@ async def test_sound_modes(hass):
|
||||
assert trt.query_attributes() == {
|
||||
"currentModeSettings": {"sound mode": "stereo"},
|
||||
"on": True,
|
||||
"online": True,
|
||||
}
|
||||
|
||||
assert trt.can_execute(
|
||||
|
||||
Reference in new issue
Block a user