Fix PDF export + mask image API key

dataflow_agent/toolkits/imtool/req_img.py

@@ -19,6 +19,17 @@ class Provider(str, Enum):
 _B64_RE = re.compile(r"[A-Za-z0-9+/=]+")  # 匹配 Base64 字符
 
 
+def _mask_secret(value: str, keep_start: int = 4, keep_end: int = 4) -> str:
+    if value is None:
+        return ""
+    s = str(value)
+    if not s:
+        return ""
+    if len(s) <= keep_start + keep_end:
+        return "*" * len(s)
+    return f"{s[:keep_start]}...{s[-keep_end:]}"
+
+
 def detect_provider(api_url: str) -> Provider:
     """
     根据 api_url 粗略识别服务商
@@ -823,7 +834,9 @@ async def generate_or_edit_and_save_image_async(
         timeout_map = {"1K": 180, "2K": 300, "4K": 360}
         timeout = timeout_map.get(resolution, 300)
     
-    log.info(f"aspect_ratio: {aspect_ratio} \n resolution: {resolution} \n use_edit: {use_edit} \n model: {model} \n api_url: {api_url} \n timeout: {timeout} \n api_key: {api_key}")
+    log.info(
+        f"aspect_ratio: {aspect_ratio} \n resolution: {resolution} \n use_edit: {use_edit} \n model: {model} \n api_url: {api_url} \n timeout: {timeout} \n api_key: {_mask_secret(api_key)}"
+    )
     # 根据模型类型选择不同的API
     if _is_dalle_model(model):
         if use_edit:

dataflow_agent/workflow/wf_paper2ppt_parallel.py

@@ -467,7 +467,6 @@ def create_paper2ppt_parallel_graph() -> GenericGraphBuilder:  # noqa: N802
                     state.generated_pages.append("")
 
         state.pagecontent = new_pagecontent
-        state.gen_down = True
         return state
 
     async def edit_single_page(state: Paper2FigureState) -> Paper2FigureState:

gradio_app/pages/paper2ppt.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import json
 import os
 from pathlib import Path
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import gradio as gr
 
@@ -38,11 +38,11 @@ def _list_generated_pages(run_dir: str) -> list[str]:
     return [str(p.resolve()) for p in sorted(img_dir.glob("page_*.png"))]
 
 
-def _pdf_path(run_dir: str) -> str:
+def _pdf_path(run_dir: str) -> Optional[str]:
     if not run_dir:
-        return ""
+        return None
     p = Path(run_dir) / "paper2ppt.pdf"
-    return str(p.resolve()) if p.exists() else ""
+    return str(p.resolve()) if p.exists() else None
 
 
 async def _run_pagecontent(
@@ -108,7 +108,7 @@ async def _run_generate(
     gen_fig_model: str,
     style: str,
     aspect_ratio: str,
-) -> Tuple[list[str], str]:
+) -> Tuple[list[str], Optional[str]]:
     if not run_dir:
         raise gr.Error("请先生成 pagecontent。")
     if not (gen_fig_model or "").strip():
@@ -189,7 +189,7 @@ async def _run_edit_one(
     return _list_generated_pages(run_dir)
 
 
-async def _run_export(run_dir: str, language: str, chat_api_url: str, api_key: str, llm_model: str, gen_fig_model: str) -> str:
+async def _run_export(run_dir: str, language: str, chat_api_url: str, api_key: str, llm_model: str, gen_fig_model: str) -> Optional[str]:
     if not run_dir:
         raise gr.Error("请先生成一次 PPT（产生 ppt_pages/page_*.png）。")
     os.environ["DF_API_KEY"] = api_key

gradio_app/pages/paper2video.py

@@ -103,7 +103,7 @@ def create_paper2video() -> gr.Blocks:
                     str(target_img_path) if image_path else None
                 )
                 # 提取结果
-                ppt_path = result.get("ppt_path", "")
+                ppt_path = result.get("ppt_path")
                 
                 # 构建日志信息
                 if ppt_path and Path(ppt_path).exists():
@@ -111,12 +111,12 @@ def create_paper2video() -> gr.Blocks:
                     return str(ppt_path)
                 else:
                     log.error("未能生成 PPT 文件。")
-                    return ""           
+                    return None
             except Exception as e:
                 import traceback
                 error_msg = f"执行失败:\n{traceback.format_exc()}"
                 print(f"错误: {error_msg}")
-                return ""
+                return None
 
 
         gen_btn.click(
@@ -201,4 +201,4 @@ async def run_paper2video_pipeline(
             log.warning(f"提取pdf的ppt失败: {e}")
         result["ppt_path"] = []
 
-    return result
+    return result

gradio_app/pages/ppt2polish.py

@@ -4,7 +4,7 @@ import json
 import os
 import shutil
 from pathlib import Path
-from typing import Tuple
+from typing import Optional, Tuple
 
 import gradio as gr
 
@@ -24,11 +24,11 @@ def _list_generated_pages(run_dir: str) -> list[str]:
     return [str(p.resolve()) for p in sorted(img_dir.glob("page_*.png"))]
 
 
-def _pdf_path(run_dir: str) -> str:
+def _pdf_path(run_dir: str) -> Optional[str]:
     if not run_dir:
-        return ""
+        return None
     p = Path(run_dir) / "paper2ppt.pdf"
-    return str(p.resolve()) if p.exists() else ""
+    return str(p.resolve()) if p.exists() else None
 
 
 def _safe_json_loads(s: str) -> list[dict]:
@@ -108,7 +108,7 @@ async def _run_polish_all(
     gen_fig_model: str,
     style: str,
     aspect_ratio: str,
-) -> Tuple[list[str], str]:
+) -> Tuple[list[str], Optional[str]]:
     if not run_dir:
         raise gr.Error("请先生成 pagecontent。")
     if not (gen_fig_model or "").strip():
@@ -188,7 +188,7 @@ async def _run_edit_one(
     return _list_generated_pages(run_dir)
 
 
-async def _run_export(run_dir: str, language: str, chat_api_url: str, api_key: str, llm_model: str, gen_fig_model: str) -> str:
+async def _run_export(run_dir: str, language: str, chat_api_url: str, api_key: str, llm_model: str, gen_fig_model: str) -> Optional[str]:
     if not run_dir:
         raise gr.Error("请先生成一次 polish（产生 ppt_pages/page_*.png）。")
     os.environ["DF_API_KEY"] = api_key