From f295305a06edebcbd7c25ccca9c0d1b64e486a24 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Sat, 29 Apr 2023 12:39:01 -0600 Subject: [PATCH] Add appropriate fields to data --- frigate/events.py | 12 ++++++++---- frigate/models.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frigate/events.py b/frigate/events.py index 558cb2139..fb9e58225 100644 --- a/frigate/events.py +++ b/frigate/events.py @@ -141,17 +141,21 @@ class EventProcessor(threading.Thread): Event.camera: camera, Event.start_time: start_time, Event.end_time: end_time, - Event.top_score: event_data["top_score"], - Event.score: score, Event.zones: list(event_data["entered_zones"]), Event.thumbnail: event_data["thumbnail"], - Event.region: region, - Event.box: box, Event.has_clip: event_data["has_clip"], Event.has_snapshot: event_data["has_snapshot"], Event.model_hash: first_detector.model.model_hash, Event.model_type: first_detector.model.model_type, Event.detector_type: first_detector.type, + Event.data: { + "area": event_data.get("area", 0), + "box": box, + "ratio": event_data.get("ratio", width / height), + "region": region, + "score": score, + "top_score": event_data["top_score"], + } } ( diff --git a/frigate/models.py b/frigate/models.py index 825ca2419..3770121cc 100644 --- a/frigate/models.py +++ b/frigate/models.py @@ -44,7 +44,7 @@ class Event(Model): # type: ignore[misc] model_hash = CharField(max_length=32) detector_type = CharField(max_length=32) model_type = CharField(max_length=32) - data = JSONField() # ex: tracked object area, box, region, etc. + data = JSONField() # ex: tracked object box, region, etc. class Timeline(Model): # type: ignore[misc]