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

Add MQTT valve platform (#105766)

Browse source 
* Add mqtt valve platform

* No stop topic-reports_position and validation

* Do not allow state_open, state_closed with position reporing valve

* Allow open/close feature to be disabled

* Follow up comments

* Rename

* Apply defaults in validator

* Update docstr
This commit is contained in:
Jan Bouwhuis 2023-12-20 07:49:49 +01:00 • committed by GitHub
parent 918ea8f56d
commit c7f6ab2457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 1855 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
homeassistant/components/mqtt/abbreviations.py
View file

@ -166,6 +166,7 @@ ABBREVIATIONS = {
"pl_ton": "payload_turn_on",
"pl_trig": "payload_trigger",
"pl_unlk": "payload_unlock",
"pos": "reports_position",
"pos_clsd": "position_closed",
"pos_open": "position_open",
"pow_cmd_t": "power_command_topic",

1
homeassistant/components/mqtt/config_integration.py
View file

@ -53,6 +53,7 @@ CONFIG_SCHEMA_BASE = vol.Schema(
Platform.TEXT.value: vol.All(cv.ensure_list, [dict]),
Platform.UPDATE.value: vol.All(cv.ensure_list, [dict]),
Platform.VACUUM.value: vol.All(cv.ensure_list, [dict]),
Platform.VALVE.value: vol.All(cv.ensure_list, [dict]),
Platform.WATER_HEATER.value: vol.All(cv.ensure_list, [dict]),
}
)

16
homeassistant/components/mqtt/const.py
View file

@ -42,9 +42,18 @@ CONF_MODE_COMMAND_TOPIC = "mode_command_topic"
CONF_MODE_LIST = "modes"
CONF_MODE_STATE_TEMPLATE = "mode_state_template"
CONF_MODE_STATE_TOPIC = "mode_state_topic"
CONF_PAYLOAD_CLOSE = "payload_close"
CONF_PAYLOAD_OPEN = "payload_open"
CONF_PAYLOAD_STOP = "payload_stop"
CONF_POSITION_CLOSED = "position_closed"
CONF_POSITION_OPEN = "position_open"
CONF_POWER_COMMAND_TOPIC = "power_command_topic"
CONF_POWER_COMMAND_TEMPLATE = "power_command_template"
CONF_PRECISION = "precision"
CONF_STATE_CLOSED = "state_closed"
CONF_STATE_CLOSING = "state_closing"
CONF_STATE_OPEN = "state_open"
CONF_STATE_OPENING = "state_opening"
CONF_TEMP_COMMAND_TEMPLATE = "temperature_command_template"
CONF_TEMP_COMMAND_TOPIC = "temperature_command_topic"
CONF_TEMP_STATE_TEMPLATE = "temperature_state_template"
@ -81,11 +90,16 @@ DEFAULT_ENCODING = "utf-8"
DEFAULT_OPTIMISTIC = False
DEFAULT_QOS = 0
DEFAULT_PAYLOAD_AVAILABLE = "online"
DEFAULT_PAYLOAD_CLOSE = "CLOSE"
DEFAULT_PAYLOAD_NOT_AVAILABLE = "offline"
DEFAULT_PAYLOAD_OPEN = "OPEN"
DEFAULT_PORT = 1883
DEFAULT_RETAIN = False
DEFAULT_WS_HEADERS: dict[str, str] = {}
DEFAULT_WS_PATH = "/"
DEFAULT_POSITION_CLOSED = 0
DEFAULT_POSITION_OPEN = 100
DEFAULT_RETAIN = False
PROTOCOL_31 = "3.1"
PROTOCOL_311 = "3.1.1"
@ -146,6 +160,7 @@ PLATFORMS = [
Platform.TEXT,
Platform.UPDATE,
Platform.VACUUM,
Platform.VALVE,
Platform.WATER_HEATER,
]
@ -173,5 +188,6 @@ RELOADABLE_PLATFORMS = [
Platform.TEXT,
Platform.UPDATE,
Platform.VACUUM,
Platform.VALVE,
Platform.WATER_HEATER,
]

32
homeassistant/components/mqtt/cover.py
View file

@ -38,10 +38,24 @@ from .config import MQTT_BASE_SCHEMA
from .const import (
CONF_COMMAND_TOPIC,
CONF_ENCODING,
CONF_PAYLOAD_CLOSE,
CONF_PAYLOAD_OPEN,
CONF_PAYLOAD_STOP,
CONF_POSITION_CLOSED,
CONF_POSITION_OPEN,
CONF_QOS,
CONF_RETAIN,
CONF_STATE_CLOSED,
CONF_STATE_CLOSING,
CONF_STATE_OPEN,
CONF_STATE_OPENING,
CONF_STATE_TOPIC,
DEFAULT_OPTIMISTIC,
DEFAULT_PAYLOAD_CLOSE,
DEFAULT_PAYLOAD_OPEN,
DEFAULT_POSITION_CLOSED,
DEFAULT_POSITION_OPEN,
DEFAULT_RETAIN,
)
from .debug_info import log_messages
from .mixins import (
@ -64,15 +78,6 @@ CONF_TILT_COMMAND_TEMPLATE = "tilt_command_template"
CONF_TILT_STATUS_TOPIC = "tilt_status_topic"
CONF_TILT_STATUS_TEMPLATE = "tilt_status_template"
CONF_PAYLOAD_CLOSE = "payload_close"
CONF_PAYLOAD_OPEN = "payload_open"
CONF_PAYLOAD_STOP = "payload_stop"
CONF_POSITION_CLOSED = "position_closed"
CONF_POSITION_OPEN = "position_open"
CONF_STATE_CLOSED = "state_closed"
CONF_STATE_CLOSING = "state_closing"
CONF_STATE_OPEN = "state_open"
CONF_STATE_OPENING = "state_opening"
CONF_STATE_STOPPED = "state_stopped"
CONF_TILT_CLOSED_POSITION = "tilt_closed_value"
CONF_TILT_MAX = "tilt_max"
@ -84,13 +89,10 @@ TILT_PAYLOAD = "tilt"
COVER_PAYLOAD = "cover"
DEFAULT_NAME = "MQTT Cover"
DEFAULT_PAYLOAD_CLOSE = "CLOSE"
DEFAULT_PAYLOAD_OPEN = "OPEN"
DEFAULT_PAYLOAD_STOP = "STOP"
DEFAULT_POSITION_CLOSED = 0
DEFAULT_POSITION_OPEN = 100
DEFAULT_RETAIN = False
DEFAULT_STATE_STOPPED = "stopped"
DEFAULT_PAYLOAD_STOP = "STOP"
DEFAULT_TILT_CLOSED_POSITION = 0
DEFAULT_TILT_MAX = 100
DEFAULT_TILT_MIN = 0

1
homeassistant/components/mqtt/discovery.py
View file

@ -74,6 +74,7 @@ SUPPORTED_COMPONENTS = {
"text",
"update",
"vacuum",
"valve",
"water_heater",
}

420
homeassistant/components/mqtt/valve.py Normal file
View file

@ -0,0 +1,420 @@
"""Support for MQTT valve devices."""
from __future__ import annotations
from contextlib import suppress
import logging
from typing import Any
import voluptuous as vol
from homeassistant.components import valve
from homeassistant.components.valve import (
DEVICE_CLASSES_SCHEMA,
ValveEntity,
ValveEntityFeature,
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
CONF_DEVICE_CLASS,
CONF_NAME,
CONF_OPTIMISTIC,
CONF_VALUE_TEMPLATE,
STATE_CLOSED,
STATE_CLOSING,
STATE_OPEN,
STATE_OPENING,
)
from homeassistant.core import HomeAssistant, callback
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.typing import ConfigType
from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads
from homeassistant.util.percentage import (
percentage_to_ranged_value,
ranged_value_to_percentage,
)
from . import subscription
from .config import MQTT_BASE_SCHEMA
from .const import (
CONF_COMMAND_TEMPLATE,
CONF_COMMAND_TOPIC,
CONF_ENCODING,
CONF_PAYLOAD_CLOSE,
CONF_PAYLOAD_OPEN,
CONF_PAYLOAD_STOP,
CONF_POSITION_CLOSED,
CONF_POSITION_OPEN,
CONF_QOS,
CONF_RETAIN,
CONF_STATE_CLOSED,
CONF_STATE_CLOSING,
CONF_STATE_OPEN,
CONF_STATE_OPENING,
CONF_STATE_TOPIC,
DEFAULT_OPTIMISTIC,
DEFAULT_PAYLOAD_CLOSE,
DEFAULT_PAYLOAD_OPEN,
DEFAULT_POSITION_CLOSED,
DEFAULT_POSITION_OPEN,
DEFAULT_RETAIN,
)
from .debug_info import log_messages
from .mixins import (
MQTT_ENTITY_COMMON_SCHEMA,
MqttEntity,
async_setup_entity_entry_helper,
write_state_on_attr_change,
)
from .models import (
MqttCommandTemplate,
MqttValueTemplate,
ReceiveMessage,
ReceivePayloadType,
)
from .util import valid_publish_topic, valid_subscribe_topic
_LOGGER = logging.getLogger(__name__)
CONF_REPORTS_POSITION = "reports_position"
DEFAULT_NAME = "MQTT Valve"
MQTT_VALVE_ATTRIBUTES_BLOCKED = frozenset(
{
valve.ATTR_CURRENT_POSITION,
}
)
NO_POSITION_KEYS = (
CONF_PAYLOAD_CLOSE,
CONF_PAYLOAD_OPEN,
CONF_STATE_CLOSED,
CONF_STATE_OPEN,
)
DEFAULTS = {
CONF_PAYLOAD_CLOSE: DEFAULT_PAYLOAD_CLOSE,
CONF_PAYLOAD_OPEN: DEFAULT_PAYLOAD_OPEN,
CONF_STATE_OPEN: STATE_OPEN,
CONF_STATE_CLOSED: STATE_CLOSED,
}
def _validate_and_add_defaults(config: ConfigType) -> ConfigType:
"""Validate config options and set defaults."""
if config[CONF_REPORTS_POSITION] and any(key in config for key in NO_POSITION_KEYS):
raise vol.Invalid(
"Options `payload_open`, `payload_close`, `state_open` and "
"`state_closed` are not allowed if the valve reports a position."
)
return {**DEFAULTS, **config}
_PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
{
vol.Optional(CONF_COMMAND_TOPIC): valid_publish_topic,
vol.Optional(CONF_COMMAND_TEMPLATE): cv.template,
vol.Optional(CONF_DEVICE_CLASS): vol.Any(DEVICE_CLASSES_SCHEMA, None),
vol.Optional(CONF_NAME): vol.Any(cv.string, None),
vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
vol.Optional(CONF_PAYLOAD_CLOSE): vol.Any(cv.string, None),
vol.Optional(CONF_PAYLOAD_OPEN): vol.Any(cv.string, None),
vol.Optional(CONF_PAYLOAD_STOP): vol.Any(cv.string, None),
vol.Optional(CONF_POSITION_CLOSED, default=DEFAULT_POSITION_CLOSED): int,
vol.Optional(CONF_POSITION_OPEN, default=DEFAULT_POSITION_OPEN): int,
vol.Optional(CONF_REPORTS_POSITION, default=False): cv.boolean,
vol.Optional(CONF_RETAIN, default=DEFAULT_RETAIN): cv.boolean,
vol.Optional(CONF_STATE_CLOSED): cv.string,
vol.Optional(CONF_STATE_CLOSING, default=STATE_CLOSING): cv.string,
vol.Optional(CONF_STATE_OPEN): cv.string,
vol.Optional(CONF_STATE_OPENING, default=STATE_OPENING): cv.string,
vol.Optional(CONF_STATE_TOPIC): valid_subscribe_topic,
vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
}
).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
PLATFORM_SCHEMA_MODERN = vol.All(_PLATFORM_SCHEMA_BASE, _validate_and_add_defaults)
DISCOVERY_SCHEMA = vol.All(
_PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
_validate_and_add_defaults,
)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up MQTT valve through YAML and through MQTT discovery."""
await async_setup_entity_entry_helper(
hass,
config_entry,
MqttValve,
valve.DOMAIN,
async_add_entities,
DISCOVERY_SCHEMA,
PLATFORM_SCHEMA_MODERN,
)
class MqttValve(MqttEntity, ValveEntity):
"""Representation of a valve that can be controlled using MQTT."""
_attr_is_closed: bool | None = None
_attributes_extra_blocked: frozenset[str] = MQTT_VALVE_ATTRIBUTES_BLOCKED
_default_name = DEFAULT_NAME
_entity_id_format: str = valve.ENTITY_ID_FORMAT
_optimistic: bool
_range: tuple[int, int]
_tilt_optimistic: bool
@staticmethod
def config_schema() -> vol.Schema:
"""Return the config schema."""
return DISCOVERY_SCHEMA
def _setup_from_config(self, config: ConfigType) -> None:
"""Set up valve from config."""
self._attr_reports_position = config[CONF_REPORTS_POSITION]
self._range = (
self._config[CONF_POSITION_CLOSED] + 1,
self._config[CONF_POSITION_OPEN],
)
no_state_topic = config.get(CONF_STATE_TOPIC) is None
self._optimistic = config[CONF_OPTIMISTIC] or no_state_topic
self._attr_assumed_state = self._optimistic
template_config_attributes = {
"position_open": config[CONF_POSITION_OPEN],
"position_closed": config[CONF_POSITION_CLOSED],
}
self._value_template = MqttValueTemplate(
config.get(CONF_VALUE_TEMPLATE), entity=self
).async_render_with_possible_json_value
self._command_template = MqttCommandTemplate(
config.get(CONF_COMMAND_TEMPLATE), entity=self
).async_render
self._value_template = MqttValueTemplate(
config.get(CONF_VALUE_TEMPLATE),
entity=self,
config_attributes=template_config_attributes,
).async_render_with_possible_json_value
self._attr_device_class = config.get(CONF_DEVICE_CLASS)
supported_features = ValveEntityFeature(0)
if CONF_COMMAND_TOPIC in config:
if config[CONF_PAYLOAD_OPEN] is not None:
supported_features |= ValveEntityFeature.OPEN
if config[CONF_PAYLOAD_CLOSE] is not None:
supported_features |= ValveEntityFeature.CLOSE
if config[CONF_REPORTS_POSITION]:
supported_features |= ValveEntityFeature.SET_POSITION
if config.get(CONF_PAYLOAD_STOP) is not None:
supported_features |= ValveEntityFeature.STOP
self._attr_supported_features = supported_features
@callback
def _update_state(self, state: str) -> None:
"""Update the valve state based on static payload."""
self._attr_is_closed = state == STATE_CLOSED
self._attr_is_opening = state == STATE_OPENING
self._attr_is_closing = state == STATE_CLOSING
@callback
def _process_binary_valve_update(
self, payload: ReceivePayloadType, state_payload: str
) -> None:
"""Process an update for a valve that does not report the position."""
state: str | None = None
if state_payload == self._config[CONF_STATE_OPENING]:
state = STATE_OPENING
elif state_payload == self._config[CONF_STATE_CLOSING]:
state = STATE_CLOSING
elif state_payload == self._config[CONF_STATE_OPEN]:
state = STATE_OPEN
elif state_payload == self._config[CONF_STATE_CLOSED]:
state = STATE_CLOSED
if state is None:
_LOGGER.warning(
"Payload is not one of [open, closed, opening, closing], got: %s",
payload,
)
return
self._update_state(state)
@callback
def _process_position_valve_update(
self, payload: ReceivePayloadType, position_payload: str, state_payload: str
) -> None:
"""Process an update for a valve that reports the position."""
state: str | None = None
if state_payload == self._config[CONF_STATE_OPENING]:
state = STATE_OPENING
elif state_payload == self._config[CONF_STATE_CLOSING]:
state = STATE_CLOSING
if state is None or position_payload != state_payload:
try:
percentage_payload = ranged_value_to_percentage(
self._range, float(position_payload)
)
except ValueError:
_LOGGER.warning("Payload '%s' is not numeric", position_payload)
return
self._attr_current_valve_position = min(max(percentage_payload, 0), 100)
if state is None:
_LOGGER.warning(
"Payload is not one of [opening, closing], got: %s",
payload,
)
return
self._update_state(state)
def _prepare_subscribe_topics(self) -> None:
"""(Re)Subscribe to topics."""
topics = {}
@callback
@log_messages(self.hass, self.entity_id)
@write_state_on_attr_change(
self,
{
"_attr_current_valve_position",
"_attr_is_closed",
"_attr_is_closing",
"_attr_is_opening",
},
)
def state_message_received(msg: ReceiveMessage) -> None:
"""Handle new MQTT state messages."""
payload_dict: Any = None
position_payload: Any = None
state_payload: Any = None
payload = self._value_template(msg.payload)
if not payload:
_LOGGER.debug("Ignoring empty state message from '%s'", msg.topic)
return
with suppress(*JSON_DECODE_EXCEPTIONS):
payload_dict = json_loads(payload)
if isinstance(payload_dict, dict) and "position" in payload_dict:
position_payload = payload_dict["position"]
if isinstance(payload_dict, dict) and "state" in payload_dict:
state_payload = payload_dict["state"]
state_payload = payload if state_payload is None else state_payload
position_payload = payload if position_payload is None else position_payload
if self._config[CONF_REPORTS_POSITION]:
self._process_position_valve_update(
payload, position_payload, state_payload
)
else:
self._process_binary_valve_update(payload, state_payload)
if self._config.get(CONF_STATE_TOPIC):
topics["state_topic"] = {
"topic": self._config.get(CONF_STATE_TOPIC),
"msg_callback": state_message_received,
"qos": self._config[CONF_QOS],
"encoding": self._config[CONF_ENCODING] or None,
}
self._sub_state = subscription.async_prepare_subscribe_topics(
self.hass, self._sub_state, topics
)
async def _subscribe_topics(self) -> None:
"""(Re)Subscribe to topics."""
await subscription.async_subscribe_topics(self.hass, self._sub_state)
async def async_open_valve(self) -> None:
"""Move the valve up.
This method is a coroutine.
"""
payload = self._command_template(
self._config.get(CONF_PAYLOAD_OPEN, DEFAULT_PAYLOAD_OPEN)
)
await self.async_publish(
self._config[CONF_COMMAND_TOPIC],
payload,
self._config[CONF_QOS],
self._config[CONF_RETAIN],
self._config[CONF_ENCODING],
)
if self._optimistic:
# Optimistically assume that valve has changed state.
self._update_state(STATE_OPEN)
self.async_write_ha_state()
async def async_close_valve(self) -> None:
"""Move the valve down.
This method is a coroutine.
"""
payload = self._command_template(
self._config.get(CONF_PAYLOAD_CLOSE, DEFAULT_PAYLOAD_CLOSE)
)
await self.async_publish(
self._config[CONF_COMMAND_TOPIC],
payload,
self._config[CONF_QOS],
self._config[CONF_RETAIN],
self._config[CONF_ENCODING],
)
if self._optimistic:
# Optimistically assume that valve has changed state.
self._update_state(STATE_CLOSED)
self.async_write_ha_state()
async def async_stop_valve(self) -> None:
"""Stop valve positioning.
This method is a coroutine.
"""
payload = self._command_template(self._config[CONF_PAYLOAD_STOP])
await self.async_publish(
self._config[CONF_COMMAND_TOPIC],
payload,
self._config[CONF_QOS],
self._config[CONF_RETAIN],
self._config[CONF_ENCODING],
)
async def async_set_valve_position(self, position: int) -> None:
"""Move the valve to a specific position."""
percentage_position = position
scaled_position = round(
percentage_to_ranged_value(self._range, percentage_position)
)
variables = {
"position": percentage_position,
"position_open": self._config[CONF_POSITION_OPEN],
"position_closed": self._config[CONF_POSITION_CLOSED],
}
rendered_position = self._command_template(scaled_position, variables=variables)
await self.async_publish(
self._config[CONF_COMMAND_TOPIC],
rendered_position,
self._config[CONF_QOS],
self._config[CONF_RETAIN],
self._config[CONF_ENCODING],
)
if self._optimistic:
self._update_state(
STATE_CLOSED
if percentage_position == self._config[CONF_POSITION_CLOSED]
else STATE_OPEN
)
self._attr_current_valve_position = percentage_position
self.async_write_ha_state()

1399
tests/components/mqtt/test_valve.py Normal file
View file

File diff suppressed because it is too large Load diff