diff --git a/apps/worker/worker_app/tasks/generation.py b/apps/worker/worker_app/tasks/generation.py index de1f94075..6a7092671 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,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}" + 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)