Skip to content

Commit

Permalink
Add support for zwave_js event entities (#102285)
Browse files Browse the repository at this point in the history
Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
  • Loading branch information
raman325 and MartinHjelmare committed Oct 20, 2023
1 parent a2c60d9 commit 41b59b6
Show file tree
Hide file tree
Showing 6 changed files with 733 additions and 1 deletion.
14 changes: 14 additions & 0 deletions homeassistant/components/zwave_js/discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ class ZWaveValueDiscoverySchema(DataclassMustHaveAtLeastOne):
any_available_states: set[tuple[int, str]] | None = None
# [optional] the value's value must match this value
value: Any | None = None
# [optional] the value's metadata_stateful must match this value
stateful: bool | None = None


@dataclass
Expand Down Expand Up @@ -1045,6 +1047,15 @@ class ZWaveDiscoverySchema:
any_available_states={(0, "idle")},
),
),
# event
# stateful = False
ZWaveDiscoverySchema(
platform=Platform.EVENT,
hint="stateless",
primary_value=ZWaveValueDiscoverySchema(
stateful=False,
),
),
]


Expand Down Expand Up @@ -1294,6 +1305,9 @@ def check_value(value: ZwaveValue, schema: ZWaveValueDiscoverySchema) -> bool:
# check value
if schema.value is not None and value.value not in schema.value:
return False
# check metadata_stateful
if schema.stateful is not None and value.metadata.stateful != schema.stateful:
return False
return True


Expand Down
98 changes: 98 additions & 0 deletions homeassistant/components/zwave_js/event.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
"""Support for Z-Wave controls using the event platform."""
from __future__ import annotations

from zwave_js_server.client import Client as ZwaveClient
from zwave_js_server.model.driver import Driver
from zwave_js_server.model.value import Value, ValueNotification

from homeassistant.components.event import DOMAIN as EVENT_DOMAIN, EventEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.entity_platform import AddEntitiesCallback

from .const import ATTR_VALUE, DATA_CLIENT, DOMAIN
from .discovery import ZwaveDiscoveryInfo
from .entity import ZWaveBaseEntity

PARALLEL_UPDATES = 0


async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up Z-Wave Event entity from Config Entry."""
client: ZwaveClient = hass.data[DOMAIN][config_entry.entry_id][DATA_CLIENT]

@callback
def async_add_event(info: ZwaveDiscoveryInfo) -> None:
"""Add Z-Wave event entity."""
driver = client.driver
assert driver is not None # Driver is ready before platforms are loaded.
entities: list[ZWaveBaseEntity] = [ZwaveEventEntity(config_entry, driver, info)]
async_add_entities(entities)

config_entry.async_on_unload(
async_dispatcher_connect(
hass,
f"{DOMAIN}_{config_entry.entry_id}_add_{EVENT_DOMAIN}",
async_add_event,
)
)


def _cc_and_label(value: Value) -> str:
"""Return a string with the command class and label."""
label = value.metadata.label
if label:
label = label.lower()
return f"{value.command_class_name.capitalize()} {label}".strip()


class ZwaveEventEntity(ZWaveBaseEntity, EventEntity):
"""Representation of a Z-Wave event entity."""

def __init__(
self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
) -> None:
"""Initialize a ZwaveEventEntity entity."""
super().__init__(config_entry, driver, info)
value = self.value = info.primary_value
self.states: dict[int, str] = {}

if states := value.metadata.states:
self._attr_event_types = sorted(states.values())
self.states = {int(k): v for k, v in states.items()}
else:
self._attr_event_types = [_cc_and_label(value)]
# Entity class attributes
self._attr_name = self.generate_name(include_value_name=True)

@callback
def _async_handle_event(self, value_notification: ValueNotification) -> None:
"""Handle a value notification event."""
# If the notification doesn't match the value we are tracking, we can return
value = self.value
if (
value_notification.command_class != value.command_class
or value_notification.endpoint != value.endpoint
or value_notification.property_ != value.property_
or value_notification.property_key != value.property_key
or (notification_value := value_notification.value) is None
):
return
event_name = self.states.get(notification_value, _cc_and_label(value))
self._trigger_event(event_name, {ATTR_VALUE: notification_value})
self.async_write_ha_state()

async def async_added_to_hass(self) -> None:
"""Call when entity is added."""
await super().async_added_to_hass()
self.async_on_remove(
self.info.node.on(
"value notification",
lambda event: self._async_handle_event(event["value_notification"]),
)
)
14 changes: 14 additions & 0 deletions tests/components/zwave_js/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,12 @@ def climate_intermatic_pe653_state_fixture():
return json.loads(load_fixture("zwave_js/climate_intermatic_pe653_state.json"))


@pytest.fixture(name="central_scene_node_state", scope="session")
def central_scene_node_state_fixture():
"""Load node with Central Scene CC node state fixture data."""
return json.loads(load_fixture("zwave_js/central_scene_node_state.json"))


# model fixtures


Expand Down Expand Up @@ -1304,3 +1310,11 @@ def climate_intermatic_pe653_fixture(client, climate_intermatic_pe653_state):
node = Node(client, copy.deepcopy(climate_intermatic_pe653_state))
client.driver.controller.nodes[node.node_id] = node
return node


@pytest.fixture(name="central_scene_node")
def central_scene_node_fixture(client, central_scene_node_state):
"""Mock a node with the Central Scene CC."""
node = Node(client, copy.deepcopy(central_scene_node_state))
client.driver.controller.nodes[node.node_id] = node
return node
Loading

0 comments on commit 41b59b6

Please sign in to comment.