Update app.py

app.py

@@ -64,7 +64,7 @@ else:
     ROOT_BASE = os.getcwd()
 
 TASKS_ROOT_DIR = os.path.join(ROOT_BASE, "nihaisha_tasks_v14_final") 
-CORPUS_ROOT_DIR = os.path.join(ROOT_BASE, "nihaisha_corpus_lib")      
+CORPUS_ROOT_DIR = os.path.join(ROOT_BASE, "nihaisha_corpus_lib")       
 PERSONAS_FILE = os.path.join(ROOT_BASE, "personas_config.json")       
 
 os.makedirs(TASKS_ROOT_DIR, exist_ok=True)
@@ -81,11 +81,13 @@ class PersonaManager:
                 "user_template": "【任务】：请根据参考资料总结核心内容。\n【主题】：{topic}"
             }
         }
-        self.personas = self.load_personas()
+        # 启动时确保文件存在
+        if not os.path.exists(self.filepath):
+            self.save_personas(self.default_personas)
 
     def load_personas(self):
+        """强制从硬盘读取，不使用内存缓存"""
         if not os.path.exists(self.filepath):
-            self.save_personas(self.default_personas)
             return self.default_personas
         try:
             with open(self.filepath, 'r', encoding='utf-8') as f:
@@ -96,22 +98,27 @@ class PersonaManager:
             return self.default_personas
 
     def save_personas(self, new_data):
+        """保存并强制刷入磁盘"""
         try:
             with open(self.filepath, 'w', encoding='utf-8') as f:
                 json.dump(new_data, f, indent=4, ensure_ascii=False)
-            self.personas = new_data
+                f.flush()
+                os.fsync(f.fileno()) # 物理写入
+            time.sleep(0.05) # 微小延迟确保系统文件锁释放
             return True
         except Exception as e:
             print(f"❌ 保存失败: {e}")
             return False
 
     def get_persona(self, name):
-        if name not in self.personas and self.personas:
-            return list(self.personas.values())[0]
-        return self.personas.get(name)
+        data = self.load_personas()
+        if name not in data and data:
+            return list(data.values())[0]
+        return data.get(name)
 
     def get_all_names(self):
-        return list(self.personas.keys())
+        data = self.load_personas()
+        return list(data.keys())
 
 persona_manager = PersonaManager()
 
@@ -532,31 +539,57 @@ def start_execution(topic_text, persona_name, p_sys, p_user, selected_refs):
     threading.Thread(target=worker, args=(tid, topics, persona_name, p_sys, p_user, selected_refs, manual_topic_name)).start()
     return f"任务已启动: {tid}", tid
 
-# --- UI Helper ---
-def update_persona_dropdown():
-    names = persona_manager.get_all_names()
-    return gr.Dropdown(choices=names, value=names[0] if names else None)
+# --- UI Helper (核心修复部分) ---
+
+def global_refresh_dropdowns(target_value=None):
+    """
+    通用刷新函数：强制从硬盘读取最新列表，并生成两个gr.update对象。
+    """
+    all_names = persona_manager.get_all_names()
+    
+    # 确定选中的值：如果指定值在列表里，就选它；否则选第一个；如果列表为空，则None
+    final_val = target_value if (target_value and target_value in all_names) else (all_names[0] if all_names else None)
+    
+    # 返回两个更新指令，分别对应 Tab1 和 Tab2 的下拉框
+    # 注意：使用 gr.update(choices=..., value=...) 是解决不同步的终极方案
+    return gr.update(choices=all_names, value=final_val), gr.update(choices=all_names, value=final_val)
 
 def on_select_persona_config(name):
+    if not name:
+        return "", ""
     p = persona_manager.get_persona(name)
+    if not p:
+        return "", ""
     return p.get("system"), p.get("user_template")
 
 def save_new_persona(name, sys, user):
-    if not name: return "❌ 名字不能为空", gr.update()
+    """保存角色并原子化更新两个下拉框"""
+    if not name: 
+        return "❌ 名字不能为空", gr.update(), gr.update()
+    
     current = persona_manager.load_personas()
     current[name] = {"system": sys, "user_template": user}
+    
     if persona_manager.save_personas(current):
-        return f"✅ 角色 '{name}' 已保存", update_persona_dropdown()
+        # 保存成功后，直接调用通用刷新函数，选中新创建的角色
+        u1, u2 = global_refresh_dropdowns(target_value=name)
+        return f"✅ 角色 '{name}' 已保存", u1, u2
     else:
-        return f"❌ 保存失败", gr.update()
+        return f"❌ 保存失败", gr.update(), gr.update()
 
 def delete_persona(name):
-    if not name: return "❌ 未选择", gr.update()
+    """删除角色并原子化更新两个下拉框"""
+    if not name: 
+        return "❌ 未选择", gr.update(), gr.update()
+    
     current = persona_manager.load_personas()
     if name in current:
         del current[name]
         persona_manager.save_personas(current)
-    return f"🗑️ 已删除", update_persona_dropdown()
+    
+    # 删除后，刷新列表，默认选中第一个
+    u1, u2 = global_refresh_dropdowns(target_value=None)
+    return f"🗑️ 已删除", u1, u2
 
 # --- 界面布局 ---
 
@@ -571,10 +604,11 @@ with gr.Blocks(title="AI 灵活内容工厂 (V14 Final)") as demo:
 
     with gr.Tabs():
         # --- Tab 1: 创作中心 ---
-        with gr.Tab("🚀 1. 创作中心"):
+        with gr.Tab("🚀 1. 创作中心") as tab_create:
             with gr.Row():
                 with gr.Column(scale=1):
                     gr.Markdown("### 配置与启动")
+                    # 给组件定义变量名，方便后续更新
                     persona_select = gr.Dropdown(label="加载预设角色 (选填)", choices=persona_manager.get_all_names(), interactive=True)
                     topic_input = gr.Textbox(label="输入主题 (一行一个)", lines=3, placeholder="留空则自动拟题...")
                     
@@ -591,10 +625,11 @@ with gr.Blocks(title="AI 灵活内容工厂 (V14 Final)") as demo:
             start_msg = gr.Label(show_label=False)
 
         # --- Tab 2: 角色配置 ---
-        with gr.Tab("🎭 2. 角色配置"):
+        with gr.Tab("🎭 2. 角色配置") as tab_config:
             with gr.Row():
                 with gr.Column(scale=1):
                     gr.Markdown("### 角色管理")
+                    # 这里定义变量名
                     p_config_select = gr.Dropdown(label="选择角色编辑", choices=persona_manager.get_all_names(), interactive=True)
                     p_name_input = gr.Textbox(label="新建/重命名", placeholder="角色名")
                     p_save_btn = gr.Button("💾 保存/新建", variant="primary")
@@ -636,37 +671,61 @@ with gr.Blocks(title="AI 灵活内容工厂 (V14 Final)") as demo:
         outputs=task_dd
     )
     
+    # ================= 核心修复逻辑：Tab 切换自动刷新 =================
+    # 原理：只要用户点击 Tab 1 或 Tab 2，就强制刷新该页面下的下拉框
+    # 这确保了即使按钮更新失败，切换一下页面也能立刻修复
+    
+    def tab_refresh_handler():
+        u1, u2 = global_refresh_dropdowns()
+        return u1 # 返回给当前Tab的组件
+    
+    # 绑定 Tab 选中事件 (Gradio 4.x+)
+    tab_create.select(fn=lambda: global_refresh_dropdowns()[0], inputs=None, outputs=persona_select)
+    tab_config.select(fn=lambda: global_refresh_dropdowns()[1], inputs=None, outputs=p_config_select)
+
+    # =============================================================
+    
     # 角色配置联动
     persona_select.select(on_select_persona_config, persona_select, [p_sys_input, p_user_input])
+    
+    # 关键逻辑：选择角色配置时，自动填充名字输入框
     p_config_select.select(on_select_persona_config, p_config_select, [p_sys_input, p_user_input])
     p_config_select.select(lambda x: x, p_config_select, p_name_input)
     
-    p_save_btn.click(save_new_persona, [p_name_input, p_sys_input, p_user_input], [p_status, p_config_select])
-    p_save_btn.click(update_persona_dropdown, outputs=persona_select)
-    p_del_btn.click(delete_persona, p_config_select, [p_status, p_config_select])
-    p_del_btn.click(update_persona_dropdown, outputs=persona_select)
+    # 核心修复：保存按钮同时更新两个下拉框，并设置Value，防止报错
+    p_save_btn.click(
+        save_new_persona, 
+        inputs=[p_name_input, p_sys_input, p_user_input], 
+        outputs=[p_status, persona_select, p_config_select] # 同时指向 Tab1 和 Tab2 的下拉框
+    )
+    
+    # 核心修复：删除按钮同时更新两个下拉框
+    p_del_btn.click(
+        delete_persona, 
+        inputs=p_config_select, 
+        outputs=[p_status, persona_select, p_config_select]
+    )
     
     analyze_btn.click(analyze_matches, topic_input, [ref_checkboxes, analyze_status, state_all_files])
     select_all_btn.click(toggle_select_all, inputs=[ref_checkboxes, state_all_files], outputs=ref_checkboxes)
     upload_btn.click(save_to_corpus, files, [corpus_display, upload_res])
     clear_btn.click(clear_corpus, outputs=[corpus_display, upload_res])
     
-    # 【关键修复】自动刷新逻辑
-    # 每2秒从后台读取日志和结果文件路径
+    # 自动刷新逻辑
     timer.tick(
         lambda tid: (task_manager.get_task_info(tid)["log"], task_manager.get_task_info(tid)["result"]) if tid else ("", None), 
         inputs=task_dd, 
         outputs=[log_box, result_dl]
     )
     
-    # 手动刷新按钮
     refresh_task.click(lambda: gr.Dropdown(choices=task_manager.list_tasks(), value=task_manager.list_tasks()[0] if task_manager.list_tasks() else None), outputs=task_dd)
     task_dd.change(lambda tid: (task_manager.get_task_info(tid)["log"], task_manager.get_task_info(tid)["result"]) if tid else ("", None), task_dd, [log_box, result_dl])
     
-    # 自动加载
+    # 初始加载
     demo.load(list_corpus_files, outputs=corpus_display)
-    demo.load(update_persona_dropdown, outputs=persona_select)
-    demo.load(update_persona_dropdown, outputs=p_config_select)
+    # 初始化时确保两个下拉框都有值
+    demo.load(lambda: global_refresh_dropdowns()[0], outputs=persona_select)
+    demo.load(lambda: global_refresh_dropdowns()[1], outputs=p_config_select)
 
 if __name__ == "__main__":
     demo.queue().launch()