Update app.py

app.py

@@ -1,7 +1,10 @@
 import gradio as gr
+# import os
+# import sys
+# from pathlib import Path
 import time
 
-models = [
+models =[
     "mann-e/Mann-E_Dreams",
     "Yntec/ChickFlick",
     "John6666/ultimate-realistic-mix-v2-sdxl",
@@ -11,96 +14,134 @@ models = [
     "John6666/wai-real-mix-v8-sdxl",
     "John6666/real-vis-xl-v40-sdxl",
     "Yntec/DegreesOfFreedom",
+
 ]
+    
 
 model_functions = {}
 model_idx = 1
 for model_path in models:
     try:
-        model_functions[model_idx] = gr.Interface.load(f"models/{model_path}")
+        model_functions[model_idx] = gr.Interface.load(f"models/{model_path}", live=False, preprocess=True, postprocess=False)
     except Exception as error:
         def the_fn(txt):
+            
             return None
-        model_functions[model_idx] = gr.Interface(fn=the_fn, inputs=gr.Textbox(), outputs=gr.Image())
-    model_idx += 1
+        model_functions[model_idx] = gr.Interface(fn=the_fn, inputs=["text"], outputs=["image"])
+        
+    model_idx+=1
+    
 
 def send_it_idx(idx):
     def send_it_fn(prompt):
-        model = model_functions.get(idx, model_functions.get(1))
-        return model.predict(prompt)
+        output = (model_functions.get(str(idx)) or model_functions.get(str(1)))(prompt)
+        return output
     return send_it_fn
 
 def get_prompts(prompt_text):
+
     return prompt_text
 
 def clear_it(val):
-    return 0
+    if int(val) != 0:
+        val = 0
+    else:
+        val = 0
+        pass
+    return val
 
-def all_task_end(cnt, t_stamp):
+def all_task_end(cnt,t_stamp):
     to = t_stamp + 360
     et = time.time()
     if et > to and t_stamp != 0:
         d = gr.update(value=0)
         tog = gr.update(value=1)
+        #print(f'to: {to}  et: {et}')
     else:
-        d = gr.update(value=et) if cnt != 0 else gr.update(value=0)
+        if cnt != 0:
+            d = gr.update(value=et)
+        else:
+            d = gr.update(value=0)
         tog = gr.update(value=0)
+        #print (f'passing:  to: {to}  et: {et}')
+        pass
     return d, tog
 
 def all_task_start():
+    print("\n\n\n\n\n\n\n")
+    t = time.gmtime()
     t_stamp = time.time()
+    current_time = time.strftime("%H:%M:%S", t)
     return gr.update(value=t_stamp), gr.update(value=t_stamp), gr.update(value=0)
 
-def clear_fn(*args):
+def clear_fn():
     nn = len(models)
-    return (None, *[None for _ in range(nn)])
+    return tuple([None, *[None for _ in range(nn)]])
 
-def run_model(prompt, model_idx):
-    return send_it_idx(model_idx)(prompt)
 
 with gr.Blocks(title="SD Models") as my_interface:
-    primary_prompt = gr.Textbox(label="Prompt", value="")
-    run = gr.Button("Run")
-    clear_btn = gr.Button("Clear")
-
-    sd_outputs = {}
-    for idx, model_path in enumerate(models, start=1):
-        sd_outputs[idx] = gr.Image(label=model_path)
-
-    start_box = gr.Number(visible=False)
-    end_box = gr.Number(visible=False)
-    tog_box = gr.Textbox(value=0, visible=False)
-
-    def main_function(prompt):
-        return {idx: run_model(prompt, idx) for idx in range(1, len(models) + 1)}
-
-    run.click(
-        fn=main_function,
-        inputs=[primary_prompt],
-        outputs=list(sd_outputs.values()),
-        concurrency_limit=10
-    )
-
-    clear_btn.click(
-        fn=clear_fn,
-        inputs=None,
-        outputs=[primary_prompt] + list(sd_outputs.values()),
-        concurrency_limit=10
-    )
-
-    start_box.change(
-        fn=all_task_end,
-        inputs=[start_box, end_box],
-        outputs=[start_box, tog_box],
-        every=1
-    )
-
-    primary_prompt.submit(all_task_start, inputs=None, outputs=[start_box, end_box, tog_box])
-    run.click(all_task_start, inputs=None, outputs=[start_box, end_box, tog_box])
-    tog_box.change(
-        fn=clear_it,
-        inputs=tog_box,
-        outputs=tog_box
-    )
-
-    my_interface.launch(max_threads=10)
+    with gr.Column(scale=12):
+        # with gr.Row():
+        #     gr.Markdown("""- Primary prompt: 你想画的内容(英文单词，如 a cat, 加英文逗号效果更好；点 Improve 按钮进行完善)\n- Real prompt: 完善后的提示词，出现后再点右边的 Run 按钮开始运行""")
+        with gr.Row():
+            with gr.Row(scale=6):
+                primary_prompt=gr.Textbox(label="Prompt", value="")
+                # real_prompt=gr.Textbox(label="Real prompt")
+            with gr.Row(scale=6):
+                # improve_prompts_btn=gr.Button("Improve")
+                with gr.Row():
+                    run=gr.Button("Run",variant="primary")
+                    clear_btn=gr.Button("Clear")
+        with gr.Row():
+            sd_outputs = {}
+            model_idx = 1
+            for model_path in models:
+                with gr.Column(scale=3, min_width=320):
+                    with gr.Box():
+                        sd_outputs[model_idx] = gr.Image(label=model_path)
+                    pass
+                model_idx += 1
+                pass
+            pass
+
+        with gr.Row(visible=False):
+            start_box=gr.Number(interactive=False)
+            end_box=gr.Number(interactive=False)
+            tog_box=gr.Textbox(value=0,interactive=False)
+
+        start_box.change(
+            all_task_end,
+            [start_box, end_box],
+            [start_box, tog_box],
+            every=1,
+            show_progress=True)
+
+        primary_prompt.submit(all_task_start, None, [start_box, end_box, tog_box])
+        run.click(all_task_start, None, [start_box, end_box, tog_box])
+        runs_dict = {}
+        model_idx = 1
+        for model_path in models:
+            runs_dict[model_idx] = run.click(model_functions[model_idx], inputs=[primary_prompt], outputs=[sd_outputs[model_idx]])
+            model_idx += 1
+            pass
+        pass
+
+        # improve_prompts_btn_clicked=improve_prompts_btn.click(
+        #     get_prompts,
+        #     inputs=[primary_prompt],
+        #     outputs=[primary_prompt],
+        #     cancels=list(runs_dict.values()))
+        clear_btn.click(
+            clear_fn,
+            None,
+            [primary_prompt, *list(sd_outputs.values())],
+            cancels=[*list(runs_dict.values())])
+        tog_box.change(
+            clear_it,
+            tog_box,
+            tog_box,
+            cancels=[*list(runs_dict.values())])
+text_gen1=gr.Interface.load("spaces/phenomenon1981/MagicPrompt-Stable-Diffusion")
+
+my_interface.queue(concurrency_count=600, status_update_rate=1)
+my_interface.launch(inline=True, show_api=True)