ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all override add and remove now use new datastructures, close to be able to test / augment as per TODO

Browse Source
This commit is contained in:
Damien De Paoli
2025-10-09 23:56:27 +11:00
parent 846bdc4e52
commit ee1c9b5494
6 changed files with 95 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
TODO
View File

@@ -1,19 +1,20 @@
### ###
# # 4 TEST everything (don't forget keybindings,e.g. delete)
# fix all face, right-click options:
# [DONE] add to new, add to existing
# [TODO] 4 x override*
#
#1 get override data into view
# also all the add ref img/add override, etc are non-functional - FIX the override* stuff first to get table/naming consistency as that is half the problem
# NMO data -> there is an NMO object (just NMO names/types - |json), then there is per face level data - this should be a reference from Face and Schema/marshmallow
#
#4 TEST everything (don't forget keybindings,e.g. delete)
# -- go into viewer code from a files_rbp - had red bin, bot green on viewer. # -- go into viewer code from a files_rbp - had red bin, bot green on viewer.
# #
#5 think I killed pa_job_manager without passing an eid to a transform job, shouldn't crash # consider this:
# SHOULD JUST get AI to help clean-up and write defensive code here... $('#viewer_bin use').attr('fill', 'var(--bs-success)'); $('#viewer_del').removeClass('btn-outline-danger').addClass('btn-outline-success')
$('#viewer_bin').hover(
function() {
$('use', this).attr('fill', 'white');
},
function() {
$('use', this).attr('fill', 'var(--bs-success)');
}
);
# #
# 5 think I killed pa_job_manager without passing an eid to a transform job, shouldn't crash
# SHOULD JUST get AI to help clean-up and write defensive code here...
### ###
### major fix - go to everywhere I call GetEntries(), and redo the logic totally... ### major fix - go to everywhere I call GetEntries(), and redo the logic totally...

4
face.py
View File

@@ -31,6 +31,8 @@ class Face(PA,db.Model):
refimg_lnk = db.relationship("FaceRefimgLink", uselist=False, viewonly=True ) refimg_lnk = db.relationship("FaceRefimgLink", uselist=False, viewonly=True )
facefile_lnk = db.relationship("FaceFileLink", uselist=False, viewonly=True ) facefile_lnk = db.relationship("FaceFileLink", uselist=False, viewonly=True )
refimg =db.relationship("Refimg", secondary="face_refimg_link", uselist=False) refimg =db.relationship("Refimg", secondary="face_refimg_link", uselist=False)
fnmo = db.relationship("FaceNoMatchOverride", back_populates="face")
ffmo = db.relationship("FaceForceMatchOverride", back_populates="face")
################################################################################ ################################################################################
@@ -104,6 +106,7 @@ class FaceNoMatchOverride(PA, db.Model):
face_id = db.Column(db.Integer, db.ForeignKey("face.id"), primary_key=True ) face_id = db.Column(db.Integer, db.ForeignKey("face.id"), primary_key=True )
type_id = db.Column(db.Integer, db.ForeignKey("face_override_type.id")) type_id = db.Column(db.Integer, db.ForeignKey("face_override_type.id"))
type = db.relationship("FaceOverrideType") type = db.relationship("FaceOverrideType")
face = db.relationship("Face", back_populates="fnmo")
################################################################################ ################################################################################
@@ -123,3 +126,4 @@ class FaceForceMatchOverride(PA, db.Model):
face_id = db.Column(db.Integer, db.ForeignKey("face.id"), primary_key=True ) face_id = db.Column(db.Integer, db.ForeignKey("face.id"), primary_key=True )
person_id = db.Column(db.Integer, db.ForeignKey("person.id"), primary_key=True ) person_id = db.Column(db.Integer, db.ForeignKey("person.id"), primary_key=True )
person = db.relationship("Person") person = db.relationship("Person")
face = db.relationship("Face", back_populates="ffmo")

69
files.py
View File

@@ -180,74 +180,83 @@ class PathSchema(ma.SQLAlchemyAutoSchema):
class FileTypeSchema(ma.SQLAlchemyAutoSchema): class FileTypeSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FileType class Meta:
load_instance = True model = FileType
load_instance = True
class DirSchema(ma.SQLAlchemyAutoSchema): class DirSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = Dir class Meta:
load_instance = True model = Dir
load_instance = True
eid = ma.auto_field() # Explicitly include eid eid = ma.auto_field() # Explicitly include eid
in_path = ma.Nested(PathSchema) in_path = ma.Nested(PathSchema)
class FaceFileLinkSchema(ma.SQLAlchemyAutoSchema): class FaceFileLinkSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FaceFileLink class Meta:
model = FaceFileLink
load_instance = True
model_used = ma.auto_field() model_used = ma.auto_field()
load_instance = True
class PersonSchema(ma.SQLAlchemyAutoSchema): class PersonSchema(ma.SQLAlchemyAutoSchema):
class Meta: model=Person class Meta:
load_instance = True model=Person
load_instance = True
class RefimgSchema(ma.SQLAlchemyAutoSchema): class RefimgSchema(ma.SQLAlchemyAutoSchema):
class Meta: class Meta:
model = Refimg model = Refimg
exclude = ('face',) exclude = ('face',)
load_instance = True load_instance = True
person = ma.Nested(PersonSchema) person = ma.Nested(PersonSchema)
class FaceRefimgLinkSchema(ma.SQLAlchemyAutoSchema): class FaceRefimgLinkSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FaceRefimgLink class Meta:
load_instance = True model = FaceRefimgLink
load_instance = True
class FaceOverrideTypeSchema(ma.SQLAlchemyAutoSchema):
class Meta:
model = FaceOverrideType
load_instance = True
class FaceNoMatchOverrideSchema(ma.SQLAlchemyAutoSchema): class FaceNoMatchOverrideSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FaceOverrideType class Meta:
load_instance = True model = FaceNoMatchOverride
type = ma.Nested(FaceOverrideType) load_instance = True
type = ma.Nested(FaceOverrideTypeSchema)
class FaceForceMatchOverrideSchema(ma.SQLAlchemyAutoSchema): class FaceForceMatchOverrideSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FaceOverrideType class Meta:
load_instance = True model = FaceForceMatchOverride
person = ma.Nested(Person) load_instance = True
person = ma.Nested(PersonSchema)
class FaceSchema(ma.SQLAlchemyAutoSchema): class FaceSchema(ma.SQLAlchemyAutoSchema):
class Meta: class Meta:
model=Face model=Face
exclude = ('face',) exclude = ('face',)
load_instance = True load_instance = True
refimg = ma.Nested(RefimgSchema,allow_none=True) refimg = ma.Nested(RefimgSchema,allow_none=True)
# faces have to come with a file connection # faces have to come with a file connection
facefile_lnk = ma.Nested(FaceFileLinkSchema) facefile_lnk = ma.Nested(FaceFileLinkSchema)
refimg_lnk = ma.Nested(FaceRefimgLinkSchema,allow_none=True) refimg_lnk = ma.Nested(FaceRefimgLinkSchema,allow_none=True)
fnmo = ma.Nested( FaceNoMatchOverride, allow_none=True ) fnmo = ma.Nested( FaceNoMatchOverrideSchema, allow_none=True, many=True )
ffmo = ma.Nested( FaceForceMatchOverride, allow_none=True ) ffmo = ma.Nested( FaceForceMatchOverrideSchema, allow_none=True, many=True )
class FileSchema(ma.SQLAlchemyAutoSchema): class FileSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = File class Meta:
load_instance = True model = File
load_instance = True
faces = ma.Nested(FaceSchema,many=True,allow_none=True) faces = ma.Nested(FaceSchema,many=True,allow_none=True)
# used just in NMO var
class FaceOverrideTypeSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FaceOverrideType
load_instance = True
################################################################################ ################################################################################
# Schema for Entry so we can json for data to the client # Schema for Entry so we can json for data to the client
################################################################################ ################################################################################
class EntrySchema(ma.SQLAlchemyAutoSchema): class EntrySchema(ma.SQLAlchemyAutoSchema):
# gives id, name, type_id # gives id, name, type_id
class Meta: model = Entry class Meta:
load_instance = True model = Entry
load_instance = True
type = ma.Nested(FileTypeSchema) type = ma.Nested(FileTypeSchema)
file_details = ma.Nested(FileSchema,allow_none=True) file_details = ma.Nested(FileSchema,allow_none=True)
@@ -284,6 +293,8 @@ def process_ids():
joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.refimg).joinedload(Refimg.person), joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.refimg).joinedload(Refimg.person),
joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.refimg_lnk), joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.refimg_lnk),
joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.facefile_lnk), joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.facefile_lnk),
joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.fnmo).joinedload(FaceNoMatchOverride.type),
joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.ffmo).joinedload(FaceForceMatchOverride.person),
) )
.where(Entry.id.in_(ids)) .where(Entry.id.in_(ids))
) )

54
internal/js/view_support.js
View File

@@ -117,10 +117,13 @@ function DrawImg()
context.lineWidth = 2 context.lineWidth = 2
// this face has an override so diff colour // this face has an override so diff colour
if( faces[i].override ) if( faces[i].fnmo.length || faces[i].ffmo.length )
{ {
context.strokeStyle = 'blue' context.strokeStyle = 'blue'
DrawLabelOnFace( faces[i].override.who ) if( faces[i].ffmo.length )
DrawLabelOnFace( faces[i].ffmo[0].person.tag )
else
DrawLabelOnFace( faces[i].fnmo[0].type.name )
} }
else else
{ {
@@ -234,10 +237,10 @@ $(document).ready( function()
if( x >= fx && x <= fx+fw && y >= fy && y <= fy+fh ) if( x >= fx && x <= fx+fw && y >= fy && y <= fy+fh )
{ {
if( faces[i].override ) if( faces[i].ffmo.length || faces[i].fnmo.length )
{ {
item_list['remove_force_match_override']={ 'name': 'Remove override for this face', 'which_face': i, 'id': faces[i].id } item_list['remove_force_match_override']={ 'name': 'Remove override for this face', 'which_face': i, 'id': faces[i].id }
} }
else if( faces[i].refimg ) else if( faces[i].refimg )
{ {
item_list['match']={ 'name': faces[i].refimg.person.tag, 'which_face': i, 'id': faces[i].id } item_list['match']={ 'name': faces[i].refimg.person.tag, 'which_face': i, 'id': faces[i].id }
@@ -250,7 +253,7 @@ $(document).ready( function()
item_list['no_match_new_person']={ 'name': 'Add as reference image to NEW person', 'which_face': i, 'id': faces[i].id } item_list['no_match_new_person']={ 'name': 'Add as reference image to NEW person', 'which_face': i, 'id': faces[i].id }
item_list['no_match_new_refimg']={ 'name': 'Add as reference image to EXISTING person', 'which_face': i, 'id': faces[i].id } item_list['no_match_new_refimg']={ 'name': 'Add as reference image to EXISTING person', 'which_face': i, 'id': faces[i].id }
for( var el in NMO ) { for( var el in NMO ) {
item_list['NMO_'+el]={'type_id': NMO[el].type_id, 'name': 'Override: ' + NMO[el].name, 'which_face': i, 'id': faces[i].id } item_list['NMO_'+el]={'type_id': NMO[el].id, 'name': 'Override: ' + NMO[el].name, 'which_face': i, 'id': faces[i].id }
} }
} }
delete item_list['not_a_face'] delete item_list['not_a_face']
@@ -276,7 +279,7 @@ function OverrideForceMatch( person_id, key )
// we have type_id passed in, so dig the NMO out, and use that below (its really just for name, but in case we change that in the DB) // we have type_id passed in, so dig the NMO out, and use that below (its really just for name, but in case we change that in the DB)
for( el in NMO ) for( el in NMO )
{ {
if( NMO[el].type_id == item[key].type_id ) if( NMO[el].id == item[key].type_id )
{ {
fm_idx=el fm_idx=el
break break
@@ -284,12 +287,9 @@ function OverrideForceMatch( person_id, key )
} }
ofm='&person_id='+person_id+'&face_id='+item[key].id ofm='&person_id='+person_id+'&face_id='+item[key].id
$.ajax({ type: 'POST', data: ofm, url: '/add_force_match_override', success: function(data) { $.ajax({ type: 'POST', data: ofm, url: '/add_force_match_override', success: function(data) {
document.viewing.file_details.faces[item[key].which_face].override={} document.viewing.file_details.faces[item[key].which_face].ffmo=[]
document.viewing.file_details.faces[item[key].which_face].override.who=data.person_tag document.viewing.file_details.faces[item[key].which_face].ffmo[0]={}
document.viewing.file_details.faces[item[key].which_face].override.distance='N/A' document.viewing.file_details.faces[item[key].which_face].ffmo[0].person=data.person
document.viewing.file_details.faces[item[key].which_face].override.type_id=NMO[fm_idx].id
document.viewing.file_details.faces[item[key].which_face].override.type_name=NMO[fm_idx].name
$('#dbox').modal('hide') $('#dbox').modal('hide')
$('#faces').prop('checked',true) $('#faces').prop('checked',true)
DrawImg() DrawImg()
@@ -350,8 +350,7 @@ function SearchForPerson(content, key, face_id, face_pos, type_id)
for( var el in data ) { for( var el in data ) {
content+='<div class="row">' content+='<div class="row">'
var person = data[el]; var person = data[el];
// NMO_1 is a non-match-override type_id==1 (or force match to existing person) if( item[key].name == "Override: Manual match to existing person" )
if( key == "NMO_1" )
{ {
func='OverrideForceMatch('+person.id+',\''+key+'\' )' func='OverrideForceMatch('+person.id+',\''+key+'\' )'
content+= '<div class="col">' + person.tag + ' (' + person.firstname+' '+person.surname+ ') </div>' content+= '<div class="col">' + person.tag + ' (' + person.firstname+' '+person.surname+ ') </div>'
@@ -376,15 +375,16 @@ function SearchForPerson(content, key, face_id, face_pos, type_id)
function RemoveOverrideForceMatch(face_pos) function RemoveOverrideForceMatch(face_pos)
{ {
if( document.viewing.file_details.faces[face_pos].override ) if( document.viewing.file_details.faces[face_pos].ffmo.length )
who=document.viewing.file_details.faces[face_pos].override.who who=document.viewing.file_details.faces[face_pos].ffmo[0].person.tag
else else
who=document.viewing.file_details.faces[face_pos].refimg.person.tag who=document.viewing.file_details.faces[face_pos].refimg.person.tag
d='&face_id='+document.viewing.file_details.faces[face_pos].id+'&person_tag='+document.viewing.file_details.faces[face_pos].refimg.person.tag+'&file_eid='+document.viewing.id d='&face_id='+document.viewing.file_details.faces[face_pos].id+'&person_tag='+who+'&file_eid='+document.viewing.id
$.ajax({ type: 'POST', data: d, url: '/remove_force_match_override', $.ajax({ type: 'POST', data: d, url: '/remove_force_match_override',
success: function(data) { success: function(data) {
delete document.viewing.file_details.faces[face_pos].override // force/delete the ffmo cleanly
document.viewing.file_details.faces[face_pos].ffmo.length=0
$('#dbox').modal('hide') $('#dbox').modal('hide')
DrawImg() DrawImg()
CheckForJobs() CheckForJobs()
@@ -399,7 +399,7 @@ function RemoveOverrideNoMatch(face_pos, type_id)
d='&face_id='+document.viewing.file_details.faces[face_pos].id+'&type_id='+type_id d='&face_id='+document.viewing.file_details.faces[face_pos].id+'&type_id='+type_id
$.ajax({ type: 'POST', data: d, url: '/remove_no_match_override', $.ajax({ type: 'POST', data: d, url: '/remove_no_match_override',
success: function(data) { success: function(data) {
delete document.viewing.file_details.faces[face_pos].override document.viewing.file_details.faces[face_pos].fnmo.length=0
$('#dbox').modal('hide') $('#dbox').modal('hide')
DrawImg() DrawImg()
CheckForJobs() CheckForJobs()
@@ -414,11 +414,7 @@ function AddNoMatchOverride(type_id, face_id, face_pos, type_id)
d='&type_id='+type_id+'&face_id='+face_id d='&type_id='+type_id+'&face_id='+face_id
$.ajax({ type: 'POST', data: d, url: '/add_no_match_override', $.ajax({ type: 'POST', data: d, url: '/add_no_match_override',
success: function(data) { success: function(data) {
document.viewing.file_details.faces[face_pos].override={} document.viewing.file_details.faces[face_pos].fnmo[0]=data
document.viewing.file_details.faces[face_pos].override.who=NMO[type_id].name
document.viewing.file_details.faces[face_pos].override.distance='N/A'
document.viewing.file_details.faces[face_pos].override.type_id=type_id
document.viewing.file_details.faces[face_pos].override.type_name=NMO[type_id].name
$('#dbox').modal('hide') $('#dbox').modal('hide')
$('#faces').prop('checked',true) $('#faces').prop('checked',true)
DrawImg() DrawImg()
@@ -466,17 +462,17 @@ function FaceDBox(key, item)
div+='</div><div class="col-6">' div+='</div><div class="col-6">'
if ( key == 'remove_force_match_override' ) if ( key == 'remove_force_match_override' )
{ {
if( document.viewing.file_details.faces[face_pos].override.type_name == 'Manual match to existing person' ) if( document.viewing.file_details.faces[face_pos].ffmo.length )
div+='<div class="row col-12">remove this override (force match to: ' + document.viewing.file_details.faces[face_pos].override.who + ')</div>' div+='<div class="row col-12">remove this override (force match to: ' + document.viewing.file_details.faces[face_pos].ffmo[0].person.tag + ')</div>'
else else
div+='<div class="row col-12">remove this override (no match)</div>' div+='<div class="row col-12">remove this override (' + document.viewing.file_details.faces[face_pos].fnmo[0].type.name + ')</div>'
div+='<div class="row">' div+='<div class="row">'
div+='<button class="btn btn-outline-info col-6" type="button" onClick="$(\'#dbox\').modal(\'hide\'); return false">Cancel</button>' div+='<button class="btn btn-outline-info col-6" type="button" onClick="$(\'#dbox\').modal(\'hide\'); return false">Cancel</button>'
div+='<button class="btn btn-outline-danger col-6" type="button" ' div+='<button class="btn btn-outline-danger col-6" type="button" '
if( document.viewing.file_details.faces[face_pos].override.type_name == 'Manual match to existing person' ) if( document.viewing.file_details.faces[face_pos].ffmo.length )
div+='onClick="RemoveOverrideForceMatch(' +face_pos+ ')">Remove</button>' div+='onClick="RemoveOverrideForceMatch(' +face_pos+ ')">Remove</button>'
else else
div+='onClick="RemoveOverrideNoMatch(' +face_pos+','+document.viewing.file_details.faces[face_pos].override.type_id+ ')">Remove</button>' div+='onClick="RemoveOverrideNoMatch(' +face_pos+','+document.viewing.file_details.faces[face_pos].fnmo[0].type.id+ ')">Remove</button>'
div+='</div>' div+='</div>'
} }
if ( key == 'no_match_new_person' ) if ( key == 'no_match_new_person' )

14
person.py
View File

@@ -385,7 +385,9 @@ def add_force_match_override():
NewJob( "metadata", num_files=0, wait_for=None, jex=jex, desc="create metadata for adding forced match" ) NewJob( "metadata", num_files=0, wait_for=None, jex=jex, desc="create metadata for adding forced match" )
# this will reply to the Ajax / POST, and cause the page to re-draw with new face override to person_tag # this will reply to the Ajax / POST, and cause the page to re-draw with new face override to person_tag
return make_response( jsonify( person_tag=p.tag ) ) person_schema = PersonSchema(many=False)
p_data = person_schema.dump(p)
return make_response( jsonify( person=p_data ) )
################################################################################ ################################################################################
# /remove_force_match_override -> POST # /remove_force_match_override -> POST
@@ -436,6 +438,11 @@ def remove_no_match_override():
return make_response( jsonify( face_id=face_id ) ) return make_response( jsonify( face_id=face_id ) )
class FaceOverrideTypeSchema(ma.SQLAlchemyAutoSchema):
class Meta:
model = FaceOverrideType
load_instance = True
################################################################################ ################################################################################
# /add_no_match_override -> POST # /add_no_match_override -> POST
################################################################################ ################################################################################
@@ -463,5 +470,6 @@ def add_no_match_override():
# dont do status update here, the F/E is in the middle of a dbox, just send metadata through to the B/E # dont do status update here, the F/E is in the middle of a dbox, just send metadata through to the B/E
NewJob( "metadata", num_files=0, wait_for=None, jex=jex, desc="create metadata for adding forced non-match" ) NewJob( "metadata", num_files=0, wait_for=None, jex=jex, desc="create metadata for adding forced non-match" )
# this will reply to the Ajax / POST, and cause the page to re-draw with new face override to person_tag fot_schema = FaceOverrideTypeSchema(many=False)
return make_response( jsonify( type=t.name ) ) t_data=fot_schema.dump(t)
return make_response( jsonify( type_id=t.id, type=t_data ) )

4
templates/files.html
View File

@@ -209,9 +209,9 @@
<button class="btn btn-outline-info p-1" title="View Original" onClick="window.location='/'+document.viewing.FullPathOnFS"> <button class="btn btn-outline-info p-1" title="View Original" onClick="window.location='/'+document.viewing.FullPathOnFS">
<svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#download"/></svg> <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#download"/></svg>
</button> </button>
<button id="del" class="btn btn-outline-danger p-1" title="Delete (hotkey: Del)" <button id="viewer_del" class="btn btn-outline-danger p-1" title="Delete (hotkey: Del)"
onClick="$.ajax({ type: 'POST', data: '&eid-0='+document.viewing.id, url: '/delete_files', success: function(data){ window.location='/'; return false; } })"> onClick="$.ajax({ type: 'POST', data: '&eid-0='+document.viewing.id, url: '/delete_files', success: function(data){ window.location='/'; return false; } })">
<svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#trash"/></svg> <svg id="viewer_bin" width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#trash"/></svg>
</button> </button>
</div> </div>
</div class="row"> </div class="row">