model_used is now per file, not per face, implemented split of default_model to default_refimg_model and default_scan_model in settings, and default_refimg_model actualy works when creating refimgs in person.py. The model_used in face_file_link is based on default settings model and will scan with cnn if chosen and store that in DB as needed. Need viewer to allow changing per file / not just default for future scans

person.py

@@ -2,6 +2,7 @@ from wtforms import SubmitField, StringField, HiddenField, validators, Form
 from flask_wtf import FlaskForm
 from flask import request, render_template, redirect, url_for
 from main import db, app, ma
+from settings import Settings, AIModel
 from sqlalchemy import Sequence
 from sqlalchemy.exc import SQLAlchemyError
 from status import st, Status
@@ -27,6 +28,7 @@ class Refimg(db.Model):
     face_locn = db.Column(db.String)
     thumbnail = db.Column(db.String, unique=True, nullable=False)
     created_on = db.Column(db.Float)
+    model_used = db.Column(db.Integer, db.ForeignKey("ai_model.id") )
     person = db.relationship( 'Person', secondary="person_refimg_link", uselist=False, viewonly=True )
 
     def __repr__(self):
@@ -123,7 +125,7 @@ def person(id):
                 # do the linkage tables by hand
                 db.session.execute( f"delete from face_refimg_link frl where refimg_id in ( select refimg_id from person_refimg_link where person_id = {id} )" )
                 db.session.execute( f"delete from person_refimg_link where person_id = {id}" )
-                person = Person.query.filter(Person.id==id).delete()
+                Person.query.filter(Person.id==id).delete()
                 db.session.commit()
                 return redirect( f'/persons' )
             elif request.form and form.validate():
@@ -132,9 +134,11 @@ def person(id):
                     if "ref-img-id-{}".format(ref_img.id) in request.form:
                         new_refs.append(ref_img)
                 if new_refs != person.refimg:
-                    deld = list(set(person.refimg) - set(new_refs))
-                    st.SetMessage( f"Successfully Updated Person: removed reference image {deld[0].fname}" )
+                    deld = list(set(person.refimg) - set(new_refs));
+                    print(deld)
                     person.refimg = new_refs
+                    Refimg.query.filter(Refimg.id==deld[0].id).delete()
+                    st.SetMessage( f"Successfully Updated Person: removed reference image {deld[0].fname}" )
                 else:
                     st.SetMessage("Successfully Updated Person: (From: {}, {}, {})".format(person.tag, person.firstname, person.surname) )
                     person.tag = request.form['tag']
@@ -176,8 +180,11 @@ def add_refimg():
         fname = f"/tmp/{fname}"
         f.save( fname )
         refimg.thumbnail, refimg.orig_w, refimg.orig_h = GenThumb( fname )
-        refimg.face, face_locn = GenFace( fname )
+        settings = Settings.query.first()
+        model=AIModel.query.get(settings.default_refimg_model)
+        refimg.face, face_locn = GenFace( fname, model=model.name )
         refimg.face_locn = json.dumps(face_locn)
+        refimg.model_used = settings.default_refimg_model
         os.remove(fname)
         person.refimg.append(refimg)
         db.session.add(person)