use run_ai_on_path as job type, rather than find ent and pass it to run_ai_on

This commit is contained in:
2022-02-04 21:57:13 +11:00
parent e16f7dbc30
commit 8ef3a97eb7

21
ai.py
View File

@@ -62,14 +62,11 @@ def run_ai_on():
@login_required @login_required
def run_ai_on_import(): def run_ai_on_import():
jex=[] jex=[]
ptype=PathType.query.filter(PathType.name=='Import').first()
jex.append( JobExtra( name=f"person", value="all" ) ) jex.append( JobExtra( name=f"person", value="all" ) )
paths=Path.query.join(PathType).filter(PathType.name=='Import').all() jex.append( JobExtra( name=f"path_type", value=ptype.id ) )
path_cnt=0 job=NewJob( "run_ai_on_path", 0, None, jex )
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 )
st.SetMessage( f"Created&nbsp;<a href=/job/{job.id}>Job #{job.id}</a>&nbsp;to Look for face(s) in import path(s)") st.SetMessage( f"Created&nbsp;<a href=/job/{job.id}>Job #{job.id}</a>&nbsp;to Look for face(s) in import path(s)")
return redirect("/jobs") return redirect("/jobs")
@@ -77,14 +74,10 @@ def run_ai_on_import():
@login_required @login_required
def run_ai_on_storage(): def run_ai_on_storage():
jex=[] jex=[]
ptype=PathType.query.filter(PathType.name=='Storage').first()
jex.append( JobExtra( name=f"person", value="all" ) ) jex.append( JobExtra( name=f"person", value="all" ) )
paths=Path.query.join(PathType).filter(PathType.name=='Storage').all() jex.append( JobExtra( name=f"path_type", value=ptype.id ) )
path_cnt=0 job=NewJob( "run_ai_on_path", 0, None, jex )
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 )
st.SetMessage( f"Created&nbsp;<a href=/job/{job.id}>Job #{job.id}</a>&nbsp;to Look for face(s) in storage path(s)") st.SetMessage( f"Created&nbsp;<a href=/job/{job.id}>Job #{job.id}</a>&nbsp;to Look for face(s) in storage path(s)")
return redirect("/jobs") return redirect("/jobs")