feat: make job creation idempotent

这个提交存在于:
YokiiroBW 2026-07-05 18:20:14 +08:00
父节点 ea84cf08f6
当前提交 5d84d582da
共有 3 个文件被更改,包括 92 次插入 和 1 次删除

查看文件

@ -40,6 +40,11 @@ class QueueService:
"unsupported task status",
{"field": "status", "allowed": sorted(TASK_STATUSES)},
)
idempotency_key = _optional_text(payload.get("idempotency_key"))
if idempotency_key:
existing = self.repository.get_by_idempotency_key(idempotency_key)
if existing is not None:
return existing
task = self.repository.create(
{
"task_id": payload.get("task_id") or new_task_id(),
@ -50,7 +55,7 @@ class QueueService:
"status": status,
"model_route": payload.get("model_route"),
"progress": payload.get("progress", 0),
"idempotency_key": payload.get("idempotency_key"),
"idempotency_key": idempotency_key,
"request": payload.get("request") or {},
"result": payload.get("result") or {},
"error_message": payload.get("error_message"),
@ -260,3 +265,10 @@ class QueueService:
def new_task_id() -> str:
return f"task_{uuid4().hex}"
def _optional_text(value: Any) -> str | None:
if value is None:
return None
text = str(value).strip()
return text or None

查看文件

@ -99,6 +99,18 @@ class JobRepository:
conn.close()
return _row_to_task(row) if row else None
def get_by_idempotency_key(self, idempotency_key: str) -> GenerationTask | None:
placeholder = self.placeholder
conn = self.database.connect()
try:
row = conn.execute(
f"SELECT {TASK_COLUMNS} FROM generation_tasks WHERE idempotency_key = {placeholder}",
(idempotency_key,),
).fetchone()
finally:
conn.close()
return _row_to_task(row) if row else None
def list(
self,
*,

67
tests/test_queue_service.py 普通文件
查看文件

@ -0,0 +1,67 @@
from __future__ import annotations
import tempfile
import unittest
from pathlib import Path
from backend.services.queue_service import QueueService
from core.audit_service import AuditService
from core.event_bus import EventBus
from core.identity import RequestContext
from database.db_helper import Database, DatabaseSettings, SqliteSettings
from database.repositories.job_repository import JobRepository
class QueueServiceTests(unittest.TestCase):
def setUp(self):
self.tmp = tempfile.TemporaryDirectory()
self.database = Database(
DatabaseSettings(sqlite=SqliteSettings(path=str(Path(self.tmp.name) / "imagestudio.db")))
)
self.database.initialize()
self.audit_service = AuditService(self.database)
self.event_bus = EventBus()
self.queue_service = QueueService(JobRepository(self.database), self.audit_service, self.event_bus)
self.ctx = RequestContext.from_astrbot(
username="admin",
user_id="user_001",
permissions={"can_write"},
)
def tearDown(self):
self.tmp.cleanup()
def test_create_task_reuses_existing_idempotency_key(self):
first = self.queue_service.create_task(
{
"status": "queued",
"idempotency_key": "generate-node-001",
"request": {"prompt": "portrait"},
},
self.ctx,
)
second = self.queue_service.create_task(
{
"status": "queued",
"idempotency_key": " generate-node-001 ",
"request": {"prompt": "different prompt"},
},
self.ctx,
)
self.assertEqual(first.task_id, second.task_id)
self.assertEqual(second.request, {"prompt": "portrait"})
self.assertEqual(self.queue_service.list_jobs(page=1, page_size=10).total, 1)
self.assertEqual(len(self.event_bus.history("generation.task_created")), 1)
def test_blank_idempotency_key_is_treated_as_missing(self):
first = self.queue_service.create_task({"status": "queued", "idempotency_key": " "}, self.ctx)
second = self.queue_service.create_task({"status": "queued", "idempotency_key": ""}, self.ctx)
self.assertNotEqual(first.task_id, second.task_id)
self.assertIsNone(first.idempotency_key)
self.assertIsNone(second.idempotency_key)
if __name__ == "__main__":
unittest.main()