add region/bbox/area to event table

This commit is contained in:
Blake Blackshear 2021-09-23 07:31:48 -05:00
parent 1049673413
commit 1d25936f31
5 changed files with 54 additions and 2 deletions

View File

@ -55,6 +55,9 @@ class EventProcessor(threading.Thread):
false_positive=event_data["false_positive"], false_positive=event_data["false_positive"],
zones=list(event_data["entered_zones"]), zones=list(event_data["entered_zones"]),
thumbnail=event_data["thumbnail"], thumbnail=event_data["thumbnail"],
region=event_data["region"],
box=event_data["box"],
area=event_data["area"],
has_clip=event_data["has_clip"], has_clip=event_data["has_clip"],
has_snapshot=event_data["has_snapshot"], has_snapshot=event_data["has_snapshot"],
) )

View File

@ -15,6 +15,9 @@ class Event(Model):
thumbnail = TextField() thumbnail = TextField()
has_clip = BooleanField(default=True) has_clip = BooleanField(default=True)
has_snapshot = BooleanField(default=True) has_snapshot = BooleanField(default=True)
region = JSONField()
box = JSONField()
area = IntegerField
class Recordings(Model): class Recordings(Model):

View File

@ -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"])

View File

@ -57,7 +57,6 @@ describe('Event Route', () => {
const mockEvent = { const mockEvent = {
camera: 'front', camera: 'front',
end_time: 1613257337.841237, end_time: 1613257337.841237,
false_positive: false,
has_clip: true, has_clip: true,
has_snapshot: true, has_snapshot: true,
id: '1613257326.237365-83cgl2', id: '1613257326.237365-83cgl2',

View File

@ -71,7 +71,6 @@ describe('Events Route', () => {
const mockEvents = new Array(12).fill(null).map((v, i) => ({ const mockEvents = new Array(12).fill(null).map((v, i) => ({
end_time: 1613257337 + i, end_time: 1613257337 + i,
false_positive: false,
has_clip: true, has_clip: true,
has_snapshot: true, has_snapshot: true,
id: i, id: i,