Update app.py

app.py

@@ -4,96 +4,42 @@ import sys
 import random
 from pathlib import Path
 
+# Load all models at once
+proc1 = gr.Interface.load("models/dreamlike-art/dreamlike-photoreal-2.0")
+proc2 = gr.Interface.load("models/dreamlike-art/dreamlike-diffusion-1.0")
 
-text_gen=gr.Interface.load("spaces/Omnibus/MagicPrompt-Stable-Diffusion")
-
-
-proc1=gr.Interface.load("models/dreamlike-art/dreamlike-photoreal-2.0")
-proc2=gr.Interface.load("models/dreamlike-art/dreamlike-photoreal-2.0")
-proc3=gr.Interface.load("models/dreamlike-art/dreamlike-photoreal-2.0")
-proc4=gr.Interface.load("models/dreamlike-art/dreamlike-photoreal-2.0")
-
-proc5=gr.Interface.load("models/dreamlike-art/dreamlike-diffusion-1.0")
-proc6=gr.Interface.load("models/dreamlike-art/dreamlike-diffusion-1.0")
-proc7=gr.Interface.load("models/dreamlike-art/dreamlike-diffusion-1.0")
-proc8=gr.Interface.load("models/dreamlike-art/dreamlike-diffusion-1.0")
-
-
-def send_it1(inputs,proc1=proc1):
-        output1=proc1(inputs)
-        return(output1)
-def send_it2(inputs,proc2=proc2):
-        output2=proc2(inputs)
-        return(output2)
-def send_it3(inputs,proc3=proc3):
-        output3=proc3(inputs)
-        return(output3)
-def send_it4(inputs,proc4=proc4):
-        output4=proc4(inputs)
-        return(output4)
-
-def send_it5(inputs,proc5=proc5):
-        output5=proc5(inputs)
-        return(output5)
-def send_it6(inputs,proc6=proc6):
-        output6=proc6(inputs)
-        return(output6)
-def send_it7(inputs,proc7=proc7):
-        output7=proc7(inputs)
-        return(output7)
-def send_it8(inputs,proc8=proc8):
-        output8=proc8(inputs)
-        return(output8)
-
-
-def get_prompts(prompt_text):
-    return text_gen(prompt_text)
+# Load text generation model
+text_gen = gr.Interface.load("spaces/Omnibus/MagicPrompt-Stable-Diffusion")
 
+def generate_images(prompt_text):
+    # generate prompts
+    prompts = text_gen(prompt_text)
+    
+    # run both models on all prompts
+    output1 = proc1(prompts)
+    output2 = proc2(prompts)
+    
+    return output1, output2
 
+with gr.Blocks(title="DreamlikeArt Generator") as myface:
+    with gr.Row(title="Instructions", padding=20):
+        gr.Label("Enter a short prompt below and click 'Magic Prompt' to generate prettified prompts.")
+        gr.Label("Then, select the models to run and click 'Launch' to generate images.")
 
-with gr.Blocks() as myface:
-    with gr.Row():
-            
-            
-            input_text=gr.Textbox(label="Short Prompt")
-            see_prompts=gr.Button("Magic Prompt")
     with gr.Row():
+        input_text = gr.Textbox(label="Short Prompt")
+        see_prompts = gr.Button("Magic Prompt")
         
-            prompt=gr.Textbox(label="Prettified Prompt")
-            run=gr.Button("Launch")
-        
-    
     with gr.Row():
-            output1=gr.Image(label="DreamlikeArt PhotoReal 1")
-            output2=gr.Image(label="DreamlikeArt PhotoReal 2")
-            output3=gr.Image(label="DreamlikeArt PhotoReal 3")
-            output4=gr.Image(label="DreamlikeArt PhotoReal 4")
+        prompt = gr.Textbox(label="Prettified Prompt", output=True)
+        run = gr.Button("Launch")
+        
     with gr.Row():
-            output5=gr.Image(label="DreamlikeArt Diffusion 1")
-            output6=gr.Image(label="DreamlikeArt Diffusion 2")
-            output7=gr.Image(label="DreamlikeArt Diffusion 3")
-            output8=gr.Image(label="DreamlikeArt Diffusion 4")        
-
-
-    #def set_models(model_name1, model_name2, model_name3, model_name4):
-
-    #return(proc1,proc2,proc3,proc4)
-
-    #run.click(set_models, inputs=[model_name1, model_name2, model_name3, model_name4], outputs=[proc1,proc2,proc3,proc4])
-    #run.click(send_it, inputs=[prompt], outputs=[output1, output2, output3, output4])
-
-
-    see_prompts.click(get_prompts, inputs=[input_text], outputs=[prompt])
+        output1 = gr.Image(label="DreamlikeArt PhotoReal", output=True)
+        output2 = gr.Image(label="DreamlikeArt Diffusion", output=True)
         
-    run.click(send_it1, inputs=[prompt], outputs=[output1])
-    run.click(send_it2, inputs=[prompt], outputs=[output2])
-    run.click(send_it3, inputs=[prompt], outputs=[output3])
-    run.click(send_it4, inputs=[prompt], outputs=[output4])
-    run.click(send_it5, inputs=[prompt], outputs=[output5])
-    run.click(send_it6, inputs=[prompt], outputs=[output6])
-    run.click(send_it7, inputs=[prompt], outputs=[output7])
-    run.click(send_it8, inputs=[prompt], outputs=[output8])
-
+    with gr.Row():
+        model_select = gr.Checkbox(["DreamlikeArt PhotoReal", "DreamlikeArt Diffusion"])
 
-myface.queue(concurrency_count=8)
-myface.launch(enable_queue=True, inline=True)
+    see_prompts.click(text_gen, inputs=[input_text], outputs=[prompt])
+    run.click(generate_images, inputs=[prompt], outputs=[output1, output2], control_inputs=[model_select], control_outputs=[output1, output2])