Update app.py

app.py

@@ -131,24 +131,12 @@ captions = []
 face_btns = []
 det_btns = []
 vlm_btns = []
-accordions = []
 idip_checkboxes = []
-accordion_states = []
 
 def open_accordion_on_example_selection(*args):
-    print("enter open_accordion_on_example_selection")
+    # print("enter open_accordion_on_example_selection")
     len_images = (len(args)-11)//3
-    images = list(args[:len_images])+[None,]*(num_inputs-len_images)
-    outputs = []
-    for i, img in enumerate(images):
-        if img is not None:
-            print(f"open accordions {i}")
-            outputs.append(True)
-        else:
-            print(f"close accordions {i}")
-            outputs.append(False)
-    print("Setup all accordions", outputs)
-    return outputs
+    return [None,]*(num_inputs-len_images)*3
 
 @spaces.GPU
 def generate_image(
@@ -160,7 +148,6 @@ def generate_image(
     single_attention,  # 新增参数
     latent_dblora_scale_str,
     latent_sblora_scale_str, vae_lora_scale,
-    indexs,  # 新增参数
     *images_captions_faces,  # Combine all unpacked arguments into one tuple
 ):
     torch.cuda.empty_cache()
@@ -170,13 +157,9 @@ def generate_image(
     images = list(images_captions_faces[:num_inputs])
     captions = list(images_captions_faces[num_inputs:2 * num_inputs])
     idips_checkboxes = list(images_captions_faces[2 * num_inputs:3 * num_inputs])
-    images = [images[i] for i in indexs]
-    captions = [captions[i] for i in indexs]
-    idips_checkboxes = [idips_checkboxes[i] for i in indexs]
 
     print(f"Length of images: {len(images)}")
     print(f"Length of captions: {len(captions)}")
-    print(f"Indexs: {indexs}")
     
     print(f"Control weight lambda: {control_weight_lambda}")
     if control_weight_lambda != "no":
@@ -301,28 +284,16 @@ def generate_image(
 
     return image
 
-def create_image_input(index, open=True, indexs_state=None):
-    accordion_state = gr.State(open)
+def create_image_input(index):
     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
+        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")
+    return image, caption, face_btn, det_btn, vlm_btn, id_ip_checkbox
 
 
 def merge_instances(orig_img, indices, ins_bboxes, ins_images):
@@ -342,42 +313,10 @@ def merge_instances(orig_img, indices, ins_bboxes, ins_images):
     img = final_img.crop(bbox)
     return img, bbox
 
-def change_accordion(at: bool, index: int, state: list):
-    print("change_accordion", index, state)
-    print("at:", at)
-    # indexs = state
-    # if at:
-    #     if index not in indexs:
-    #         indexs.append(index)
-    # else:
-    #     if index in indexs:
-    #         indexs.remove(index)
-    
-    # # 确保 indexs 是有序的
-    # indexs.sort()
-    # print("After changed", indexs)
-    # return gr.Accordion(open=at), indexs
-
-def update_inputs(is_open, index, state: list):
-    indexs = state
-    if is_open:
-        if index not in indexs:
-            indexs.append(index)
-    else:
-        if index in indexs:
-            indexs.remove(index)
-    
-    # 确保 indexs 是有序的
-    indexs.sort()
-    print("After update input", indexs)
-    return indexs, is_open
-    
 if __name__ == "__main__":
 
     with gr.Blocks() as demo:
 
-        indexs_state = gr.State([0, 1])  # 添加状态来存储 indexs
-        
         gr.Markdown("### XVerse Demo")
         with gr.Row():
             with gr.Column():
@@ -386,16 +325,13 @@ if __name__ == "__main__":
                 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)
+                        image, caption, face_btn, det_btn, vlm_btn, id_ip_checkbox = create_image_input(i)
                         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)
                 
                 # 将其他设置参数压缩到 Advanced Accordion 内
                 with gr.Accordion("Advanced", open=False):
@@ -481,9 +417,9 @@ if __name__ == "__main__":
                         single_attention = gr.Checkbox(value=True, label="Single Attention", visible=False)
 
             with gr.Column():
-                output = gr.Image(label="生成的图像")
+                output = gr.Image(label="Generated Image")
                 seed = gr.Number(value=42, label="Seed", info="")
-                gen_btn = gr.Button("生成图像")
+                gen_btn = gr.Button("Generate Image")
 
         gr.Markdown("### Examples")
         gen_btn.click(
@@ -493,7 +429,6 @@ if __name__ == "__main__":
                 vae_skip_iter, weight_id_ip_str,
                 double_attention, single_attention,
                 db_latent_lora_scale_str, sb_latent_lora_scale_str, vae_lora_scale_str,
-                indexs_state,  # 传递 indexs 状态
                 *images,  
                 *captions, 
                 *idip_checkboxes,
@@ -509,8 +444,6 @@ if __name__ == "__main__":
             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])
-
         
         examples = gr.Examples(
             examples=[
@@ -570,7 +503,7 @@ if __name__ == "__main__":
                 vae_skip_iter_s1,
                 vae_skip_iter_s2,
             ],
-            outputs=accordion_states,
+            outputs=images[3:]+captions[3:]+idip_checkboxes[3:],
             fn=open_accordion_on_example_selection,
             run_on_click=True,
             label="Examples"