Update app.py

[fix] block is nonetype

app.py

@@ -23,45 +23,6 @@ from model_video import build_model
 import numpy as np
 import collections
 
-def crf_refine(img, annos):
-    print(img.shape,annos.shape)
-    def _sigmoid(x):
-        return 1 / (1 + np.exp(-x))
-
-    assert img.dtype == np.uint8
-    assert annos.dtype == np.uint8
-    assert img.shape[:2] == annos.shape
-
-    # img and annos should be np array with data type uint8
-
-    EPSILON = 1e-8
-
-    M = 2  # salient or not
-    tau = 1.05
-    # Setup the CRF model
-    d = dcrf.DenseCRF2D(img.shape[1], img.shape[0], M)
-
-    anno_norm = annos / 255.
-
-    n_energy = -np.log((1.0 - anno_norm + EPSILON)) / (tau * _sigmoid(1 - anno_norm))
-    p_energy = -np.log(anno_norm + EPSILON) / (tau * _sigmoid(anno_norm))
-
-    U = np.zeros((M, img.shape[0] * img.shape[1]), dtype='float32')
-    U[0, :] = n_energy.flatten()
-    U[1, :] = p_energy.flatten()
-
-    d.setUnaryEnergy(U)
-
-    d.addPairwiseGaussian(sxy=3, compat=3)
-    d.addPairwiseBilateral(sxy=60, srgb=5, rgbim=img, compat=5)
-
-    # Do the inference
-    infer = np.array(d.inference(1)).astype('float32')
-    res = infer[1, :]
-
-    res = res * 255
-    res = res.reshape(img.shape[:2])
-    return res.astype('uint8')
 def show_coord(evt: gr.SelectData):
     return f"{evt.index[0]},{evt.index[1]}"
 
@@ -154,11 +115,6 @@ def test(gpu_id, net, img_list, group_size, img_size):
         
 img_lst=[(torch.rand(352,352,3)*255).numpy().astype(np.uint8) for i in range(5)]
 
-
-
-
-
-
 #simly test
 res=test('cpu',net,img_lst,5,224)
 '''for i in range(5):
@@ -219,17 +175,48 @@ def create_mode1_interface():
     )
 
 with gr.Blocks(title="交互式图像组分割系统") as demo:
-    #gr.Markdown("## mode choice")
-    mode = gr.Radio(["多图协同分割", "点提示交互分割"], value="多图协同分割", label="运行模式")
+    # 模式选择器
+    mode = gr.Radio(["多图协同分割", "点提示交互分割"], 
+                   value="多图协同分割", 
+                   label="运行模式")
     
-    mode1 = create_mode1_interface()
-    mode2 = create_mode2_interface()
+    # 使用Tab容器替代独立Blocks
+    with gr.Tabs() as mode_container:
+        with gr.Tab("多图模式", id=0) as tab1:
+            # 模式1界面组件
+            with gr.Row():
+                inputs = [gr.Image(type="numpy", label=f"图像{i+1}") for i in range(5)]
+            process_btn = gr.Button("开始处理")
+            output_img = gr.Image(label="处理结果")
+            
+            process_btn.click(
+                sepia,
+                inputs=inputs,
+                outputs=output_img
+            )
+            
+        with gr.Tab("点选模式", id=1) as tab2:
+            # 模式2界面组件
+            img_input = gr.Image(type="numpy", label="点击上传图片并选择点")
+            coord_store = gr.Textbox(visible=False)
+            mask_btn = gr.Button("生成分割掩码")
+            mask_output = gr.Image(label="分割结果")
+            
+            @img_input.select(inputs=[], outputs=coord_store)
+            def store_coordinate(evt: gr.SelectData):
+                return f"{evt.index[0]},{evt.index[1]}"
+            
+            mask_btn.click(
+                generate_mask,
+                inputs=[img_input, coord_store],
+                outputs=mask_output
+            )
     
+    # 动态显示控制
     mode.change(
         lambda x: (gr.update(visible=x=="多图协同分割"), gr.update(visible=x=="点提示交互分割")),
         inputs=mode,
-        outputs=[mode1, mode2]
+        outputs=[tab1, tab2]
     )
 
-demo.launch()
 demo.launch(debug=True)