update app.py

app.py

@@ -323,10 +323,10 @@ mask_source_segment = "type what to detect below"
 
 def run_grounded_sam(input_image, text_prompt, task_type, inpaint_prompt, box_threshold, text_threshold, 
             iou_threshold, inpaint_mode, mask_source_radio, remove_mode, remove_mask_extend):
-    if (task_type == 'inpainting' or task_type == 'remove') and mask_source_radio == mask_source_draw:
-        pass
-    else:
-        assert text_prompt, f'text_prompt for {task_type} is not found!'
+    text_prompt = text_prompt.strip()
+    if not ((task_type == 'inpainting' or task_type == 'remove') and mask_source_radio == mask_source_draw):
+        if text_prompt == '':
+            return [], gr.Gallery.update(label='Detection prompt is not found!')
 
     file_temp = int(time.time())
     logger.info(f'run_grounded_sam_[{file_temp}]_{task_type}_[{text_prompt}]_1_')
@@ -361,6 +361,9 @@ def run_grounded_sam(input_image, text_prompt, task_type, inpaint_prompt, box_th
         boxes_filt, pred_phrases = get_grounding_output(
             groundingdino_model, image, text_prompt, box_threshold, text_threshold, device=groundingdino_device
         )
+        if boxes_filt.size(0) == 0:
+            logger.info(f'run_grounded_sam_[{file_temp}]_{task_type}_[{text_prompt}]_1_[No objects detected]_')
+            return [], gr.Gallery.update(label='No objects detected, please try others.')
         boxes_filt_ori = copy.deepcopy(boxes_filt)
 
         pred_dict = {
@@ -414,7 +417,7 @@ def run_grounded_sam(input_image, text_prompt, task_type, inpaint_prompt, box_th
     logger.info(f'run_grounded_sam_[{file_temp}]_{task_type}_3_')
     if task_type == 'detection' or task_type == 'segment':
         logger.info(f'run_grounded_sam_[{file_temp}]_{task_type}_9_')
-        return output_images
+        return output_images, gr.Gallery.update(label='result images')
     elif task_type == 'inpainting' or task_type == 'remove':
         if inpaint_prompt.strip() == '' and mask_source_radio == mask_source_segment:
             task_type = 'remove'
@@ -488,11 +491,11 @@ def run_grounded_sam(input_image, text_prompt, task_type, inpaint_prompt, box_th
         os.remove(image_path)
         logger.info(f'run_grounded_sam_[{file_temp}]_{task_type}_9_')
         output_images.append(image_result)
-        return output_images        
+        return output_images, gr.Gallery.update(label='result images')        
     else:
         logger.info(f"task_type:{task_type} error!")
     logger.info(f'run_grounded_sam_[{file_temp}]_9_9_')
-    return output_images
+    return output_images, gr.Gallery.update(label='result images')
 
 def change_radio_display(task_type, mask_source_radio):
     text_prompt_visible = True
@@ -524,7 +527,7 @@ if __name__ == "__main__":
                 mask_source_radio = gr.Radio([mask_source_draw, mask_source_segment], 
                                     value=mask_source_segment, label="Mask from",
                                     interactive=True, visible=False)                                                
-                text_prompt = gr.Textbox(label="Detection Prompt[To detect multiple objects, seperating each name with '.' , Like this: cat . dog . chair ]", placeholder="Cannot be empty")                                                
+                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)
                 run_button = gr.Button(label="Run")
                 with gr.Accordion("Advanced options", open=False):
@@ -546,11 +549,11 @@ if __name__ == "__main__":
 
             with gr.Column():
                 gallery = gr.Gallery(
-                    label="Generated images", show_label=False, elem_id="gallery"
+                    label="result images", show_label=True, elem_id="gallery"
                 ).style(grid=[2], full_width=True, full_height=True)         
 
         run_button.click(fn=run_grounded_sam, 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], outputs=[gallery])
+                        input_image, text_prompt, task_type, inpaint_prompt, box_threshold, text_threshold, iou_threshold, inpaint_mode, mask_source_radio, remove_mode, remove_mask_extend], outputs=[gallery, gallery])
         task_type.change(fn=change_radio_display, inputs=[task_type, mask_source_radio], outputs=[text_prompt, inpaint_prompt, mask_source_radio])
         mask_source_radio.change(fn=change_radio_display, inputs=[task_type, mask_source_radio], outputs=[text_prompt, inpaint_prompt, mask_source_radio])