Update app.py

app.py

@@ -249,10 +249,13 @@ list_ratios=[["None",[None,None]],
              ["5:12 (640 x 1536)",[640,1536]],
              ["1:4 (512 x 2048)",[512,2048]]]
 
-def fonc_add_param(lp,txt_input,neg_input,width,height,steps,cfg,seed):
+def fonc_add_param(lp,txt_input,neg_input,width,height,steps,cfg,seed):###########################################
     if lp == [["","",0,0,0,0,-1]]:
         lp.remove(["","",0,0,0,0,-1])
-    lp.append([txt_input,neg_input,width,height,steps,cfg,seed])
+    #lp.append([txt_input,neg_input,width,height,steps,cfg,seed])
+    list_txt=txt_input.split("/")
+    for t in list_txt:
+        lp.append([t,neg_input,width,height,steps,cfg,seed])
     return gr.Dataset(samples=lp) , gr.Dropdown(choices=[["a",lp]], value=lp)
 def fonc_del_param(lp,txt_input,neg_input,width,height,steps,cfg,seed):
     if [txt_input,neg_input,width,height,steps,cfg,seed] in lp :
@@ -466,8 +469,18 @@ def fonc_load_gallery_by_model(id_session,gallery,models,index_g,index_m,gallery
     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)
-    return gr.Gallery(gallery,visible=(index_g==(index_m%nb_gallery_model))), gr.Gallery(gallery_all,visible=False)#################################
-    #return gr.Gallery(gallery,visible=True), gr.Gallery(gallery_all,visible=False)
+    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): 
+    #"prompt":p[0],"nprompt":p[1],"width":p[2],"height":p[3],"steps":p[4],"cfg":p[5],"seed":p[6]
+    gallery = reset_gallery(gallery)
+    for i in range(len(cache_image[f"{id_session}"])):
+        if cache_image[f"{id_session}"][i]["prompt"]==list_p[index_p][0] :
+            gallery=add_gallery(cache_image[f"{id_session}"][i]["image"],cache_image[f"{id_session}"][i]["model"],gallery)
+    if len(gallery)!=0:
+        gallery=sorted(gallery, key=itemgetter(1))
+    return gr.Gallery(gallery, visible=True)
+    
 def index_gallery_next(i,list_models):
     iT=i+1
     return gr.Number(iT%len(list_models)),gr.Number(1)
@@ -589,6 +602,20 @@ def make_me():
                     update_actu=gr.Number(0,visible=False)
                     update_actu.change(fonc_update_actu,[text_actu,id_session],[text_actu])
                     button_start.click(fonc_update_actu,[text_actu,id_session],[text_actu])
+                    
+                    with gr.Accordion("Gallery Parameters",open=False) :
+                        with gr.Row():
+                            with gr.Column():
+                                set_height_gallery=gr.Checkbox(True,label="set height",show_label=True)
+                                height_gallery=gr.Number(650,label="height",show_label=True)
+                            col_gallery=gr.Number(5,label="nb columns",show_label=True)
+                            row_gallery=gr.Number(4,label="nb row",show_label=True)
+                            with gr.Column():
+                                button_reset_cache_image=gr.Button("Reset Images")
+                                button_reset_cache_image.click(reset_cache_image,[id_session],[])
+                                button_reset_cache_image_all_session=gr.Button("Reset Images ALL SESSION")
+                                button_reset_cache_image_all_session.click(reset_cache_image_all_sessions,[],[])
+                            
                     with gr.Row():
                         outputs=[]
                         id_modules=[]
@@ -608,46 +635,89 @@ def make_me():
                         
                         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)
+                                            interactive=False, show_share_button=False, container=True, format="png",
+                                            preview=True, object_fit="contain",columns=5,rows=4,height=650)
+                            gallery_by_prompt = gr.Gallery(label="Output", show_download_button=True, elem_classes="gallery",
+                                            interactive=False, show_share_button=False, container=True, format="png",
+                                            preview=True, object_fit="contain",columns=5,rows=4,visible=False,height=650)
                             gallery_models=[]
                             index_gallery=[]
+                            set_height_gallery.change(lambda g,h,s: gr.Gallery(g,height=h) if s else gr.Gallery(g,height=None),
+                                                      [gallery,height_gallery,set_height_gallery],[gallery])
+                            height_gallery.change(lambda g,h: gr.Gallery(g,height=h),[gallery,height_gallery],[gallery])
+                            col_gallery.change(lambda g,h: gr.Gallery(g,columns=h),[gallery,col_gallery],[gallery])
+                            row_gallery.change(lambda g,h: gr.Gallery(g,rows=h),[gallery,row_gallery],[gallery])
                             for i in range(nb_gallery_model):
                                 gallery_models.append(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,visible=False))
+                                            interactive=False, show_share_button=False, container=True, format="png",
+                                            preview=True, object_fit="contain",columns=5,rows=4,visible=False,height=650))
                                 index_gallery.append(gr.Number(i,visible=False))
+                                set_height_gallery.change(lambda g,h,s: gr.Gallery(g,height=h) if s else gr.Gallery(g,height=None),
+                                                          [gallery_models[i],height_gallery,set_height_gallery],[gallery_models[i]])
+                                height_gallery.change(lambda g,h: gr.Gallery(g,height=h),[gallery_models[i],height_gallery],[gallery_models[i]])
+                                col_gallery.change(lambda g,h: gr.Gallery(g,columns=h),[gallery_models[i],col_gallery],[gallery_models[i]])
+                                row_gallery.change(lambda g,h: gr.Gallery(g,rows=h),[gallery_models[i],row_gallery],[gallery_models[i]])
                         with gr.Column(scale=3):
                             button_load_gallery=gr.Button("Load Gallery All")
                             button_load_gallery.click(fonc_load_gallery,[id_session,gallery],[gallery])
-    
-                            index_gallery_m=gr.Number(0,visible=False)
-                            button_load_gallery_first=gr.Button("Init Gallery by model")
-                            with gr.Row():
-                                button_load_gallery_prev=gr.Button("Prev model")
-                                button_load_gallery_next=gr.Button("Next model")
-                                direction_gallery=gr.Number(0,visible=False)
-                                button_load_gallery_next.click(index_gallery_next,[index_gallery_m,list_models_to_gen],[index_gallery_m,direction_gallery])
-                                button_load_gallery_prev.click(index_gallery_prev,[index_gallery_m,list_models_to_gen],[index_gallery_m,direction_gallery])
+
+                            with gr.Accordion("Gallery by Model",open=True) :
+                                index_gallery_m=gr.Number(0,visible=False)
+                                button_load_gallery_first=gr.Button("Init Gallery by model")
+                                with gr.Row():
+                                    button_load_gallery_prev=gr.Button("Prev model")
+                                    button_load_gallery_next=gr.Button("Next model")
+                                    direction_gallery=gr.Number(0,visible=False)
+                                    button_load_gallery_next.click(index_gallery_next,[index_gallery_m,list_models_to_gen],[index_gallery_m,direction_gallery])
+                                    button_load_gallery_prev.click(index_gallery_prev,[index_gallery_m,list_models_to_gen],[index_gallery_m,direction_gallery])
+                                    for g,i in zip(gallery_models,index_gallery):
+                                        index_gallery_m.change(fonc_move_gallery_by_model,[id_session,g,i,list_models_to_gen,index_gallery_m,direction_gallery],[g])
+                                        gen_event_gallery_first = gr.on(triggers=[button_load_gallery_first.click], fn=fonc_load_gallery_by_model,
+                                                                        inputs=[id_session,g,list_models_to_gen,i,index_gallery_m,gallery], outputs=[g,gallery])
+                                        gen_event_gallery_first_all = gr.on(triggers=[button_load_gallery.click], fn=lambda g:gr.Gallery(g,visible=False),
+                                                                        inputs=[g], outputs=[g])
+                                text_model_actu_gal = gr.Textbox(label='Model Actu:', lines=1, interactive = False)
+                                index_gallery_m.change(change_text_model_actu_gal,[list_models_to_gen,index_gallery_m],[text_model_actu_gal])
+                                with gr.Row():
+                                    with gr.Column():
+                                        button_add_to_bl=gr.Button("Add to Blacklist")
+                                        #button_remove_from_bl=gr.Button("Remove from Blacklist")
+                                        text_bl=gr.Textbox(label='Blacklist', lines=5, interactive = True)
+                                        button_add_to_bl.click(fonc_add_to_text,[text_bl,list_models_to_gen,index_gallery_m],[text_bl])
+                                        #button_remove_from_bl.click(fonc_remove_from_text,[text_bl,list_models_to_gen,index_gallery_m],[text_bl])
+                                    with gr.Column():
+                                        button_add_to_fav=gr.Button("Add to Favlist")
+                                        text_fav=gr.Textbox(label='Favlist', lines=5, interactive = True)
+                                        button_add_to_fav.click(fonc_add_to_text,[text_fav,list_models_to_gen,index_gallery_m],[text_fav])
+                            with gr.Accordion("Gallery by Prompt",open=False) :
+                                index_gallery_by_prompt=gr.Number(0,visible=False)
+                                button_load_gallery_by_prompt=gr.Button("Load Gallery by prompt")
+                                text_gallery_by_prompt=gr.Textbox(f"{index_gallery_by_prompt.value+1}/{len(list_param.value)}",show_label=False)
+                                index_gallery_by_prompt.change(lambda i,p:gr.Textbox(f"{i+1}/{len(p)}"),[index_gallery_by_prompt,list_param],[text_gallery_by_prompt])
+                                button_load_gallery_by_prompt.click(load_gallery_by_prompt,
+                                                                    [id_session,gallery_by_prompt,index_gallery_by_prompt,list_param],[gallery_by_prompt])
+                                gen_event_gallery_by_prompt = gr.on(triggers=[button_load_gallery_by_prompt.click], fn=lambda g:gr.Gallery(g,visible=False),
+                                                                inputs=[gallery], outputs=[gallery])
+                                gen_event_gallery_first = gr.on(triggers=[button_load_gallery_first.click], fn=lambda g:gr.Gallery(g,visible=False),
+                                                                inputs=[gallery_by_prompt], outputs=[gallery_by_prompt])
+                                gen_event_gallery = gr.on(triggers=[button_load_gallery.click], fn=lambda g:gr.Gallery(g,visible=False),
+                                                                inputs=[gallery_by_prompt], outputs=[gallery_by_prompt])
                                 for g,i in zip(gallery_models,index_gallery):
-                                    index_gallery_m.change(fonc_move_gallery_by_model,[id_session,g,i,list_models_to_gen,index_gallery_m,direction_gallery],[g])
-                                    gen_event_gallery_first = gr.on(triggers=[button_load_gallery_first.click], fn=fonc_load_gallery_by_model,
-                                                                    inputs=[id_session,g,list_models_to_gen,i,index_gallery_m,gallery], outputs=[g,gallery])
-                                    gen_event_gallery_first_all = gr.on(triggers=[button_load_gallery.click], fn=lambda g:gr.Gallery(g,visible=False),
-                                                                    inputs=[g], outputs=[g])
-                            text_model_actu_gal = gr.Textbox(label='Model Actu:', lines=1, interactive = False)
-                            index_gallery_m.change(change_text_model_actu_gal,[list_models_to_gen,index_gallery_m],[text_model_actu_gal])
-                            with gr.Row():
-                                with gr.Column():
-                                    button_add_to_bl=gr.Button("Add to Blacklist")
-                                    #button_remove_from_bl=gr.Button("Remove from Blacklist")
-                                    text_bl=gr.Textbox(label='Blacklist', lines=5, interactive = True)
-                                    button_add_to_bl.click(fonc_add_to_text,[text_bl,list_models_to_gen,index_gallery_m],[text_bl])
-                                    #button_remove_from_bl.click(fonc_remove_from_text,[text_bl,list_models_to_gen,index_gallery_m],[text_bl])
-                                with gr.Column():
-                                    button_add_to_fav=gr.Button("Add to Favlist")
-                                    text_fav=gr.Textbox(label='Favlist', lines=5, interactive = True)
-                                    button_add_to_fav.click(fonc_add_to_text,[text_fav,list_models_to_gen,index_gallery_m],[text_fav])
+                                    gen_event_gallery_by_prompt = gr.on(triggers=[button_load_gallery_by_prompt.click], fn=lambda g:gr.Gallery(g,visible=False),
+                                                                        inputs=[g], outputs=[g])
+                                with gr.Row():
+                                    button_gallery_prev_prompt=gr.Button("Prev prompt")
+                                    button_gallery_next_prompt=gr.Button("Next prompt")
+                                    button_gallery_next_prompt.click(lambda i,p: (i+1)%len(p),[index_gallery_by_prompt,list_param],[index_gallery_by_prompt])
+                                    button_gallery_prev_prompt.click(lambda i,p: (i-1)%len(p),[index_gallery_by_prompt,list_param],[index_gallery_by_prompt])
+                                index_gallery_by_prompt.change(load_gallery_by_prompt,
+                                                                    [id_session,gallery_by_prompt,index_gallery_by_prompt,list_param],[gallery_by_prompt])
+                            set_height_gallery.change(lambda g,h,s: gr.Gallery(g,height=h) if s else gr.Gallery(g,height=None),
+                                                      [gallery_by_prompt,height_gallery,set_height_gallery],[gallery_by_prompt])
+                            height_gallery.change(lambda g,h: gr.Gallery(g,height=h),[gallery_by_prompt,height_gallery],[gallery_by_prompt])
+                            col_gallery.change(lambda g,h: gr.Gallery(g,columns=h),[gallery_by_prompt,col_gallery],[gallery_by_prompt])
+                            row_gallery.change(lambda g,h: gr.Gallery(g,rows=h),[gallery_by_prompt,row_gallery],[gallery_by_prompt])
+