批次4后续专项完成：D11清偿 + OCC方案B实施 + 部署参数 + D2诚实标注 + CI门禁

① D11 HTML 报告 RustFS 单源化（TECH_DEBT P2 清偿）：可视化产物写任务临时目录后裸传报告键 html/reports/{filename}（文件名寻址），/html StaticFiles 挂载删除，新增 html_report_router 根路径代理（报告键→遗留 JSON 包装→本地卷兜底→404，防穿越）；URL 形状 /html/{filename} 不变，持久化引用零迁移；celery 摘除 html_data 卷，镜像不再烤入陈旧报告；顺带删除 get_stp_file_with_data 死数据块 ② OCC 方案 B（D10 清偿）：run_occ(op_name, payload) 契约 + 常驻工作进程池（occ_process_pool + occ_worker 操作注册表），超时/崩溃 terminate 换新补位、任务级超时 recover 整体重建，残留线程泄漏根治；TopoDS 不跨进程（generate_cavity 分模 + 方案 STEP 持久化全在子进程内，返回 export_manifest）；删除内存形状缓存链、 CADExporter.export_mold_results、shape_loader（→ stp_materializer） ③ OCC 方案 A 部署参数：CELERY_CONCURRENCY / CELERY_MAX_TASKS_PER_CHILD 进 Dockerfile.celery + compose + .env.example ④ D2 诚实标注：铝价响应带 source: "simulated"，前端按来源渲染标注（原硬编码 "上海期货交易所"属虚假声明），死代码 getAluminumPrice 删除 ⑤ CI 门禁：.gitea/workflows/ci.yml 三 job（pytest / 前端构建含 vue-tsc / openapi 漂移检测）接口变更三件套随批完成（openapi 76→77 paths + gen:api + 前端构建通过；方案 B 接口面零变化）。测试基线 143 passed, 0 skipped（新增 16 项）。文档六处同步。 Co-Authored-By: Claude Code <noreply@anthropic.com>
2026-09-18 17:22:01 +08:00
parent 0e6b3b1811
commit e728dcd226
36 changed files with 1474 additions and 565 deletions
@@ -178,76 +178,45 @@ async def export_mold_results(
            },
        }

-    cavity_shapes = processing_service.get_export_shapes(
-        task_id,
-        resolved_scheme_id,
-    )
+    # 方案 B 后主进程不再持有内存形状缓存（get_export_shapes 已删除）：
+    # 未命中持久化清单时，从持久化单组件 STEP 现场转换缺失格式，用户无需重新分析
    filename = task_data.get("filename", f"mold_{task_id}")
-
-    if not cavity_shapes:
-        # 内存 shape 缓存失效（如服务重启）：从持久化的单组件 STEP
-        # 现场转换缺失格式，用户无需重新分析
-        artifacts = _get_export_artifacts(task_data)
-        scheme_data = (artifacts.get("schemes") or {}).get(resolved_scheme_id)
-        if scheme_data:
-            base_filename = scheme_data.get("base_filename") or Path(filename).stem
-            regenerated = await processing_service.regenerate_export_from_persisted(
-                task_id=task_id,
-                scheme_id=resolved_scheme_id,
-                formats=formats,
-                components=_expand_components(components),
-                base_filename=base_filename,
-                scheme_files=scheme_data.get("files", []),
-            )
-            if regenerated:
-                regenerated["files"] = _augment_export_files(
-                    task_id, regenerated.get("files", [])
-                )
-                # 合并进持久化 manifest，后续请求直接命中持久化路径
-                merged_artifacts = _merge_export_artifacts(artifacts, regenerated)
-                await TaskStorageService().update_task_parameters(
-                    db_session,
-                    task_id,
-                    {"export_artifacts": merged_artifacts},
-                )
-                # D9：存储方法已不再自行 commit，请求侧显式提交
-                await db_session.commit()
-                await redis_task_manager.update_task(
-                    task_id, {"export_artifacts": merged_artifacts}
-                )
-                TaskQueryService.invalidate_task_view(task_id)
-
-                return {"status": "success", "data": regenerated}
-
-        raise HTTPException(
-            409,
-            "导出缓存已失效或任务尚未完成，请重新分析后再导出以保证方案一致性",
+    artifacts = _get_export_artifacts(task_data)
+    scheme_data = (artifacts.get("schemes") or {}).get(resolved_scheme_id)
+    if scheme_data:
+        base_filename = scheme_data.get("base_filename") or Path(filename).stem
+        regenerated = await processing_service.regenerate_export_from_persisted(
+            task_id=task_id,
+            scheme_id=resolved_scheme_id,
+            formats=formats,
+            components=_expand_components(components),
+            base_filename=base_filename,
+            scheme_files=scheme_data.get("files", []),
        )
+        if regenerated:
+            regenerated["files"] = _augment_export_files(
+                task_id, regenerated.get("files", [])
+            )
+            # 合并进持久化 manifest，后续请求直接命中持久化路径
+            merged_artifacts = _merge_export_artifacts(artifacts, regenerated)
+            await TaskStorageService().update_task_parameters(
+                db_session,
+                task_id,
+                {"export_artifacts": merged_artifacts},
+            )
+            # D9：存储方法已不再自行 commit，请求侧显式提交
+            await db_session.commit()
+            await redis_task_manager.update_task(
+                task_id, {"export_artifacts": merged_artifacts}
+            )
+            TaskQueryService.invalidate_task_view(task_id)

-    base_filename = Path(filename).stem
-    result = cad_exporter.export_mold_results(
-        cavity_data=cavity_shapes,
-        base_filename=base_filename,
-        formats=formats,
-        components=components,
-        task_id=task_id,
-        scheme_id=resolved_scheme_id,
+            return {"status": "success", "data": regenerated}
+
+    raise HTTPException(
+        409,
+        "导出文件不可用：任务未生成持久化导出清单，请重新分析后再导出",
    )
-    result["files"] = _augment_export_files(task_id, result.get("files", []))
-    result["source"] = "generated"
-
-    merged_artifacts = _merge_export_artifacts(_get_export_artifacts(task_data), result)
-    await TaskStorageService().update_task_parameters(
-        db_session,
-        task_id,
-        {"export_artifacts": merged_artifacts},
-    )
-    # D9：存储方法已不再自行 commit，请求侧显式提交
-    await db_session.commit()
-    await redis_task_manager.update_task(task_id, {"export_artifacts": merged_artifacts})
-    TaskQueryService.invalidate_task_view(task_id)  # parameters 已变更，缓存视图失效
-
-    return {"status": "success", "data": result}


@router.get("/export-download/{filepath:path}")