diff --git a/face.py b/face.py index 9a4b8e8..f873583 100644 --- a/face.py +++ b/face.py @@ -20,19 +20,21 @@ import json # - refimg is a real link to the refimg used for this face (its is only used in # viewer, and is either set when there is a matched face, or None if no match ################################################################################ -class Face(db.Model): +class Face(PA,db.Model): __tablename__ = "face" id = db.Column(db.Integer, db.Sequence('face_id_seq'), primary_key=True ) face = db.Column( db.LargeBinary ) locn = db.Column( db.String ) + face_top = db.Column( db.Integer ) + face_right = db.Column( db.Integer ) + face_bottom = db.Column( db.Integer ) + face_left = db.Column( db.Integer ) w = db.Column( db.Integer ) h = db.Column( db.Integer ) refimg_lnk = db.relationship("FaceRefimgLink", uselist=False, viewonly=True) facefile_lnk = db.relationship("FaceFileLink", uselist=False, viewonly=True) refimg =db.relationship("Refimg", secondary="face_refimg_link", uselist=False) - def __repr__(self): - return f"" -class FaceNoMatchOverride(db.Model): +################################################################################ +# Class describing FaceNoMatchOverride in the database and DB via sqlalchemy +# used when a face does not match for some reason (type and face id connected) +################################################################################ +class FaceNoMatchOverride(PA, db.Model): __tablename__ = "face_no_match_override" id = db.Column(db.Integer, db.Sequence('face_override_id_seq'), 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 = db.relationship("FaceOverrideType") - def __repr__(self): - return f"" - -class FaceForceMatchOverride(db.Model): +################################################################################ +# Class describing FaceForceMatchOverride in the database and DB via sqlalchemy +# used when a face is forced to match for some reason (who and face id connected) +################################################################################ +class FaceForceMatchOverride(PA, db.Model): __tablename__ = "face_force_match_override" id = db.Column(db.Integer, db.Sequence('face_override_id_seq'), 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 = db.relationship("Person") - def __repr__(self): - return f"" - +################################################################################ +# TO BE REMOVED ONCE BUG 108 IS COMPLETE +################################################################################ def fix_face_locn(face): # just fix any data issues in DB (happens with some bugs in code) if face.locn[0]=='{':