Update app.py

app.py

@@ -2,6 +2,7 @@ import os
 import gradio as gr
 from random import randint
 from operator import itemgetter
+import bisect
 from all_models import tags_plus_models,models,models_plus_tags
 from datetime import datetime
 from externalmod import gr_Interface_load
@@ -301,16 +302,18 @@ def load_gallery(gallery,id):
 def load_gallery_actu(gallery,id):
     gallery = reset_gallery(gallery)
     #for c in cache_image_actu:
-    for c in sorted(cache_image[f"{id}"], key=itemgetter(1)):
+    for c in cache_image_actu[f"{id}"]:
         gallery=add_gallery(c[0],c[1],gallery)
     return gallery
 
-def add_cache_image(o,m,id,cache_image=cache_image):
-    cache_image[f"{id}"].append((o,m))
+def add_cache_image(image, model_str,id,cache_image=cache_image):
+    if image is not None:
+        cache_image[f"{id}"].append((image,model_str))
     #cache_image=sorted(cache_image, key=itemgetter(1))
     return 
-def add_cache_image_actu(o,m,id,cache_image_actu=cache_image_actu):
-    cache_image_actu[f"{id}"].append((o,m))
+def add_cache_image_actu(image, model_str,id,cache_image_actu=cache_image_actu):
+    if image is not None:
+        bisect.insort(cache_image_actu[f"{id}"],(image, model_str), key=itemgetter(1))
     #cache_image_actu=sorted(cache_image_actu, key=itemgetter(1))
     return
 def reset_cache_image(id,cache_image=cache_image):
@@ -377,6 +380,24 @@ def search_info(txt_search_info,models_plus_tags=models_plus_tags):
         outputList.append("Model Not Find")
     return gr.Textbox(label="out",value=outputList)
 
+def ratio_chosen(choice_ratio,width,height):
+    if choice_ratio == [None,None]:
+        return width , height
+    else :
+        return gr.Slider(label="Width", info="If 0, the default value is used.", maximum=2024, step=32, value=choice_ratio[0]), gr.Slider(label="Height", info="If 0, the default value is used.", maximum=2024, step=32, value=choice_ratio[1])
+
+list_ratios=[["None",[None,None]],
+             ["4:1 (2048 x 512)",[2048,512]],
+             ["12:5 (1536 x 640)",[1536,640]],
+             ["~16:9 (1344 x 768)",[1344,768]],
+             ["~3:2 (1216 x 832)",[1216,832]],
+             ["~4:3 (1152 x 896)",[1152,896]],
+             ["1:1 (1024 x 1024)",[1024,1024]],
+             ["~3:4 (896 x 1152)",[896,1152]],
+             ["~2:3 (832 x 1216)",[832,1216]],
+             ["~9:16 (768 x 1344)",[768,1344]],
+             ["5:12 (640 x 1536)",[640,1536]],
+             ["1:4 (512 x 2048)",[512,2048]]]
 
 def make_me():
    # with gr.Tab('The Dream'): 
@@ -391,6 +412,11 @@ def make_me():
                         with gr.Row():
                             width = gr.Slider(label="Width", info="If 0, the default value is used.", maximum=1216, step=32, value=0)
                             height = gr.Slider(label="Height", info="If 0, the default value is used.", maximum=1216, step=32, value=0)
+                        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])
+                            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)
                             cfg = gr.Slider(label="Guidance scale", info="If 0, the default value is used.", maximum=30.0, step=0.1, value=0)
@@ -414,13 +440,11 @@ def make_me():
             choices=models_test[0][1][0][1]
             """output = [gr.Image(label=m, min_width=170, height=170) for m in choices]
             current_models = [gr.Textbox(m, visible=False) for m in choices]"""
-            global output_g
-            global current_models_g
-            output_g = update_imgbox([choices[0]])
-            current_models_g = extend_choices_b([choices[0]])
+            output = update_imgbox([choices[0]])
+            current_models = extend_choices_b([choices[0]])
 
             
-            for m, o in zip(current_models_g, output_g):
+            for m, o in zip(current_models, output):
                 gen_event = gr.on(triggers=[gen_button.click, txt_input.submit], fn=gen_fn,
                                 inputs=[m, txt_input, neg_input, height, width, steps, cfg, seed], outputs=[o])
                 stop_button.click(lambda: gr.update(interactive=False), None, stop_button, cancels=[gen_event])
@@ -439,7 +463,6 @@ def make_me():
                     gen_button.click(set_session, id_session, id_session)
                     cache_image[f"{id_session.value}"]=[]
                     cache_image_actu[f"{id_session.value}"]=[]
-                    print(cache_image)
                     with gr.Column():
                         b11 = gr.Button('Load Galerry Actu')
                         b12 = gr.Button('Load Galerry All')
@@ -453,7 +476,7 @@ def make_me():
                     b12.click(load_gallery,[gallery,id_session],gallery)
                     b21.click(reset_gallery,[gallery],gallery)
                     b22.click(reset_cache_image,[id_session],gallery)
-                    for m, o in zip(current_models_g, output_g):
+                    for m, o in zip(current_models, output):
                         #o.change(add_gallery, [o, m, gallery], [gallery])
                         o.change(add_cache_image,[o,m,id_session],[])
                         o.change(add_cache_image_actu,[o,m,id_session],[])
@@ -465,8 +488,8 @@ def make_me():
                     
                 with gr.Row():
                     group_model_choice = gr.Dropdown(label="List of Models with the chosen Tag", show_label=True, choices=list([]) , interactive = True)
-                    group_model_choice.change(choice_group_b,group_model_choice,output_g)
-                    group_model_choice.change(choice_group_c,group_model_choice,current_models_g)
+                    group_model_choice.change(choice_group_b,group_model_choice,output)
+                    group_model_choice.change(choice_group_c,group_model_choice,current_models)
                     group_tag_choice.change(tag_choice,group_tag_choice,group_model_choice)
                 
             with gr.Row():
@@ -477,8 +500,8 @@ def make_me():
                 txt_list_perso = gr.Textbox(label='List Models Perso')
             
                 button_list_perso = gr.Button('Load')
-                button_list_perso.click(aff_models_perso_b,txt_list_perso,output_g)
-                button_list_perso.click(aff_models_perso_c,txt_list_perso,current_models_g)
+                button_list_perso.click(aff_models_perso_b,txt_list_perso,output)
+                button_list_perso.click(aff_models_perso_c,txt_list_perso,current_models)
     
             with gr.Row():
                 txt_search = gr.Textbox(label='Search in')