update app.py

app.py

@@ -481,9 +481,6 @@ mask_source_segment = "type what to detect below"
 
 def run_anything_task(input_image, text_prompt, task_type, inpaint_prompt, box_threshold, text_threshold, 
             iou_threshold, inpaint_mode, mask_source_radio, remove_mode, remove_mask_extend, num_relation):
-    if task_type == "relate anything":
-        return relate_anything(input_image['image'], num_relation)
-
     text_prompt = text_prompt.strip()
     if not ((task_type == 'inpainting' or task_type == 'remove') and mask_source_radio == mask_source_draw):
         if text_prompt == '':
@@ -664,13 +661,13 @@ def run_anything_task(input_image, text_prompt, task_type, inpaint_prompt, box_t
     logger.info(f'run_anything_task_[{file_temp}]_9_9_')
     return output_images, gr.Gallery.update(label='result images')
 
-def change_radio_display(task_type, mask_source_radio, num_relation): #, gsa_gallery, ram_gallery):
+def change_radio_display(task_type, mask_source_radio, num_relation, run_button, relate_all_button):
     text_prompt_visible = True
     inpaint_prompt_visible = False
     mask_source_radio_visible = False
     num_relation_visible = False
-    # gsa_gallery_visible = True
-    # ram_gallery_visible = False
+    run_button_visible = True
+    relate_all_button_visible = False
     if task_type == "inpainting":
         inpaint_prompt_visible = True
     if task_type == "inpainting" or task_type == "remove":
@@ -680,10 +677,9 @@ def change_radio_display(task_type, mask_source_radio, num_relation): #, gsa_gal
     if task_type == "relate anything":
         text_prompt_visible = False
         num_relation_visible = True
-        # gsa_gallery_visible = False
-        # ram_gallery_visible = True
-    return  gr.Textbox.update(visible=text_prompt_visible), gr.Textbox.update(visible=inpaint_prompt_visible), gr.Radio.update(visible=mask_source_radio_visible), gr.Slider.update(visible=num_relation_visible)
-    # gr.Gallery.update(visible=gsa_gallery_visible), gr.Gallery.update(visible=ram_gallery_visible)
+        run_button_visible = False
+        relate_all_button_visible = True
+    return  gr.Textbox.update(visible=text_prompt_visible), gr.Textbox.update(visible=inpaint_prompt_visible), gr.Radio.update(visible=mask_source_radio_visible), gr.Slider.update(visible=num_relation_visible), gr.Button.update(visible=run_button_visible), gr.Button.update(visible=relate_all_button_visible)
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser("Grounded SAM demo", add_help=True)
@@ -706,7 +702,8 @@ if __name__ == "__main__":
                 text_prompt = gr.Textbox(label="Detection Prompt[To detect multiple objects, seperating each name with '.', like this: cat . dog . chair ]", placeholder="Cannot be empty")                                                
                 inpaint_prompt = gr.Textbox(label="Inpaint Prompt (if this is empty, then remove)", visible=False)
                 num_relation = gr.Slider(label="How many relations do you want to see", minimum=1, maximum=20, value=5, step=1, visible=False)
-                run_button = gr.Button(label="Run")
+                run_button = gr.Button(label="Run", visible=True)
+                relate_all_button = gr.Button(label="Run", visible=False)
                 with gr.Accordion("Advanced options", open=False) as advanced_options:
                     box_threshold = gr.Slider(
                         label="Box Threshold", minimum=0.0, maximum=1.0, value=0.3, step=0.001
@@ -725,16 +722,15 @@ if __name__ == "__main__":
                             remove_mask_extend = gr.Textbox(label="remove_mask_extend", value='10')
 
             with gr.Column():
-                # gsa_gallery = gr.Gallery(
-                #     label="result images", show_label=True, elem_id="gsa_gallery"
-                #     ).style(grid=[2], full_width=True, full_height=True)
                 gallery = gr.Gallery(label="result images", show_label=True, elem_id="gallery"
                     ).style(preview=True, columns=5, object_fit="scale-down", full_width=True, full_height=True)
 
         run_button.click(fn=run_anything_task, inputs=[
-                        input_image, text_prompt, task_type, inpaint_prompt, box_threshold, text_threshold, iou_threshold, inpaint_mode, mask_source_radio, remove_mode, remove_mask_extend, num_relation], outputs=[gallery, gallery])
-        task_type.change(fn=change_radio_display, inputs=[task_type, mask_source_radio], outputs=[text_prompt, inpaint_prompt, mask_source_radio, num_relation])
-        mask_source_radio.change(fn=change_radio_display, inputs=[task_type, mask_source_radio], outputs=[text_prompt, inpaint_prompt, mask_source_radio, num_relation])
+                        input_image, text_prompt, task_type, inpaint_prompt, box_threshold, text_threshold, iou_threshold, inpaint_mode, mask_source_radio, remove_mode, remove_mask_extend, num_relation], outputs=[gallery, gallery], show_progress=True, queue=True)
+        relate_all_button.click(fn=relate_anything, inputs=[input_image, num_relation], outputs=[gallery], show_progress=True, queue=True)
+
+        task_type.change(fn=change_radio_display, inputs=[task_type, mask_source_radio], outputs=[text_prompt, inpaint_prompt, mask_source_radio, num_relation, run_button, relate_all_button])
+        mask_source_radio.change(fn=change_radio_display, inputs=[task_type, mask_source_radio], outputs=[text_prompt, inpaint_prompt, mask_source_radio, num_relation, run_button, relate_all_button])
 
         DESCRIPTION = '### This demo from [Grounded-Segment-Anything](https://github.com/IDEA-Research/Grounded-Segment-Anything). <br>'
         DESCRIPTION += 'RAM from [RelateAnything](https://github.com/Luodian/RelateAnything). <br>'