This commit is contained in:
Nicolas Mowen
2026-11-21 07:46:35 -07:00
parent 07d7f723b8
commit 0a5a75204a
4 changed files with 72 additions and 3 deletions
+1
View File
@@ -42,6 +42,7 @@ def should_update_db(prev_event: dict[str, Any], current_event: dict[str, Any])
or prev_event["recognized_license_plate"]
!= current_event["recognized_license_plate"]
or prev_event["path_data"] != current_event["path_data"]
or prev_event["max_severity"] != current_event["max_severity"]
):
return True
return False
@@ -0,0 +1,42 @@
"""When tracked object updates are written to the database."""
import unittest
from typing import Any
from frigate.events.maintainer import should_update_db
def _event(**overrides: Any) -> dict[str, Any]:
return {
"end_time": None,
"has_clip": False,
"has_snapshot": True,
"top_score": 0.8,
"entered_zones": ["porch"],
"average_estimated_speed": 0,
"velocity_angle": 0,
"recognized_license_plate": None,
"path_data": [],
"max_severity": None,
**overrides,
}
class TestShouldUpdateDb(unittest.TestCase):
def test_unchanged_saved_event_is_not_updated(self):
self.assertFalse(should_update_db(_event(), _event()))
def test_max_severity_change_updates_saved_event(self):
self.assertTrue(should_update_db(_event(), _event(max_severity="alert")))
def test_max_severity_change_ignored_when_not_saved(self):
self.assertFalse(
should_update_db(
_event(has_snapshot=False),
_event(has_snapshot=False, max_severity="alert"),
)
)
if __name__ == "__main__":
unittest.main()
+24 -1
View File
@@ -152,7 +152,9 @@ class TestTrackedObjectMaxSeverity(unittest.TestCase):
self.last_detection = self._obj_data(x, score, frame_time)
self.obj.update(frame_time, dict(self.last_detection), False)
_, self.last_significant, _, _ = self.obj.update(
frame_time, dict(self.last_detection), False
)
activity = ActiveObjects(frame_time, self.camera_config, [self.obj.to_dict()])
if activity.has_activity_category(SeverityEnum.alert):
@@ -192,6 +194,27 @@ class TestTrackedObjectMaxSeverity(unittest.TestCase):
self.assertIsNone(self.obj.max_severity)
self.assertIsNone(self.obj.to_dict()["max_severity"])
def test_severity_change_is_significant(self):
"""Confirming an object already moving in the zone changes nothing else
that is watched, but the new severity still has to be published."""
for i in range(10):
self._step(OUTSIDE_X + i * 40, 0.6, moved=True)
self.assertEqual(self.obj.current_zones, [ZONE])
self.assertIsNone(self.obj.max_severity)
for i in range(10):
self._step(INSIDE_X + (i % 2) * 10, 0.9, moved=True)
if self.obj.max_severity is not None:
break
self.assertEqual(self.obj.max_severity, SeverityEnum.alert)
self.assertTrue(self.last_significant)
self._step(INSIDE_X, 0.9, moved=True)
self.assertFalse(self.last_significant)
def test_alert_is_kept_after_object_stops_qualifying(self):
for i in range(10):
self._step(OUTSIDE_X + i * 40, 0.9, moved=True)
+5 -2
View File
@@ -373,10 +373,13 @@ class TrackedObject:
pending_loitering=self.pending_loitering,
)
if severity == SeverityEnum.alert or (
severity == SeverityEnum.detection and self.max_severity is None
if severity != self.max_severity and (
severity == SeverityEnum.alert
or (severity == SeverityEnum.detection and self.max_severity is None)
):
self.max_severity = severity
# max_severity is saved with the event, so publish the change
significant_change = True
logger.debug(
f"{self.camera_config.name}: Updating {obj_data['id']}: thumb update? {thumb_update}, significant change? {significant_change}, path update? {path_update}, autotracker update? {autotracker_update} "