Update app.py

app.py

@@ -60,20 +60,20 @@ tags_plus_models_to_list=[]
 list_tags=[]
 for tag_plus_m in tags_plus_models:
     list_tags.append(tag_plus_m[0]+f" ({tag_plus_m[1]})")
-    
-def test_pass(test):
-    if test==os.getenv('p'):
-        print("ok")
-        return gr.Dropdown(label="Lists Tags", show_label=True, choices=list(models_test) , interactive = True)
-    else:
-        print("nop")
-        return gr.Dropdown(label="Lists Tags", show_label=True, choices=list([]) , interactive = True)
+
+models_publ=[]
+if len(models)>10: 
+    nb_publ=10
+else:
+    nb_publ=len(models)
+for i in range(nb_publ):
+    models_publ.append(models[i])
 
 def test_pass_aff(test):
     if test==os.getenv('p'):
-        return gr.Accordion( open=True, visible=True) ,gr.Row(visible=False)
+        return gr.Tab(visible=True) 
     else:
-        return gr.Accordion( open=True, visible=False) , gr.Row()
+        return gr.Tab(visible=False) 
 
 
 # https://huggingface.co/docs/api-inference/detailed_parameters
@@ -440,138 +440,162 @@ def change_text_model_actu_gal(list_models,index):
 def fonc_add_to_text(text,list_models,index):
     return gr.Textbox(text+f"\"{list_models[index]}\",\n")
 
+
+def load_model_publ(choice_model_publ):
+    return gr.Image(None,label=choice_model_publ,interactive=False),gr.Textbox(choice_model_publ,visible=False,show_label=False)
+    
 def make_me():
-        with gr.Column():
-            id_session=gr.Number(visible=False,value=0)
-            with gr.Group():
+        with gr.Tab(" "):
+            with gr.Column():
                 with gr.Row():
                     with gr.Column(scale=4):
-                        txt_input = gr.Textbox(label='Your prompt:', lines=4, interactive = True)
-                        neg_input = gr.Textbox(label='Negative prompt:', lines=4, interactive = True)
+                        prompt_publ=gr.Textbox(label='Your prompt:', lines=4, interactive = True)
+                        choice_model_publ=gr.Dropdown(label="List of Models", choices=list(models_publ),value=models_publ[0])
+                    gen_button_publ = gr.Button('Generate images',scale=2)
+                image_publ=gr.Image(None,label=models_publ[0],interactive=False)
+                current_models_publ=gr.Textbox(models_publ[0],visible=False,show_label=False)
+                choice_model_publ.change(load_model_publ,[choice_model_publ],[image_publ,current_models_publ])
+                gen_event_publ = gr.on(triggers=[gen_button_publ.click, prompt_publ.submit], fn=gen_fn,
+                                inputs=[choice_model_publ, prompt_publ], outputs=[image_publ])
+                
+                with gr.Row():
                     with gr.Column(scale=4):
-                        with gr.Row():
-                            width = gr.Slider(label="Width", info="If 0, the default value is used.", maximum=2024, step=32, value=0, interactive = True)
-                            height = gr.Slider(label="Height", info="If 0, the default value is used.", maximum=2024, step=32, value=0, interactive = True)
-                        with gr.Row():
-                            choice_ratio = gr.Dropdown(label="Ratio Width/Height", 
-                                                info="OverWrite Width and Height (W*H<1024*1024)", 
-                                                show_label=True, choices=list(list_ratios) , interactive = True, value=list_ratios[0][1])
-                            choice_ratio.change(ratio_chosen,[choice_ratio,width,height],[width,height])
-                        with gr.Row():
-                            steps = gr.Slider(label="Number of inference steps", info="If 0, the default value is used.", maximum=100, step=1, value=0, interactive = True)
-                            cfg = gr.Slider(label="Guidance scale", info="If 0, the default value is used.", maximum=30.0, step=0.1, value=0, interactive = True)
-                            seed = gr.Slider(label="Seed", info="Randomize Seed if -1.", minimum=-1, maximum=MAX_SEED, step=1, value=-1, interactive = True)
-                            
-            add_param=gr.Button("Add to the list")
-            del_param=gr.Button("Delete to the list")
-            
-        #gen_button = gr.Button('Generate images', scale=3)
-        #stop_button = gr.Button('Stop', variant='secondary', interactive=False, scale=1)
-        #gen_button.click(lambda: gr.update(interactive=True), None, stop_button)
-            
-            list_param=gr.Dropdown(choices=[["a",[["","",0,0,0,0,-1]]]], value=[["","",0,0,0,0,-1]], visible=False)
-            disp_param = gr.Examples(
-                label="list of prompt",
-                examples=list_param.value,
-                inputs=[txt_input,neg_input,width,height,steps,cfg,seed],
-                outputs=[txt_input,neg_input,width,height,steps,cfg,seed],
-            )
-            add_param.click(fonc_add_param,[list_param,txt_input,neg_input,width,height,steps,cfg,seed],[disp_param.dataset,list_param])
-            add_param.click(set_session,[id_session],[id_session])
-            del_param.click(fonc_del_param,[list_param,txt_input,neg_input,width,height,steps,cfg,seed],[disp_param.dataset,list_param])
-
-            with gr.Row():
-                list_models_to_gen=gr.Dropdown(choices=[["",[]]], value=[], visible=False)
-                disp_info=gr.Textbox(label="Info")
-                with gr.Column():
+                        test_pass=gr.Textbox(show_label=False,lines=1, interactive = True)
+                    button_test_pass=gr.Button(" ",scale=1)
+    
+        with gr.Tab(" Sort ",visible=False) as tab_p:   
+            button_test_pass.click(test_pass_aff,[test_pass],[tab_p]) 
+            with gr.Column():
+                id_session=gr.Number(visible=False,value=0)
+                with gr.Group():
                     with gr.Row():
-                        nb_images_by_prompt=gr.Number(2,label="Number of images by prompt:",interactive=True)
-                        nb_of_models_to_gen=gr.Number(10,label="Number of Models:",interactive=True)
-                    index_tag=gr.Dropdown(label="Tag",choices=list(list_tags),type="index")
-                    index_first_model=gr.Dropdown(label="First model",choices=list([]), type="index")
-                    index_tag.change(lambda i:gr.Dropdown(choices=list([f"({j+1}/{len(tags_plus_models[i][2])}) {tags_plus_models[i][2][j]}" for j in range(len(tags_plus_models[i][2]))])),
-                                     index_tag,index_first_model)
-                    load_info=gr.Button("Load Models")
-                    load_info.click(fonc_load_info,[nb_of_models_to_gen,index_tag,index_first_model],[nb_of_models_to_gen,disp_info,list_models_to_gen])
+                        with gr.Column(scale=4):
+                            txt_input = gr.Textbox(label='Your prompt:', lines=4, interactive = True)
+                            neg_input = gr.Textbox(label='Negative prompt:', lines=4, interactive = True)
+                        with gr.Column(scale=4):
+                            with gr.Row():
+                                width = gr.Slider(label="Width", info="If 0, the default value is used.", maximum=2024, step=32, value=0, interactive = True)
+                                height = gr.Slider(label="Height", info="If 0, the default value is used.", maximum=2024, step=32, value=0, interactive = True)
+                            with gr.Row():
+                                choice_ratio = gr.Dropdown(label="Ratio Width/Height", 
+                                                    info="OverWrite Width and Height (W*H<1024*1024)", 
+                                                    show_label=True, choices=list(list_ratios) , interactive = True, value=list_ratios[0][1])
+                                choice_ratio.change(ratio_chosen,[choice_ratio,width,height],[width,height])
+                            with gr.Row():
+                                steps = gr.Slider(label="Number of inference steps", info="If 0, the default value is used.", maximum=100, step=1, value=0, interactive = True)
+                                cfg = gr.Slider(label="Guidance scale", info="If 0, the default value is used.", maximum=30.0, step=0.1, value=0, interactive = True)
+                                seed = gr.Slider(label="Seed", info="Randomize Seed if -1.", minimum=-1, maximum=MAX_SEED, step=1, value=-1, interactive = True)
+                                
+                add_param=gr.Button("Add to the list")
+                del_param=gr.Button("Delete to the list")
+                
+            #gen_button = gr.Button('Generate images', scale=3)
+            #stop_button = gr.Button('Stop', variant='secondary', interactive=False, scale=1)
+            #gen_button.click(lambda: gr.update(interactive=True), None, stop_button)
                 
-            with gr.Accordion("Models Custom",open=False) :
+                list_param=gr.Dropdown(choices=[["a",[["","",0,0,0,0,-1]]]], value=[["","",0,0,0,0,-1]], visible=False)
+                disp_param = gr.Examples(
+                    label="list of prompt",
+                    examples=list_param.value,
+                    inputs=[txt_input,neg_input,width,height,steps,cfg,seed],
+                    outputs=[txt_input,neg_input,width,height,steps,cfg,seed],
+                )
+                add_param.click(fonc_add_param,[list_param,txt_input,neg_input,width,height,steps,cfg,seed],[disp_param.dataset,list_param])
+                add_param.click(set_session,[id_session],[id_session])
+                del_param.click(fonc_del_param,[list_param,txt_input,neg_input,width,height,steps,cfg,seed],[disp_param.dataset,list_param])
+    
                 with gr.Row():
-                    text_list_model_custom=gr.Textbox(label="List Models Custom")
+                    list_models_to_gen=gr.Dropdown(choices=[["",[]]], value=[], visible=False)
+                    disp_info=gr.Textbox(label="Info")
                     with gr.Column():
-                        list_model_custom=gr.Dropdown(choices=[["",[]]], value=[], visible=False)
-                        #use_models_custom=gr.Radio("Use Models Custom",value=False)
-                        cut_model_custom=gr.Button("Cut Text Models Custom")
-                        cut_model_custom.click(aff_models_perso,[text_list_model_custom],[list_model_custom])
-                        
-                        index_first_model_custom=gr.Dropdown(label="First model",choices=list([]), type="index")
-                        list_model_custom.change(lambda li:gr.Dropdown(choices=list([f"({j+1}/{len(li)}) {li[j]}" for j in range(len(li))])),
-                                         [list_model_custom],index_first_model_custom)
-                        
-                        load_model_custom=gr.Button("Load Models Custom")
-                        load_model_custom.click(fonc_load_info_custom,[nb_of_models_to_gen,list_model_custom,index_first_model_custom],[nb_of_models_to_gen,disp_info,list_models_to_gen])
-            
-            list_models_to_gen.change(crea_list_task,[id_session,list_param,list_models_to_gen,nb_images_by_prompt],[])
-            
-
-            
-            with gr.Column():
+                        with gr.Row():
+                            nb_images_by_prompt=gr.Number(2,label="Number of images by prompt:",interactive=True)
+                            nb_of_models_to_gen=gr.Number(10,label="Number of Models:",interactive=True)
+                        index_tag=gr.Dropdown(label="Tag",choices=list(list_tags),type="index")
+                        index_first_model=gr.Dropdown(label="First model",choices=list([]), type="index")
+                        index_tag.change(lambda i:gr.Dropdown(choices=list([f"({j+1}/{len(tags_plus_models[i][2])}) {tags_plus_models[i][2][j]}" for j in range(len(tags_plus_models[i][2]))])),
+                                         index_tag,index_first_model)
+                        load_info=gr.Button("Load Models")
+                        load_info.click(fonc_load_info,[nb_of_models_to_gen,index_tag,index_first_model],[nb_of_models_to_gen,disp_info,list_models_to_gen])
+                    
+                with gr.Accordion("Models Custom",open=False) :
+                    with gr.Row():
+                        text_list_model_custom=gr.Textbox(label="List Models Custom")
+                        with gr.Column():
+                            list_model_custom=gr.Dropdown(choices=[["",[]]], value=[], visible=False)
+                            #use_models_custom=gr.Radio("Use Models Custom",value=False)
+                            cut_model_custom=gr.Button("Cut Text Models Custom")
+                            cut_model_custom.click(aff_models_perso,[text_list_model_custom],[list_model_custom])
+                            
+                            index_first_model_custom=gr.Dropdown(label="First model",choices=list([]), type="index")
+                            list_model_custom.change(lambda li:gr.Dropdown(choices=list([f"({j+1}/{len(li)}) {li[j]}" for j in range(len(li))])),
+                                             [list_model_custom],index_first_model_custom)
+                            
+                            load_model_custom=gr.Button("Load Models Custom")
+                            load_model_custom.click(fonc_load_info_custom,[nb_of_models_to_gen,list_model_custom,index_first_model_custom],[nb_of_models_to_gen,disp_info,list_models_to_gen])
                 
-                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=[]
-                    states=[]
-                    for i in range(nb_req_simult):
-                        #outputs.append(gr.Image(None,interactive=False,render=False))
-                        #id_modules.append(gr.Number(i,interactive=False,render=False))
-                        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))
-                    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,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])
+                list_models_to_gen.change(crea_list_task,[id_session,list_param,list_models_to_gen,nb_images_by_prompt],[])
+                
+    
+                
+                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])
-
-                        index_gallery=gr.Number(-1,visible=False)
-                        button_load_gallery_first=gr.Button("Load Gallery first model")
-                        button_load_gallery_first.click(index_gallery_first,[],[index_gallery])
-                        with gr.Row():
-                            button_load_gallery_prev=gr.Button("Prev model")
-                            button_load_gallery_next=gr.Button("Next model")
-                            button_load_gallery_next.click(index_gallery_next,[index_gallery,list_models_to_gen],[index_gallery])
-                            button_load_gallery_prev.click(index_gallery_prev,[index_gallery,list_models_to_gen],[index_gallery])
-                            index_gallery.change(fonc_load_gallery_by_model,[id_session,gallery,list_models_to_gen,index_gallery],[gallery])
-                        text_model_actu_gal = gr.Textbox(label='Model Actu:', lines=1, interactive = False)
-                        index_gallery.change(change_text_model_actu_gal,[list_models_to_gen,index_gallery],[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],[text_bl])
-                                #button_remove_from_bl.click(fonc_remove_from_text,[text_bl,list_models_to_gen,index_gallery],[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],[text_fav])
-
+                    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=[]
+                        states=[]
+                        for i in range(nb_req_simult):
+                            #outputs.append(gr.Image(None,interactive=False,render=False))
+                            #id_modules.append(gr.Number(i,interactive=False,render=False))
+                            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))
+                        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,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])
+                        
+                        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])
+    
+                            index_gallery=gr.Number(-1,visible=False)
+                            button_load_gallery_first=gr.Button("Load Gallery first model")
+                            button_load_gallery_first.click(index_gallery_first,[],[index_gallery])
+                            with gr.Row():
+                                button_load_gallery_prev=gr.Button("Prev model")
+                                button_load_gallery_next=gr.Button("Next model")
+                                button_load_gallery_next.click(index_gallery_next,[index_gallery,list_models_to_gen],[index_gallery])
+                                button_load_gallery_prev.click(index_gallery_prev,[index_gallery,list_models_to_gen],[index_gallery])
+                                index_gallery.change(fonc_load_gallery_by_model,[id_session,gallery,list_models_to_gen,index_gallery],[gallery])
+                            text_model_actu_gal = gr.Textbox(label='Model Actu:', lines=1, interactive = False)
+                            index_gallery.change(change_text_model_actu_gal,[list_models_to_gen,index_gallery],[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],[text_bl])
+                                    #button_remove_from_bl.click(fonc_remove_from_text,[text_bl,list_models_to_gen,index_gallery],[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],[text_fav])
+