let5see/AI-Video
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化并行推理逻辑

Browse Source
This commit is contained in:
puke
2025-11-19 09:31:41 +08:00
parent 11c9158851
commit 89f46351f0
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
web/components/output_preview.py
View File

@@ -244,23 +244,30 @@ def render_batch_output(pixelle_video, video_params):
# Prepare shared config # Prepare shared config
shared_config = { shared_config = {
"title_prefix": video_params.get("title_prefix"), "title_prefix": video_params.get("title_prefix"),
"n_scenes": video_params.get("n_scenes", 5), "n_scenes": video_params.get("n_scenes") or 5,
"image_workflow": video_params.get("image_workflow"), "image_workflow": video_params.get("image_workflow"),
"frame_template": video_params.get("frame_template"), "frame_template": video_params.get("frame_template"),
"prompt_prefix": video_params.get("prompt_prefix", ""), "prompt_prefix": video_params.get("prompt_prefix") or "",
"bgm_path": video_params.get("bgm_path"), "bgm_path": video_params.get("bgm_path"),
"bgm_volume": video_params.get("bgm_volume", 0.2), "bgm_volume": video_params.get("bgm_volume") or 0.2,
"tts_inference_mode": video_params.get("tts_inference_mode", "local"), "tts_inference_mode": video_params.get("tts_inference_mode") or "local",
} }
# Add TTS parameters # Add TTS parameters based on mode (only add non-None values)
if shared_config["tts_inference_mode"] == "local": if shared_config["tts_inference_mode"] == "local":
shared_config["tts_voice"] = video_params.get("tts_voice") tts_voice = video_params.get("tts_voice")
shared_config["tts_speed"] = video_params.get("tts_speed") tts_speed = video_params.get("tts_speed")
else: if tts_voice:
shared_config["tts_workflow"] = video_params.get("tts_workflow") shared_config["tts_voice"] = tts_voice
if video_params.get("ref_audio"): if tts_speed:
shared_config["ref_audio"] = str(video_params["ref_audio"]) shared_config["tts_speed"] = tts_speed
else: # comfyui
tts_workflow = video_params.get("tts_workflow")
if tts_workflow:
shared_config["tts_workflow"] = tts_workflow
ref_audio = video_params.get("ref_audio")
if ref_audio:
shared_config["ref_audio"] = str(ref_audio)
# Add template parameters # Add template parameters
if video_params.get("template_params"): if video_params.get("template_params"):

5
web/utils/batch_manager.py
View File

@@ -91,9 +91,10 @@ class SimpleBatchManager:
"mode": "generate", # Fixed mode "mode": "generate", # Fixed mode
} }
# Merge shared config, excluding title_prefix # Merge shared config, excluding title_prefix and None values
# Filter out None values to avoid interfering with parameter logic in generate_video
for key, value in shared_config.items(): for key, value in shared_config.items():
if key != "title_prefix": if key != "title_prefix" and value is not None:
task_params[key] = value task_params[key] = value
# Generate title using title_prefix # Generate title using title_prefix