From 5372d4668ebacaf780926847e278ef2725a7df76 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Sat, 29 Apr 2023 12:27:58 -0600 Subject: [PATCH] Organize event table to be more generalized --- frigate/models.py | 21 ++++++++++---- migrations/015_event_refactor.py | 49 ++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 migrations/015_event_refactor.py diff --git a/frigate/models.py b/frigate/models.py index cc1a29f31..825ca2419 100644 --- a/frigate/models.py +++ b/frigate/models.py @@ -18,22 +18,33 @@ class Event(Model): # type: ignore[misc] camera = CharField(index=True, max_length=20) start_time = DateTimeField() end_time = DateTimeField() - top_score = FloatField() - score = FloatField() + top_score = ( + FloatField() + ) # TODO remove when columns can be dropped without rebuilding table + score = ( + FloatField() + ) # TODO remove when columns can be dropped without rebuilding table false_positive = BooleanField() zones = JSONField() thumbnail = TextField() has_clip = BooleanField(default=True) has_snapshot = BooleanField(default=True) - region = JSONField() - box = JSONField() - area = IntegerField() + region = ( + JSONField() + ) # TODO remove when columns can be dropped without rebuilding table + box = ( + JSONField() + ) # TODO remove when columns can be dropped without rebuilding table + area = ( + IntegerField() + ) # TODO remove when columns can be dropped without rebuilding table retain_indefinitely = BooleanField(default=False) ratio = FloatField(default=1.0) plus_id = CharField(max_length=30) 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. class Timeline(Model): # type: ignore[misc] diff --git a/migrations/015_event_refactor.py b/migrations/015_event_refactor.py new file mode 100644 index 000000000..ff9ab2bbb --- /dev/null +++ b/migrations/015_event_refactor.py @@ -0,0 +1,49 @@ +"""Peewee migrations + +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.drop_not_null( + Event, "top_score", "score", "region", "box", "area", "ratio" + ) + migrator.add_fields( + Event, + data=pw_pext.JSONField(), + ) + + +def rollback(migrator, database, fake=False, **kwargs): + pass