From 34b6f4b2055f4c38f7c5492b47ca076a2b4872db Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Sat, 1 Aug 2026 21:45:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=5Fdownload=5Fvideo=5Fassets=20?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BB=85=E4=BC=A0=20asset=5Fids=EF=BC=88?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 预览生成（#1197）是模板模式，只传 template_id + asset_ids， 不传 project_id/asset_library_id。asset_ids 已有明确素材ID列表， 下游查询也支持直接按ID查，但被这个校验挡住了。 改动： - 校验条件从 (not library and not project) 改为 (not library and not project and not asset_ids) - mode_desc 兜底：三者都空时显示"指定素材"而非"项目 None" - 向后兼容：原有传 project_id 或 asset_library_id 的路径不受影响 --- apps/worker/worker_app/tasks/generation.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/worker/worker_app/tasks/generation.py b/apps/worker/worker_app/tasks/generation.py index de1f94075..b6e65843a 100755 --- a/apps/worker/worker_app/tasks/generation.py +++ b/apps/worker/worker_app/tasks/generation.py @@ -600,11 +600,11 @@ def _download_library_assets( 下载成功的视频文件 Path 列表 Raises: - ValueError: 当 asset_library_id 和 project_id 都为空时 + ValueError: 当 asset_library_id、project_id 和 asset_ids 都为空时 RuntimeError: strict=True 时任何下载失败；或指定了 asset_ids 但全部下载失败 """ - if not asset_library_id and not project_id: - raise ValueError("asset_library_id 和 project_id 至少需要提供一个") + if not asset_library_id and not project_id and not asset_ids: + raise ValueError("asset_library_id、project_id 或 asset_ids 至少需要提供一个") try: from packages.adapters.sqlalchemy_impl.models import AssetModel @@ -646,7 +646,7 @@ def _download_library_assets( assets = query.order_by(AssetModel.created_at).all() if not assets: - mode_desc = f"素材库 {asset_library_id}" if asset_library_id else f"项目 {project_id}" + mode_desc = f"素材库 {asset_library_id}" if asset_library_id else (f"项目 {project_id}" if project_id else "指定素材") msg = f"未找到视频素材: {mode_desc}, asset_ids={asset_ids or 'all'}" logger.error(msg) raise RuntimeError(msg) -- 2.54.0 From 67530da9bb6f71b14df9c93a1f50bcea0f1feab2 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Sat, 1 Aug 2026 13:50:34 +0000 Subject: [PATCH 2/2] style: auto-format with black + isort + prettier [skip ci-format-check] --- apps/worker/worker_app/tasks/generation.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/worker/worker_app/tasks/generation.py b/apps/worker/worker_app/tasks/generation.py index b6e65843a..6a7092671 100755 --- a/apps/worker/worker_app/tasks/generation.py +++ b/apps/worker/worker_app/tasks/generation.py @@ -646,7 +646,11 @@ def _download_library_assets( assets = query.order_by(AssetModel.created_at).all() if not assets: - mode_desc = f"素材库 {asset_library_id}" if asset_library_id else (f"项目 {project_id}" if project_id else "指定素材") + mode_desc = ( + f"素材库 {asset_library_id}" + if asset_library_id + else (f"项目 {project_id}" if project_id else "指定素材") + ) msg = f"未找到视频素材: {mode_desc}, asset_ids={asset_ids or 'all'}" logger.error(msg) raise RuntimeError(msg) -- 2.54.0