Skip to content

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

fix(redis): preserve queued audio and subtitle request models

RudyCeleklib76c3a871f7a
diff --git a/app/controllers/manager/redis_manager.py b/app/controllers/manager/redis_manager.py
index af7b7681..0cbc3317 100644
--- a/app/controllers/manager/redis_manager.py
+++ b/app/controllers/manager/redis_manager.py
@@ -8,7 +8,7 @@ from pydantic import ValidationError
from app.controllers.manager.base_manager import TaskManager, TaskQueueFullError
from app.models import const
-from app.models.schema import VideoParams
+from app.models.schema import AudioRequest, SubtitleRequest, VideoParams
from app.services import state as sm
from app.services import task as tm
@@ -74,7 +74,9 @@ class RedisTaskManager(TaskManager):
task_kwargs = task.get("kwargs", {})
task_with_serializable_params["kwargs"] = task_kwargs.copy()
- if "params" in task_kwargs and isinstance(task_kwargs["params"], VideoParams):
+ if "params" in task_kwargs and isinstance(
+ task_kwargs["params"], (VideoParams, AudioRequest, SubtitleRequest)
+ ):
task_with_serializable_params["kwargs"]["params"] = task_kwargs[
"params"
].model_dump(warnings=False)
@@ -147,11 +149,20 @@ class RedisTaskManager(TaskManager):
if "params" in task_kwargs and isinstance(task_kwargs["params"], dict):
try:
- task_kwargs["params"] = VideoParams(**task_kwargs["params"])
+ params_model = VideoParams
+ # /audio and /subtitle use short-form request models without
+ # video_subject. Preserve those schemas at the queue boundary;
+ # full VideoParams can also stop at either of these stages.
+ if "video_subject" not in task_kwargs["params"]:
+ if task_kwargs.get("stop_at") == "audio":
+ params_model = AudioRequest
+ elif task_kwargs.get("stop_at") == "subtitle":
+ params_model = SubtitleRequest
+ task_kwargs["params"] = params_model(**task_kwargs["params"])
except ValidationError as e:
logger.error(
"dropping queued task with params that fail current "
- f"VideoParams validation (queued under an older, more "
+ f"request model validation (queued under an older, more "
f"permissive schema, or corrupted): {e}"
)
# 任务状态记录在入队前就已创建,且默认是 processing;如果只是
diff --git a/test/services/test_redis_short_form_requests.py b/test/services/test_redis_short_form_requests.py
new file mode 100644
index 00000000..25c66c10
--- /dev/null
+++ b/test/services/test_redis_short_form_requests.py
@@ -0,0 +1,76 @@
+"""Short-form HTTP requests must survive the Redis queue boundary."""
+
+import os
+import unittest
+from uuid import uuid4
+from unittest.mock import patch
+
+import redis
+from fastapi.testclient import TestClient
+
+from app import asgi
+from app.config import config
+from app.controllers.manager.redis_manager import RedisTaskManager
+from app.controllers.v1 import video as video_controller
+from app.models.schema import AudioRequest, SubtitleRequest
+from app.services import state as sm
+
+
+class TestRedisShortFormRequests(unittest.TestCase):
+ def setUp(self):
+ host = os.getenv("MPT_TEST_REDIS_HOST", "127.0.0.1")
+ port = int(os.getenv("MPT_TEST_REDIS_PORT", "6379"))
+ db = int(os.getenv("MPT_TEST_REDIS_DB", "15"))
+ self.manager = RedisTaskManager(0, f"redis://{host}:{port}/{db}")
+ try:
+ self.manager.redis_client.ping()
+ except redis.RedisError as exc:
+ self.skipTest(f"Redis is unavailable: {exc}")
+ self.manager.queue = f"test-short-form:{uuid4()}"
+ self.addCleanup(self.manager.redis_client.delete, self.manager.queue)
+ self.addCleanup(self.manager.redis_client.close)
+
+ def test_http_requests_round_trip_without_video_only_fields(self):
+ for route, model in (("audio", AudioRequest), ("subtitle", SubtitleRequest)):
+ with (
+ self.subTest(route=route),
+ patch.object(video_controller, "task_manager", self.manager),
+ patch.object(sm, "state", sm.MemoryState()),
+ patch.dict(config.app, {"api_key": ""}),
+ TestClient(asgi.app, raise_server_exceptions=False) as client,
+ ):
+ response = client.post(
+ f"/api/v1/{route}",
+ json={"video_script": "A prepared script", "voice_rate": 1.35},
+ )
+ self.assertEqual(response.status_code, 200, response.text)
+ task_id = response.json()["data"]["task_id"]
+ task = self.manager.dequeue()
+ self.assertIsNotNone(task)
+ self.assertEqual(task["kwargs"]["task_id"], task_id)
+ self.assertEqual(task["kwargs"]["stop_at"], route)
+ restored = task["kwargs"]["params"]
+ self.assertIsInstance(restored, model)
+ self.assertEqual(restored.video_script, "A prepared script")
+ self.assertEqual(restored.voice_rate, 1.35)
+ self.assertNotIn("video_subject", restored.model_dump())
+
+ def test_legacy_short_form_dicts_are_restored_instead_of_discarded(self):
+ import json
+
+ for route, model in (("audio", AudioRequest), ("subtitle", SubtitleRequest)):
+ with self.subTest(route=route):
+ params = model(video_script="Persisted script", voice_rate=1.35)
+ payload = {
+ "func": "start",
+ "args": [],
+ "kwargs": {
+ "task_id": f"test-{route}",
+ "params": params.model_dump(),
+ "stop_at": route,
+ },
+ }
+ self.manager.redis_client.rpush(self.manager.queue, json.dumps(payload))
+ task = self.manager.dequeue()
+ self.assertIsNotNone(task)
+ self.assertEqual(task["kwargs"]["params"], params)