Update app.py

app.py

@@ -364,18 +364,22 @@ def crea_list_task(id_session,list_param,list_models_to_gen,nb_images_by_prompt)
         dict_temp={}
         dict_temp["model"]=m
         dict_temp["id_module"]=-1
+        dict_temp["pending_task"]=0
         dict_temp["task"]=[]
         list_progress.append(0)
+        index_prompt=0
         for p in list_param:
             for i in range(nb_images_by_prompt):
-                dict_temp["task"].append({"prompt":p[0],"nprompt":p[1],"width":p[2],"height":p[3],"steps":p[4],"cfg":p[5],"seed":p[6]})
+                dict_temp["task"].append({"prompt":p[0],"nprompt":p[1],"width":p[2],"height":p[3],"steps":p[4],"cfg":p[5],"seed":p[6],"index_prompt":index_prompt})
+            index_prompt+=1
         cache_list_task[f"{id_session}"].append(dict_temp)
     
     cache_text_actu[f"{id_session}"]={"nb_modules_use":nb_req_simult,"stop":False,"nb_fail":0,"warm":False,
                                       "nb_models_to_do":len(list_models_to_gen) ,"nb_models_tot":len(list_models_to_gen) ,
                                       "nb_tasks_to_do":len(list_models_to_gen)*len(list_param)*nb_images_by_prompt ,
                                       "nb_tasks_tot":len(list_models_to_gen)*len(list_param)*nb_images_by_prompt,
-                                     "progress":list_progress,'nb_tasks_by_model': nb_images_by_prompt*len(list_param) }
+                                     "progress":list_progress,'nb_tasks_by_model': nb_images_by_prompt*len(list_param),
+                                     "nb_warm_in_use":0}
 
 def fonc_update_actu(text_actu,id):
     s=""
@@ -413,11 +417,12 @@ def fonc_update_actu_2(id):
             s+="\n"
     
     s+="\n"
-    s+=f"modules: {cache_text_actu[str(id)]['nb_modules_use']}/{nb_req_simult} ({cache_text_actu[str(id)]['nb_modules_use']-nb_ones}/{cache_text_actu[str(id)]['nb_modules_use']})\n"
+    s+=f"modules: {cache_text_actu[str(id)]['nb_modules_use']}/{nb_req_simult} ({nb_ones}/{cache_text_actu[str(id)]['nb_modules_use']})\n"
     s+=f"models remaining: {cache_text_actu[str(id)]['nb_models_to_do']}/{cache_text_actu[str(id)]['nb_models_tot']}\n"
 
     s+=f"images remaining(done): {cache_text_actu[str(id)]['nb_tasks_to_do']}({cache_text_actu[str(id)]['nb_tasks_tot']-cache_text_actu[str(id)]['nb_tasks_to_do']})/{cache_text_actu[str(id)]['nb_tasks_tot']}\n"
     s+=f"fail attempt: {cache_text_actu[str(id)]['nb_fail']}\n"
+    s+=f"warm task pending = {cache_text_actu[str(id)]['nb_warm_in_use']}\n"
     #s+=f"{tempo_update_actu*incr_update_actu[str(id)]} s"
     #incr_update_actu[str(id)]+=1
     s+=f"{randint(1,MAX_SEED)}"
@@ -464,11 +469,15 @@ def fonc_load_gallery(id_session,gallery):
     
 def fonc_move_gallery_by_model(id_session,gallery,index_g,models,index_m,direction):
     delta=int((nb_gallery_model-1)/2)
+    list_image_temp=[]
     if index_g==(index_m+(delta*direction))%nb_gallery_model :
         gallery = reset_gallery(gallery)
         for i in range(len(cache_image[f"{id_session}"])):
             if cache_image[f"{id_session}"][i]["model"]==models[(index_m+(delta*direction))%len(models)]:
-                gallery=add_gallery(cache_image[f"{id_session}"][i]["image"],cache_image[f"{id_session}"][i]["model"],gallery)
+                list_image_temp.append([cache_image[f"{id_session}"][i]["image"],cache_image[f"{id_session}"][i]["model"],cache_image[f"{id_session}"][i]["index_prompt"]])
+                
+    for temp in sorted(list_image_temp,key=itemgetter(2)):
+        gallery=add_gallery(temp[0],temp[1],gallery)
     if index_g==(index_m-direction)%nb_gallery_model:
         return gr.Gallery(gallery,visible=False)
         #return gr.Gallery(gallery,visible=True)
@@ -485,21 +494,49 @@ def fonc_start(id_session,id_module,s,cont,list_models_to_gen):
         return None,gr.Textbox(s),gr.Number(randint(1,MAX_SEED))
     task_actu={}
     model_actu=""
+    use_warm_model=False
     print(f"in fonc : id module={id_module}\n")
+    
+    warm_models , models_plus_tags_temp = find_warm_model_list("John6666", ["stable-diffusion-xl"], "", "last_modified", 10000)
+    
     for model_plus_tasks in cache_list_task[f"{id_session}"]:
-        if model_plus_tasks["id_module"]==id_module:
-            model_actu=model_plus_tasks["model"]
-            task_actu=model_plus_tasks["task"][0]
-            
-            print(f"find model : {model_actu}\n")
+        if model_actu == "":
+            if model_plus_tasks["model"] in warm_models:
+                try:
+                    task_actu=model_plus_tasks["task"].pop()
+                except:
+                    continue
+                model_actu=model_plus_tasks["model"]
+                model_plus_tasks["pending_task"]+=1
+                use_warm_model=True
+                cache_text_actu[f"{id_session}"]["nb_warm_in_use"]+=1
+                print(f"warm model : {model_actu}\n")
+                break
+                
+    if model_actu == "":        
+        for model_plus_tasks in cache_list_task[f"{id_session}"]:
+            if model_plus_tasks["id_module"]==id_module:
+                try:
+                    task_actu=model_plus_tasks["task"].pop()
+                except:
+                    continue
+                model_actu=model_plus_tasks["model"]
+                model_plus_tasks["pending_task"]+=1
+                print(f"find model : {model_actu}\n")
+                break
             
     if model_actu=="":
         for model_plus_tasks in cache_list_task[f"{id_session}"]:
             if model_plus_tasks["id_module"]==-1 :
                 if model_actu=="":
-                    model_plus_tasks["id_module"]=id_module
+                    
+                    try:
+                        task_actu=model_plus_tasks["task"].pop()
+                    except:
+                        continue
                     model_actu=model_plus_tasks["model"]
-                    task_actu=model_plus_tasks["task"][0]
+                    model_plus_tasks["pending_task"]+=1
+                    model_plus_tasks["id_module"]=id_module
                     print(f"module num {id_module} take {model_actu}\n")
                     i=0
                     for model in list_models_to_gen:
@@ -514,22 +551,25 @@ def fonc_start(id_session,id_module,s,cont,list_models_to_gen):
     print("begin gen image:")
     print(model_actu)
     print(task_actu)
-    result=gen_fn(model_actu, task_actu["prompt"], task_actu["nprompt"], task_actu["height"], task_actu["width"], task_actu["steps"], task_actu["cfg"], task_actu["seed"])
+    if use_warm_model:
+        result=gen_fn(model_actu, task_actu["prompt"], task_actu["nprompt"], task_actu["height"], task_actu["width"], task_actu["steps"], task_actu["cfg"], task_actu["seed"],inference_timeout_w)
+    else:
+        result=gen_fn(model_actu, task_actu["prompt"], task_actu["nprompt"], task_actu["height"], task_actu["width"], task_actu["steps"], task_actu["cfg"], task_actu["seed"])
     print("reception")
     if result!=None:
         #result=gr.Image(result)
         id_image=len(cache_image[f"{id_session}"])
         i=0
         for model_plus_tasks in cache_list_task[f"{id_session}"]:
-            if model_plus_tasks["id_module"]==id_module:
-                model_plus_tasks["task"].remove(task_actu)
+            if model_plus_tasks["model"]==model_actu:
+                model_plus_tasks["pending_task"]-=1
                 cache_text_actu[f"{id_session}"]["nb_tasks_to_do"]-=1
                 i=0
                 for model in list_models_to_gen:
                     if model_actu==model:
-                        cache_text_actu[f"{id_session}"]['progress'][i]=int(((1-(len(model_plus_tasks["task"])/cache_text_actu[f"{id_session}"]["nb_tasks_by_model"]))*7)//1)+2
+                        cache_text_actu[f"{id_session}"]['progress'][i]=int(((1-((len(model_plus_tasks["task"])+model_plus_tasks["pending_task"])/cache_text_actu[f"{id_session}"]["nb_tasks_by_model"]))*7)//1)+2
                     i+=1
-            if len(model_plus_tasks["task"])==0:
+            if len(model_plus_tasks["task"])+model_plus_tasks["pending_task"]==0:
                 cache_list_task[f"{id_session}"].remove(model_plus_tasks)
                 cache_text_actu[f"{id_session}"]["nb_models_to_do"]-=1
                 
@@ -542,12 +582,15 @@ def fonc_start(id_session,id_module,s,cont,list_models_to_gen):
         cache_image[f"{id_session}"].append(task_actu)
         print("image saved\n")
     else:
+        model_plus_tasks["task"].append(task_actu)
         cache_text_actu[f"{id_session}"]["nb_fail"]+=1
         print("fail to generate\n")
     num_task_to_do=0
     for model_plus_tasks in cache_list_task[f"{id_session}"]:
         for task in model_plus_tasks["task"]:
             num_task_to_do+=1
+    if use_warm_model:
+        cache_text_actu[f"{id_session}"]["nb_warm_in_use"]-=1
     print(f"\n {num_task_to_do} tasks to do\n")
     return result , gr.Textbox(s+"1"),gr.Number(randint(1,MAX_SEED))
 
@@ -557,9 +600,13 @@ def fonc_init(s):
 def fonc_load_gallery_by_model(id_session,gallery,models,index_g,index_m,gallery_all): 
     delta=int((nb_gallery_model-1)/2)
     gallery = reset_gallery(gallery)
+    list_image_temp=[]
     for i in range(len(cache_image[f"{id_session}"])):
         if cache_image[f"{id_session}"][i]["model"]==models[((index_m+index_g+delta)%nb_gallery_model)-delta]:
-            gallery=add_gallery(cache_image[f"{id_session}"][i]["image"],cache_image[f"{id_session}"][i]["model"],gallery)
+            list_image_temp.append([cache_image[f"{id_session}"][i]["image"],cache_image[f"{id_session}"][i]["model"],cache_image[f"{id_session}"][i]["index_prompt"]])
+                
+    for temp in sorted(list_image_temp,key=itemgetter(2)):
+        gallery=add_gallery(temp[0],temp[1],gallery)
     return gr.Gallery(gallery,visible=(index_g==(index_m%nb_gallery_model))), gr.Gallery(gallery_all,visible=False)
     
 def load_gallery_by_prompt(id_session,gallery,index_p,list_p):