Update merged_app2.py

merged_app2.py

@@ -1054,7 +1054,8 @@ def use_orientation(selected_image:gr.SelectData):
 
 
 def generate_description(object_description,image, detail="high", max_tokens=250):
-    client = OpenAI(api_key=os.getenv["OPENAI_API_KEY"])
+    openai_api_key = os.getenv["OPENAI_API_KEY"]
+    client = OpenAI(api_key=openai_api_key)
 
     if image is not None:
         try:
@@ -1799,7 +1800,7 @@ with gr.Blocks() as app:
             #     run_on_click=True, examples_per_page=1024
             # )
         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])
+        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)
 
@@ -1849,7 +1850,7 @@ 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])
+            outputs=[fill_result]).then(clear_memory, inputs=[], outputs=[])
         # ).then(
         #     fn=lambda: gr.update(visible=True),
         #     inputs=None,
@@ -1865,7 +1866,7 @@ 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])
+            outputs=[fill_result]).then(clear_memory, inputs=[], outputs=[])
 
         def convert_to_pil(image):
             try:
@@ -1888,19 +1889,20 @@ with gr.Blocks() as app:
                 extracted_fg,  # Already processed RGBA image
             ],
             outputs=[orientation_result],
-        )
+        ).then(clear_memory, inputs=[], outputs=[])
         
         find_objects_button.click(
             fn=process_image,
             inputs=[input_fg, text_prompt],
             outputs=[extracted_objects, extracted_fg]
-            )
+            ).then(clear_memory, inputs=[], outputs=[])
         
         extract_button.click(
             fn=extract_foreground,
             inputs=[input_fg],
             outputs=[extracted_fg, x_slider, y_slider]
-        )
+        ).then(clear_memory, inputs=[], outputs=[])
+        
     with gr.Tab("Style Transfer"):
         gr.Markdown("## Apply the style of an image to another one")
         with gr.Row():
@@ -1950,7 +1952,7 @@ with gr.Blocks() as app:
         def send_img(img_result):
                 return img_result
         
-        transfer_btn.click(send_img, [output_image], [input_fg])
+        transfer_btn.click(send_img, [output_image], [input_fg]).then(clear_memory, inputs=[], outputs=[])
 
         # describe_button.click(describe_image, [image_to_describe], [description_text])
 
@@ -1958,13 +1960,13 @@ with gr.Blocks() as app:
             fn=generate_description,
             inputs=[text_to_describe,image_to_describe],
             outputs=description_text
-        )
+        ).then(clear_memory, inputs=[], outputs=[])
                 
         generate_btn.click(
             fn=generate_image,
             inputs=[prompt_input, structure_image, style_image, depth_strength, style_strength],
             outputs=[output_image]
-        )
+        ).then(clear_memory, inputs=[], outputs=[])
 
 if __name__ == "__main__":
     app.launch(share=True)