fix

app.py

@@ -11,6 +11,7 @@ from inference import SegmentPredictor
 sam = SegmentPredictor() #service.get_sam(configs.model_type, configs.model_ckpt_path, configs.device)
 red = (255,0,0)
 blue = (0,0,255)
+annos = []
 
 
 block = gr.Blocks()
@@ -34,15 +35,16 @@ with block:
             cutout_galary = gr.Gallery(label='Cutouts', object_fit='contain', height=512)
         with gr.Row():
             with gr.Column(scale=1):
-                point_label_radio = gr.Radio(label='Point Label', choices=[1,0], value=1)
+                with gr.Row():
+                    point_label_radio = gr.Radio(label='Point Label', choices=[1,0], value=1)
+                    text = gr.Textbox(label='Mask Name')
                 sam_sgmt_everything_btn = gr.Button('Segment Everything!', variant = 'primary')
-                sam_encode_btn = gr.Button('Encode')
                 sam_decode_btn = gr.Button('Predict using points!', variant = 'primary')
                 reset_btn = gr.Button('Reset')
 
     # components
     components = {point_coords, point_labels, raw_image, masks, cutout_idx, input_image,
-                  point_label_radio, reset_btn, sam_sgmt_everything_btn, sam_encode_btn,
+                  point_label_radio, text, reset_btn, sam_sgmt_everything_btn,
                   sam_decode_btn, masks_annotated_image}
     # event - init coords
     def on_reset_btn_click(raw_image):
@@ -50,8 +52,10 @@ with block:
     reset_btn.click(on_reset_btn_click, [raw_image], [input_image, point_coords, point_labels], queue=False)
 
     def on_input_image_upload(input_image):
-        print("uploading")
+        print("encoding")
         # encode image on upload
+        sam.encode(input_image)
+        print("encoding done")
         return input_image, point_coords_empty(), point_labels_empty(), None
     input_image.upload(on_input_image_upload, [input_image], [raw_image, point_coords, point_labels], queue=False)
 
@@ -67,24 +71,15 @@ with block:
         return img, point_coords, point_labels
     input_image.select(on_input_image_select, [input_image, point_coords, point_labels, point_label_radio], [input_image, point_coords, point_labels], queue=False)
 
-    # event - inference
-    def on_click_sam_encode_btn(inputs):
-        print("encoding")
-        image = inputs[raw_image]
-        sam.encode(image)
-        return [None, None, None]
 
     def on_click_sam_dencode_btn(inputs):
         print("inferencing")
         image = inputs[raw_image]
-        #sam.encode(image)
-        generated_masks, _, _ = sam.cond_pred(pts=np.array(inputs[point_coords]), lbls=np.array(inputs[point_labels]))
-        #generated_mask = Image.fromarray(generated_masks)
-        #annotated = (image, [(generated_masks[i], f'Mask {i}') for i in range(len(generated_masks))])
-        return {masks_annotated_image: (image, [(generated_masks, "fisk")]), 
-                masks: generated_masks, 
+        generated_mask, _, _ = sam.cond_pred(pts=np.array(inputs[point_coords]), lbls=np.array(inputs[point_labels]))
+        annos.append((generated_mask, inputs[text]))
+        return {masks_annotated_image: (image, annos), 
+                masks: generated_mask, 
                 cutout_idx: set()}
-    sam_encode_btn.click(on_click_sam_encode_btn, components, [masks_annotated_image, masks, cutout_idx], queue=True)
     sam_decode_btn.click(on_click_sam_dencode_btn, components, [masks_annotated_image, masks, cutout_idx], queue=True)
     #sam_sgmt_everything_btn.click(on_sam_sgmt_everything_click, components, [masks_annotated_image, masks, cutout_idx], queue=True)