webui适配视频功能; 统一模板命名规范;
This commit is contained in:
@@ -117,9 +117,10 @@ class CustomPipeline(BasePipeline):
|
||||
VideoGenerationResult
|
||||
|
||||
Image Generation Logic:
|
||||
- If template has {{image}} → automatically generates images
|
||||
- If template has no {{image}} → skips image generation (faster, cheaper)
|
||||
- To customize: Override the template_requires_image logic in your subclass
|
||||
- image_*.html templates → automatically generates images
|
||||
- video_*.html templates → automatically generates videos
|
||||
- static_*.html templates → skips media generation (faster, cheaper)
|
||||
- To customize: Override the template type detection logic in your subclass
|
||||
"""
|
||||
logger.info("Starting CustomPipeline")
|
||||
logger.info(f"Input text length: {len(text)} chars")
|
||||
@@ -151,23 +152,27 @@ class CustomPipeline(BasePipeline):
|
||||
frame_template = template_config.get("default_template", "1080x1920/default.html")
|
||||
|
||||
# ========== Step 0.5: Check template requirements ==========
|
||||
# Detect if template requires {{image}} parameter
|
||||
# This allows skipping the entire image generation pipeline for text-only templates
|
||||
# Detect template type by filename prefix
|
||||
from pathlib import Path
|
||||
from pixelle_video.services.frame_html import HTMLFrameGenerator
|
||||
from pixelle_video.utils.template_util import resolve_template_path
|
||||
from pixelle_video.utils.template_util import resolve_template_path, get_template_type
|
||||
|
||||
template_path = resolve_template_path(frame_template)
|
||||
generator = HTMLFrameGenerator(template_path)
|
||||
template_requires_image = generator.requires_image()
|
||||
template_name = Path(frame_template).name
|
||||
template_type = get_template_type(template_name)
|
||||
template_requires_image = (template_type == "image")
|
||||
|
||||
# Read media size from template meta tags
|
||||
template_path = resolve_template_path(frame_template)
|
||||
generator = HTMLFrameGenerator(template_path)
|
||||
image_width, image_height = generator.get_media_size()
|
||||
logger.info(f"📐 Media size from template: {image_width}x{image_height}")
|
||||
|
||||
if template_requires_image:
|
||||
if template_type == "image":
|
||||
logger.info(f"📸 Template requires image generation")
|
||||
else:
|
||||
logger.info(f"⚡ Template does not require images - skipping image generation pipeline")
|
||||
elif template_type == "video":
|
||||
logger.info(f"🎬 Template requires video generation")
|
||||
else: # static
|
||||
logger.info(f"⚡ Static template - skipping media generation pipeline")
|
||||
logger.info(f" 💡 Benefits: Faster generation + Lower cost + No ComfyUI dependency")
|
||||
|
||||
# ========== Step 1: Process content (CUSTOMIZE THIS) ==========
|
||||
@@ -197,8 +202,8 @@ class CustomPipeline(BasePipeline):
|
||||
# ========== Step 2: Generate image prompts (CONDITIONAL - CUSTOMIZE THIS) ==========
|
||||
self._report_progress(progress_callback, "generating_image_prompts", 0.25)
|
||||
|
||||
# IMPORTANT: Check if template actually needs images
|
||||
# If your template doesn't use {{image}}, you can skip this entire step!
|
||||
# IMPORTANT: Check if template is image type
|
||||
# If your template is static_*.html, you can skip this entire step!
|
||||
if template_requires_image:
|
||||
# Template requires images - generate image prompts using LLM
|
||||
from pixelle_video.utils.content_generators import generate_image_prompts
|
||||
|
||||
@@ -282,8 +282,8 @@ class StandardPipeline(BasePipeline):
|
||||
logger.info(f"🎬 Template requires video generation")
|
||||
elif template_media_type == "image":
|
||||
logger.info(f"📸 Template requires image generation")
|
||||
else: # text
|
||||
logger.info(f"⚡ Template does not require media - skipping media generation pipeline")
|
||||
else: # static
|
||||
logger.info(f"⚡ Static template - skipping media generation pipeline")
|
||||
logger.info(f" 💡 Benefits: Faster generation + Lower cost + No ComfyUI dependency")
|
||||
|
||||
try:
|
||||
@@ -525,35 +525,23 @@ class StandardPipeline(BasePipeline):
|
||||
- Media generation API calls
|
||||
- ComfyUI dependency
|
||||
|
||||
Template naming rules:
|
||||
Template naming convention:
|
||||
- static_*.html: Static style template (returns "static")
|
||||
- image_*.html: Image template (returns "image")
|
||||
- video_*.html: Video template (returns "video")
|
||||
- Other templates with {{image}}: Image template (returns "image")
|
||||
- Other templates without {{image}}: Text-only template (returns "text")
|
||||
|
||||
Args:
|
||||
frame_template: Template path (e.g., "1080x1920/default.html" or "1080x1920/video_default.html")
|
||||
frame_template: Template path (e.g., "1080x1920/image_default.html" or "1080x1920/video_default.html")
|
||||
|
||||
Returns:
|
||||
"video", "image", or "text"
|
||||
"static", "image", or "video"
|
||||
"""
|
||||
from pixelle_video.services.frame_html import HTMLFrameGenerator
|
||||
from pixelle_video.utils.template_util import resolve_template_path
|
||||
from pixelle_video.utils.template_util import get_template_type
|
||||
|
||||
# Check if template name starts with video_
|
||||
# Determine type by template filename prefix
|
||||
template_name = Path(frame_template).name
|
||||
if template_name.startswith("video_"):
|
||||
logger.debug(f"Template '{frame_template}' is video template (video_ prefix)")
|
||||
return "video"
|
||||
template_type = get_template_type(template_name)
|
||||
|
||||
# Check if template contains {{image}}
|
||||
template_path = resolve_template_path(frame_template)
|
||||
generator = HTMLFrameGenerator(template_path)
|
||||
|
||||
requires_image = generator.requires_image()
|
||||
if requires_image:
|
||||
logger.debug(f"Template '{frame_template}' is image template (has {{image}})")
|
||||
return "image"
|
||||
else:
|
||||
logger.debug(f"Template '{frame_template}' is text-only template")
|
||||
return "text"
|
||||
logger.debug(f"Template '{frame_template}' is {template_type} template")
|
||||
return template_type
|
||||
|
||||
|
||||
Reference in New Issue
Block a user