Update app.py

app.py

@@ -13,6 +13,8 @@ lock = RLock()
 HF_TOKEN = os.environ.get("HF_TOKEN") if os.environ.get("HF_TOKEN") else None # If private or gated models aren't used, ENV setting is unnecessary.
 
 
+nb_req_simult=10 ########
+
 now2 = 0
 inference_timeout = 300
 MAX_SEED = 2**32-1
@@ -25,6 +27,7 @@ nb_models=nb_mod_dif*nb_rep
 cache_image={}
 cache_id_image={}
 cache_list_task={}
+cache_text_actu={}
 
 
 def load_fn(models):
@@ -164,6 +167,7 @@ def set_session(id):
         cache_id_image[f"{randTemp}"]=[]
         
         cache_list_task[f"{randTemp}"]=[]
+        cache_text_actu[f"{randTemp}"]={}
         return gr.Number(visible=False,value=randTemp)
     else :
         return id
@@ -301,8 +305,20 @@ def crea_list_task(id_session,list_param,list_models_to_gen,nb_images_by_prompt)
             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]})
         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,
+                                      "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 }
+
+def fonc_update_actu(text_actu,id):
+    s=""
+    s+=f"modules: {cache_text_actu[f"{id}"]["nb_modules_use"]}/{nb_req_simult}\n"
+    s+=f"models remaining: {cache_text_actu[f"{id}"]["nb_models_to_do"]}/{cache_text_actu[f"{id}"]["nb_models_tot"]}\n"
+    s+=f"images remaining: {cache_text_actu[f"{id}"]["nb_tasks_to_do"]}/{cache_text_actu[f"{id}"]["nb_tasks_tot"]}\n"
+    s+=f"fail attempt: {cache_text_actu[f"{id}"]["nb_fail"]}"
+    return gr.Texbox(s)
+
 def cutStrg(longStrg,start,end):
     shortStrg=''
     for i in range(end-start):
@@ -346,11 +362,12 @@ def fonc_load_gallery_by_model(id_session,gallery,models,index):
         if cache_image[f"{id_session}"][i]["model"]==models[index]:
             gallery=add_gallery(cache_image[f"{id_session}"][i]["image"],cache_image[f"{id_session}"][i]["model"],gallery)
     return gallery
-
+    
 def fonc_start(id_session,id_module,s,cont):
     if cont==False:
+        cache_text_actu[f"{id_session}"]["nb_modules_use"]-=1
         print("manual stop")
-        return None,gr.Textbox(s)
+        return None,gr.Textbox(s),gr.Number(randint(1,MAX_SEED))
     task_actu={}
     model_actu=""
     print(f"in fonc : id module={id_module}\n")
@@ -369,9 +386,10 @@ def fonc_start(id_session,id_module,s,cont):
                     model_actu=model_plus_tasks["model"]
                     task_actu=model_plus_tasks["task"][0]
                     print(f"module num {id_module} take {model_actu}\n")
-    if model_actu=="":#crash
+    if model_actu=="":
+        cache_text_actu[f"{id_session}"]["nb_modules_use"]-=1
         print("Stop with :"+s+"\n")
-        return None,gr.Textbox(s)
+        return None,gr.Textbox(s),gr.Number(randint(1,MAX_SEED))
     print("begin gen image:")
     print(model_actu)
     print(task_actu)
@@ -383,8 +401,10 @@ def fonc_start(id_session,id_module,s,cont):
         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)
+                cache_text_actu[f"{id_session}"]["nb_tasks_to_do"]-=1
             if len(model_plus_tasks["task"])==0:
                 cache_list_task[f"{id_session}"].remove(model_plus_tasks)
+                cache_text_actu[f"{id_session}"]["nb_models_to_do"]-=1
             
         task_actu["id_image"]=id_image
         task_actu["model"]=model_actu
@@ -394,13 +414,14 @@ def fonc_start(id_session,id_module,s,cont):
         cache_image[f"{id_session}"].append(task_actu)
         print("image saved\n")
     else:
+        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
     print(f"\n {num_task_to_do} tasks to do\n")
-    return result , gr.Textbox(s+"1")
+    return result , gr.Textbox(s+"1"),gr.Number(randint(1,MAX_SEED))
 
 def fonc_init(s):
     return gr.Textbox(s+"1")
@@ -494,15 +515,15 @@ def make_me():
 
             
             with gr.Column():
-                with gr.Row():
-                    nb_req_simult=gr.Number(10,"Number simultaneous request")
-                    nb_req_simult_max_by_mod=gr.Number(2,"Number max simultaneous request by model")
                 
                 button_start=gr.Button("START")
                 button_stop=gr.Button("STOP")
                 cont=gr.Checkbox(True,visible=False)
                 button_start.click(lambda:True,[],[cont])
                 button_stop.click(lambda:False,[],[cont])
+                text_actu=gr.Textbox("",label="in progress",interactive=False,lines=6)
+                update_actu=gr.Number(0,visible=False)
+                update_actu.change(fonc_update_actu,[text_actu,id_session],[text_actu])
                 with gr.Row():
                     outputs=[]
                     id_modules=[]
@@ -513,19 +534,18 @@ def make_me():
                         outputs.append(gr.Image(None,interactive=False,visible=False))
                         id_modules.append(gr.Number(i,interactive=False,visible=False))
                         states.append(gr.Textbox("1",interactive=False,visible=False))
-                    print(len(outputs))
-                    print(outputs[0])
                     for o,i,s in zip(outputs,id_modules,states):
                         #o.change(fonc_start,[id_session,i],[o])
                         #o.change(test_change,[],[])
-                        s.change(fonc_start,[id_session,i,s,cont],[o,s])
+                        s.change(fonc_start,[id_session,i,s,cont],[o,s,update_actu])
                         #button_start.click(lambda : gr.Image(None),[],[o])
                         gen_event = gr.on(triggers=[button_start.click], fn=fonc_init,inputs=[s], outputs=[s])
-                        
-                    gallery = gr.Gallery(label="Output", show_download_button=True, elem_classes="gallery",
-                                    interactive=False, show_share_button=True, container=True, format="png",
-                                    preview=True, object_fit="cover",columns=4,rows=4) 
-                    with gr.Column():
+                    
+                    with gr.Column(scale=2):    
+                        gallery = gr.Gallery(label="Output", show_download_button=True, elem_classes="gallery",
+                                        interactive=False, show_share_button=True, container=True, format="png",
+                                        preview=True, object_fit="cover",columns=4,rows=4) 
+                    with gr.Column(scale=3):
                         button_load_gallery=gr.Button("Load Gallery All")
                         button_load_gallery.click(fonc_load_gallery,[id_session,gallery],[gallery])