Skip to content

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

fix(loomloom): coerce and bound the configured duration settings

c020627552e0ee9fbfb
diff --git a/app/services/loomloom.py b/app/services/loomloom.py
index 4c3a7d2b..9c4dea44 100644
--- a/app/services/loomloom.py
+++ b/app/services/loomloom.py
@@ -8,6 +8,7 @@ rows; it is not a chat-completions provider.
from __future__ import annotations
import json
+import math
import os
import time
from collections.abc import Callable, Mapping
@@ -65,6 +66,25 @@ class LoomLoomRunError(LoomLoomError):
"""Raised when a submitted run fails or exceeds its wait timeout."""
+def _coerce_seconds_setting(value: Any, name: str) -> float:
+ """
+ 把配置里的秒数字段转成浮点数,并保持配置错误的异常类型约定。
+
+ TOML 允许字符串/数组写法,裸 ``float()`` 抛出的 ``ValueError`` /
+ ``TypeError`` 不是 ``LoomLoomError``,会让只捕获 ``LoomLoomError`` 的轮询
+ 入口冒泡成 traceback,绕过 ``validate()`` 带配置名的提示;``float(True)``
+ 还会静默变成 1.0,把 600 秒等待压成 1 秒。
+ """
+ if isinstance(value, bool):
+ raise LoomLoomConfigurationError(f"{name} must be a number, got {value!r}")
+ try:
+ return float(value)
+ except (TypeError, ValueError):
+ raise LoomLoomConfigurationError(
+ f"{name} must be a number, got {value!r}"
+ ) from None
+
+
def resolve_api_token(values: Mapping[str, Any]) -> str:
"""
解析当前功能应使用的胜算云 API Key。
@@ -103,20 +123,23 @@ class LoomLoomSettings:
market_listing_id=DEFAULT_SCRIPT_MARKET_LISTING_ID,
listing_version_id="",
result_port_name=DEFAULT_RESULT_PORT_NAME,
- request_timeout_seconds=float(
+ request_timeout_seconds=_coerce_seconds_setting(
values.get(
"loomloom_request_timeout_seconds",
DEFAULT_REQUEST_TIMEOUT_SECONDS,
- )
+ ),
+ "loomloom_request_timeout_seconds",
),
- poll_interval_seconds=float(
+ poll_interval_seconds=_coerce_seconds_setting(
values.get(
"loomloom_poll_interval_seconds",
DEFAULT_POLL_INTERVAL_SECONDS,
- )
+ ),
+ "loomloom_poll_interval_seconds",
),
- run_timeout_seconds=float(
- values.get("loomloom_run_timeout_seconds", DEFAULT_RUN_TIMEOUT_SECONDS)
+ run_timeout_seconds=_coerce_seconds_setting(
+ values.get("loomloom_run_timeout_seconds", DEFAULT_RUN_TIMEOUT_SECONDS),
+ "loomloom_run_timeout_seconds",
),
)
settings.validate(require_api_token=True)
@@ -147,6 +170,10 @@ class LoomLoomSettings:
("loomloom_poll_interval_seconds", self.poll_interval_seconds),
("loomloom_run_timeout_seconds", self.run_timeout_seconds),
):
+ # ``value <= 0`` 拦不住 NaN/Inf:NaN 参与比较恒为 False,Inf 永远
+ # 大于当前时间,两者都会让 ``wait_for_run`` 的截止时间失效。
+ if not math.isfinite(value):
+ raise LoomLoomConfigurationError(f"{name} must be a finite number")
if value <= 0:
raise LoomLoomConfigurationError(f"{name} must be greater than zero")
@@ -265,11 +292,12 @@ def video_settings_from_mapping(values: Mapping[str, Any]) -> LoomLoomSettings:
result_port_name=settings.result_port_name,
request_timeout_seconds=settings.request_timeout_seconds,
poll_interval_seconds=settings.poll_interval_seconds,
- run_timeout_seconds=float(
+ run_timeout_seconds=_coerce_seconds_setting(
values.get(
"loomloom_video_run_timeout_seconds",
DEFAULT_VIDEO_RUN_TIMEOUT_SECONDS,
- )
+ ),
+ "loomloom_video_run_timeout_seconds",
),
)
diff --git a/test/services/test_loomloom.py b/test/services/test_loomloom.py
index ea8ef621..5838be3f 100644
--- a/test/services/test_loomloom.py
+++ b/test/services/test_loomloom.py
@@ -133,6 +133,63 @@ class TestLoomLoomSettings(unittest.TestCase):
self.assertEqual(settings.base_url, "https://example.test/loom/v1")
self.assertNotIn("secret-token", repr(settings))
+ def test_rejects_non_numeric_timeout_settings(self):
+ """字符串/数组/布尔不是秒数,须报带配置名的配置错误而非裸异常。"""
+ for name in (
+ "loomloom_request_timeout_seconds",
+ "loomloom_poll_interval_seconds",
+ "loomloom_run_timeout_seconds",
+ ):
+ for value in ("600s", [30], {"seconds": 30}, True):
+ with self.subTest(name=name, value=value):
+ with self.assertRaisesRegex(LoomLoomConfigurationError, name):
+ LoomLoomSettings.from_mapping(
+ {
+ "loomloom_api_token": "configured-key",
+ name: value,
+ }
+ )
+
+ def test_video_settings_reject_non_numeric_run_timeout(self):
+ with self.assertRaisesRegex(
+ LoomLoomConfigurationError, "loomloom_video_run_timeout_seconds"
+ ):
+ video_settings_from_mapping(
+ {
+ "loomloom_api_token": "configured-key",
+ "loomloom_video_run_timeout_seconds": "30m",
+ }
+ )
+
+ def test_rejects_non_finite_timeout_settings(self):
+ """NaN/Inf 能通过 ``value <= 0``,却会让运行截止时间判断永远不成立。"""
+ for value in ("nan", "inf"):
+ with self.subTest(value=value):
+ with self.assertRaisesRegex(
+ LoomLoomConfigurationError,
+ "loomloom_run_timeout_seconds must be a finite number",
+ ):
+ LoomLoomSettings.from_mapping(
+ {
+ "loomloom_api_token": "configured-key",
+ "loomloom_run_timeout_seconds": value,
+ }
+ )
+
+ def test_backend_rejects_non_finite_run_timeout(self):
+ """非有限超时不得进入轮询循环,否则 ``wait_for_run`` 永不超时。"""
+ settings = LoomLoomSettings(
+ base_url=DEFAULT_BASE_URL,
+ api_token="configured-key",
+ market_listing_id=DEFAULT_SCRIPT_MARKET_LISTING_ID,
+ run_timeout_seconds=float("nan"),
+ )
+ with self.assertRaisesRegex(
+ LoomLoomConfigurationError,
+ "loomloom_run_timeout_seconds must be a finite number",
+ ):
+ LoomLoomScriptBackend(settings)
+
def test_video_settings_use_fixed_default_skillbot(self):
settings = video_settings_from_mapping(
{