diff --git a/frigate/events.py b/frigate/events.py index cb238bb74..46cee3536 100644 --- a/frigate/events.py +++ b/frigate/events.py @@ -55,6 +55,9 @@ class EventProcessor(threading.Thread): false_positive=event_data["false_positive"], zones=list(event_data["entered_zones"]), thumbnail=event_data["thumbnail"], + region=event_data["region"], + box=event_data["box"], + area=event_data["area"], has_clip=event_data["has_clip"], has_snapshot=event_data["has_snapshot"], ) diff --git a/frigate/models.py b/frigate/models.py index 1ff9bc196..ccf368c72 100644 --- a/frigate/models.py +++ b/frigate/models.py @@ -15,6 +15,9 @@ class Event(Model): thumbnail = TextField() has_clip = BooleanField(default=True) has_snapshot = BooleanField(default=True) + region = JSONField() + box = JSONField() + area = IntegerField class Recordings(Model): diff --git a/migrations/004_add_bbox_region_area.py b/migrations/004_add_bbox_region_area.py new file mode 100644 index 000000000..bcc362aac --- /dev/null +++ b/migrations/004_add_bbox_region_area.py @@ -0,0 +1,48 @@ +"""Peewee migrations -- 004_add_bbox_region_area.py. + +Some examples (model - class or model name):: + + > Model = migrator.orm['model_name'] # Return model in current state by name + + > migrator.sql(sql) # Run custom SQL + > migrator.python(func, *args, **kwargs) # Run python code + > migrator.create_model(Model) # Create a model (could be used as decorator) + > migrator.remove_model(model, cascade=True) # Remove a model + > migrator.add_fields(model, **fields) # Add fields to a model + > migrator.change_fields(model, **fields) # Change fields + > migrator.remove_fields(model, *field_names, cascade=True) + > migrator.rename_field(model, old_field_name, new_field_name) + > migrator.rename_table(model, new_table_name) + > migrator.add_index(model, *col_names, unique=False) + > migrator.drop_index(model, *col_names) + > migrator.add_not_null(model, *field_names) + > migrator.drop_not_null(model, *field_names) + > migrator.add_default(model, field_name, default) + +""" + +import datetime as dt +import peewee as pw +from playhouse.sqlite_ext import * +from decimal import ROUND_HALF_EVEN +from frigate.models import Event + +try: + import playhouse.postgres_ext as pw_pext +except ImportError: + pass + +SQL = pw.SQL + + +def migrate(migrator, database, fake=False, **kwargs): + migrator.add_fields( + Event, + region=JSONField(default=[]), + box=JSONField(default=[]), + area=pw.IntegerField(default=0), + ) + + +def rollback(migrator, database, fake=False, **kwargs): + migrator.remove_fields(Event, ["region", "box", "area"]) diff --git a/web/src/routes/__tests__/Event.test.jsx b/web/src/routes/__tests__/Event.test.jsx index deed924d7..ada5b783c 100644 --- a/web/src/routes/__tests__/Event.test.jsx +++ b/web/src/routes/__tests__/Event.test.jsx @@ -57,7 +57,6 @@ describe('Event Route', () => { const mockEvent = { camera: 'front', end_time: 1613257337.841237, - false_positive: false, has_clip: true, has_snapshot: true, id: '1613257326.237365-83cgl2', diff --git a/web/src/routes/__tests__/Events.test.jsx b/web/src/routes/__tests__/Events.test.jsx index bd64925af..9f033859d 100644 --- a/web/src/routes/__tests__/Events.test.jsx +++ b/web/src/routes/__tests__/Events.test.jsx @@ -71,7 +71,6 @@ describe('Events Route', () => { const mockEvents = new Array(12).fill(null).map((v, i) => ({ end_time: 1613257337 + i, - false_positive: false, has_clip: true, has_snapshot: true, id: i,