Skip to content

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

fix(material): distinguish image decode failures

harry0703428dd4e1bfb7
diff --git a/app/services/material.py b/app/services/material.py
index 7065b1bf..818ceb3b 100644
--- a/app/services/material.py
+++ b/app/services/material.py
@@ -13,7 +13,7 @@ from urllib.parse import quote_plus, urlencode, urlsplit, urlunsplit
import requests
from loguru import logger
from moviepy.video.io.VideoFileClip import VideoFileClip
-from PIL import Image
+from PIL import Image, UnidentifiedImageError
from app.config import config
from app.models.schema import MaterialInfo, VideoAspect, VideoConcatMode
@@ -25,6 +25,10 @@ _api_key_counter = 0
_api_key_lock = threading.Lock()
+class _OpenAIImageDecodeError(ValueError):
+ """表示兼容接口返回的字节无法解码为图片,不包含本地文件写入故障。"""
+
+
def _safe_public_url(value: Any) -> str | None:
"""
只保留可公开展示的 HTTP(S) 页面地址,并移除查询参数和凭据。
@@ -1368,10 +1372,25 @@ def _save_openai_image_file(
os.makedirs(save_dir, exist_ok=True)
image_path = os.path.join(save_dir, f"openai-image-{uuid.uuid4().hex[:12]}.png")
- with Image.open(io.BytesIO(image_bytes)) as image:
- image.load()
+
+ # 图片解码失败可以降级为“跳过当前关键词”,但目录权限、磁盘空间和文件
+ # 写入失败必须继续抛出,否则按需生成循环会在本地无法保存文件时继续创建
+ # 后续付费任务。Image.open 只读取内存字节,因此这里的 OSError 属于格式
+ # 识别失败;image.load 的 OSError 则对应截断或损坏的图片数据。
+ try:
+ image = Image.open(io.BytesIO(image_bytes))
+ except (UnidentifiedImageError, OSError, SyntaxError, ValueError) as exc:
+ raise _OpenAIImageDecodeError(f"{type(exc).__name__}: {exc}") from exc
+
+ with image:
+ try:
+ image.load()
+ except (OSError, SyntaxError, ValueError) as exc:
+ raise _OpenAIImageDecodeError(f"{type(exc).__name__}: {exc}") from exc
if image.mode not in ("RGB", "RGBA", "L", "LA", "P"):
image = image.convert("RGB")
+ # save 不放进解码异常保护区:写入错误表示运行环境持续不可用,应立即
+ # 终止整个任务,避免后续关键词继续产生无法落盘的付费图片。
image.save(image_path, format="PNG")
width, height = image.size
return image_path, width, height
@@ -1415,7 +1434,7 @@ def generate_images_openai(
try:
image_path, width, height = _save_openai_image_file(image_bytes, save_dir)
- except Exception as e:
+ except _OpenAIImageDecodeError as e:
# 兼容层可能返回 200 但 body 不是图片(如伪装成 JSON 的 HTML 错误页、
# 网关的降级提示页)。图片无法解码属于"该次生成已失败",按素材源
# 约定返回空列表让上层跳过该关键词继续,而不是让异常中断整个任务。
diff --git a/test/services/test_material_openai_image.py b/test/services/test_material_openai_image.py
index c688574b..15c6f43f 100644
--- a/test/services/test_material_openai_image.py
+++ b/test/services/test_material_openai_image.py
@@ -189,6 +189,34 @@ class TestOpenAIImageProvider(unittest.TestCase):
self.assertEqual(results, [])
self.assertEqual(os.listdir(self.save_dir), [])
+ def test_generate_images_openai_propagates_image_write_failure(self):
+ """
+ 图片已经成功解码但 PNG 写入失败时必须中断任务。此类故障通常会持续
+ 影响后续关键词,若误判为单张内容异常并继续,会产生无法落盘的付费请求。
+ """
+ response = _image_response(
+ {
+ "data": [
+ {"b64_json": base64.b64encode(_png_bytes()).decode("ascii")}
+ ]
+ }
+ )
+
+ with (
+ patch("app.services.material.requests.post", return_value=response),
+ patch.object(
+ Image.Image,
+ "save",
+ side_effect=OSError("no space left on device"),
+ ),
+ self.assertRaisesRegex(OSError, "no space left on device"),
+ ):
+ material.generate_images_openai(
+ "city at night", minimum_duration=3, save_dir=self.save_dir
+ )
+
+ self.assertEqual(os.listdir(self.save_dir), [])
+
# ------------------------------------------------------------------
# 退避重试与 key 轮换
# ------------------------------------------------------------------
@@ -613,6 +641,54 @@ class TestOpenAIImageProvider(unittest.TestCase):
self.assertEqual(render.call_count, 2)
self.assertEqual(result, ["/tmp/img-1.png.mp4", "/tmp/img-2.png.mp4"])
+ def test_download_videos_openai_image_continues_after_invalid_image(self):
+ """
+ 首个兼容接口响应无法解码时只跳过对应关键词,随后一张合法图片仍能
+ 完成落盘和渲染,验证修复覆盖真实的按需生成调用链而不只是单个函数。
+ """
+ invalid_response = _image_response(
+ {
+ "data": [
+ {
+ "b64_json": base64.b64encode(
+ b"<html>gateway degraded</html>"
+ ).decode("ascii")
+ }
+ ]
+ }
+ )
+ valid_response = _image_response(
+ {
+ "data": [
+ {"b64_json": base64.b64encode(_png_bytes()).decode("ascii")}
+ ]
+ }
+ )
+ config.app["material_directory"] = self.save_dir
+
+ with (
+ patch(
+ "app.services.material.requests.post",
+ side_effect=[invalid_response, valid_response],
+ ) as post,
+ patch(
+ "app.services.material._render_openai_image_video",
+ return_value="/tmp/rendered-openai-image.mp4",
+ ) as render,
+ patch("app.services.material._persist_material_sources"),
+ ):
+ result = material.download_videos(
+ task_id="test-openai-image-invalid-then-valid",
+ search_terms=["invalid term", "valid term"],
+ source="openai_image",
+ audio_duration=5,
+ max_clip_duration=5,
+ )
+
+ self.assertEqual(post.call_count, 2)
+ self.assertEqual(render.call_count, 1)
+ self.assertEqual(result, ["/tmp/rendered-openai-image.mp4"])
+
def test_download_videos_openai_image_stops_when_duration_exactly_covered(self):
"""边界回归:恰好凑够所需时长即已够用,停止判断必须是 >= 而不是 >。"""
generated = {