fix

api_routes.py

@@ -6,6 +6,7 @@ import inspect
 import io
 import json
 import os
+import shutil
 import time
 import uuid
 import subprocess
@@ -3526,23 +3527,48 @@ def _extract_tar_archive(archive_path: str, target_dir: str) -> Dict[str, str]:
     }
 
 
+def _flatten_chinese_celeb_dataset_dir(target_dir: str) -> bool:
+    """
+    若解压后出现 /opt/data/... 的嵌套结构，将内容提升到 target_dir 根目录，避免重复嵌套。
+    """
+    nested_root = os.path.join(target_dir, "opt", "data", "chinese_celeb_dataset")
+    if not os.path.isdir(nested_root):
+        return False
+
+    for name in os.listdir(nested_root):
+        src = os.path.join(nested_root, name)
+        dst = os.path.join(target_dir, name)
+        shutil.move(src, dst)
+
+    # 清理多余的 opt/data 目录
+    try:
+        shutil.rmtree(os.path.join(target_dir, "opt"))
+    except FileNotFoundError:
+        pass
+    return True
+
+
 def extract_chinese_celeb_dataset_sync() -> Dict[str, Any]:
     """
     同步执行 chinese_celeb_dataset 解压操作，供启动流程或其他同步场景复用。
     """
     archive_path = os.path.join(MODELS_PATH, "chinese_celeb_dataset.tar.gz")
-    target_dir = "/opt/data"
+    target_dir = "/opt/data/chinese_celeb_dataset"
 
     if not os.path.isfile(archive_path):
         raise FileNotFoundError(f"数据集文件不存在: {archive_path}")
 
     try:
+        if os.path.isdir(target_dir):
+            shutil.rmtree(target_dir)
         os.makedirs(target_dir, exist_ok=True)
     except OSError as exc:
         logger.error(f"创建目标目录失败: {target_dir}, {exc}")
         raise RuntimeError(f"创建目标目录失败: {exc}") from exc
 
     extract_result = _extract_tar_archive(archive_path, target_dir)
+    flattened = _flatten_chinese_celeb_dataset_dir(target_dir)
+
     return {
         "success": True,
         "message": "chinese_celeb_dataset 解压完成",
@@ -3551,6 +3577,7 @@ def extract_chinese_celeb_dataset_sync() -> Dict[str, Any]:
         "command": extract_result.get("command"),
         "stdout": extract_result.get("stdout"),
         "stderr": extract_result.get("stderr"),
+        "normalized": flattened,
     }