Просмотр исходного кода

feat(annotator): 优化json提取路径逻辑和保存状态反馈

- 实现组件任务特定的 assets.py 提取路径解析功能
- 根据生成状态动态显示保存结果消息
- 添加 assets.py 文件路径信息到保存成功提示
- 在生成失败时显示目标文件路径信息
- 改进日志记录以包含资产文件路径详情
AzurTian 8 месяцев назад
Родитель
Сommit
7128c4f24f
2 измененных файлов с 47 добавлено и 8 удалено
  1. 38 4
      module/server/tool.py
  2. 9 4
      module/server/web/annotator/static/js/app.js

+ 38 - 4
module/server/tool.py

@@ -855,6 +855,34 @@ class AnnotatorManager:
             raise AnnotatorError("invalid_path", "目标文件必须是 .json", 400)
             raise AnnotatorError("invalid_path", "目标文件必须是 .json", 400)
         return task_root, target_json
         return task_root, target_json
 
 
+    @staticmethod
+    def _resolve_assets_extract_target(task_root: Path, target_json: Path) -> tuple[Path, Path]:
+        task_root = task_root.resolve()
+        target_json = target_json.resolve()
+        AnnotatorManager._ensure_within_root(target_json, task_root)
+
+        if task_root.name != "Component":
+            return task_root, task_root / "assets.py"
+
+        rel_parts = target_json.relative_to(task_root).parts
+        if len(rel_parts) < 2:
+            raise AnnotatorError(
+                "invalid_component_task",
+                "Component 目录下的规则文件必须位于具体组件子任务目录中",
+                400,
+            )
+
+        component_name = rel_parts[0]
+        extract_root = (task_root / component_name).resolve()
+        AnnotatorManager._ensure_within_root(extract_root, task_root)
+        if not extract_root.exists() or not extract_root.is_dir():
+            raise AnnotatorError(
+                "invalid_component_task",
+                f"Component 子任务目录不存在: {component_name}",
+                404,
+            )
+        return extract_root, extract_root / "assets.py"
+
     @staticmethod
     @staticmethod
     def list_task_json_files(task_name: str) -> list[str]:
     def list_task_json_files(task_name: str) -> list[str]:
         task_root = AnnotatorManager._resolve_task_root(task_name)
         task_root = AnnotatorManager._resolve_task_root(task_name)
@@ -1302,18 +1330,24 @@ class AnnotatorManager:
         save_status = "success"
         save_status = "success"
         generate_status = "success"
         generate_status = "success"
         generate_error = ""
         generate_error = ""
+        assets_file = ""
+        extract_root = None
         try:
         try:
-            AssetsExtractor(str(task_root)).extract()
+            extract_root, assets_path = self._resolve_assets_extract_target(task_root, target_json)
+            assets_file = str(assets_path.relative_to(PROJECT_ROOT).as_posix())
+            AssetsExtractor(str(extract_root)).extract()
         except Exception as e:
         except Exception as e:
             generate_status = "failed"
             generate_status = "failed"
             generate_error = str(e)
             generate_error = str(e)
             logger.exception(
             logger.exception(
-                f"[annotator] assets generate failed, session={session_id}, task={task_name}, target={target_json}"
+                f"[annotator] assets generate failed, session={session_id}, task={task_name}, "
+                f"target={target_json}, extract_root={extract_root}"
             )
             )
 
 
         logger.info(
         logger.info(
             f"[annotator] save rules, session={session_id}, task={task_name}, target={target_json}, "
             f"[annotator] save rules, session={session_id}, task={task_name}, target={target_json}, "
-            f"rule_type={rule_type}, save_status={save_status}, generate_status={generate_status}"
+            f"rule_type={rule_type}, save_status={save_status}, generate_status={generate_status}, "
+            f"assets_file={assets_file or 'n/a'}"
         )
         )
 
 
         rule_count = len(payload.get("list", [])) if isinstance(payload, dict) and "list" in payload else len(payload)
         rule_count = len(payload.get("list", [])) if isinstance(payload, dict) and "list" in payload else len(payload)
@@ -1323,7 +1357,7 @@ class AnnotatorManager:
             "generate_status": generate_status,
             "generate_status": generate_status,
             "error": generate_error,
             "error": generate_error,
             "target_json": str(target_json.relative_to(PROJECT_ROOT).as_posix()),
             "target_json": str(target_json.relative_to(PROJECT_ROOT).as_posix()),
-            "assets_file": str((task_root / "assets.py").relative_to(PROJECT_ROOT).as_posix()),
+            "assets_file": assets_file,
             "rule_count": rule_count,
             "rule_count": rule_count,
         }
         }
 
 

+ 9 - 4
module/server/web/annotator/static/js/app.js

@@ -1979,7 +1979,10 @@
 
 
       const ok = result.generate_status === "success";
       const ok = result.generate_status === "success";
       setSaveStatus(ok);
       setSaveStatus(ok);
-      appendOutput(ok ? "保存成功" : "保存失败", result);
+      const outputTitle = ok
+        ? "保存成功"
+        : (result.save_status === "success" ? "规则已保存,生成失败" : "保存失败");
+      appendOutput(outputTitle, result);
 
 
       clearDirty();
       clearDirty();
       await rebuildDirSelectors(state.currentDirPath, state.jsonFileName, false);
       await rebuildDirSelectors(state.currentDirPath, state.jsonFileName, false);
@@ -1994,11 +1997,14 @@
 
 
   async function saveRules() {
   async function saveRules() {
     const { ok, result } = await persistRules();
     const { ok, result } = await persistRules();
+    const assetsFile = String(result.assets_file || "").trim();
     if (ok) {
     if (ok) {
-      showMessage(`已保存规则,共 ${result.rule_count || 0} 条`, "ok");
+      const suffix = assetsFile ? `,已生成 ${assetsFile}` : "";
+      showMessage(`已保存规则,共 ${result.rule_count || 0} 条${suffix}`, "ok");
       return;
       return;
     }
     }
-    showMessage(`规则已保存,但 assets.py 生成失败: ${result.error || "未知错误"}`, "error");
+    const targetText = assetsFile ? `,目标文件: ${assetsFile}` : "";
+    showMessage(`规则已保存,但 assets.py 生成失败: ${result.error || "未知错误"}${targetText}`, "error");
   }
   }
   async function saveImageCrop() {
   async function saveImageCrop() {
     const rule = getCurrentRule();
     const rule = getCurrentRule();
@@ -2629,4 +2635,3 @@
   });
   });
 })();
 })();
 
 
-