revil-O/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

[zigbee.mqtt] Removed synchronous logic on device_set.

Browse source 
Don't wait for a value update on `device_set` - an event will be
triggered anyway when the value changes.

This should prevent timeouts when setting/toggling values.
This commit is contained in:
Fabio Manganiello 2024-08-09 15:15:21 +02:00
parent d70737ea2b
commit 129c7587ad
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
platypush/plugins/zigbee/mqtt/__init__.py
View file

@ -1131,7 +1131,6 @@ class ZigbeeMqttPlugin(
the default configured device). the default configured device).
""" """
msg = (values or {}).copy() msg = (values or {}).copy()
reply_topic = None
device_info = self._get_device_info(device, **kwargs) device_info = self._get_device_info(device, **kwargs)
assert device_info, f'No such device: {device}' assert device_info, f'No such device: {device}'
device = self._preferred_name(device_info) device = self._preferred_name(device_info)
@ -1143,53 +1142,18 @@ class ZigbeeMqttPlugin(
return self.device_set_option(device, property, value, **kwargs) return self.device_set_option(device, property, value, **kwargs)
# Check if it's a property # Check if it's a property
reply_topic = self._topic(device)
stored_property = self._get_properties(device_info).get(property) stored_property = self._get_properties(device_info).get(property)
assert stored_property, f'No such property: {property}' assert stored_property, f'No such property: {property}'
# Set the new value on the message # Set the new value on the message
msg[property] = value msg[property] = value
# Don't wait for an update from a value that is not readable self._run_request(
if self._is_write_only(stored_property):
reply_topic = None
if property and reply_topic:
self.logger.debug(
'Waiting for updated value of %s for device %s, reply topic: %s',
property,
device,
reply_topic,
)
properties = self._run_request(
topic=self._topic(device + '/set'), topic=self._topic(device + '/set'),
reply_topic=reply_topic,
msg=msg, msg=msg,
**self._mqtt_args(**kwargs), **self._mqtt_args(**kwargs),
) )
if property and reply_topic:
if property not in (properties or {}):
self.logger.warning(
(
'Could not retrieve value of property %s on device %s, '
'reply topic: %s, retrieved properties: %s',
),
property,
device,
reply_topic,
properties,
)
raise AssertionError(
f'Cound not retrieve the new state for {property} on device {device}'
)
return {property: properties[property]}
return properties
@action @action
# pylint: disable=redefined-builtin # pylint: disable=redefined-builtin
def set_value( def set_value(