more than one user.

app.py

@@ -66,6 +66,18 @@ def load_image_ui(load_edit, input_folder="example_tmp"):
     #    return None, None, None, None, None, None
 
 
+def run_segmentation_wrapper(image):
+    mask_np_list,mask_label_list = run_segmentation(image)
+    for img_path in Path("example_tmp").iterdir():
+        if img_path.name in ["img_512.png"]:
+            image = Image.open(img_path)
+    image = image.convert('RGB')
+    segmentation = create_segmentation(mask_np_list)
+    print("!!", len(mask_np_list))  
+    max_val = len(mask_np_list)-1
+    sliderup = gr.Slider(value = 0, minimum=0, maximum=max_val, step=1, interactive=True)
+    return image, segmentation, mask_np_list, mask_label_list, image, sliderup, sliderup , 'Segmentatin finish.'
+        
 
 def transparent_paste_with_mask(backimg, foreimg, mask_np,transparency = 128):
     backimg_solid_np =  np.array(backimg)
@@ -177,8 +189,6 @@ if os.path.isdir("./example_tmp"):
 
 from segment import run_segmentation
 
-
-
 with gr.Blocks() as demo:
     image = gr.State() # store mask
     image_loaded = gr.State()
@@ -218,9 +228,7 @@ with gr.Blocks() as demo:
                         outputs= [canvas, label]
                     )
 
-        segment_button.click(run_segmentation, 
-                [canvas] ,
-                [text_button, result_info0] )
+        
 
 
         canvas.upload(image_change, inputs=[], outputs=[text_button])
@@ -361,6 +369,9 @@ with gr.Blocks() as demo:
         text_button.click(load_image_ui, [false] , 
                         [image_loaded, segmentation,  mask_np_list, mask_label_list, canvas, slider, slider2] )
 
+        segment_button.click(run_segmentation_wrapper, 
+                [canvas] ,
+                [image_loaded, segmentation,  mask_np_list, mask_label_list, canvas, slider, slider2, result_info0] )
 
 
 

segment.py

@@ -45,14 +45,17 @@ def draw_panoptic_segmentation(segmentation, segments_info,save_folder=None, nos
     instances_counter = defaultdict(int)
     handles = []
     label_list = []
+
+    mask_list = []
+    
     if not noseg:
         if torch.min(segmentation) == 0: 
             mask = segmentation==0
-            mask = mask.cpu().detach().numpy()   # [512,512]   bool
+            mask = mask.cpu().detach()   # [512,512]   bool
             segment_label = "rest"
-            np.save( os.path.join(save_folder, "mask{}_{}.npy".format(0,"rest")) , mask)
             color = viridis(0)
             label = f"{segment_label}-{0}"
+            mask_list.append(mask)  
             handles.append(mpatches.Patch(color=color, label=label))
             label_list.append(label)
        
@@ -61,20 +64,20 @@ def draw_panoptic_segmentation(segmentation, segments_info,save_folder=None, nos
             mask = segmentation==segment_id
             if torch.min(segmentation) != 0: 
                 segment_id -= 1
-            mask = mask.cpu().detach().numpy()   # [512,512] bool
-            
+            mask = mask.cpu().detach()   # [512,512] bool
+            mask_list.append(mask) 
             segment_label = model.config.id2label[segment['label_id']]
             instances_counter[segment['label_id']] += 1
-            np.save( os.path.join(save_folder, "mask{}_{}.npy".format(segment_id,segment_label)) , mask)
+
             color = viridis(segment_id)
             
             label = f"{segment_label}-{segment_id}"
             handles.append(mpatches.Patch(color=color, label=label))
             label_list.append(label)
     else:
-        mask = np.full(segmentation.shape, True)
+        mask = torch.from_numpy(np.full(segmentation.shape, True))
         segment_label = "all"
-        np.save( os.path.join(save_folder, "mask{}_{}.npy".format(0,"all")) , mask)
+        mask_list.append(mask) 
         color = viridis(0)
         label = f"{segment_label}-{0}"
         handles.append(mpatches.Patch(color=color, label=label))
@@ -86,6 +89,7 @@ def draw_panoptic_segmentation(segmentation, segments_info,save_folder=None, nos
     ax.legend(handles=handles)
     plt.savefig(os.path.join(save_folder, 'seg_init.png'), dpi=500 )
     print("; ".join(label_list))
+    return mask_list,label_list
 
 
 
@@ -114,7 +118,7 @@ def run_segmentation(image, name="example_tmp", size = 512, noseg=False):
     panoptic_segmentation = processor.post_process_panoptic_segmentation(outputs, target_sizes=[image.size[::-1]])[0]
     save_folder = os.path.join(base_folder_path, name)
     os.makedirs(save_folder, exist_ok=True)
-    draw_panoptic_segmentation(**panoptic_segmentation, save_folder = save_folder, noseg = noseg, model = model)
+    mask_list,label_list = draw_panoptic_segmentation(**panoptic_segmentation, save_folder = save_folder, noseg = noseg, model = model)
     print("Finish segment")
     #block_flag += 1
-    return  gr.Button("1.2 Load original masks",visible = True), "Segmentation finished."#, gr.Button.update("1.2 Load edited masks",visible = True), gr.Checkbox.update(label = "Show Segmentation",visible = True) 
+    return  mask_list,label_list#, gr.Button.update("1.2 Load edited masks",visible = True), gr.Checkbox.update(label = "Show Segmentation",visible = True)