realised I never cleaned up git branch, merge back into main/master when I get a chance

BUGs

@@ -1,4 +1,5 @@
-### Next: 147
+### Next: 148
+BUG-147: cant change base path in settings anymore?
 BUG-146: with an empty DB, I See 'No files in Path!' twice (for file*, except for files_rbp)
 BUG-118: can move files from Bin path, but it leaves the del_file entry for it - need to remove it
 BUG-117: when search returns files that can be deleted and/or restored, the icon stays as delete and tries to delete!

TODO

@@ -1,3 +1,5 @@
+* clean up git branches!!!
+
 ### GENERAL
 * jobs for AI should show path name
 * rm dups job should show progress bar

pa_job_manager.py

@@ -2775,7 +2775,7 @@ if __name__ == "__main__":
     # Initial job run on startup (hence True in 1st param)
     try:
         with PA_db_session() as sess:
-            HandleJobs(True,sess)
+            HandleJobs(True)
     except Exception as e:
         PAprint(f"ERROR: Initial job handle failed: {e}")
 
@@ -2793,10 +2793,10 @@ if __name__ == "__main__":
 
                 # 2. Process Jobs after a successful socket connection
                 with PA_db_session() as sess:
-                    HandleJobs(False, sess)
+                    HandleJobs(False)
                     # Check for scheduled tasks as well
-                    if ScheduledJobs(sess):
-                        HandleJobs(False, sess)
+                    if ScheduledJobs():
+                        HandleJobs(False)
 
             except socket.timeout:
                 if DEBUG:
@@ -2805,8 +2805,8 @@ if __name__ == "__main__":
                 # 3. Process Scheduled Jobs during the timeout
                 try:
                     with PA_db_session() as sess:
-                        if ScheduledJobs(sess):
-                            HandleJobs(False, sess)
+                        if ScheduledJobs():
+                            HandleJobs(False)
                 except sqlalchemy.exc.OperationalError:
                     PAprint("DB Connection lost during scheduled task window. Retrying next cycle.")
                 continue

requirements.txt

@@ -1,5 +1,5 @@
 numpy==1.26.4
-setuptools
+setuptools<70.0.0
 flask
 flask_login
 flask-ldap3-login
@@ -17,6 +17,7 @@ datetime
 pytz
 dlib
 face_recognition
+face_recognition_models @ git+https://github.com/ageitgey/face_recognition_models
 Werkzeug
 flask-compress
 ffmpeg-python