Commit Graph

1088 Commits

Author SHA1 Message Date
30195e9597 removed filedata*, moved ProcessImportDir out into its own function, used it, also in scannow job, ensure job states are set appropriately to enforce all of the jobs are processed right 2021-01-20 16:37:00 +11:00
6523500d54 use file progress as overall process in job list if applicable 2021-01-20 16:35:58 +11:00
41c2af2cd2 removed fake job data, and pass* from jobs, moved last_import_date into Dir from settings 2021-01-20 16:35:35 +11:00
4be0ef2a73 removed pass* from jobs 2021-01-20 16:34:56 +11:00
0de95d56d5 fixed up JobExtra printout in class, also put it in job.py, and passed extras to templates/jobs.html to show the extra details on the jobs list page so we can see what path is imported for example 2021-01-20 00:05:56 +11:00
0c70a0ca89 more TODOs 2021-01-20 00:05:02 +11:00
9474c12a0d JobGetFileDetails now works - first pass, need to improve handling of files in dirs - I optimised/assumed last dir is what you are in, but that is not always true, so need to set actual dir each time 2021-01-19 23:34:12 +11:00
5c840273c2 added hidden route to wake up the job manager 2021-01-19 23:33:08 +11:00
1c181668e8 small renames of id to eid, added num_files to DIR and removed comments 2021-01-19 23:32:47 +11:00
3a73b9546d KLUDGE around num_passes for now, jobs need a clean up before I finish the new wait_for jobs 2021-01-19 23:31:37 +11:00
325bd95f25 stopping for the night, so keeping track of where I am at 2021-01-19 23:30:53 +11:00
21678fdaad fixed BUG-1 ages ago (timezones) 2021-01-19 23:29:51 +11:00
31d45e80b6 moved over to new ENTRY based data structures for loading from DB and viewing content 2021-01-19 17:33:10 +11:00
2bd25c3e18 set up FileType properly, select on in DB, rather than add new ones each time, ouch! Also renamed type to type_id (better as it is a new foreign key) and use type as the relationship to hold the object anyway 2021-01-19 17:32:33 +11:00
5eb967c77f added foreign key constraint for file type in ENTRY 2021-01-19 17:30:51 +11:00
45c06dd218 remove unnecessary import 2021-01-19 17:30:13 +11:00
558b43870a added instructions on how to run all this 2021-01-19 17:29:41 +11:00
47085b7a43 cleaned up code, before rewrite for viewing 2021-01-19 11:10:25 +11:00
5285bf66ab alternate database structure with entry, (new_)file, dir works in terms of DB and SQL alchemy, tomorrow we rewrite the jobs to really use the new structure 2021-01-18 21:40:46 +11:00
4053919def comment out sleep again, also removed some debugs, and converted some to AddLogForJob 2021-01-18 13:20:15 +11:00
3951b3e0a1 do not need to send any data down the client conn to wake up the pa_job_manager 2021-01-18 13:19:50 +11:00
ab3eff4e62 starting on new DB structure, with a new branch, with thoughts in TODO, file_types in tables.sql 2021-01-18 13:19:25 +11:00
0e01b132ab removed debug 2021-01-18 10:53:28 +11:00
c543f21f3e added TODO thoughts 2021-01-17 15:20:32 +11:00
507336c2b2 commented out sleep which I use for testing of active jobs/job refresh page, and re-title the job list html 2021-01-17 12:38:28 +11:00
2b9dedb9b9 change how we calculate active jobs, probably will remove it from pa_job_engine, safer with threads I think. But, mostyle, added in client / server socket comms between web FE and job manager, with better job creation message (including link to job detail) and when you view job detail it auto-refreshes every few seconds until job complete) 2021-01-17 12:35:28 +11:00
abff2d8bab finished moving GenerateFileData out of files.py into pa_job_manager.py 2021-01-17 11:31:06 +11:00
a89f7fdb2b fixed bugs with wrong sequence names in DB classes, also added AddLogForJob and used it in GenerateFileData, and fixed but where I re-ran a completed job 2021-01-17 11:05:14 +11:00
c5d8811671 actually create a job for scan now, and let the job manager do the work and send back output via new PA_JobManager_FE_Message table 2021-01-17 10:50:43 +11:00
2a33b6e2f4 Fixed BUG-1 - timezone issues, by forcing alter database 2021-01-17 10:49:50 +11:00
f661cf0489 Fixed BUG-1 - timezone issues, by forcing alter database 2021-01-17 10:49:29 +11:00
b01bdea505 had to make pa_eng global in Init* func, but that worked, now have a basic harness to run a job, and ran scannow job, by pulling in much of the files.py code, but it will be removed from there when this is finished. Will have to move to IPC (via sockets?) to allow better coordination of new job processing and updating 2021-01-16 23:54:31 +11:00
e138ab22aa git commit, converted over to base.html pulling Status*, rather than every render_template calling it. Tightened up naming for job manager, fixed a few bugs in there with items like div by zero, created the active jobs link/badge in navbar, have it invoked each time by base.html template and it gets active jobs from DB, pa_job_manager now initiliases from an empty DB and can work out where it is at, no loop/thread/or actual job code yet. jobs.py has basics of a NewJob(), so next step is to force that job to be executed in pa_job_manager, but its tea time 2021-01-16 17:51:16 +11:00
dc2ea1265f instructions on how to fully reset the DB in docker from tables.sql 2021-01-16 17:48:00 +11:00
826e2fd421 switched name to pa_job_manager, feels more appropriate 2021-01-16 17:46:54 +11:00
a6d2e424d2 added shared.py at least for DB_URL, maybe more 2021-01-16 17:46:28 +11:00
2776fdc5b3 fixed bug with creating a person and seeing if they have a refimg yet, also tweaked formatting so when we have more than 5 refimages, they will look right in person.html 2021-01-15 17:22:22 +11:00
cda9bce7f3 just staring on this, it is not even reference anywhere 2021-01-15 16:58:55 +11:00
34814236fc add pa_job_engine_id_seq 2021-01-15 16:57:27 +11:00
b123f067b1 fix up comment 2021-01-15 16:57:14 +11:00
58083dbfab added package dependencies 2021-01-15 16:57:07 +11:00
Cam
588980a260 Added the ability to add a reference image to a person, and connect the two in the db 2021-01-15 16:55:12 +11:00
Cam
3191fb650b Merge branch 'master' of mara.ddp.net:photoassistant 2021-01-15 15:33:59 +11:00
Cam
7cda51c89b starting on doing AI with people and refimgs 2021-01-15 15:33:56 +11:00
7d03413e60 fix wrong output on printing Refimg 2021-01-15 15:33:30 +11:00
665096f97d minor tweak to fix pixel alignment, its a serious hack, but it *seems to work 2021-01-15 14:44:31 +11:00
46f8d84cd3 first thoughts on pa_job_engine - to keep overall pa_job engine state, also a pa_job_state in each action also a wait_for so we can do basic handling of jobs and dependencies 2021-01-14 22:13:07 +11:00
a8789e60fe first thoughts on pa_job_engine - to keep overall pa_job engine state, also a pa_job_state in each action also a wait_for so we can do basic handling of jobs and dependencies 2021-01-14 22:13:00 +11:00
a93f9e1da8 changed files table to file to be consistent with other tables in the db 2021-01-14 21:58:20 +11:00
348c9132f2 rename of files table to file, included settings defaults to make this work in DEV after rebuild of DB container 2021-01-14 21:57:53 +11:00