Update app.py

app.py

@@ -2,7 +2,6 @@ import gradio as gr
 from random import randint
 from all_models import models
 from datetime import datetime
-import time
 
 def get_current_time():
     now = datetime.now()
@@ -36,45 +35,29 @@ def update_imgbox(choices):
 
 def gen_fn(model_str, prompt, negative_prompt, max_retries=10):
     if model_str == 'NA':
-        return None, ""
+        return None
     
     retries = 0
-    feedback = ""
     while retries < max_retries:
         try:
             noise = str(randint(0, 9999999))
-            with gr.Blocks.update():
-                for i, m in enumerate(default_models):
-                    if m == model_str:
-                        progress_bars[i].update(value=0, visible=True)
-                        progress_labels[i].update(value=f"**Progress for {m}**")
-            
-            for step in range(1, 101):
-                time.sleep(0.05)  # Simulate work being done
-                with gr.Blocks.update():
-                    for i, m in enumerate(default_models):
-                        if m == model_str:
-                            progress_bars[i].update(value=step / 100)
-            
             if hasattr(models_load[model_str], 'negative_prompt'):
                 result = models_load[model_str](f'{prompt} {noise}', negative_prompt=negative_prompt)
             else:
                 result = models_load[model_str](f'{prompt} {noise}')
-            feedback += f"{get_current_time()} - Attempt {retries + 1}: Success for {model_str}\n"
-            return result, feedback
+            return result
         except Exception as e:
             # Check for specific error messages or status codes
             if "CUDA out of memory" in str(e) or "500" in str(e):
-                feedback += f"{get_current_time()} - CUDA out of memory or server error for {model_str}: {e}\n"
+                print(f"CUDA out of memory or server error: {e}")
             else:
-                feedback += f"{get_current_time()} - Error generating image for {model_str}: {e}\n"
+                print(f"Error generating image: {e}")
             
             retries += 1
             if retries >= max_retries:
-                feedback += f"{get_current_time()} - Failed to generate image after {max_retries} retries for {model_str}\n"
-                raise Exception(f"Failed to generate image after {max_retries} retries for {model_str}.")
+                raise Exception(f"Failed to generate image after {max_retries} retries.")
     
-    return None, feedback
+    return None
 
 def make_me():
     with gr.Row():
@@ -95,27 +78,11 @@ def make_me():
                 stop_button.click(on_stop_click, inputs=None, outputs=[gen_button, stop_button])
     
     with gr.Row():
-        output = []
-        progress_bars = []
-        progress_labels = []
-        feedback_box = gr.Textbox(label="Feedback", lines=10, interactive=False, elem_id="custom_feedback_box")
+        output = [gr.Image(label=m, min_width=250, height=250, elem_id="custom_image") for m in default_models]
         current_models = [gr.Textbox(m, visible=False) for m in default_models]
-        
-        for m in default_models:
-            if m != 'NA':
-                progress_label = gr.Markdown(value=f"**Progress for {m}**")
-                progress_bar = gr.Progress()
-                output.append(gr.Image(label=m, min_width=250, height=250, elem_id="custom_image"))
-                progress_labels.append(progress_label)
-                progress_bars.append(progress_bar)
-            else:
-                output.append(gr.Image(label=m, visible=False, elem_id="custom_image"))
-                progress_labels.append(gr.Markdown(value="", visible=False))
-                progress_bars.append(gr.Progress(visible=False))
-        
-        for m, o, p, l, c in zip(current_models, output, progress_bars, progress_labels, default_models):
-            gen_button.click(gen_fn, [m, txt_input, negative_txt_input, gr.Slider(1, 10, value=10, label="Max Retries")], [o, feedback_box])
-            stop_button.click(on_stop_click, inputs=None, outputs=[gen_button, stop_button])
+        for m, o in zip(current_models, output):
+            gen_event = gen_button.click(gen_fn, [m, txt_input, negative_txt_input], o)
+            stop_button.click(on_stop_click, inputs=None, outputs=[gen_button, stop_button], cancels=[gen_event])
     
     with gr.Accordion('Model selection', elem_id="custom_accordion"):
         model_choice = gr.CheckboxGroup(models, label=f'{num_models} different models selected', value=default_models, interactive=True, elem_id="custom_checkbox_group")
@@ -263,17 +230,6 @@ body {
     width: 100%;
     box-sizing: border-box;
 }
-.custom_feedback_box {
-    background-color: #2d343f;
-    border: 1px solid #3b4252;
-    color: #7f8184;
-    padding: 10px;
-    border-radius: 4px;
-    margin-top: 10px;
-    width: 100%;
-    box-sizing: border-box;
-    overflow-y: auto;
-}
 @media (max-width: 768px) {
    .gradio-container {
         width: 100%;