Update app.py

app.py

@@ -364,28 +364,6 @@ def generate_image(
 
     return image
 
-def create_image_input(index, open=True, indexs_state=None):
-    accordion_state = gr.State(open)
-    with gr.Column():
-        with gr.Accordion(f"Input Image {index + 1}", open=accordion_state.value) as accordion:
-            image = gr.Image(type="filepath", label=f"Image {index + 1}")
-            caption = gr.Textbox(label=f"Caption {index + 1}", value="")
-            id_ip_checkbox = gr.Checkbox(value=False, label=f"ID or not {index + 1}", visible=True)
-            with gr.Row():
-                vlm_btn = gr.Button("Auto Caption")
-                det_btn = gr.Button("Det & Seg")
-                face_btn = gr.Button("Crop Face")
-            accordion.expand(
-                    inputs=[indexs_state],
-                    fn = lambda x: update_inputs(True, index, x), 
-                    outputs=[indexs_state, accordion_state],
-                )
-            accordion.collapse(
-                    inputs=[indexs_state],
-                    fn = lambda x: update_inputs(False, index, x), 
-                    outputs=[indexs_state, accordion_state],
-                )
-    return image, caption, face_btn, det_btn, vlm_btn, accordion_state, accordion, id_ip_checkbox
 
 
 def merge_instances(orig_img, indices, ins_bboxes, ins_images):
@@ -526,17 +504,24 @@ with gr.Blocks() as demo:
 
                 clear_btn = gr.Button("清空输入图像")
             with gr.Row():
-                for i in range(num_inputs):
-                    image, caption, face_btn, det_btn, vlm_btn, accordion_state, accordion, id_ip_checkbox = create_image_input(i, open=i<2, indexs_state=indexs_state)
-                    images.append(image)
-                    idip_checkboxes.append(id_ip_checkbox)
-                    captions.append(caption)
-                    face_btns.append(face_btn)
-                    det_btns.append(det_btn)
-                    vlm_btns.append(vlm_btn)
-                    accordion_states.append(accordion_state)
-                    
-                    accordions.append(accordion)
+                with gr.Column():
+                    image_1 = gr.Image(type="filepath", label=f"Image {index + 1}")
+                    caption_1 = gr.Textbox(label=f"Caption {index + 1}", value="")
+                    id_ip_checkbox_1 = gr.Checkbox(value=False, label=f"ID or not {index + 1}", visible=True)
+                    with gr.Row():
+                        vlm_btn_1 = gr.Button("Auto Caption")
+                        det_btn_1 = gr.Button("Det & Seg")
+                        face_btn_1 = gr.Button("Crop Face")
+
+                with gr.Column():
+                    image_2 = gr.Image(type="filepath", label=f"Image {index + 1}")
+                    caption_2 = gr.Textbox(label=f"Caption {index + 1}", value="")
+                    id_ip_checkbox_2 = gr.Checkbox(value=False, label=f"ID or not {index + 1}", visible=True)
+                    with gr.Row():
+                        vlm_btn_2 = gr.Button("Auto Caption")
+                        det_btn_2 = gr.Button("Det & Seg")
+                        face_btn_2 = gr.Button("Crop Face")
+    
         with gr.Column():
             output = gr.Image(label="生成的图像")
             seed = gr.Number(value=42, label="Seed", info="")
@@ -561,12 +546,13 @@ with gr.Blocks() as demo:
     # 修改清空函数的输出参数
     clear_btn.click(clear_images, outputs=images)
 
-    # 循环绑定 Det & Seg 和 Auto Caption 按钮的点击事件
-    for i in range(num_inputs):
-        face_btns[i].click(crop_face_img, inputs=[images[i]], outputs=[images[i]])
-        det_btns[i].click(det_seg_img, inputs=[images[i], captions[i]], outputs=[images[i]])
-        vlm_btns[i].click(vlm_img_caption, inputs=[images[i]], outputs=[captions[i]])
-        accordion_states[i].change(fn=lambda x, state, index=i: change_accordion(x, index, state), inputs=[accordion_states[i], indexs_state], outputs=[accordions[i], indexs_state])
+    face_btns_1.click(crop_face_img, inputs=[image_1], outputs=[image_1])
+    det_btns_1.click(det_seg_img, inputs=[images_1, captions_1], outputs=[images_1])
+    vlm_btns_1.click(vlm_img_caption, inputs=[images_1], outputs=[captions_1])
+
+    face_btns_2.click(crop_face_img, inputs=[image_2], outputs=[image_2])
+    det_btns_2.click(det_seg_img, inputs=[images_2, captions_2], outputs=[images_2])
+    vlm_btns_2.click(vlm_img_caption, inputs=[images_2], outputs=[captions_2])
 
 
 demo.queue().launch(share=True)