Update app.py

app.py

@@ -171,7 +171,6 @@ def save_api_settings(api_key, api_base_url=None):
         if api_base_url:
             success_msg += ", Base URL updated"
             
-        # 返回成功消息和 True (表示 API 已就绪)
         return success_msg, get_debug_info(), True
     except Exception as e:
         return f"❌ Error: {str(e)}", get_debug_info(), False
@@ -186,7 +185,6 @@ def save_pdf(file):
                 
         file_path = os.path.join(PAPERS_DIR, os.path.basename(file.name))
         shutil.copy(file.name, file_path)
-        # 返回成功消息和 True (表示 PDF 已就绪)
         return f"✅ Saved: {os.path.basename(file.name)}", get_debug_info(), True
     except Exception as e:
         return f"❌ Error: {str(e)}", get_debug_info(), False
@@ -221,7 +219,6 @@ def clear_pdf():
             os.remove(ZIP_OUTPUT_PATH)
             
         disable_btn = gr.update(interactive=False)
-        # 返回：状态文本, debug视窗, pdf_ready=False, 以及锁定4个生成按钮
         if deleted_files or deleted_dirs:
             return f"🗑️ Workspace cleared", get_debug_info(), False, disable_btn, disable_btn, disable_btn, disable_btn
         return "ℹ️ Workspace is already empty", get_debug_info(), False, disable_btn, disable_btn, disable_btn, disable_btn
@@ -232,8 +229,12 @@ def run_mineru_parsing_and_dag_gen():
     no_change = gr.update()
     disable_btn = gr.update(interactive=False)
     
+    # 进度条显示 (visible=True)
+    show_progress = gr.update(visible=True)
+    hide_progress = gr.update(visible=False)
+    
     if not os.path.exists(PAPERS_DIR) or not any(f.endswith('.pdf') for f in os.listdir(PAPERS_DIR)):
-        yield "❌ No PDF file found", get_debug_info(), "No execution logs.", no_change, no_change, no_change, no_change
+        yield "❌ No PDF file found", get_debug_info(), "No execution logs.", no_change, no_change, no_change, no_change, hide_progress
         return
 
     full_log = ""
@@ -246,55 +247,59 @@ def run_mineru_parsing_and_dag_gen():
 
         command_mineru = ["mineru", "-p", PAPERS_DIR, "-o", OUTPUT_DIR]
         full_log += "--- Mineru Executing ---\n"
-        # 运行中保持按钮状态不变
-        yield "⏳ Executing Mineru parsing...", get_debug_info(), full_log, no_change, no_change, no_change, no_change
+        
+        # 激活显示全局进度条
+        yield "⏳ Executing Mineru parsing...", get_debug_info(), full_log, no_change, no_change, no_change, no_change, show_progress
 
         process_mineru = subprocess.Popen(
             command_mineru, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, bufsize=1
         )
         for line in iter(process_mineru.stdout.readline, ''):
             full_log += line
-            yield "⏳ Executing Mineru parsing...", get_debug_info(), full_log, no_change, no_change, no_change, no_change
+            yield "⏳ Executing Mineru parsing...", get_debug_info(), full_log, no_change, no_change, no_change, no_change, show_progress
         process_mineru.stdout.close()
         returncode_mineru = process_mineru.wait()
 
         if returncode_mineru != 0:
-            yield f"❌ Mineru parsing failed (Exit Code: {returncode_mineru})", get_debug_info(), full_log, disable_btn, disable_btn, disable_btn, disable_btn
+            yield f"❌ Mineru parsing failed (Exit Code: {returncode_mineru})", get_debug_info(), full_log, disable_btn, disable_btn, disable_btn, disable_btn, hide_progress
             return
 
         command_dag = [sys.executable, "gen_dag.py"]
         full_log += "\n--- DAG Gen Executing ---\n"
-        yield "⏳ Mineru parsing complete, executing DAG generation...", get_debug_info(), full_log, no_change, no_change, no_change, no_change
+        yield "⏳ Mineru parsing complete, executing DAG generation...", get_debug_info(), full_log, no_change, no_change, no_change, no_change, show_progress
         
         process_dag = subprocess.Popen(
             command_dag, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, bufsize=1
         )
         for line in iter(process_dag.stdout.readline, ''):
             full_log += line
-            yield "⏳ Executing DAG generation...", get_debug_info(), full_log, no_change, no_change, no_change, no_change
+            yield "⏳ Executing DAG generation...", get_debug_info(), full_log, no_change, no_change, no_change, no_change, show_progress
         process_dag.stdout.close()
         returncode_dag = process_dag.wait()
         
-        # 解析完全成功，解锁第三部分的按钮
+        # 解析完全成功，解锁第三部分的按钮，并隐藏进度条
         if returncode_dag == 0:
             status = "✅ PDF parsing & DAG generation fully completed"
             enable_btn = gr.update(interactive=True)
-            yield status, get_debug_info(), full_log, enable_btn, enable_btn, enable_btn, enable_btn
+            yield status, get_debug_info(), full_log, enable_btn, enable_btn, enable_btn, enable_btn, hide_progress
         else:
             status = f"❌ DAG generation failed (Exit Code: {returncode_dag})"
-            yield status, get_debug_info(), full_log, disable_btn, disable_btn, disable_btn, disable_btn
+            yield status, get_debug_info(), full_log, disable_btn, disable_btn, disable_btn, disable_btn, hide_progress
 
     except Exception as e:
         error_log = full_log + f"\n[Global Exception] Exception occurred:\n{str(e)}"
-        yield "❌ Execution Exception", get_debug_info(), error_log, disable_btn, disable_btn, disable_btn, disable_btn
+        yield "❌ Execution Exception", get_debug_info(), error_log, disable_btn, disable_btn, disable_btn, disable_btn, hide_progress
 
 
 def run_final_generation(task_type="all"):
     """
     使用队列和多线程实时获取子进程的流式输出，并通过 yield 推送到前端界面。
     """
+    show_progress = gr.update(visible=True)
+    hide_progress = gr.update(visible=False)
+
     if not os.path.exists(OUTPUT_DIR):
-        yield "❌ Please run the parsing step first", get_debug_info(), "No output folder found.", gr.update(visible=False)
+        yield "❌ Please run the parsing step first", get_debug_info(), "No output folder found.", gr.update(visible=False), hide_progress
         return
 
     scripts_to_run = []
@@ -303,11 +308,12 @@ def run_final_generation(task_type="all"):
     elif task_type == "pr": scripts_to_run = ["gen_pr.py"]
     elif task_type == "all": scripts_to_run = ["gen_ppt.py", "gen_poster.py", "gen_pr.py"]
     else: 
-        yield "❌ Unknown task type", get_debug_info(), "Invalid task_type.", gr.update(visible=False)
+        yield "❌ Unknown task type", get_debug_info(), "Invalid task_type.", gr.update(visible=False), hide_progress
         return
 
     full_log = f"🚀 Preparing to start {len(scripts_to_run)} tasks...\n"
-    yield f"⏳ Starting {task_type.upper()} generation...", get_debug_info(), full_log, gr.update(visible=False)
+    # 激活全局进度条
+    yield f"⏳ Starting {task_type.upper()} generation...", get_debug_info(), full_log, gr.update(visible=False), show_progress
 
     q = queue.Queue()
     processes = []
@@ -336,7 +342,7 @@ def run_final_generation(task_type="all"):
             try:
                 script_name, line = q.get(timeout=0.1)
                 full_log += f"[{script_name}] {line}"
-                yield f"⏳ Generating {task_type.upper()}...", get_debug_info(), full_log, gr.update(visible=False)
+                yield f"⏳ Generating {task_type.upper()}...", get_debug_info(), full_log, gr.update(visible=False), show_progress
             except queue.Empty:
                 active_processes = sum(1 for _, p in processes if p.poll() is None)
 
@@ -347,21 +353,21 @@ def run_final_generation(task_type="all"):
                 full_log += f"\n❌ [Error] {script} returned non-zero exit code (Exit Code: {p.returncode})\n"
 
         if not success: 
-            yield f"❌ {task_type.upper()} contains failed tasks, please check logs", get_debug_info(), full_log, gr.update(visible=False)
+            yield f"❌ {task_type.upper()} contains failed tasks, please check logs", get_debug_info(), full_log, gr.update(visible=False), hide_progress
             return
 
         full_log += "\n📦 Zipping output directory...\n"
-        yield f"⏳ Zipping outputs...", get_debug_info(), full_log, gr.update(visible=False)
+        yield f"⏳ Zipping outputs...", get_debug_info(), full_log, gr.update(visible=False), show_progress
         
         zip_base_name = ZIP_OUTPUT_PATH.replace(".zip", "")
         shutil.make_archive(zip_base_name, 'zip', OUTPUT_DIR)
         
         full_log += "✅ All tasks and zipping completed successfully.\n"
-        yield f"✅ {task_type.upper()} generated and zipped successfully", get_debug_info(), full_log, gr.update(value=ZIP_OUTPUT_PATH, visible=True)
+        yield f"✅ {task_type.upper()} generated and zipped successfully", get_debug_info(), full_log, gr.update(value=ZIP_OUTPUT_PATH, visible=True), hide_progress
         
     except Exception as e:
         error_log = full_log + f"\n[Global Exception] Exception occurred:\n{str(e)}"
-        yield "❌ Global exception during final generation", get_debug_info(), error_log, gr.update(visible=False)
+        yield "❌ Global exception during final generation", get_debug_info(), error_log, gr.update(visible=False), hide_progress
 
 
 # ==========================================
@@ -395,10 +401,29 @@ body, .gradio-container {
 
 @keyframes gradient-shift { 0%, 100% { background-position: 0% 50%; } 50% { background-position: 100% 50%; } }
 
-#subtitle { text-align: center !important; margin-bottom: 2rem; }
+#subtitle { text-align: center !important; margin-bottom: 1.5rem; }
 #subtitle p { margin: 0 auto; color: #666; font-size: 1.1rem; font-weight: 500; }
 .dark #subtitle p { color: #DAB2FF; }
 
+/* ======== CSS FOR GLOBAL PROGRESS BAR ======== */
+#global-progress { margin-bottom: 20px !important; transition: opacity 0.3s ease; }
+.progress-container {
+    width: 100%; background-color: rgba(243, 232, 255, 0.8);
+    border: 1px solid #C084FC; border-radius: 16px; overflow: hidden;
+    position: relative; height: 38px; display: flex; align-items: center; justify-content: center;
+    box-shadow: 0 4px 15px rgba(168, 85, 247, 0.15);
+}
+.progress-bar {
+    height: 100%; width: 40%;
+    background: linear-gradient(90deg, transparent, rgba(168, 85, 247, 0.6), rgba(192, 132, 252, 0.8), rgba(168, 85, 247, 0.6), transparent);
+    position: absolute; left: -40%; top: 0;
+    animation: loading-slide 1.5s infinite linear;
+}
+@keyframes loading-slide { 0% { left: -40%; } 100% { left: 100%; } }
+.progress-text { position: relative; z-index: 1; color: #6B21A8; font-weight: 600; font-size: 15px; letter-spacing: 0.5px; }
+.dark .progress-container { background-color: rgba(30, 30, 30, 0.9); border-color: rgba(168, 85, 247, 0.4); }
+.dark .progress-text { color: #DAB2FF; }
+
 .gradio-group {
     background: rgba(255, 255, 255, 0.9) !important;
     border: 2px solid #E9D5FF !important; 
@@ -473,7 +498,7 @@ body, .gradio-container {
     margin-right: auto !important; 
     margin-top: 10px !important;
     margin-bottom: 10px !important;
-    display: block !important;      
+    display: block !important;     
     transition: transform 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275), box-shadow 0.3s ease !important;
     box-shadow: 0 4px 15px rgba(126, 34, 206, 0.3) !important;
     cursor: pointer !important; 
@@ -549,6 +574,13 @@ with gr.Blocks(theme=purple_theme, css=custom_css) as demo:
         gr.Markdown("# **PaperX Platform**", elem_id="main-title")
         gr.Markdown("One-click parsing of academic PDFs, DAG structuring, and multi-modal asset generation.", elem_id="subtitle")
         
+        # 🟢 新增的全局加载动画条，默认隐藏
+        global_progress = gr.HTML(
+            '<div class="progress-container"><div class="progress-bar"></div><div class="progress-text">⏳ 加载中... (Task in progress, please wait)</div></div>',
+            visible=False,
+            elem_id="global-progress"
+        )
+        
         with gr.Row():
             # ================= LEFT COLUMN: SETTINGS & ACTIONS =================
             with gr.Column(scale=1):
@@ -625,7 +657,6 @@ with gr.Blocks(theme=purple_theme, css=custom_css) as demo:
     # ================= LOGIC BINDINGS =================
     
     # [步骤 1] 配置 API
-    # 成功后不仅更新 UI 文本，还会将 api_saved_state 设置为 True
     key_btn.click(
         fn=save_api_settings, 
         inputs=[key_input, api_base_url_input], 
@@ -633,11 +664,9 @@ with gr.Blocks(theme=purple_theme, css=custom_css) as demo:
     )
     
     # [步骤 2.1] 上传 PDF
-    # 成功后更新文本，并将 pdf_ready_state 设置为 True
     pdf_input.upload(fn=save_pdf, inputs=pdf_input, outputs=[parse_status, debug_view, pdf_ready_state])
     
     # [步骤 2.2] 清除 PDF
-    # 会锁定第四步的所有生成按钮，同时将 pdf_ready_state 重置为 False
     pdf_input.clear(
         fn=clear_pdf, 
         outputs=[parse_status, debug_view, pdf_ready_state, gen_ppt_btn, gen_poster_btn, gen_pr_btn, gen_all_btn]
@@ -650,11 +679,10 @@ with gr.Blocks(theme=purple_theme, css=custom_css) as demo:
     api_saved_state.change(fn=check_parse_btn_ready, inputs=[api_saved_state, pdf_ready_state], outputs=parse_btn)
     pdf_ready_state.change(fn=check_parse_btn_ready, inputs=[api_saved_state, pdf_ready_state], outputs=parse_btn)
 
-    # [步骤 2.3] 执行解析
-    # 如果完全成功，函数最后的一个 yield 会连带输出 interactive=True 给这4个生成按钮
+    # [步骤 2.3] 执行解析，绑定 8 个 outputs (新增控制 global_progress)
     parse_btn.click(
         fn=run_mineru_parsing_and_dag_gen, 
-        outputs=[parse_status, debug_view, cmd_logs, gen_ppt_btn, gen_poster_btn, gen_pr_btn, gen_all_btn]
+        outputs=[parse_status, debug_view, cmd_logs, gen_ppt_btn, gen_poster_btn, gen_pr_btn, gen_all_btn, global_progress]
     )
 
     # [步骤 3] 资产生成
@@ -663,12 +691,13 @@ with gr.Blocks(theme=purple_theme, css=custom_css) as demo:
     def trigger_gen_pr(): yield from run_final_generation("pr")
     def trigger_gen_all(): yield from run_final_generation("all")
 
-    gen_ppt_btn.click(fn=trigger_gen_ppt, outputs=[gen_status, debug_view, cmd_logs, download_file])
-    gen_poster_btn.click(fn=trigger_gen_poster, outputs=[gen_status, debug_view, cmd_logs, download_file])
-    gen_pr_btn.click(fn=trigger_gen_pr, outputs=[gen_status, debug_view, cmd_logs, download_file])
-    gen_all_btn.click(fn=trigger_gen_all, outputs=[gen_status, debug_view, cmd_logs, download_file])
+    # [步骤 3 绑定] 绑定 5 个 outputs (新增控制 global_progress)
+    gen_ppt_btn.click(fn=trigger_gen_ppt, outputs=[gen_status, debug_view, cmd_logs, download_file, global_progress])
+    gen_poster_btn.click(fn=trigger_gen_poster, outputs=[gen_status, debug_view, cmd_logs, download_file, global_progress])
+    gen_pr_btn.click(fn=trigger_gen_pr, outputs=[gen_status, debug_view, cmd_logs, download_file, global_progress])
+    gen_all_btn.click(fn=trigger_gen_all, outputs=[gen_status, debug_view, cmd_logs, download_file, global_progress])
     
     refresh_btn.click(fn=get_debug_info, outputs=debug_view)
 
 if __name__ == "__main__":
-    demo.launch(debug=True)
+    demo.launch()