Update app.py

app.py

@@ -24,7 +24,7 @@ scheduler = CommitScheduler(
     token=TOKEN
 )
 
-# --- 3. 数据加载逻辑 (保持不变) ---
+# --- 3. 数据加载逻辑 ---
 def load_data():
     groups = {}
     if not os.path.exists(DATA_FOLDER):
@@ -57,13 +57,8 @@ def load_data():
 
 ALL_GROUPS, ALL_GROUP_IDS = load_data()
 
-# --- 4. 保存逻辑 (支持多选保存) ---
+# --- 4. 保存逻辑 ---
 def save_user_vote(user_id, group_id, choice_labels, method_names):
-    """
-    保存投票。
-    choice_labels: 字符串，例如 "Option A; Option B"
-    method_names: 字符串，例如 "omnigen; sdxl"
-    """
     user_filename = f"user_{user_id}.csv"
     user_file_path = LOG_FOLDER / user_filename
     
@@ -85,7 +80,7 @@ def save_user_vote(user_id, group_id, choice_labels, method_names):
     
     print(f"Saved: User {user_id} selected {method_names}")
 
-# --- 5. 交互逻辑 (多选核心) ---
+# --- 5. 交互逻辑 ---
 
 def get_current_question_ui(user_state):
     """根据当前索引刷新界面"""
@@ -100,8 +95,8 @@ def get_current_question_ui(user_state):
             gr.update(visible=False),
             gr.update(value="## 🎉 测试结束！\n感谢您的参与，所有结果已保存。", visible=True),
             user_state,
-            [], # 清空文件路径
-            []  # 清空当前选中的索引
+            [], 
+            []  
         )
     
     # 2. 获取数据
@@ -111,7 +106,7 @@ def get_current_question_ui(user_state):
     # 3. 准备文本
     instruction_text = f"### 任务 ({current_idx + 1} / {len(ALL_GROUP_IDS)})\n\n{group_data['instruction']}"
     
-    # 4. 准备图片 (盲测 + 打乱)
+    # 4. 准备图片
     original_images = group_data["images"]
     shuffled_images = original_images.copy()
     random.shuffle(shuffled_images)
@@ -119,7 +114,7 @@ def get_current_question_ui(user_state):
     # 构造显示列表
     display_list = []
     for i, img_path in enumerate(shuffled_images):
-        label = f"Option {chr(65+i)}" # Option A, Option B...
+        label = f"Option {chr(65+i)}" 
         display_list.append((img_path, label))
     
     # 动态列数
@@ -128,33 +123,25 @@ def get_current_question_ui(user_state):
 
     return (
         gr.update(value=instruction_text, visible=True),
-        gr.update(value=display_list, columns=cols, visible=True), # Gallery
-        gr.update(value="当前未选择任何图片", visible=True), # 状态栏重置
-        gr.update(visible=True), # 按钮区可见
-        gr.update(visible=False), # 结束语
+        gr.update(value=display_list, columns=cols, visible=True), 
+        gr.update(value="当前未选择任何图片", visible=True), 
+        gr.update(visible=True), 
+        gr.update(visible=False), 
         user_state,
         shuffled_images,
-        [] # 重置选中的索引列表
+        [] 
     )
 
 def toggle_selection(evt: gr.SelectData, current_indices):
-    """
-    处理图片点击：
-    点击一次 -> 选中
-    再点一次 -> 取消选中
-    """
     clicked_idx = evt.index
     
-    # 切换状态
     if clicked_idx in current_indices:
         current_indices.remove(clicked_idx)
     else:
         current_indices.append(clicked_idx)
         
-    # 排序一下，让显示更好看 (Option A, Option B)
     current_indices.sort()
     
-    # 更新状态文本
     if not current_indices:
         status_text = "当前未选择任何图片"
     else:
@@ -164,9 +151,6 @@ def toggle_selection(evt: gr.SelectData, current_indices):
     return current_indices, status_text
 
 def submit_vote(user_state, current_file_paths, current_indices, is_none=False):
-    """
-    提交投票（可能是多选，可能是None）
-    """
     user_id = user_state["user_id"]
     current_idx = user_state["index"]
     
@@ -175,16 +159,14 @@ def submit_vote(user_state, current_file_paths, current_indices, is_none=False):
     
     group_id = ALL_GROUP_IDS[current_idx]
     
-    # --- 场景1: 都没有 ---
+    # 场景1: 都没有
     if is_none:
         save_user_vote(user_id, group_id, "Rejected All", "None_Satisfied")
         user_state["index"] += 1
         return get_current_question_ui(user_state)
     
-    # --- 场景2: 提交多选 ---
+    # 场景2: 提交多选
     if not current_indices:
-        # 如果用户没选图片就点了提交，弹窗提示或者不做反应
-        # 这里为了简单，返回原样，并提示
         return (
             gr.update(), gr.update(), 
             gr.update(value="❌ 请至少选择一张图片，或者点击“都不满意”"), 
@@ -192,16 +174,13 @@ def submit_vote(user_state, current_file_paths, current_indices, is_none=False):
             user_state, current_file_paths, current_indices
         )
     
-    # 解析所有选中的图片
     selected_labels = []
     selected_methods = []
     
     for idx in current_indices:
-        # 1. 记录 Option X
         label = f"Option {chr(65+idx)}"
         selected_labels.append(label)
         
-        # 2. 提取方法名
         real_path = current_file_paths[idx]
         filename = os.path.basename(real_path)
         name_no_ext = os.path.splitext(filename)[0]
@@ -209,28 +188,24 @@ def submit_vote(user_state, current_file_paths, current_indices, is_none=False):
         method = parts[1] if len(parts) > 1 else name_no_ext
         selected_methods.append(method)
     
-    # 用分号连接 (CSV友好)
     str_labels = "; ".join(selected_labels)
     str_methods = "; ".join(selected_methods)
     
     save_user_vote(user_id, group_id, str_labels, str_methods)
     
-    # 下一题
     user_state["index"] += 1
     return get_current_question_ui(user_state)
 
-# --- 6. 界面构建 ---
-with gr.Blocks(title="Multi-Select User Study", theme=gr.themes.Soft()) as demo:
+# --- 6. 界面构建 (已移除 theme 参数) ---
+with gr.Blocks(title="Multi-Select User Study") as demo:
     
-    # 状态变量
     state_user = gr.State(lambda: {"user_id": str(uuid.uuid4())[:8], "index": 0})
-    state_files = gr.State([])      # 存当前图片的真实路径
-    state_indices = gr.State([])    # 存当前选中的图片索引 [0, 2]
+    state_files = gr.State([])      
+    state_indices = gr.State([])    
     
     with gr.Column():
         instruction_md = gr.Markdown("Loading...")
         
-        # 图片区
         gallery = gr.Gallery(
             label="请点击选择图片（可多选）", 
             allow_preview=True, 
@@ -239,40 +214,32 @@ with gr.Blocks(title="Multi-Select User Study", theme=gr.themes.Soft()) as demo:
             interactive=True
         )
         
-        # 状态显示区（告诉用户选了啥）
         status_box = gr.Textbox(value="当前未选择任何图片", label="当前选中状态", interactive=False)
         
-        # 按钮区
         with gr.Row():
             btn_submit = gr.Button("✅ 提交选择 (Confirm Selection)", variant="primary", scale=2)
             btn_none = gr.Button("🚫 都不满意 (None of them)", variant="stop", scale=1)
         
         end_msg = gr.Markdown(visible=False)
 
-    # --- 事件流 ---
-    
-    # 1. 启动加载
     demo.load(
         fn=get_current_question_ui, 
         inputs=[state_user], 
         outputs=[instruction_md, gallery, status_box, btn_submit, end_msg, state_user, state_files, state_indices]
     )
     
-    # 2. 点击图片 -> 切换选中状态 (不翻页)
     gallery.select(
         fn=toggle_selection,
         inputs=[state_indices],
         outputs=[state_indices, status_box]
     )
     
-    # 3. 点击提交 -> 保存并下一页
     btn_submit.click(
         fn=lambda s, f, i: submit_vote(s, f, i, is_none=False),
         inputs=[state_user, state_files, state_indices],
         outputs=[instruction_md, gallery, status_box, btn_submit, end_msg, state_user, state_files, state_indices]
     )
     
-    # 4. 点击都不满意 -> 保存并下一页
     btn_none.click(
         fn=lambda s, f, i: submit_vote(s, f, i, is_none=True),
         inputs=[state_user, state_files, state_indices],