Upload app.py

app.py

@@ -6,6 +6,7 @@ import asyncio
 from threading import RLock
 lock = RLock()
 
+
 def load_fn(models):
     global models_load
     models_load = {}
@@ -24,8 +25,10 @@ load_fn(models)
 
 
 num_models = 6
-default_models = models[:num_models]
+max_images = 6
 timeout = 60
+default_models = models[:num_models]
+
 
 def extend_choices(choices):
     return choices[:num_models] + (num_models - len(choices[:num_models])) * ['NA']
@@ -85,23 +88,6 @@ def add_gallery(image, model_str, gallery):
     return gallery
 
 
-def gen_fn_gallery(model_str, prompt, gallery):
-    if gallery is None: gallery = []
-    if model_str == 'NA':
-        yield gallery
-    try:
-        loop = asyncio.new_event_loop()
-        result = loop.run_until_complete(infer(model_str, prompt, timeout))
-        with lock:
-            if result: gallery.insert(0, result)
-    except (Exception, asyncio.CancelledError) as e:
-        print(e)
-        print(f"Task aborted: {model_str}")
-    finally:
-        loop.close()
-    yield gallery
-
-
 CSS="""
 #container { max-width: 1200px; margin: 0 auto; !important; }
 .output { width=112px; height=112px; !important; }
@@ -116,15 +102,15 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=CSS) as demo:
             with gr.Row():
                 gen_button = gr.Button('Generate up to 6 images in up to 3 minutes total', scale=2)
                 stop_button = gr.Button('Stop', variant='secondary', interactive=False, scale=1)
-                gen_button.click(lambda: gr.update(interactive = True), None, stop_button)
+                gen_button.click(lambda: gr.update(interactive=True), None, stop_button)
             gr.Markdown("Scroll down to see more images and select models.", elem_classes="guide")
 
         with gr.Column(scale=1):
             with gr.Group():
                 with gr.Row():
-                    output = [gr.Image(label=m, show_download_button=True, elem_classes="output", interactive=False, min_width=80, show_share_button=False, visible=True) for m in default_models]
-                    #output = [gr.Image(label=m, show_download_button=True, elem_classes="output", interactive=False, show_share_button=True) for m in default_models]
-                    #output = [gr.Gallery(label=m, show_download_button=True, elem_classes="output", interactive=False, show_share_button=True, container=True, format="png", object_fit="cover") for m in default_models]
+                    output = [gr.Image(label=m, show_download_button=True, elem_classes="output",
+                              interactive=False, min_width=80, show_share_button=False, format=".png",
+                              visible=True) for m in default_models]
                     current_models = [gr.Textbox(m, visible=False) for m in default_models]
 
         with gr.Column(scale=2):
@@ -133,27 +119,21 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=CSS) as demo:
                                 preview=True, object_fit="cover", columns=2, rows=2) 
 
         for m, o in zip(current_models, output):
-            #gen_event = gen_button.click(gen_fn, [m, txt_input], o)
-            #gen_event = gen_button.click(gen_fn_gallery, [m, txt_input, o], o)
             gen_event = gr.on(triggers=[gen_button.click, txt_input.submit], fn=gen_fn, inputs=[m, txt_input], outputs=[o])
             o.change(add_gallery, [o, m, gallery], [gallery])
-            stop_button.click(lambda: gr.update(interactive = False), None, stop_button, cancels = [gen_event])
+            stop_button.click(lambda: gr.update(interactive=False), None, stop_button, cancels = [gen_event])
 
         with gr.Column(scale=4):
             with gr.Accordion('Model selection'):
                 model_choice = gr.CheckboxGroup(models, label = f'Choose up to {num_models} different models from the 866 available!', value=default_models, interactive=True)
                 model_choice.change(update_imgbox, model_choice, output)
-                #model_choice.change(update_imgbox_gallery, model_choice, output)
                 model_choice.change(extend_choices, model_choice, current_models)
 
     with gr.Tab('Single model'):
         with gr.Column(scale=2):
             model_choice2 = gr.Dropdown(models, label='Choose model', value=models[0])
             txt_input2 = gr.Textbox(label='Your prompt:', lines=4)
-            
-            max_images = 6
             num_images = gr.Slider(1, max_images, value=max_images, step=1, label='Number of images')
-            
             with gr.Row():
                 gen_button2 = gr.Button('Generate', scale=2)
                 stop_button2 = gr.Button('Stop', variant='secondary', interactive=False, scale=1)
@@ -162,8 +142,9 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=CSS) as demo:
         with gr.Column(scale=1):
             with gr.Group():
                 with gr.Row():
-                    output2 = [gr.Image(label = '', show_download_button=True, elem_classes="output", interactive=False, min_width=80, visible=True, show_share_button=False, show_label=False) for _ in range(max_images)]
-                    #output2 = [gr.Image(label = '') for _ in range(max_images)]
+                    output2 = [gr.Image(label='', show_download_button=True, elem_classes="output",
+                               interactive=False, min_width=80, visible=True, format=".png",
+                               show_share_button=False, show_label=False) for _ in range(max_images)]
 
         with gr.Column(scale=2):
             gallery2 = gr.Gallery(label="Output", show_download_button=True, elem_classes="gallery",
@@ -173,8 +154,9 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=CSS) as demo:
         for i, o in enumerate(output2):
             img_i = gr.Number(i, visible = False)
             num_images.change(lambda i, n: gr.update(visible = (i < n)), [img_i, num_images], o)
-            #gen_event2 = gen_button2.click(lambda i, n, m, t: gen_fn(m, t) if (i < n) else None, [img_i, num_images, model_choice2, txt_input2], o)
-            gen_event2 = gr.on(triggers=[gen_button2.click, txt_input2.submit], fn=lambda i, n, m, t: gen_fn(m, t) if (i < n) else None, inputs=[img_i, num_images, model_choice2, txt_input2], outputs=[o])
+            gen_event2 = gr.on(triggers=[gen_button2.click, txt_input2.submit],
+                               fn=lambda i, n, m, t: gen_fn(m, t) if (i < n) else None,
+                               inputs=[img_i, num_images, model_choice2, txt_input2], outputs=[o])
             o.change(add_gallery, [o, model_choice2, gallery2], [gallery2])
             stop_button2.click(lambda: gr.update(interactive = False), None, stop_button2, cancels = [gen_event2])