Update app.py

app.py

@@ -6,7 +6,7 @@ import os
 from threading import RLock
 from datetime import datetime
 
-preSetPrompt = "tall slender athletic 18+ caucasian woman. gorgeous face. perky tits. short wet messy hair. open jeans. torn shirt. challenging. explicit. artistic. photorealistic. f1.4"
+preSetPrompt = "tall slender athletic 18+ caucasian woman. gorgeous face. perky tits. short hair. open jeans. shredded ripped torn shirt. coy smile. explicit. artistic. photorealistic. f1.4"
 negPreSetPrompt = "[deformed | disfigured], poorly drawn, [bad : wrong] anatomy, [extra | missing | floating | disconnected] limb, (mutated hands and fingers), blurry, text, fuzziness"
 
 lock = RLock()
@@ -33,8 +33,8 @@ def load_fn(models):
 
 load_fn(models)
 
-num_models = 12
-max_images = 12
+num_models = 3
+max_images = 3
 inference_timeout = 400
 default_models = models[:num_models]
 MAX_SEED = 2**32-1
@@ -191,93 +191,49 @@ CSS="""
 </style>
 """
 
-# with gr.Blocks(fill_width=True, head=js) as demo:
 with gr.Blocks(head=CSS + JS) as demo:
-    with gr.Tab(str(num_models) + ' Models'):
-        with gr.Column(scale=2):
-            with gr.Group():
-                txt_input = gr.Textbox(label='Your prompt:', value=preSetPrompt, lines=3, autofocus=1)
-                neg_input = gr.Textbox(label='Negative prompt:', value=negPreSetPrompt, lines=1)
-                with gr.Accordion("Advanced", open=False, visible=True):
-                    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():
-                        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)
-                        seed = gr.Slider(label="Seed", info="Randomize Seed if -1.", minimum=-1, maximum=MAX_SEED, step=1, value=-1)
-                        seed_rand = gr.Button("Randomize Seed 🎲", size="sm", variant="secondary")
-                        seed_rand.click(randomize_seed, None, [seed], queue=False)
-            with gr.Row():
-                gen_button = gr.Button(f'Generate up to {int(num_models)} images', variant='primary', scale=3, elem_classes=["butt"])
-                random_button = gr.Button(f'Randomize Models', variant='secondary', scale=1)
-
-        with gr.Column(scale=1):
-            with gr.Group():
+    with gr.Column(scale=2):
+        with gr.Group():
+            txt_input = gr.Textbox(label='Your prompt:', value=preSetPrompt, lines=3, autofocus=1)
+            neg_input = gr.Textbox(label='Negative prompt:', value=negPreSetPrompt, lines=1)
+            with gr.Accordion("Advanced", open=False, visible=True):
                 with gr.Row():
-                    output = [gr.Image(label=m, show_download_button=True, elem_classes=["image-monitor"],
-                              interactive=False, width=112, height=112, 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):
-            gallery = gr.Gallery(label="Output", show_download_button=True,
-                                interactive=False, show_share_button=False, container=True, format="png",
-                                preview=True, object_fit="cover", columns=2, rows=2) 
-
-        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],
-                              concurrency_limit=None, queue=False)
-            o.change(add_gallery, [o, m, gallery], [gallery])
-
-        with gr.Column(scale=4):
-            with gr.Accordion('Model selection'):
-                model_choice = gr.CheckboxGroup(models, label = f'Choose up to {int(num_models)} different models from the {len(models)} available!', value=default_models, interactive=True)
-                model_choice.change(update_imgbox, model_choice, output)
-                model_choice.change(extend_choices, model_choice, current_models)
-                random_button.click(random_choices, None, model_choice)
-
-    with gr.Tab('Single model'):
-        with gr.Column(scale=2):
-            model_choice2 = gr.Dropdown(models, label='Choose model', value=models[0])
-            with gr.Group():
-                txt_input2 = gr.Textbox(label='Your prompt:', value = preSetPrompt, lines=3, autofocus=1)
-                neg_input2 = gr.Textbox(label='Negative prompt:', value=negPreSetPrompt, lines=1)
-                with gr.Accordion("Advanced", open=False, visible=True):
-                    with gr.Row():
-                        width2 = gr.Slider(label="Width", info="If 0, the default value is used.", maximum=1216, step=32, value=0)
-                        height2 = gr.Slider(label="Height", info="If 0, the default value is used.", maximum=1216, step=32, value=0)
-                    with gr.Row():
-                        steps2 = gr.Slider(label="Number of inference steps", info="If 0, the default value is used.", maximum=100, step=1, value=0)
-                        cfg2 = gr.Slider(label="Guidance scale", info="If 0, the default value is used.", maximum=30.0, step=0.1, value=0)
-                        seed2 = gr.Slider(label="Seed", info="Randomize Seed if -1.", minimum=-1, maximum=MAX_SEED, step=1, value=-1)
-                        seed_rand2 = gr.Button("Randomize Seed", size="sm", variant="secondary")
-                        seed_rand2.click(randomize_seed, None, [seed2], queue=False)
-            num_images = gr.Slider(1, max_images, value=max_images, step=1, label='Number of images')
-            with gr.Row():
-                gen_button2 = gr.Button('Let the machine halucinate', variant='primary', scale=2, elem_classes=["butt"])
-
-        with gr.Column(scale=1):
-            with gr.Group():
+                    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():
-                    output2 = [gr.Image(label='', show_download_button=True,
-                               interactive=False, width=112, height=112, 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,
-                                interactive=False, show_share_button=True, container=True, format="png",
-                                preview=True, object_fit="cover", columns=2, rows=2) 
-
-        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, queue=False)
-            gen_event2 = gr.on(triggers=[gen_button2.click, txt_input2.submit],
-                               fn=lambda i, n, m, t1, t2, n1, n2, n3, n4, n5: gen_fn(m, t1, t2, n1, n2, n3, n4, n5) if (i < n) else None,
-                               inputs=[img_i, num_images, model_choice2, txt_input2, neg_input2,
-                                       height2, width2, steps2, cfg2, seed2], outputs=[o],
-                                       concurrency_limit=None, queue=False)
-            o.change(add_gallery, [o, model_choice2, gallery2], [gallery2])
+                    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)
+                    seed = gr.Slider(label="Seed", info="Randomize Seed if -1.", minimum=-1, maximum=MAX_SEED, step=1, value=-1)
+                    seed_rand = gr.Button("Randomize Seed 🎲", size="sm", variant="secondary")
+                    seed_rand.click(randomize_seed, None, [seed], queue=False)
+        with gr.Row():
+            gen_button = gr.Button(f'Generate up to {int(num_models)} images', variant='primary', scale=3, elem_classes=["butt"])
+            random_button = gr.Button(f'Randomize Models', variant='secondary', scale=1)
+
+    with gr.Column(scale=1):
+        with gr.Group():
+            with gr.Row():
+                output = [gr.Image(label=m, show_download_button=True, elem_classes=["image-monitor"],
+                          interactive=False, width=112, height=112, 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):
+        gallery = gr.Gallery(label="Output", show_download_button=True,
+                            interactive=False, show_share_button=False, container=True, format="png",
+                            preview=True, object_fit="cover", columns=2, rows=2) 
+
+    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],
+                          concurrency_limit=None, queue=False)
+        o.change(add_gallery, [o, m, gallery], [gallery])
+
+    with gr.Column(scale=4):
+        with gr.Accordion('Model selection'):
+            model_choice = gr.CheckboxGroup(models, label = f'Choose up to {int(num_models)} different models from the {len(models)} available!', value=default_models, interactive=True)
+            model_choice.change(update_imgbox, model_choice, output)
+            model_choice.change(extend_choices, model_choice, current_models)
+            random_button.click(random_choices, None, model_choice)
 
 demo.launch(show_api=False, max_threads=400)