diff --git a/tables.sql b/tables.sql index 35e48dc..dec7a7b 100644 --- a/tables.sql +++ b/tables.sql @@ -1,6 +1,15 @@ alter database PA set timezone to 'Australia/Victoria'; -create table SETTINGS( ID integer, IMPORT_PATH varchar, STORAGE_PATH varchar, RECYCLE_BIN_PATH varchar, constraint PK_SETTINGS_ID primary key(ID) ); +-- these are hard-coded at present, not sure I can reflexively find models from API? +create table AI_MODEL ( ID integer, NAME varchar(24), constraint PK_AI_MODEL primary key(ID) ); +insert into AI_MODEL values ( 1, 'hog' ); +insert into AI_MODEL values ( 2, 'cnn' ); + +create table SETTINGS( + ID integer, IMPORT_PATH varchar, STORAGE_PATH varchar, RECYCLE_BIN_PATH varchar, + DEFAULT_MODEL integer, DEFAULT_THRESHOLD float, + constraint PK_SETTINGS_ID primary key(ID), + constraint FK_DEFAULT_MODEL foreign key (DEFAULT_MODEL) references AI_MODEL(ID) ); create table PA_USER( ID integer, dn varchar, constraint PK_PA_USER_ID primary key(ID) ); @@ -45,15 +54,17 @@ create table REFIMG ( ID integer, FNAME varchar(128), FACE bytea, ORIG_W integer create table FACE( ID integer, FACE bytea, LOCN varchar(32), constraint PK_FACE_ID primary key(ID) ); -create table FACE_FILE_LINK( FACE_ID integer, FILE_EID integer, +create table FACE_FILE_LINK( FACE_ID integer, FILE_EID integer, MODEL_USED integer, constraint PK_FFL_FACE_ID_FILE_ID primary key(FACE_ID, FILE_EID), constraint FK_FFL_FACE_ID foreign key (FACE_ID) references FACE(ID) on delete cascade, - constraint FK_FFL_FILE_EID foreign key (FILE_EID) references FILE(EID) ); + constraint FK_FFL_FILE_EID foreign key (FILE_EID) references FILE(EID), + constraint FK_FFL_MODEL_USED foreign key (MODEL_USED) references AI_MODEL(ID) ); -create table FACE_REFIMG_LINK( FACE_ID integer, REFIMG_ID integer, +create table FACE_REFIMG_LINK( FACE_ID integer, REFIMG_ID integer, MODEL_USED integer, constraint PK_FRL_FACE_ID_REFIMG_ID primary key(FACE_ID, REFIMG_ID), constraint FK_FRL_FACE_ID foreign key (FACE_ID) references FACE(ID) on delete cascade, - constraint FK_FRL_REFIMG_ID foreign key (REFIMG_ID) references REFIMG(ID) ); + constraint FK_FRL_REFIMG_ID foreign key (REFIMG_ID) references REFIMG(ID), + constraint FK_FRL_MODEL_USED foreign key (MODEL_USED) references AI_MODEL(ID) ); create table PERSON_REFIMG_LINK ( PERSON_ID integer, REFIMG_ID integer, constraint PK_PRL primary key(PERSON_ID, REFIMG_ID), @@ -109,6 +120,6 @@ insert into PERSON values ( (select nextval('PERSON_ID_SEQ')), 'mum', 'Mandy', ' insert into PERSON values ( (select nextval('PERSON_ID_SEQ')), 'cam', 'Cameron', 'De Paoli' ); insert into PERSON values ( (select nextval('PERSON_ID_SEQ')), 'mich', 'Michelle', 'De Paoli' ); -- DEV: -insert into SETTINGS ( id, import_path, storage_path, recycle_bin_path ) values ( (select nextval('SETTINGS_ID_SEQ')), '/home/ddp/src/photoassistant/images_to_process/#c:/Users/cam/Desktop/code/python/photoassistant/photos/#/home/ddp/src/photoassistant/new_img_dir/', '/home/ddp/src/photoassistant/storage/#c:/Users/cam/Desktop/code/python/photoassistant/storage/', '/home/ddp/src/photoassistant/.pa_bin/#c:/Users/cam/Desktop/code/python/photoassistant/.pa_bin/' ); +insert into SETTINGS ( id, import_path, storage_path, recycle_bin_path, default_model, default_threshold ) values ( (select nextval('SETTINGS_ID_SEQ')), '/home/ddp/src/photoassistant/images_to_process/#c:/Users/cam/Desktop/code/python/photoassistant/photos/#/home/ddp/src/photoassistant/new_img_dir/', '/home/ddp/src/photoassistant/storage/#c:/Users/cam/Desktop/code/python/photoassistant/storage/', '/home/ddp/src/photoassistant/.pa_bin/#c:/Users/cam/Desktop/code/python/photoassistant/.pa_bin/', 1, '0.55' ); -- PROD: ---insert into SETTINGS ( id, import_path, storage_path, recycle_bin_path ) values ( (select nextval('SETTINGS_ID_SEQ')), '/export/docker/storage/Camera_uploads/', '/export/docker/storage/photos/', '/export/docker/storage/.pa_bin/' ); +--insert into SETTINGS ( id, import_path, storage_path, recycle_bin_path, default_model, default_threshold ) values ( (select nextval('SETTINGS_ID_SEQ')), '/export/docker/storage/Camera_uploads/', '/export/docker/storage/photos/', '/export/docker/storage/.pa_bin/', 1, '0.55' );