利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.
Python ai-video-generatorcontent-creationffmpeginstagram-reelsllmpythonshort-videosubtitlestext-to-speechtiktokvideo-automationvideo-workflowworkflow-automationyoutube-shorts
fix: correct Redis task pagination
Harry4cdf51100683
diff --git a/app/services/state.py b/app/services/state.pyindex 21d325fe..3e6b98d4 100644--- a/app/services/state.py+++ b/app/services/state.py@@ -73,17 +73,27 @@ class RedisState(BaseState):total = 0while True:cursor, keys = self._redis.scan(cursor, count=page_size)- total += len(keys)- if total > start:- for key in keys[max(0, start - total):end - total]:+ batch_start = total+ batch_size = len(keys)+ total += batch_size++ # Redis SCAN 是分批返回 key。分页切片必须基于“当前批次起始索引”+ # 计算,而不能用累积后的 total 反推,否则第一页会切到空数组,+ # 第二页也可能只返回部分数据。+ if batch_start < end and total > start:+ slice_start = max(0, start - batch_start)+ slice_end = min(batch_size, end - batch_start)+ for key in keys[slice_start:slice_end]:task_data = self._redis.hgetall(key)task = {- k.decode("utf-8"): self._convert_to_original_type(v) for k, v in task_data.items()+ k.decode("utf-8"): self._convert_to_original_type(v)+ for k, v in task_data.items()}tasks.append(task)- if len(tasks) >= page_size:- break- if cursor == 0 or len(tasks) >= page_size:++ # 即使当前页已经取满,也要继续 SCAN 到 cursor=0,+ # 因为调用方需要准确 total 来渲染分页信息。+ if cursor == 0:breakreturn tasks, totaldiff --git a/test/services/test_state.py b/test/services/test_state.pynew file mode 100644index 00000000..dcb67cef--- /dev/null+++ b/test/services/test_state.py@@ -0,0 +1,74 @@+import sys+import unittest+from pathlib import Path++sys.path.insert(0, str(Path(__file__).parent.parent.parent))++from app.services.state import RedisState+++class _FakeRedis:+ def __init__(self, batches):+ self.batches = batches+ self.data = {}+ for key in [key for batch in batches for key in batch]:+ index = int(key.decode("utf-8").split(":")[-1])+ self.data[key] = {+ b"task_id": key,+ b"state": b"1",+ b"progress": str(index).encode("utf-8"),+ }++ def scan(self, cursor, count):+ batch_index = int(cursor)+ next_cursor = batch_index + 1+ if next_cursor >= len(self.batches):+ next_cursor = 0+ return next_cursor, self.batches[batch_index]++ def hgetall(self, key):+ return self.data[key]+++class TestRedisState(unittest.TestCase):+ def _build_state(self, batch_sizes):+ keys = [f"task:{i}".encode("utf-8") for i in range(sum(batch_sizes))]+ batches = []+ offset = 0+ for batch_size in batch_sizes:+ batches.append(keys[offset : offset + batch_size])+ offset += batch_size++ state = RedisState.__new__(RedisState)+ state._redis = _FakeRedis(batches)+ return state++ def test_get_all_tasks_paginates_across_scan_batches(self):+ """+ Redis SCAN 分批返回 key 时,分页切片必须按当前批次起始位置计算。++ 这个用例复现 PR #890 描述的 18 条任务、page_size=10 场景:+ 第一批 10 条,第二批 8 条。旧逻辑第一页会返回空列表,第二页+ 只返回 2 条;修复后第一页返回 10 条,第二页返回剩余 8 条。+ """+ state = self._build_state([10, 8])++ first_page, first_total = state.get_all_tasks(page=1, page_size=10)+ second_page, second_total = state.get_all_tasks(page=2, page_size=10)++ self.assertEqual(first_total, 18)+ self.assertEqual(second_total, 18)+ self.assertEqual(len(first_page), 10)+ self.assertEqual(len(second_page), 8)+ self.assertEqual(+ [task["task_id"] for task in first_page],+ [f"task:{i}" for i in range(10)],+ )+ self.assertEqual(+ [task["task_id"] for task in second_page],+ [f"task:{i}" for i in range(10, 18)],+ )+++if __name__ == "__main__":+ unittest.main()