Update merged_app2.py

merged_app2.py

@@ -448,7 +448,7 @@ def enable_efficient_attention():
 def clear_memory():
     if torch.cuda.is_available():
         torch.cuda.empty_cache()
-        torch.cuda.synchronize()
+        #torch.cuda.synchronize()
 
 # Enable efficient attention
 enable_efficient_attention()
@@ -1631,7 +1631,7 @@ with gr.Blocks() as app:
                     input_fg = gr.Image(type="pil", label="Image", height=480)
                 with gr.Row():
                     with gr.Group():
-                        find_objects_button = gr.Button(value="(Option 1) Segment Object from text")
+                        find_objects_button = gr.Button(value="Segment Object from text")
                         text_prompt = gr.Textbox(
                                 label="Text Prompt", 
                                 placeholder="Enter object classes separated by periods (e.g. 'car . person .'), leave empty to get all objects",
@@ -1645,24 +1645,24 @@ with gr.Blocks() as app:
 
                     
                     
-                    # output_bg = gr.Image(type="numpy", label="Preprocessed Foreground", height=480)
-                with gr.Group():
-                    run_button = gr.Button("Generate alternative angles")
-                    orientation_result = gr.Gallery(
-                                label="Result",
-                                show_label=False,
-                                columns=[3],
-                                rows=[2],
-                                object_fit="fill",
-                                height="auto",
-                                allow_preview=False,
-                            )                
-    
+                with gr.Accordion(label="Alternative Angles", open=False) as alternative_angles:
+                    with gr.Group():
+                        run_button = gr.Button("Generate alternative angles")
+                        orientation_result = gr.Gallery(
+                                    label="Result",
+                                    show_label=False,
+                                    columns=[3],
+                                    rows=[2],
+                                    object_fit="fill",
+                                    height="auto",
+                                    allow_preview=False,
+                                )                
+        
                 if orientation_result:
                     orientation_result.select(use_orientation, inputs=None, outputs=extracted_fg)
                     
                 dummy_image_for_outputs = gr.Image(visible=False, label='Result', type='pil')
-                dummy_image_for_prompt_augmentation = gr.Image(type="pil", label="Dummy image", height=480)
+                dummy_image_for_prompt_augmentation = gr.Image(type="pil", label="Dummy image", height=48, visible=False)
 
                 
             with gr.Column():
@@ -1676,10 +1676,10 @@ with gr.Blocks() as app:
                         with gr.Group():
                             gr.Markdown("Outpaint")
                             with gr.Row():
-                                # with gr.Column(scale=2):
-                                #     # prompt_fill = gr.Textbox(label="Prompt (Optional)")
-                                # with gr.Column(scale=1):
-                                fill_button = gr.Button("Generate")
+                                with gr.Column(scale=2):
+                                    prompt_fill = gr.Textbox(label="Prompt (Optional)")
+                                with gr.Column(scale=1):
+                                    fill_button = gr.Button("Generate")
                             target_ratio = gr.Radio(
                                 label="Image Ratio",
                                 choices=["9:16", "16:9", "1:1", "Custom"],
@@ -1750,15 +1750,18 @@ with gr.Blocks() as app:
                         with gr.Column():
                             prompt = gr.Textbox(label="Prompt")
                         with gr.Column():
-                            augment_prompt = gr.Button(value='+')
+                            augment_prompt = gr.Button(value='Improve Prompt (+)')
+
+                        relight_button = gr.Button(value="Relight")
+
+                        cfg = gr.Slider(label="Fidelity", minimum=0.1, maximum=5.0, value=2, step=0.01, visible=True)
+
                         bg_source = gr.Radio(choices=[e.value for e in list(BGSource)[2:]],
                                             value=BGSource.LEFT.value,
                                             label="Lighting Preference (Initial Latent)", type='value')
                     
                         example_quick_subjects = gr.Dataset(samples=quick_subjects, label='Subject Quick List', samples_per_page=1000, components=[prompt])
                         example_quick_prompts = gr.Dataset(samples=quick_prompts, label='Lighting Quick List', samples_per_page=1000, components=[prompt])
-                with gr.Row():    
-                    relight_button = gr.Button(value="Relight")
 
                 with gr.Group(visible=False):
                     with gr.Row():
@@ -1771,7 +1774,6 @@ with gr.Blocks() as app:
 
                         with gr.Accordion("Advanced options", open=False):
                             steps = gr.Slider(label="Steps", minimum=1, maximum=100, value=15, step=1)
-                            cfg = gr.Slider(label="CFG Scale", minimum=1.0, maximum=32.0, value=2, step=0.01, visible=False)
                             lowres_denoise = gr.Slider(label="Lowres Denoise (for initial latent)", minimum=0.1, maximum=1.0, value=0.9, step=0.01)
                             highres_scale = gr.Slider(label="Highres Scale", minimum=1.0, maximum=3.0, value=1.5, step=0.01)
                             highres_denoise = gr.Slider(label="Highres Denoise", minimum=0.1, maximum=1.0, value=0.5, step=0.01)
@@ -1803,7 +1805,11 @@ with gr.Blocks() as app:
             #     outputs=[result_gallery, output_bg],
             #     run_on_click=True, examples_per_page=1024
             # )
-        augment_prompt.click(generate_description, inputs=[prompt, dummy_image_for_prompt_augmentation], outputs=[prompt])
+
+        def move_prompt(prompt):
+            return prompt
+            
+        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=[])
@@ -1854,7 +1860,7 @@ with gr.Blocks() as app:
         ).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,
+                    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=[])
         # ).then(
@@ -1946,17 +1952,21 @@ with gr.Blocks() as app:
                 with gr.Row():
                     with gr.Group():
                         with gr.Column():
-                            describe_button = gr.Button(value="Describe Image")
+                            describe_button = gr.Button(label="Describe Image", visible=False)
                             text_to_describe = gr.Textbox(value="Describe object or scene")
                         description_text = gr.Textbox(
                                 label="Output", 
                                 placeholder="",
                                 value=""
                             )
+                        send_to_relight = gr.Button(label="Send to Relight")
                         
 
         def send_img(img_result):
                 return img_result
+
+
+        send_to_relight.click(move_prompt, [description_text], [prompt]).then(move_prompt, [description_text], [prompt_fill])
         
         transfer_btn.click(send_img, [output_image], [input_fg]).then(clear_memory, inputs=[], outputs=[])