e0802bc573
move to form toggles, made them bg-info colours give or take, made the fname, face & distance toggles work. The model drop-down is not set correctly, or taking action, but mara needs more rel mem to run cnn model anyway
Damien De Paoli2021-07-28 21:42:40 +10:00
220200f017
face_distance is a float, also pass model through correctly to FaceFileLink
Damien De Paoli2021-07-28 21:41:35 +10:00
6fb0a0b5db
fix up __repr__ for classes to cover model_used, face_distance fields, and viewonly used for refimg_link so we can print face_distance in viewer
Damien De Paoli2021-07-28 21:34:56 +10:00
b7d346c206
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
Damien De Paoli2021-07-27 17:14:03 +10:00
50e28ed27c
model_used is not per face, but really per file - well that is how the UI will allow this... for now
Damien De Paoli2021-07-27 17:11:45 +10:00
cd51ea21bf
quick add of default_{model|threshold} to settings, face_refimg_link now stores model_used and face_distance AND working implementation of own face_distance algorithm rather than compareAI(), removed older AI code it would no longer work with DB structures anyway, tweaked viewer to remove coords of unmatched faces for now
Damien De Paoli2021-07-26 18:39:36 +10:00
555ce70577
renamed AI_Model to AIModel for consistency, added it as a functioning drop-down select on settings page, added face_distance to db and code, put face_distance model_used into all classes ready for use
Damien De Paoli2021-07-25 15:13:39 +10:00
f6f67b8a69
move import order around, not needed in the end, but doesnt matter so keep it
Damien De Paoli2021-07-25 15:12:29 +10:00
b40ecbf208
put svgs in icons.svg and reference appropriately, still not happy with pa_logo, but otherwise all working
Damien De Paoli2021-07-25 13:19:01 +10:00
2064e02ae8
clean up status message for when refimg removed from person
Damien De Paoli2021-07-22 19:49:09 +10:00
347532daef
fix up exception to not crash with further unset variables
Damien De Paoli2021-07-22 19:48:02 +10:00
915063a7a7
semi fixed move dbox, the input group is still not right, but it will suffice, more use of svg and ditching font awesome
Damien De Paoli2021-07-22 00:50:45 +10:00
f52ba689b7
more bootstrap 5 fixes, badge colors, data-bs-target, padding
Damien De Paoli2021-07-20 22:04:31 +10:00
678e18b89d
disable next button when we have no more int he list -- doesnt deal with when we exactly land on the last image, and it seems we have 1 too many in the first set of images (have 10 on select, but see 11 on page - after next button though its 10 on the page
Damien De Paoli2021-07-20 19:08:32 +10:00
b9f05d64f8
okay this now works with bootstrap 5, I dont love the sz buttons / mixed black and white hover text needs love - probably own class with own styles, but I dont want to hard-code info color, need to work out how to do style / css using the right bs variable for info color
Damien De Paoli2021-07-20 19:03:14 +10:00
44620f1e18
viewer now has toggle to turn on face bounding box + nametag
Damien De Paoli2021-07-19 18:48:39 +10:00
ffa2dd91f5
made refimg <-> person connection viewonly to avoid ORM confusion
Damien De Paoli2021-07-17 23:55:12 +10:00
ae39c26b8f
removed debugs, added faces to class File, use f print string format, hacky json.loads of face locn data to put it back to being an array -- and of course storing that in the class
Damien De Paoli2021-07-17 16:38:50 +10:00
24c4b962e5
now draws green rectangle and person.tag for matches on faces -- need to fix interface, but it works - lots of "plumbing" across database/classes and this viewer.html to get this to work
Damien De Paoli2021-07-17 16:37:43 +10:00
1df519ee37
remove own copy of GenThumb, and use the one from shared.py. Also use zip() to merge face locations and encodings for AddFaceToFile()
Damien De Paoli2021-07-17 16:36:34 +10:00
46d79ddc6a
added location and refimg connections face class
Damien De Paoli2021-07-17 16:30:58 +10:00
bba68dfb36
reminder to show faces in viewer once we redo scanning
Damien De Paoli2021-07-16 22:30:22 +10:00
e1a3ad388c
added small spaces before first row of images to stop squishing into navbar, added flipping / made that work, and now show thumbnail after rotation/flip is finished - all works, and removed debugs
Damien De Paoli2021-07-16 22:28:44 +10:00
3ac6f143f4
first pass of rotation sub-menu on images. It only posts on Image. For each selection it turns thumbnail gray, overlays a centered color spinning wheel, posts to the f/e to create a rotation job, gets the job id back, keeps checking the f/e to see when the job id is done, and when it is (for now) undoes the spinning wheel/grayscale - will return new thumb once done and pa_job_mgr has no code to handle job as yet
Damien De Paoli2021-07-16 21:08:16 +10:00
d42ac8c8b5
string / int strictness issue causing default size to not highlight button - fixed
Damien De Paoli2021-07-16 17:52:31 +10:00
6e6f59fdd5
more cases of not using px explicitly not working, fixed for icon overlays on search/file view
Damien De Paoli2021-07-16 17:16:19 +10:00
f30ca16552
added viewnext and viewprev routes and plumbed these in to the file viewer code. Viewer code now works has a prev/next button, and handles videos
Damien De Paoli2021-07-15 20:23:02 +10:00
46ac6869a3
Merge branch 'master' of 192.168.0.2:photoassistant
Damien De Paoli
2021-07-12 19:24:09 +10:00
5d6ea32ec5
added flask_login
Damien De Paoli
2021-07-12 19:24:00 +10:00
f394e39c2f
refimgs now contain face, orig_w, orig_h and face_locns. This is done via json.* to allow arrays to be saved/loaded back into face_locn - not useful for refimg as there has to be only 1, but tested for images where there will be many faces. This commit has a fair few changes. So overall, no more refimg menus/creation. You now create a person (the add button is hidden until you save), when you save you go back to the person you created rather than the list of persons. From there you can click add ref img, and it will create a thumbnail, and draw a green box around the face locations based on the data. Persons can have many refimgs, and they will all work the same, be formatted prettily no matter how many you have. Each refimg "tab" not only has the thumbnail, but also a red X click to delete button that will remove all refimg data and connection to the person table too. This all works/is tested.
Damien De Paoli2021-07-11 22:35:59 +10:00
ce81898a07
another useful sql for finding usable list of filenames that equate to a search
Damien De Paoli2021-07-11 22:32:03 +10:00
e622774c0f
made GenThumb return thumb and orig_w, orig_h - not sure this stays, but for optimising it prob. will -- its not being used in pa_job_mgr yet, and that will see the final version of this
Damien De Paoli2021-07-11 22:31:37 +10:00
955df598ee
remove encodings, add face, orig_w, orig_h, face_locn to refimg table AND remove DEV refimg data, it needs to be done in the UI now
Damien De Paoli2021-07-11 22:30:57 +10:00
cd6a42088d
remove old refimg.encodings generation, we now do this when we make a person/refimg, so its always done before an AI job needs to use it
Damien De Paoli2021-07-11 22:29:38 +10:00
3dbcf68dad
force session commit in AddLogForJob() if no recent commit - 5 seconds
Damien De Paoli2021-07-07 18:05:24 +10:00
fbd9e72f28
updated TODO to remove AI job count issues, and added optimised AI searching code to reduce DB queries on recursion into dirs
Damien De Paoli2021-07-07 17:42:00 +10:00
3c56cac1ef
fix up selections to work with ctrl/shift and right-click -- its a bit clunky but works, redid numbering to make that work and condensed down to 1 common code block for context menu for figures and dirs now
Damien De Paoli2021-07-06 17:40:53 +10:00
95303fafac
fixed BUG-41 and 43, via new refimg -> person code changes
Damien De Paoli2021-07-05 16:53:00 +10:00
2e06c0b285
moved class Refimg to person, and ditched all other routes/direct access to ref images, they are only a part of Person in UI now
Damien De Paoli2021-07-05 16:51:44 +10:00
65d781c1d6
use r.face now, instead of r.encodings - prep for big cutover to new refimg DB and thumb/face creation
Damien De Paoli2021-07-04 20:20:20 +10:00
95b8b4e17b
use r.face now, instead of r.encodings - prep for big cutover to new refimg DB and thumb/face creation
Damien De Paoli2021-07-04 20:20:02 +10:00
9fe8289239
make this at least work with new DB structures, remove dead code - BUT prob. delete routes?
Damien De Paoli2021-07-04 20:19:27 +10:00
9e3612578c
use new shared version of GenThumb, add face / thumb into refimg class - still need much more to optimise refimg usage/creation in AI jobs, but it works
Damien De Paoli2021-07-04 20:08:18 +10:00
e26c992c0f
make it clear if we are on DEV or PROD -> pass env thru app.config to base.html
Damien De Paoli2021-07-04 20:06:53 +10:00
d608531cab
reference images are now added in person.py (and removed) as buttons on person page. Will need to re-think the whole of refimg.py
Damien De Paoli2021-07-04 20:06:17 +10:00
ddc9b18e3e
reference images now create thumb and face on first association, so have DB for that
Damien De Paoli2021-07-04 20:05:47 +10:00
388c3eed9b
reference images are now added in person.py (and removed) as buttons on person page. Will need to re-think the whole of refimg.py
Damien De Paoli2021-07-04 20:05:15 +10:00
b811f8710e
moved GenFace and GenThumb common code into shared, and hook it in both f/e and b/e where needed
Damien De Paoli2021-07-04 20:04:25 +10:00
aa826f6933
if > 100 logs, truncate them and add button to show all logs, and stop auto-refresh too
Damien De Paoli2021-07-03 12:29:19 +10:00
c1177b7c0f
if > 100 logs, truncate them and add button to show all logs, and stop auto-refresh too
Damien De Paoli2021-07-03 12:29:01 +10:00
91322d438c
dont chown -R the whole of static, as the build process will follow symlinks -- we dont want that, so just do the top-level of static
Damien De Paoli2021-07-03 12:03:56 +10:00
120c2f3a77
several BUGs on refimgs/AI now we are using it in anger
Damien De Paoli2021-07-03 12:03:00 +10:00
ff2feaf7ae
fixed TODO for ProcessRecycleBinDir, added thoughts on rewrite of refimg
Damien De Paoli2021-07-03 12:02:25 +10:00
8818888596
make sure force delete removes face links too. removed extra job debug logs. rewrite of ProcessRecycleBinDir to never import content, just call AddPath appropriately
Damien De Paoli2021-07-03 12:01:51 +10:00
f66552bf81
BUG-42 is actually because there was bin remnants on restart of pa_job... need to fix that
Damien De Paoli2021-07-02 17:37:31 +10:00
f6a92d749f
added really large amounts to dups to process at once, so we can still get them all on a page if we really want
Damien De Paoli2021-07-01 21:56:59 +10:00
848cdeacc5
added some handy SQLs/commands for AI when logs suck
Damien De Paoli2021-07-01 21:55:35 +10:00
b084f5d951
copy ref images over to make it easier for rebuilds
Damien De Paoli2021-06-30 14:31:00 +10:00
d74df55e58
now using new face linking code, and working, removed many debugs, needs work (around log commits). Also put a quick hack to create Bin path on init, but need to rethink this bit
Damien De Paoli2021-06-30 14:29:28 +10:00
ea663926f2
created face.py so search / ai .py can use new face linking tables
Damien De Paoli2021-06-30 14:28:43 +10:00
78713a6767
updated stats to use new face tables and be more useful now amount of matches is in the thousands
Damien De Paoli2021-06-30 14:28:15 +10:00
f2bb87c424
Merge branch 'master' of mara.ddp.net:photoassistant
c-d-p
2021-06-29 15:46:07 +10:00
Damien De Paoli
Damien De Paoli