From 8ef3a97eb7f922fb59ec27c7cbf958528dff698b Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Fri, 4 Feb 2022 21:57:13 +1100 Subject: [PATCH] use run_ai_on_path as job type, rather than find ent and pass it to run_ai_on --- ai.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/ai.py b/ai.py index d049044..c893626 100644 --- a/ai.py +++ b/ai.py @@ -62,14 +62,11 @@ def run_ai_on(): @login_required def run_ai_on_import(): jex=[] + + ptype=PathType.query.filter(PathType.name=='Import').first() jex.append( JobExtra( name=f"person", value="all" ) ) - paths=Path.query.join(PathType).filter(PathType.name=='Import').all() - path_cnt=0 - for p in paths: - d = Dir.query.join(PathDirLink).filter(PathDirLink.path_id==p.id).filter(Dir.rel_path=='').first() - jex.append( JobExtra( name=f"eid-{path_cnt}", value=f"{d.eid}" ) ) - path_cnt+=1 - job=NewJob( "run_ai_on", 0, None, jex ) + jex.append( JobExtra( name=f"path_type", value=ptype.id ) ) + job=NewJob( "run_ai_on_path", 0, None, jex ) st.SetMessage( f"Created Job #{job.id} to Look for face(s) in import path(s)") return redirect("/jobs") @@ -77,14 +74,10 @@ def run_ai_on_import(): @login_required def run_ai_on_storage(): jex=[] + ptype=PathType.query.filter(PathType.name=='Storage').first() jex.append( JobExtra( name=f"person", value="all" ) ) - paths=Path.query.join(PathType).filter(PathType.name=='Storage').all() - path_cnt=0 - for p in paths: - d = Dir.query.join(PathDirLink).filter(PathDirLink.path_id==p.id).filter(Dir.rel_path=='').first() - jex.append( JobExtra( name=f"eid-{path_cnt}", value=f"{d.eid}" ) ) - path_cnt+=1 - job=NewJob( "run_ai_on", 0, None, jex ) + jex.append( JobExtra( name=f"path_type", value=ptype.id ) ) + job=NewJob( "run_ai_on_path", 0, None, jex ) st.SetMessage( f"Created Job #{job.id} to Look for face(s) in storage path(s)") return redirect("/jobs")