Skip to content

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

fix(loomloom): stop polling once the wait deadline expires

Rudy Celekli231796809ce0
diff --git a/app/services/loomloom.py b/app/services/loomloom.py
index 3ecd86da..48d3493c 100644
--- a/app/services/loomloom.py
+++ b/app/services/loomloom.py
@@ -463,6 +463,11 @@ class LoomLoomScriptBackend:
last_progress_log_at = started_at
consecutive_poll_errors = 0
while True:
+ if self._clock() >= deadline:
+ raise LoomLoomRunError(
+ f"LoomLoom run {run_id} did not complete within "
+ f"{self.settings.run_timeout_seconds:g} seconds"
+ )
try:
run = self.get_run(run_id)
consecutive_poll_errors = 0
@@ -513,7 +518,7 @@ class LoomLoomScriptBackend:
f"LoomLoom run {run.run_id} did not complete within "
f"{self.settings.run_timeout_seconds:g} seconds"
)
- self._sleep(self.settings.poll_interval_seconds)
+ self._sleep(min(self.settings.poll_interval_seconds, deadline - now))
def get_script_results(self, run_id: str) -> LoomLoomScriptBatchResult:
normalized_run_id = self._required_identifier(run_id, "run_id")
diff --git a/test/services/test_loom_poll_deadline_native.py b/test/services/test_loom_poll_deadline_native.py
new file mode 100644
index 00000000..a9b2d6b8
--- /dev/null
+++ b/test/services/test_loom_poll_deadline_native.py
@@ -0,0 +1,61 @@
+import http.server
+import json
+import threading
+import pytest
+from app.services.loomloom import (
+ LoomLoomScriptBackend,
+ LoomLoomSettings,
+ LoomLoomRunError,
+)
+
+
+def test_native_poll_does_not_issue_request_after_wait_deadline():
+ calls = []
+ now = [0.0]
+
+ class Handler(http.server.BaseHTTPRequestHandler):
+ def do_GET(self):
+ calls.append(self.path)
+ body = json.dumps(
+ {
+ "run": {
+ "runId": "retained-run",
+ "status": "running" if len(calls) == 1 else "completed",
+ "totalTasks": 1,
+ "completedTasks": 0,
+ "failedTasks": 0,
+ "cancelledTasks": 0,
+ }
+ }
+ ).encode()
+ self.send_response(200)
+ self.send_header("Content-Length", str(len(body)))
+ self.end_headers()
+ self.wfile.write(body)
+
+ def log_message(self, *args):
+ pass
+
+ server = http.server.ThreadingHTTPServer(("127.0.0.1", 0), Handler)
+ worker = threading.Thread(target=server.serve_forever, daemon=True)
+ worker.start()
+ backend = LoomLoomScriptBackend(
+ LoomLoomSettings(
+ base_url=f"http://127.0.0.1:{server.server_port}",
+ api_token="synthetic",
+ market_listing_id="fixture",
+ run_timeout_seconds=0.02,
+ poll_interval_seconds=0.2,
+ ),
+ clock=lambda: now[0],
+ sleep=lambda delay: now.__setitem__(0, now[0] + delay),
+ )
+ try:
+ with pytest.raises(LoomLoomRunError, match="retained-run"):
+ backend.wait_for_run("retained-run")
+ assert len(calls) == 1
+ finally:
+ backend._session.close()
+ server.shutdown()
+ server.server_close()
+ worker.join(2)
diff --git a/test/services/test_loomloom.py b/test/services/test_loomloom.py
index 5838be3f..b5a9bbd5 100644
--- a/test/services/test_loomloom.py
+++ b/test/services/test_loomloom.py
@@ -398,8 +398,9 @@ class TestLoomLoomScriptBackend(unittest.TestCase):
completed,
]
)
- self.backend._clock = MagicMock(side_effect=[0, 0, 0, 0.1])
- self.backend._sleep = MagicMock()
+ now = [0.0]
+ self.backend._clock = lambda: now[0]
+ self.backend._sleep = MagicMock(side_effect=lambda delay: now.__setitem__(0, now[0] + delay))
result = self.backend.wait_for_run("run-1")
@@ -411,8 +412,9 @@ class TestLoomLoomScriptBackend(unittest.TestCase):
completed = LoomLoomRun("run-1", "completed", 1, 1, 0, 0, "")
self.backend.get_run = MagicMock(side_effect=[running, running, completed])
self.backend.settings = replace(self.backend.settings, run_timeout_seconds=100)
- self.backend._clock = MagicMock(side_effect=[0, 0, 0, 31, 32])
- self.backend._sleep = MagicMock()
+ now = [0.0]
+ self.backend._clock = lambda: now[0]
+ self.backend._sleep = MagicMock(side_effect=lambda delay: now.__setitem__(0, now[0] + 31))
with patch("app.services.loomloom.logger.info") as log_info:
result = self.backend.wait_for_run("run-1")