jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix august lock state when API reports locking and locked with the same timestamp (#92276)

Browse Source
This commit is contained in:
J. Nick Koston 2023-04-30 11:08:12 -05:00 committed by GitHub
parent 4fcf05c202
commit ed286fc223
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/august/activity.py
View File

@ -3,6 +3,7 @@ import asyncio
import logging import logging
from aiohttp import ClientError from aiohttp import ClientError
from yalexs.util import get_latest_activity
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.debounce import Debouncer from homeassistant.helpers.debounce import Debouncer
@ -169,12 +170,11 @@ class ActivityStream(AugustSubscriberMixin):
device_id = activity.device_id device_id = activity.device_id
activity_type = activity.activity_type activity_type = activity.activity_type
device_activities = self._latest_activities.setdefault(device_id, {}) device_activities = self._latest_activities.setdefault(device_id, {})
lastest_activity = device_activities.get(activity_type) # Ignore activities that are older than the latest one unless it is a non
# locking or unlocking activity with the exact same start time.
# Ignore activities that are older than the latest one
if ( if (
lastest_activity get_latest_activity(activity, device_activities.get(activity_type))
and lastest_activity.activity_start_time >= activity.activity_start_time != activity
): ):
continue continue

27
homeassistant/components/august/lock.py
View File

@ -5,7 +5,7 @@ from typing import Any
from aiohttp import ClientResponseError from aiohttp import ClientResponseError
from yalexs.activity import SOURCE_PUBNUB, ActivityType from yalexs.activity import SOURCE_PUBNUB, ActivityType
from yalexs.lock import LockStatus from yalexs.lock import LockStatus
from yalexs.util import update_lock_detail_from_activity from yalexs.util import get_latest_activity, update_lock_detail_from_activity
from homeassistant.components.lock import ATTR_CHANGED_BY, LockEntity from homeassistant.components.lock import ATTR_CHANGED_BY, LockEntity
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
@ -90,17 +90,26 @@ class AugustLock(AugustEntityMixin, RestoreEntity, LockEntity):
@callback @callback
def _update_from_data(self): def _update_from_data(self):
"""Get the latest state of the sensor and update activity.""" """Get the latest state of the sensor and update activity."""
lock_activity = self._data.activity_stream.get_latest_device_activity( activity_stream = self._data.activity_stream
self._device_id, device_id = self._device_id
{ActivityType.LOCK_OPERATION, ActivityType.LOCK_OPERATION_WITHOUT_OPERATOR}, if lock_activity := activity_stream.get_latest_device_activity(
device_id,
{ActivityType.LOCK_OPERATION},
):
self._attr_changed_by = lock_activity.operated_by
lock_activity_without_operator = activity_stream.get_latest_device_activity(
device_id,
{ActivityType.LOCK_OPERATION_WITHOUT_OPERATOR},
) )
if lock_activity is not None: if latest_activity := get_latest_activity(
self._attr_changed_by = lock_activity.operated_by lock_activity_without_operator, lock_activity
update_lock_detail_from_activity(self._detail, lock_activity) ):
# If the source is pubnub the lock must be online since its a live update if latest_activity.source == SOURCE_PUBNUB:
if lock_activity.source == SOURCE_PUBNUB: # If the source is pubnub the lock must be online since its a live update
self._detail.set_online(True) self._detail.set_online(True)
update_lock_detail_from_activity(self._detail, latest_activity)
bridge_activity = self._data.activity_stream.get_latest_device_activity( bridge_activity = self._data.activity_stream.get_latest_device_activity(
self._device_id, {ActivityType.BRIDGE_OPERATION} self._device_id, {ActivityType.BRIDGE_OPERATION}

2
homeassistant/components/august/manifest.json
View File

@ -28,5 +28,5 @@
"documentation": "https://www.home-assistant.io/integrations/august", "documentation": "https://www.home-assistant.io/integrations/august",
"iot_class": "cloud_push", "iot_class": "cloud_push",
"loggers": ["pubnub", "yalexs"], "loggers": ["pubnub", "yalexs"],
"requirements": ["yalexs==1.3.2", "yalexs-ble==2.1.16"] "requirements": ["yalexs==1.3.3", "yalexs-ble==2.1.16"]
} }

2
requirements_all.txt
View File

@ -2679,7 +2679,7 @@ yalesmartalarmclient==0.3.9
yalexs-ble==2.1.16 yalexs-ble==2.1.16
# homeassistant.components.august # homeassistant.components.august
yalexs==1.3.2 yalexs==1.3.3
# homeassistant.components.yeelight # homeassistant.components.yeelight
yeelight==0.7.10 yeelight==0.7.10

2
requirements_test_all.txt
View File

@ -1943,7 +1943,7 @@ yalesmartalarmclient==0.3.9
yalexs-ble==2.1.16 yalexs-ble==2.1.16
# homeassistant.components.august # homeassistant.components.august
yalexs==1.3.2 yalexs==1.3.3
# homeassistant.components.yeelight # homeassistant.components.yeelight
yeelight==0.7.10 yeelight==0.7.10