2

app.py

@@ -1,224 +1,166 @@
 import gradio as gr
 import json
 import base64
+import os
 from data_manager import data_manager
 
-# ============== 状态管理 ==============
-class ReviewState:
-    def __init__(self):
-        self.all_paths = []
-        self.current_idx = -1
-    
-    def sync_paths(self):
-        self.all_paths = data_manager.get_all_chart_paths()
-    
-    def get_nav_target(self, direction):
-        new_idx = self.current_idx + direction
-        if 0 <= new_idx < len(self.all_paths):
-            self.current_idx = new_idx
-            return self.all_paths[new_idx]
-        return None
-
-nav_state = ReviewState()
-
 # ============== 工具函数 ==============
 def to_html_frame(html_content):
     if not html_content:
         return '<div style="padding:20px;text-align:center;">请选择数据进行加载</div>'
-    b64_content = base64.b64encode(html_content.encode('utf-8')).decode('utf-8')
-    return f'<iframe src="data:text/html;base64,{b64_content}" style="width:100%;height:600px;border:none;"></iframe>'
+    try:
+        b64_content = base64.b64encode(html_content.encode('utf-8')).decode('utf-8')
+        return f'<iframe src="data:text/html;base64,{b64_content}" style="width:100%;height:550px;border:2px solid #eee;border-radius:8px;"></iframe>'
+    except:
+        return '<div style="color:red;">HTML 渲染失败</div>'
 
 def get_stats_display():
-    stats = data_manager.get_review_stats()
-    return f"✅正确: {stats['correct']} | ❌错误: {stats['incorrect']} | 📝优化: {stats.get('modified', 0)} | 总计: {stats['total']}"
+    s = data_manager.get_review_stats()
+    return f"✅ 正确: {s['correct']} | ❌ 错误: {s['incorrect']} | 🔧 优化: {s.get('modified', 0)} | 总计: {s['total']}"
 
-# ============== 交互逻辑 ==============
+# ============== 核心逻辑 ==============
 def handle_source_change(source):
     struct = data_manager.get_dataset_structure()
     types = list(struct.get('sources', {}).get(source, {}).get('chart_types', {}).keys())
-    return gr.update(choices=types, value=types[0] if types else None)
+    return gr.update(choices=types, value=types[0] if types else "")
 
 def handle_type_change(source, c_type):
     charts = data_manager.get_chart_list(source, c_type)
     struct = data_manager.get_dataset_structure()
     models = struct.get('sources', {}).get(source, {}).get('chart_types', {}).get(c_type, {}).get('models', [])
     return (
-        gr.update(choices=charts, value=charts[0] if charts else None),
-        gr.update(choices=models, value=models[0] if models else None)
+        gr.update(choices=charts, value=charts[0] if charts else ""),
+        gr.update(choices=models, value=models[0] if models else "")
     )
 
 def handle_load(source, c_type, c_id, model):
     if not all([source, c_type, c_id, model]):
-        return [gr.update()] * 8
+        return [gr.update()] * 7 # 这里的数量必须严格对应 outputs
     
     chart_data = data_manager.get_chart_data(source, c_type, c_id)
     qa_list = data_manager.get_qa_list(source, c_type, model, c_id)
     
-    nav_state.sync_paths()
-    for i, p in enumerate(nav_state.all_paths):
-        if p['chart_id'] == c_id and p['model'] == model:
-            nav_state.current_idx = i
-            break
-
-    html_code = to_html_frame(chart_data.get('html_content', ''))
-    meta_md = "\n".join([f"- **{k}**: {v}" for k, v in chart_data.get('label_info', {}).items()])
-    qa_json = json.dumps([{"id": q.id, "q": q.question, "a": q.answer} for q in qa_list])
-    stats_str = get_stats_display()
-    prog_str = f"{nav_state.current_idx + 1} / {len(nav_state.all_paths)}"
-    radio_choices = [f"Q{i+1}: {q.question[:30]}..." for i, q in enumerate(qa_list)]
+    # 构造 Radio 选项，添加 ID 标记以便解析
+    radio_choices = [f"[{i}] {q.question[:30]}..." for i, q in enumerate(qa_list)]
     
     return [
-        html_code, 
-        meta_md, 
-        qa_json, 
-        stats_str, 
-        prog_str, 
+        to_html_frame(chart_data.get('html_content', '')),
+        "\n".join([f"- **{k}**: {v}" for k, v in chart_data.get('label_info', {}).items()]) if chart_data.get('label_info') else "无元数据",
+        json.dumps([{"id": q.id, "q": q.question, "a": q.answer} for q in qa_list], ensure_ascii=False),
+        get_stats_display(),
         f"{source} / {c_type} / {c_id}",
         gr.update(choices=radio_choices, value=radio_choices[0] if radio_choices else None),
-        "{}" 
+        "" # 清空备注栏
     ]
 
 def handle_qa_select(selection, qa_json):
     if not selection or not qa_json:
-        return [""] * 4
+        return ["", "", "", ""]
     try:
         qas = json.loads(qa_json)
-        idx = int(selection.split(":")[0][1:]) - 1
+        # 解析索引，形如 "[0] 标题..."
+        idx = int(selection.split(']')[0].replace('[', ''))
         curr = qas[idx]
         return [curr['id'], curr['q'], curr['a'], ""]
-    except:
-        return [""] * 4
+    except Exception as e:
+        print(f"解析QA失败: {e}")
+        return ["", "", "", ""]
 
 # ============== UI 布局 ==============
 def create_ui():
-    with gr.Blocks(title="图表审核系统 V2", theme=gr.themes.Soft()) as demo:
+    with gr.Blocks(title="ChartQA 审核系统", theme=gr.themes.Default()) as demo:
+        # 内存状态
         qa_store = gr.State(value="[]")
         
-        with gr.Row():
-            gr.Markdown("# 📊 图表问答数据集审核终端")
-            with gr.Column(min_width=200):
-                export_btn = gr.Button("📤 导出审核记录", variant="secondary")
-                download_file = gr.File(label="点击下载导出的文件", visible=False)
-
+        gr.Markdown("# 📑 图表问答数据集审核终端")
+        
         with gr.Row():
             with gr.Column(scale=4):
                 with gr.Row():
-                    src_dd = gr.Dropdown(label="1. 数据源")
+                    src_dd = gr.Dropdown(label="1. 数据源", choices=[])
                     typ_dd = gr.Dropdown(label="2. 图表类型")
                     id_dd = gr.Dropdown(label="3. 图表 ID")
                     mdl_dd = gr.Dropdown(label="4. 评估模型")
                 
-                chart_view = gr.HTML(value='<div style="height:550px; background:#f9f9f9; border-radius:8px;"></div>')
-                path_info = gr.Text(label="当前数据路径", interactive=False)
+                chart_view = gr.HTML()
+                path_info = gr.Text(label="当前路径", interactive=False)
                 
             with gr.Column(scale=2):
                 with gr.Group():
-                    stats_txt = gr.Text(label="全库审核统计", value=get_stats_display(), interactive=False)
-                    prog_txt = gr.Text(label="当前库进度", interactive=False)
-                
-                with gr.Accordion("图表元数据 (Meta)", open=False):
-                    meta_md = gr.Markdown("等待加载...")
+                    stats_txt = gr.Text(label="审核统计", value=get_stats_display(), interactive=False)
+                    export_btn = gr.Button("📤 导出并下载 JSON", variant="secondary")
+                    download_file = gr.File(label="下载链接", visible=False)
+
+                with gr.Accordion("元数据 (Meta)", open=False):
+                    meta_md = gr.Markdown()
 
                 gr.Markdown("---")
-                qa_radio = gr.Radio(label="题目快速切换", choices=[])
+                qa_radio = gr.Radio(label="题目列表", choices=[])
                 
                 with gr.Group():
-                    curr_qid = gr.Text(label="QA ID", interactive=False, visible=True)
-                    q_disp = gr.Text(label="问题 (Question)", lines=3)
-                    a_disp = gr.Text(label="答案 (Answer)", lines=3)
-                    
+                    curr_qid = gr.Text(label="当前 QA ID", interactive=False)
+                    q_disp = gr.Text(label="问题", lines=2)
+                    a_disp = gr.Text(label="答案", lines=2)
                     status_opt = gr.Radio(
-                        label="审核结论", 
-                        choices=[("✅ 正确", "correct"), ("❌ 错误", "incorrect"), ("🔧 需优化", "modified")],
+                        label="结论", 
+                        choices=[("正确", "correct"), ("错误", "incorrect"), ("优化", "modified")],
                         value="correct"
                     )
-                    err_type = gr.Dropdown(label="错误分类 (可选)", choices=["无", "事实错误", "逻辑错误", "图表无法读取", "其他"])
-                    
-                comment = gr.Text(label="审核备注 (选填)")
-                save_btn = gr.Button("💾 提交单条审核", variant="primary")
-                
-                with gr.Row():
-                    prev_btn = gr.Button("⬅️ 上一图表")
-                    next_btn = gr.Button("➡️ 下一图表")
+                    comment = gr.Text(label="备注")
+                    save_btn = gr.Button("💾 提交审核", variant="primary")
 
         # --- 事件绑定 ---
-
-        # 1. 初始加载
+        
+        # 1. 初始化
         demo.load(
             fn=lambda: gr.update(choices=list(data_manager.get_dataset_structure().get('sources', {}).keys())),
             outputs=[src_dd]
         )
 
-        # 2. 联动逻辑
+        # 2. 联动
         src_dd.change(handle_source_change, inputs=[src_dd], outputs=[typ_dd])
         typ_dd.change(handle_type_change, inputs=[src_dd, typ_dd], outputs=[id_dd, mdl_dd])
         
-        load_event_outputs = [chart_view, meta_md, qa_store, stats_txt, prog_txt, path_info, qa_radio, comment]
-        id_dd.change(handle_load, inputs=[src_dd, typ_dd, id_dd, mdl_dd], outputs=load_event_outputs)
-        mdl_dd.change(handle_load, inputs=[src_dd, typ_dd, id_dd, mdl_dd], outputs=load_event_outputs)
+        # 3. 加载 (确保 outputs 数量为 7)
+        load_outputs = [chart_view, meta_md, qa_store, stats_txt, path_info, qa_radio, comment]
+        id_dd.change(handle_load, inputs=[src_dd, typ_dd, id_dd, mdl_dd], outputs=load_outputs)
+        mdl_dd.change(handle_load, inputs=[src_dd, typ_dd, id_dd, mdl_dd], outputs=load_outputs)
 
-        # 3. 题目切换
+        # 4. 题目选择
         qa_radio.change(
             handle_qa_select, 
             inputs=[qa_radio, qa_store], 
-            outputs=[curr_qid, q_disp, a_disp, comment] 
+            outputs=[curr_qid, q_disp, a_disp, comment]
         )
 
-        # 4. 保存功能 (带反馈和刷新)
-        def process_save(qid, cid, src, status, e_type, cmt, model, c_type):
+        # 5. 保存 (增加反馈)
+        def on_save(qid, cid, src, status, cmt, model, c_type):
             if not qid:
-                gr.Warning("请先选择一条题目！")
-                return get_stats_display()
+                return gr.update(value="请先选择题目"), get_stats_display()
             
             data_manager.save_review({
-                "qa_id": qid,
-                "chart_id": cid,
-                "source": src,
-                "chart_type": c_type,
-                "model": model,
-                "status": status,
-                "issue_type": e_type,
-                "comment": cmt
+                "qa_id": qid, "chart_id": cid, "source": src,
+                "chart_type": c_type, "model": model,
+                "status": status, "comment": cmt
             })
-            gr.Info(f"保存成功: {qid}")
-            return get_stats_display()
+            # 弹出提示
+            gr.Info(f"已保存记录: {qid}")
+            return gr.update(value=cmt), get_stats_display()
 
         save_btn.click(
-            process_save, 
-            inputs=[curr_qid, id_dd, src_dd, status_opt, err_type, comment, mdl_dd, typ_dd],
-            outputs=[stats_txt] # 保存后刷新统计数字
+            on_save, 
+            inputs=[curr_qid, id_dd, src_dd, status_opt, comment, mdl_dd, typ_dd],
+            outputs=[comment, stats_txt]
         )
 
-        # 5. 导航逻辑
-        def navigate(direction):
-            target = nav_state.get_nav_target(direction)
-            if target:
-                return [
-                    gr.update(value=target['source']),
-                    gr.update(value=target['chart_type']),
-                    gr.update(value=target['chart_id']),
-                    gr.update(value=target['model'])
-                ]
-            gr.Warning("已到达边界")
-            return [gr.update()] * 4
-
-        prev_btn.click(lambda: navigate(-1), outputs=[src_dd, typ_dd, id_dd, mdl_dd])
-        next_btn.click(lambda: navigate(1), outputs=[src_dd, typ_dd, id_dd, mdl_dd])
-
-        # 6. 导出功能
-        def handle_export():
-            file_path = data_manager.export_reviews()
-            return gr.update(value=file_path, visible=True)
-
-        export_btn.click(handle_export, outputs=[download_file])
+        # 6. 导出
+        export_btn.click(
+            fn=lambda: gr.update(value=data_manager.export_reviews(), visible=True),
+            outputs=[download_file]
+        )
 
     return demo
 
 if __name__ == "__main__":
-    # 关闭所有可能干扰的 API 解析
     app = create_ui()
-    app.launch(
-        server_name="0.0.0.0", 
-        server_port=7860, 
-        show_api=False
-    )
+    app.launch(server_name="0.0.0.0", server_port=7860, show_api=False)