Update merged_app2.py

merged_app2.py

@@ -348,7 +348,6 @@ def prepare_image_and_mask(image, width, height, overlap_percentage, resize_opti
 @spaces.GPU(duration=60)
 @torch.inference_mode()
 def inpaint(image, width, height, overlap_percentage, num_inference_steps, resize_option, custom_resize_percentage, prompt_input, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom, progress=gr.Progress(track_tqdm=True)):
-    clear_memory()
     
     background, mask = prepare_image_and_mask(image, width, height, overlap_percentage, resize_option, custom_resize_percentage, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom)
     
@@ -1812,7 +1811,7 @@ with gr.Blocks() as app:
         augment_prompt.click(generate_description, inputs=[prompt, extracted_fg], outputs=[prompt]).then(move_prompt, [prompt], [prompt_fill])
         ips = [extracted_fg, prompt, image_width, image_height, num_samples, seed, steps, a_prompt, n_prompt, cfg, highres_scale, highres_denoise, lowres_denoise, bg_source]
 
-        relight_button.click(fn=process_relight, inputs=ips, outputs=[result_gallery]).then(clear_memory, inputs=[], outputs=[])
+        relight_button.click(fn=process_relight, inputs=ips, outputs=[result_gallery])#.then(clear_memory, inputs=[], outputs=[])
         example_quick_prompts.click(lambda x, y: ', '.join(y.split(', ')[:2] + [x[0]]), inputs=[example_quick_prompts, prompt], outputs=prompt, show_progress=False, queue=False)
         example_quick_subjects.click(lambda x: x[0], inputs=example_quick_subjects, outputs=prompt, show_progress=False, queue=False)
 
@@ -1853,6 +1852,22 @@ with gr.Blocks() as app:
             queue=False
         )
         
+        # fill_button.click(
+        #     fn=clear_result,
+        #     inputs=None,
+        #     outputs=fill_result,
+        # ).then(
+        #     fn=inpaint,
+        #     inputs=[dummy_image_for_outputs, width_slider, height_slider, overlap_percentage, num_inference_steps,
+        #             resize_option, custom_resize_percentage, prompt_fill, alignment_dropdown,
+        #             overlap_left, overlap_right, overlap_top, overlap_bottom],
+        #     outputs=[fill_result])
+        # ).then(
+        #     fn=lambda: gr.update(visible=True),
+        #     inputs=None,
+        #     outputs=use_as_input_button,
+        # )
+
         fill_button.click(
             fn=clear_result,
             inputs=None,
@@ -1862,23 +1877,24 @@ with gr.Blocks() as app:
             inputs=[dummy_image_for_outputs, width_slider, height_slider, overlap_percentage, num_inference_steps,
                     resize_option, custom_resize_percentage, prompt_fill, alignment_dropdown,
                     overlap_left, overlap_right, overlap_top, overlap_bottom],
-            outputs=[fill_result])#.then(clear_memory, inputs=[], outputs=[])
+            outputs=[fill_result])
         # ).then(
         #     fn=lambda: gr.update(visible=True),
         #     inputs=None,
         #     outputs=use_as_input_button,
         # )
 
-        # prompt_fill.submit(
-        #     fn=clear_result,
-        #     inputs=None,
-        #     outputs=fill_result,
-        # ).then(
-        #     fn=inpaint,
-        #     inputs=[dummy_image_for_outputs, width_slider, height_slider, overlap_percentage, num_inference_steps,
-        #             resize_option, custom_resize_percentage, prompt, alignment_dropdown,
-        #             overlap_left, overlap_right, overlap_top, overlap_bottom],
-        #     outputs=[fill_result])#.then(clear_memory, inputs=[], outputs=[])
+        prompt_fill.submit(
+            fn=clear_result,
+            inputs=None,
+            outputs=fill_result,
+        ).then(
+            fn=inpaint,
+            inputs=[dummy_image_for_outputs, width_slider, height_slider, overlap_percentage, num_inference_steps,
+                    resize_option, custom_resize_percentage, prompt_fill, alignment_dropdown,
+                    overlap_left, overlap_right, overlap_top, overlap_bottom],
+            outputs=[fill_result])
+
 
         def convert_to_pil(image):
             try:
@@ -1985,5 +2001,5 @@ with gr.Blocks() as app:
         ).then(clear_memory, inputs=[], outputs=[])
 
 if __name__ == "__main__":
-    app.queue()
+    app.queue(default_concurrency_limit=3)
     app.launch(share=True)