Update app_v4.py

app_v4.py

@@ -149,46 +149,40 @@ def generate_image(prompt, scale, steps, control_image, controlnet_conditioning_
 
 def process_image(control_image, user_prompt, system_prompt, scale, steps, 
                 controlnet_conditioning_scale, guidance_scale, seed, 
-                guidance_end, temperature, top_p, max_new_tokens, log_prompt, progress = gr.Progress(track_tqdm=True)):
+                guidance_end, temperature, top_p, max_new_tokens, log_prompt):
     # Initialize with empty caption
     final_prompt = user_prompt.strip()
     # If no user prompt provided, generate a caption first
     if not final_prompt:
         # Generate a detailed caption
-        with progress:
-            progress(0.1, "Generating caption...")
-            mcaption = model.caption(control_image, length="normal")
-            detailed_caption = mcaption["caption"]
-            final_prompt = detailed_caption
-            yield f"Using caption: {final_prompt}", None, final_prompt
-    
-    # Show the final prompt being used
-    with progress:
-        progress(0.3, "Generating with prompt...")
-        yield f"Generating with: {final_prompt}", None, final_prompt
-    
+
+        mcaption = model.caption(control_image, length="normal")
+        detailed_caption = mcaption["caption"]
+        final_prompt = detailed_caption
+        yield f"Using caption: {final_prompt}", None, final_prompt
+
+    yield f"Generating with: {final_prompt}", None, final_prompt
+
     # Generate the image
     try:
-        with progress:
-            progress(0.5, "Generating image...")
-            image = generate_image(
-                prompt=final_prompt,
-                scale=scale,
-                steps=steps,
-                control_image=control_image,
-                controlnet_conditioning_scale=controlnet_conditioning_scale,
-                guidance_scale=guidance_scale,
-                seed=seed,
-                guidance_end=guidance_end
-            )
+        image = generate_image(
+            prompt=final_prompt,
+            scale=scale,
+            steps=steps,
+            control_image=control_image,
+            controlnet_conditioning_scale=controlnet_conditioning_scale,
+            guidance_scale=guidance_scale,
+            seed=seed,
+            guidance_end=guidance_end
+        )
             
-            try:
-                debug_img = Image.open(image.save("/tmp/" + str(seed) + "output.png"))
-                save_image("/tmp/" + str(seed) + "output.png", debug_img)
-            except Exception as e:
-                print("Error 160: " + str(e))
-            log_params(final_prompt, scale, steps, controlnet_conditioning_scale, guidance_scale, seed, guidance_end, control_image, image)
-            yield f"Completed! Used prompt: {final_prompt}", image, final_prompt
+        try:
+            debug_img = Image.open(image.save("/tmp/" + str(seed) + "output.png"))
+            save_image("/tmp/" + str(seed) + "output.png", debug_img)
+        except Exception as e:
+            print("Error 160: " + str(e))
+        log_params(final_prompt, scale, steps, controlnet_conditioning_scale, guidance_scale, seed, guidance_end, control_image, image)
+        yield f"Completed! Used prompt: {final_prompt}", image, final_prompt
     except Exception as e:
         print("Error: " + str(e))
         yield f"Error: {str(e)}", None, None
@@ -285,7 +279,7 @@ with gr.Blocks(title="FLUX Turbo Upscaler", fill_height=True) as demo:
         inputs=[
             control_image, prompt, system_prompt, scale, steps, 
             controlnet_conditioning_scale, guidance_scale, seed, 
-            guidance_end, temperature_slider, top_p_slider, max_tokens_slider, log_prompt, progress
+            guidance_end, temperature_slider, top_p_slider, max_tokens_slider, log_prompt
         ],
         outputs=[log_state, generated_image, prompt]
     )