Skip to content

利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.

fix: support direct subtitle requests and default transitions

Harry8b00faa5b450
diff --git a/app/services/task.py b/app/services/task.py
index e3aef25f..046dd1f4 100644
--- a/app/services/task.py
+++ b/app/services/task.py
@@ -82,7 +82,9 @@ def generate_audio(task_id, params, video_script):
- sub_maker: subtitle maker object if TTS is used, None otherwise
'''
logger.info("\n\n## generating audio")
- custom_audio_file = params.custom_audio_file
+ # /audio 和 /subtitle 请求模型不包含 custom_audio_file,
+ # 这里统一做兼容读取,避免直调接口时抛属性错误。
+ custom_audio_file = getattr(params, "custom_audio_file", None)
if not custom_audio_file or not os.path.exists(custom_audio_file):
if custom_audio_file:
logger.warning(
@@ -247,9 +249,6 @@ def start(task_id, params: VideoParams, stop_at: str = "video"):
logger.info(f"start task: {task_id}, stop_at: {stop_at}")
sm.state.update_task(task_id, state=const.TASK_STATE_PROCESSING, progress=5)
- if type(params.video_concat_mode) is str:
- params.video_concat_mode = VideoConcatMode(params.video_concat_mode)
-
# 1. Generate script
video_script = generate_script(task_id, params)
if not video_script or "Error: " in video_script:
@@ -336,6 +335,11 @@ def start(task_id, params: VideoParams, stop_at: str = "video"):
sm.state.update_task(task_id, state=const.TASK_STATE_PROCESSING, progress=50)
+ # 仅完整视频生成流程才需要处理视频拼接模式;
+ # 这样可以避免 /subtitle 和 /audio 这类请求访问不存在的字段。
+ if type(params.video_concat_mode) is str:
+ params.video_concat_mode = VideoConcatMode(params.video_concat_mode)
+
# 6. Generate final videos
final_video_paths, combined_video_paths = generate_final_videos(
task_id, params, downloaded_videos, audio_file, subtitle_path
diff --git a/app/services/video.py b/app/services/video.py
index 7153aaf7..f7547ed6 100644
--- a/app/services/video.py
+++ b/app/services/video.py
@@ -128,6 +128,9 @@ def combine_videos(
audio_duration = audio_clip.duration
logger.info(f"audio duration: {audio_duration} seconds")
logger.info(f"maximum clip duration: {max_clip_duration} seconds")
+
+ # 兼容 API 直接调用时未传转场模式的情况,避免后续访问 .value 时崩溃。
+ transition_value = getattr(video_transition_mode, "value", video_transition_mode)
output_dir = os.path.dirname(combined_video_path)
aspect = VideoAspect(video_aspect)
@@ -191,17 +194,17 @@ def combine_videos(
clip = CompositeVideoClip([background, clip_resized])
shuffle_side = random.choice(["left", "right", "top", "bottom"])
- if video_transition_mode.value == VideoTransitionMode.none.value:
+ if transition_value in (None, VideoTransitionMode.none.value):
clip = clip
- elif video_transition_mode.value == VideoTransitionMode.fade_in.value:
+ elif transition_value == VideoTransitionMode.fade_in.value:
clip = video_effects.fadein_transition(clip, 1)
- elif video_transition_mode.value == VideoTransitionMode.fade_out.value:
+ elif transition_value == VideoTransitionMode.fade_out.value:
clip = video_effects.fadeout_transition(clip, 1)
- elif video_transition_mode.value == VideoTransitionMode.slide_in.value:
+ elif transition_value == VideoTransitionMode.slide_in.value:
clip = video_effects.slidein_transition(clip, 1, shuffle_side)
- elif video_transition_mode.value == VideoTransitionMode.slide_out.value:
+ elif transition_value == VideoTransitionMode.slide_out.value:
clip = video_effects.slideout_transition(clip, 1, shuffle_side)
- elif video_transition_mode.value == VideoTransitionMode.shuffle.value:
+ elif transition_value == VideoTransitionMode.shuffle.value:
transition_funcs = [
lambda c: video_effects.fadein_transition(c, 1),
lambda c: video_effects.fadeout_transition(c, 1),
@@ -527,4 +530,4 @@ def preprocess_video(materials: List[MaterialInfo], clip_duration=4):
close_clip(clip)
material.url = video_file
logger.success(f"image processed: {video_file}")
- return materials
\ No newline at end of file
+ return materials