Skip to content

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

fix(webui): ignore stale version check results

Rudy Celekli194a11f7045c
diff --git a/app/services/version_checker.py b/app/services/version_checker.py
index c264832a..7bcdd47a 100644
--- a/app/services/version_checker.py
+++ b/app/services/version_checker.py
@@ -132,6 +132,7 @@ class AsyncUpdateChecker:
self._available_version: str | None = None
self._completed_at: float | None = None
self._checking = False
+ self._request_id = 0
def poll(self, current_version: str) -> UpdateCheckSnapshot:
"""立即返回检查快照;缓存过期时在后台启动一次新检查。"""
@@ -162,10 +163,11 @@ class AsyncUpdateChecker:
self._available_version = None
self._completed_at = None
self._checking = True
+ self._request_id += 1
worker = threading.Thread(
target=self._run_check,
- args=(normalized_current_version,),
+ args=(normalized_current_version, self._request_id),
name="mpt-version-check",
daemon=True,
)
@@ -173,7 +175,7 @@ class AsyncUpdateChecker:
return UpdateCheckSnapshot(complete=False)
- def _run_check(self, current_version: str) -> None:
+ def _run_check(self, current_version: str, request_id: int) -> None:
try:
available_version = self._check(current_version)
except Exception:
@@ -185,8 +187,9 @@ class AsyncUpdateChecker:
available_version = None
with self._lock:
- # 极少数情况下运行期间版本可能变化。旧线程不得覆盖新版本的状态。
- if self._current_version != current_version:
+ # A -> B -> A can launch two workers for the same version. Only the
+ # latest request may complete the current snapshot.
+ if self._request_id != request_id:
return
self._available_version = available_version
self._completed_at = self._clock()
diff --git a/test/services/test_version_checker.py b/test/services/test_version_checker.py
index 0028d213..a6535c88 100644
--- a/test/services/test_version_checker.py
+++ b/test/services/test_version_checker.py
@@ -2,7 +2,7 @@ import unittest
import time
import tomllib
from pathlib import Path
-from threading import Event
+from threading import Event, Thread
from unittest.mock import MagicMock, patch
import requests
@@ -182,6 +182,48 @@ class TestAsyncUpdateChecker(unittest.TestCase):
self.assertTrue(completed.complete)
self.assertIsNone(completed.available_version)
+ def test_old_check_cannot_complete_new_check_for_same_version(self):
+ started = [Event() for _ in range(3)]
+ release = [Event() for _ in range(3)]
+ calls = []
+ workers = []
+
+ def make_thread(*args, **kwargs):
+ worker = Thread(*args, **kwargs)
+ workers.append(worker)
+ return worker
+
+ def check(current_version):
+ index = len(calls)
+ calls.append(current_version)
+ started[index].set()
+ release[index].wait(timeout=2)
+ return ("stale-a", "release-b", "fresh-a")[index]
+
+ checker = version_checker.AsyncUpdateChecker(check=check)
+ try:
+ with patch.object(
+ version_checker.threading, "Thread", side_effect=make_thread
+ ):
+ checker.poll("1.3.2")
+ self.assertTrue(started[0].wait(timeout=1))
+ checker.poll("1.3.3")
+ self.assertTrue(started[1].wait(timeout=1))
+ checker.poll("1.3.2")
+ self.assertTrue(started[2].wait(timeout=1))
+
+ release[0].set()
+ workers[0].join(timeout=1)
+ self.assertFalse(workers[0].is_alive())
+ self.assertFalse(checker.poll("1.3.2").complete)
+
+ release[2].set()
+ completed = self._wait_for_completion(checker)
+ self.assertEqual(completed.available_version, "fresh-a")
+ finally:
+ for event in release:
+ event.set()
+
class TestProjectVersionMetadata(unittest.TestCase):
"""防止发布时运行时版本与 Python 项目元数据不一致。"""