Fix race against is_smart_detected in unifiprotect (#120133)
This commit is contained in:
parent
1aa9094d3d
commit
47587ee3fb
3 changed files with 109 additions and 11 deletions
|
@ -742,21 +742,21 @@ class ProtectSmartEventBinarySensor(EventEntityMixin, BinarySensorEntity):
|
|||
prev_event = self._event
|
||||
prev_event_end = self._event_end
|
||||
super()._async_update_device_from_protect(device)
|
||||
event = self._event = description.get_event_obj(device)
|
||||
self._event_end = event.end if event else None
|
||||
if event := description.get_event_obj(device):
|
||||
self._event = event
|
||||
self._event_end = event.end if event else None
|
||||
|
||||
if not (
|
||||
event
|
||||
and not self._event_already_ended(prev_event, prev_event_end)
|
||||
and description.has_matching_smart(event)
|
||||
and ((is_end := event.end) or self.device.is_smart_detected)
|
||||
and not self._event_already_ended(prev_event, prev_event_end)
|
||||
):
|
||||
self._set_event_done()
|
||||
return
|
||||
|
||||
self._attr_is_on = True
|
||||
self._set_event_attrs(event)
|
||||
if is_end:
|
||||
if event.end:
|
||||
self._async_event_with_immediate_end()
|
||||
|
||||
|
||||
|
|
|
@ -762,21 +762,21 @@ class ProtectLicensePlateEventSensor(ProtectEventSensor):
|
|||
prev_event = self._event
|
||||
prev_event_end = self._event_end
|
||||
super()._async_update_device_from_protect(device)
|
||||
event = self._event = description.get_event_obj(device)
|
||||
self._event_end = event.end if event else None
|
||||
if event := description.get_event_obj(device):
|
||||
self._event = event
|
||||
self._event_end = event.end
|
||||
|
||||
if not (
|
||||
event
|
||||
and not self._event_already_ended(prev_event, prev_event_end)
|
||||
and description.has_matching_smart(event)
|
||||
and ((is_end := event.end) or self.device.is_smart_detected)
|
||||
and (metadata := event.metadata)
|
||||
and (license_plate := metadata.license_plate)
|
||||
and description.has_matching_smart(event)
|
||||
and not self._event_already_ended(prev_event, prev_event_end)
|
||||
):
|
||||
self._set_event_done()
|
||||
return
|
||||
|
||||
self._attr_native_value = license_plate.name
|
||||
self._set_event_attrs(event)
|
||||
if is_end:
|
||||
if event.end:
|
||||
self._async_event_with_immediate_end()
|
||||
|
|
|
@ -839,6 +839,104 @@ async def test_camera_update_license_plate_multiple_updates(
|
|||
assert state.state == "none"
|
||||
|
||||
|
||||
async def test_camera_update_license_no_dupes(
|
||||
hass: HomeAssistant, ufp: MockUFPFixture, camera: Camera, fixed_now: datetime
|
||||
) -> None:
|
||||
"""Test license plate sensor does not generate duplicate reads."""
|
||||
|
||||
camera.feature_flags.smart_detect_types.append(SmartDetectObjectType.LICENSE_PLATE)
|
||||
camera.feature_flags.has_smart_detect = True
|
||||
camera.smart_detect_settings.object_types.append(
|
||||
SmartDetectObjectType.LICENSE_PLATE
|
||||
)
|
||||
|
||||
await init_entry(hass, ufp, [camera])
|
||||
assert_entity_counts(hass, Platform.SENSOR, 23, 13)
|
||||
|
||||
_, entity_id = ids_from_device_description(
|
||||
Platform.SENSOR, camera, LICENSE_PLATE_EVENT_SENSORS[0]
|
||||
)
|
||||
|
||||
event_metadata = EventMetadata(
|
||||
license_plate=LicensePlateMetadata(name="FPR2238", confidence_level=91)
|
||||
)
|
||||
event = Event(
|
||||
model=ModelType.EVENT,
|
||||
id="6675e36400de8c03e40bd5e3",
|
||||
type=EventType.SMART_DETECT,
|
||||
start=fixed_now - timedelta(seconds=1),
|
||||
end=None,
|
||||
score=83,
|
||||
smart_detect_types=[SmartDetectObjectType.LICENSE_PLATE],
|
||||
smart_detect_event_ids=[],
|
||||
metadata=event_metadata,
|
||||
api=ufp.api,
|
||||
)
|
||||
|
||||
new_camera = camera.copy()
|
||||
new_camera.is_smart_detected = True
|
||||
new_camera.last_smart_detect_event_ids[SmartDetectObjectType.LICENSE_PLATE] = (
|
||||
event.id
|
||||
)
|
||||
|
||||
mock_msg = Mock()
|
||||
mock_msg.changed_data = {}
|
||||
mock_msg.new_obj = new_camera
|
||||
|
||||
ufp.api.bootstrap.cameras = {new_camera.id: new_camera}
|
||||
ufp.api.bootstrap.events = {event.id: event}
|
||||
|
||||
state_changes: list[HAEvent[EventStateChangedData]] = async_capture_events(
|
||||
hass, EVENT_STATE_CHANGED
|
||||
)
|
||||
ufp.ws_msg(mock_msg)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get(entity_id)
|
||||
assert state
|
||||
assert state.state == "FPR2238"
|
||||
assert state.attributes[ATTR_EVENT_SCORE] == 83
|
||||
|
||||
assert len(state_changes) == 1
|
||||
|
||||
# Now send it again
|
||||
ufp.api.bootstrap.events = {event.id: event}
|
||||
ufp.ws_msg(mock_msg)
|
||||
await hass.async_block_till_done()
|
||||
assert len(state_changes) == 1
|
||||
|
||||
# Again send it again
|
||||
ufp.api.bootstrap.events = {event.id: event}
|
||||
ufp.ws_msg(mock_msg)
|
||||
await hass.async_block_till_done()
|
||||
assert len(state_changes) == 1
|
||||
|
||||
# Now add the end time and change the confidence level
|
||||
event.end = fixed_now + timedelta(seconds=1)
|
||||
event.metadata.license_plate.confidence_level = 96
|
||||
ufp.api.bootstrap.events = {event.id: event}
|
||||
ufp.ws_msg(mock_msg)
|
||||
await hass.async_block_till_done()
|
||||
assert len(state_changes) == 2
|
||||
|
||||
state = hass.states.get(entity_id)
|
||||
assert state
|
||||
assert state.state == "none"
|
||||
|
||||
# Now send it 3 more times
|
||||
for _ in range(3):
|
||||
ufp.api.bootstrap.events = {event.id: event}
|
||||
ufp.ws_msg(mock_msg)
|
||||
await hass.async_block_till_done()
|
||||
assert len(state_changes) == 2
|
||||
|
||||
# Now clear the event
|
||||
ufp.api.bootstrap.events = {}
|
||||
ufp.ws_msg(mock_msg)
|
||||
await hass.async_block_till_done()
|
||||
assert len(state_changes) == 2
|
||||
|
||||
|
||||
async def test_sensor_precision(
|
||||
hass: HomeAssistant, ufp: MockUFPFixture, sensor_all: Sensor, fixed_now: datetime
|
||||
) -> None:
|
||||
|
|
Loading…
Add table
Reference in a new issue