update app.py

app.py

@@ -477,6 +477,7 @@ def relate_anything(input_image, k):
         concate_pil_image = concatenate_images_vertical(current_pil_image, title_image)
         pil_image_list.append(concate_pil_image)
 
+    logger.info(f'relate_anything_5_{len(pil_image_list)}')
     return pil_image_list
 
 mask_source_draw = "draw a mask on input image"
@@ -504,9 +505,6 @@ def run_anything_task(input_image, text_prompt, task_type, inpaint_prompt, box_t
     input_mask = np.array(input_mask_pil.convert("L"))  
      
     image_pil, image = load_image(input_image['image'].convert("RGB"))
-    
-    # visualize raw image
-    # image_pil.save(os.path.join(output_dir, f"raw_image_{file_temp}.jpg"))
 
     size = image_pil.size
 
@@ -539,11 +537,6 @@ def run_anything_task(input_image, text_prompt, task_type, inpaint_prompt, box_t
             "labels": pred_phrases,
         }
         image_with_box = plot_boxes_to_image(copy.deepcopy(image_pil), pred_dict)[0]
-        # image_path = os.path.join(output_dir, f"grounding_dino_output_{file_temp}.jpg")
-        # image_with_box.save(image_path)
-        # detection_image_result = cv2.cvtColor(cv2.imread(image_path), cv2.COLOR_BGR2RGB)
-        # os.remove(image_path)
-        # output_images.append(detection_image_result)
         output_images.append(image_with_box)
 
     logger.info(f'run_anything_task_[{file_temp}]_{task_type}_2_')
@@ -601,12 +594,6 @@ def run_anything_task(input_image, text_prompt, task_type, inpaint_prompt, box_t
                 masks = torch.where(masks > 0, True, False)
             mask = masks[0][0].cpu().numpy()
             mask_pil = Image.fromarray(mask)   
-
-        # image_path = os.path.join(output_dir, f"image_mask_{file_temp}.jpg")
-        # mask_pil.convert("RGB").save(image_path)
-        # image_result = cv2.cvtColor(cv2.imread(image_path), cv2.COLOR_BGR2RGB)
-        # os.remove(image_path)
-        # output_images.append(image_result)
         output_images.append(mask_pil.convert("RGB"))
 
         if task_type == 'inpainting':
@@ -645,23 +632,10 @@ def run_anything_task(input_image, text_prompt, task_type, inpaint_prompt, box_t
                                         extend_pixels=remove_mask_extend, useRectangle=useRectangle)
                         mask_imgs.append(mask_pil_exp)
                 mask_pil = mix_masks(mask_imgs)
-
-                # image_path = os.path.join(output_dir, f"image_mask_{file_temp}.jpg")
-                # mask_pil.convert("RGB").save(image_path)
-                # image_result = cv2.cvtColor(cv2.imread(image_path), cv2.COLOR_BGR2RGB)
-                # os.remove(image_path)
-                # output_images.append(image_result)
                 output_images.append(mask_pil.convert("RGB"))               
             image_inpainting = lama_cleaner_process(np.array(image_pil), np.array(mask_pil.convert("L")))
 
         image_inpainting = image_inpainting.resize((image_pil.size[0], image_pil.size[1]))
-
-        # image_path = os.path.join(output_dir, f"grounded_sam_inpainting_output_{file_temp}.jpg")
-        # image_inpainting.save(image_path)
-        # image_result = cv2.cvtColor(cv2.imread(image_path), cv2.COLOR_BGR2RGB)
-        # os.remove(image_path)
-        # logger.info(f'run_anything_task_[{file_temp}]_{task_type}_9_')
-        # output_images.append(image_result)
         output_images.append(image_inpainting)
         return output_images, gr.Gallery.update(label='result images')        
     else:
@@ -674,10 +648,6 @@ def change_radio_display(task_type, mask_source_radio):
     inpaint_prompt_visible = False
     mask_source_radio_visible = False
     num_relation_visible = False
-    # run_button_visible = True
-    # relate_all_button_visible = False
-    # gsa_gallery_visible = True 
-    # ram_gallery_visible = False
     if task_type == "inpainting":
         inpaint_prompt_visible = True
     if task_type == "inpainting" or task_type == "remove":
@@ -687,12 +657,7 @@ def change_radio_display(task_type, mask_source_radio):
     if task_type == "relate anything":
         text_prompt_visible = False
         num_relation_visible = True
-        # run_button_visible = False
-        # relate_all_button_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.Button.update(visible=run_button_visible), gr.Button.update(visible=relate_all_button_visible), gr.Gallery.update(visible=gsa_gallery_visible), gr.Gallery.update(visible=ram_gallery_visible)
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser("Grounded SAM demo", add_help=True)
@@ -716,7 +681,6 @@ if __name__ == "__main__":
                 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", 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
@@ -735,16 +699,11 @@ if __name__ == "__main__":
                             remove_mask_extend = gr.Textbox(label="remove_mask_extend", value='10')
 
             with gr.Column():
-                image_gallery = gr.Gallery(label="result images", show_label=True, elem_id="gsa_allery", visible=True
-                    ).style(preview=True, columns=[5], object_fit="scale-down", height="auto")                
-                # gsa_gallery = gr.Gallery(label="result images", show_label=True, elem_id="gsa_allery", visible=True
-                #     ).style(preview=True, grid=[2], full_width=True, full_height=True)
-                # ram_gallery = gr.Gallery(label="Your Result", show_label=True, elem_id="ram_gallery", visible=False
-                #     ).style(preview=True, columns=5, object_fit="scale-down")
+                image_gallery = gr.Gallery(label="result images", show_label=True, elem_id="gallery", visible=True
+                    ).style(preview=True, columns=[5], object_fit="scale-down", height="auto")          
 
         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=[image_gallery, image_gallery], show_progress=True, queue=True)
-        # relate_all_button.click(fn=relate_anything, inputs=[input_image, num_relation], outputs=[ram_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])
         mask_source_radio.change(fn=change_radio_display, inputs=[task_type, mask_source_radio], outputs=[text_prompt, inpaint_prompt, mask_source_radio, num_relation])