refactor(phase1): 统一渲染入口 + 模板系统双读兼容 (#630)

Co-authored-by: xiaoxia <dev@xiaoxiajianji.com>
Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>

apps/worker/video_processing/render_adapter.py

@@ -186,85 +186,15 @@ class RenderAdapter:
 
             self._report_progress(progress_cb, 35.0, "准备 BGM 音频")
 
-            # 3. 准备 BGM（从 plan.config.bgm 读取配置）
-            bgm_path = self._prepare_bgm(plan, work_dir, plan_id)
-
-            self._report_progress(progress_cb, 40.0, "执行视频渲染")
-
-            # 4. 初始化 ASR 服务（用于自动字幕）
-            asr_service = self._get_asr_service()
-
-            # 5. 从 plan.config.export 读取输出分辨率
-            plan_config = plan.config or {}
-            export_config = plan_config.get("export", {}) or {}
-            output_width, output_height = _parse_resolution(export_config.get("resolution"))
-            logger.info(
-                "渲染输出分辨率: plan_id=%s resolution=%dx%d source=%s",
-                plan_id,
-                output_width,
-                output_height,
-                "config" if export_config.get("resolution") else "default",
-            )
-
-            # 6. 执行统一渲染
-            render_svc = UnifiedRenderService(
+            # 3~6. 统一渲染核心流程（BGM + ASR + 渲染 + 缩略图 + 上传）
+            return self._do_render(
                 plan=plan,
                 clips=ready_clips,
                 asset_path_map=asset_path_map,
                 work_dir=work_dir,
-                output_width=output_width,
-                output_height=output_height,
-                bgm_path=bgm_path,
-                asr_service=asr_service,
-            )
-            result = render_svc.render()
-
-            self._report_progress(progress_cb, 80.0, "上传渲染结果")
-
-            # 4. 上传结果
-            storage_key = f"rendered/{plan_id}/{job_id or plan_id}.mp4"
-            output_url = upload_to_oss(result.output_path, storage_key)
-
-            self._report_progress(progress_cb, 90.0, "生成封面缩略图")
-
-            # 5. 生成缩略图（在清理临时目录前）
-            thumbnail_url = ""
-            try:
-                from video_processing.thumbnail_generator import generate_and_upload_thumbnail
-
-                thumb_storage_key = f"rendered/{plan_id}/thumbnail.jpg"
-                thumbnail_url = generate_and_upload_thumbnail(str(result.output_path), thumb_storage_key)
-            except Exception as thumb_err:
-                logger.warning(
-                    "[render-adapter] 缩略图生成失败（不影响主流程）: plan_id=%s error=%s",
-                    plan_id,
-                    thumb_err,
-                )
-
-            self._report_progress(progress_cb, 100.0, "渲染完成")
-
-            logger.info(
-                "[render-adapter] render success: plan_id=%s job_id=%s engine=unified "
-                "duration=%.2fs file_size=%d resolution=%dx%d clip_count=%d",
-                plan_id,
-                job_id,
-                result.duration,
-                result.file_size,
-                result.width,
-                result.height,
-                len(ready_clips),
-            )
-
-            return RenderAdapterResult(
-                success=True,
-                output_url=output_url or "",
-                output_path=result.output_path,
-                thumbnail_url=thumbnail_url,
-                duration=result.duration,
-                file_size=result.file_size,
-                width=result.width,
-                height=result.height,
-                clip_count=len(ready_clips),
+                plan_id=plan_id,
+                job_id=job_id,
+                progress_cb=progress_cb,
                 rendered_clip_ids=rendered_clip_ids,
                 failed_clip_ids=failed_clip_ids,
             )
@@ -540,3 +470,215 @@ class RenderAdapter:
         except Exception as e:
             logger.warning("ASR 服务初始化失败，自动字幕将不可用: %s", e)
             return None
+
+    def _do_render(
+        self,
+        plan: Any,
+        clips: list[Any],
+        asset_path_map: dict[str, Path],
+        work_dir: Path,
+        *,
+        plan_id: str,
+        job_id: str = "",
+        progress_cb: ProgressCallback | None = None,
+        rendered_clip_ids: list[str] | None = None,
+        failed_clip_ids: list[str] | None = None,
+    ) -> RenderAdapterResult:
+        """执行统一渲染核心流程（BGM + ASR + 渲染 + 缩略图 + 上传）。
+
+        render_plan 和 render_from_memory 共用此方法。
+
+        Args:
+            rendered_clip_ids: 成功下载/准备的 clip id 列表（render_plan 从下载阶段传入）
+            failed_clip_ids: 失败的 clip id 列表
+
+        Returns:
+            RenderAdapterResult
+        """
+        # 1. 准备 BGM
+        bgm_path = self._prepare_bgm(plan, work_dir, plan_id)
+
+        self._report_progress(progress_cb, 40.0, "执行视频渲染")
+
+        # 2. 初始化 ASR
+        asr_service = self._get_asr_service()
+
+        # 3. 读取输出分辨率
+        plan_config = plan.config or {}
+        export_config = plan_config.get("export", {}) or {}
+        output_width, output_height = _parse_resolution(export_config.get("resolution"))
+        logger.info(
+            "渲染输出分辨率: plan_id=%s resolution=%dx%d source=%s",
+            plan_id,
+            output_width,
+            output_height,
+            "config" if export_config.get("resolution") else "default",
+        )
+
+        # 4. 执行统一渲染
+        render_svc = UnifiedRenderService(
+            plan=plan,
+            clips=clips,
+            asset_path_map=asset_path_map,
+            work_dir=work_dir,
+            output_width=output_width,
+            output_height=output_height,
+            bgm_path=bgm_path,
+            asr_service=asr_service,
+        )
+        result = render_svc.render()
+
+        self._report_progress(progress_cb, 80.0, "上传渲染结果")
+
+        # 5. 上传结果
+        storage_key = f"rendered/{plan_id}/{job_id or plan_id}.mp4"
+        output_url = upload_to_oss(result.output_path, storage_key)
+
+        self._report_progress(progress_cb, 90.0, "生成封面缩略图")
+
+        # 6. 生成缩略图
+        thumbnail_url = ""
+        try:
+            from video_processing.thumbnail_generator import generate_and_upload_thumbnail
+
+            thumb_storage_key = f"rendered/{plan_id}/thumbnail.jpg"
+            thumbnail_url = generate_and_upload_thumbnail(str(result.output_path), thumb_storage_key)
+        except Exception as thumb_err:
+            logger.warning(
+                "[render-adapter] 缩略图生成失败（不影响主流程）: plan_id=%s error=%s",
+                plan_id,
+                thumb_err,
+            )
+
+        self._report_progress(progress_cb, 100.0, "渲染完成")
+
+        logger.info(
+            "[render-adapter] render success: plan_id=%s job_id=%s engine=unified "
+            "duration=%.2fs file_size=%d resolution=%dx%d clip_count=%d",
+            plan_id,
+            job_id,
+            result.duration,
+            result.file_size,
+            result.width,
+            result.height,
+            len(clips),
+        )
+
+        final_rendered_ids = (
+            rendered_clip_ids if rendered_clip_ids is not None else [c.id for c in clips if hasattr(c, "id")]
+        )
+        final_failed_ids = failed_clip_ids if failed_clip_ids is not None else []
+
+        return RenderAdapterResult(
+            success=True,
+            output_url=output_url or "",
+            output_path=result.output_path,
+            thumbnail_url=thumbnail_url,
+            duration=result.duration,
+            file_size=result.file_size,
+            width=result.width,
+            height=result.height,
+            clip_count=len(clips),
+            rendered_clip_ids=final_rendered_ids,
+            failed_clip_ids=final_failed_ids,
+        )
+
+    def render_from_memory(
+        self,
+        plan: Any,
+        clips: list[Any],
+        asset_path_map: dict[str, Path],
+        *,
+        plan_id: str = "",
+        job_id: str = "",
+        work_dir: Path | None = None,
+        progress_cb: ProgressCallback | None = None,
+    ) -> RenderAdapterResult:
+        """使用内存中的 plan/clips/asset_path_map 直接渲染。
+
+        适用于一键生成等不写DB剪辑计划的场景，复用统一的 BGM/ASR/分辨率/渲染/缩略图逻辑。
+
+        Args:
+            plan: 类 EditPlan 的对象（鸭子类型，需有 id/config 等属性）
+            clips: 类 EditPlanClip 的对象列表
+            asset_path_map: asset_id → local_path 映射
+            plan_id: 用于日志的计划标识（不传则用 plan.id）
+            job_id: 关联的 Job ID
+            work_dir: 工作目录，不传则用临时目录
+            progress_cb: 进度回调
+
+        Returns:
+            RenderAdapterResult
+        """
+        actual_plan_id = plan_id or getattr(plan, "id", "memory_plan")
+        temp_dir = None
+        try:
+            if work_dir is None:
+                temp_dir = tempfile.mkdtemp(prefix="render_mem_")
+                work_dir = Path(temp_dir)
+            work_dir.mkdir(parents=True, exist_ok=True)
+
+            if not clips:
+                return RenderAdapterResult(
+                    success=False,
+                    error_message="没有可渲染的片段",
+                    clip_count=0,
+                )
+
+            if not asset_path_map:
+                return RenderAdapterResult(
+                    success=False,
+                    error_message="素材路径映射为空",
+                    clip_count=len(clips),
+                )
+
+            logger.info(
+                "开始内存模式渲染: plan_id=%s job_id=%s clip_count=%d engine=unified",
+                actual_plan_id,
+                job_id,
+                len(clips),
+            )
+
+            self._report_progress(progress_cb, 35.0, "准备 BGM 音频")
+
+            return self._do_render(
+                plan=plan,
+                clips=clips,
+                asset_path_map=asset_path_map,
+                work_dir=work_dir,
+                plan_id=actual_plan_id,
+                job_id=job_id,
+                progress_cb=progress_cb,
+            )
+
+        except subprocess.CalledProcessError as exc:
+            stderr_text = (exc.stderr or "").strip()
+            logger.error(
+                "[render-adapter] 内存模式渲染失败: plan_id=%s exit_code=%d\nstderr:\n%s",
+                actual_plan_id,
+                exc.returncode,
+                stderr_text[-2000:] if len(stderr_text) > 2000 else stderr_text,
+            )
+            return RenderAdapterResult(
+                success=False,
+                error_message=f"FFmpeg渲染失败(exit={exc.returncode}): {stderr_text[:200]}",
+                error_detail=stderr_text[-2000:] if len(stderr_text) > 2000 else stderr_text,
+            )
+        except Exception as exc:
+            logger.exception(
+                "[render-adapter] 内存模式渲染失败: plan_id=%s error=%s",
+                actual_plan_id,
+                str(exc)[:200],
+            )
+            return RenderAdapterResult(
+                success=False,
+                error_message=str(exc)[:500],
+            )
+        finally:
+            if temp_dir:
+                import shutil
+
+                try:
+                    shutil.rmtree(temp_dir, ignore_errors=True)
+                except Exception as cleanup_err:
+                    logger.warning("临时目录清理失败: path=%s error=%s", temp_dir, cleanup_err)