diff --git a/backend/services/generation_service.py b/backend/services/generation_service.py index 42e220a..ec5cd52 100644 --- a/backend/services/generation_service.py +++ b/backend/services/generation_service.py @@ -4,6 +4,8 @@ from __future__ import annotations from typing import Any +from backend.dto.common import ApiError, ErrorCode +from backend.dto.job_dto import GenerationTask from backend.services.image_service import ImageService from backend.services.queue_service import QueueService from backend.services.workflow_service import WorkflowService @@ -30,6 +32,21 @@ class GenerationService: def generate_node(self, node_id: str, payload: dict[str, Any], ctx: RequestContext) -> dict[str, Any]: node = self.workflow_service.get_node(node_id) workflow = self.workflow_service.get_workflow(node.workflow_id).workflow + idempotency_key = _optional_text(payload.get("idempotency_key")) + if idempotency_key: + existing_task = self.queue_service.get_job_by_idempotency_key(idempotency_key) + if existing_task is not None: + if existing_task.node_id != node_id: + raise ApiError( + ErrorCode.VALIDATION_FAILED, + "idempotency_key belongs to another node", + { + "idempotency_key": idempotency_key, + "node_id": node_id, + "existing_node_id": existing_task.node_id, + }, + ) + return self._existing_generation_response(existing_task, node_id) task = self.queue_service.create_task( { "profile_id": workflow.profile_id, @@ -37,6 +54,7 @@ class GenerationService: "node_id": node_id, "status": "queued", "model_route": payload.get("model_route") or node.model_route, + "idempotency_key": idempotency_key, "request": payload, "metadata": {"source": "nodes.generate"}, }, @@ -113,6 +131,30 @@ class GenerationService: "images": [image.to_dict() for image in images], } + def _existing_generation_response(self, task: GenerationTask, node_id: str) -> dict[str, Any]: + node = self.workflow_service.get_node(node_id) + images = [] + for image_id in task.result.get("image_ids", []): + try: + images.append(self.image_service.get_image(str(image_id)).to_dict()) + except ApiError as exc: + if exc.error_code != ErrorCode.RESOURCE_NOT_FOUND: + raise + return { + "task_id": task.task_id, + "task_status": task.status, + "node_status": node.status, + "images": images, + "idempotent_replay": True, + } + def _publish(self, event_type: str, payload: dict[str, Any]) -> None: if self.event_bus: self.event_bus.publish(event_type, payload) + + +def _optional_text(value: Any) -> str | None: + if value is None: + return None + text = str(value).strip() + return text or None diff --git a/backend/services/queue_service.py b/backend/services/queue_service.py index 3657a3a..ff819b7 100644 --- a/backend/services/queue_service.py +++ b/backend/services/queue_service.py @@ -117,6 +117,12 @@ class QueueService: raise ApiError(ErrorCode.RESOURCE_NOT_FOUND, "task not found", {"task_id": task_id}) return task + def get_job_by_idempotency_key(self, idempotency_key: str) -> GenerationTask | None: + normalized_key = _optional_text(idempotency_key) + if normalized_key is None: + return None + return self.repository.get_by_idempotency_key(normalized_key) + def cancel_job(self, task_id: str, ctx: RequestContext) -> GenerationTask: before = self.get_job(task_id) if before.status in {"completed", "succeeded", "cancelled"}: diff --git a/tests/test_single_flow_generation.py b/tests/test_single_flow_generation.py index 423bf47..c5f0bad 100644 --- a/tests/test_single_flow_generation.py +++ b/tests/test_single_flow_generation.py @@ -126,6 +126,36 @@ storage: self.assertEqual(self.event_bus.history("generation.node_queued")[0].payload["task_id"], data["task_id"]) self.assertEqual(self.event_bus.history("generation.node_completed")[0].payload["image_ids"][0], data["images"][0]["image_id"]) + def test_generate_node_replays_existing_idempotent_task(self): + profile = self.profile_service.create_profile({"name": "Nova"}, self.ctx) + workflow = self.workflow_service.create_workflow( + profile.profile_id, + {"workflow_type": "single_image", "display_name": "Single"}, + self.ctx, + ) + node_id = workflow.nodes[0].node_id + payload = { + "prompt_patch": "white shirt", + "count": 2, + "model_route": "image_low", + "idempotency_key": "node-generate-001", + } + + first = generate_node(self.ctx, node_id, payload, generation_service=self.generation_service) + second = generate_node(self.ctx, node_id, payload, generation_service=self.generation_service) + + self.assertTrue(first["ok"]) + self.assertTrue(second["ok"]) + self.assertEqual(first["data"]["task_id"], second["data"]["task_id"]) + self.assertTrue(second["data"]["idempotent_replay"]) + self.assertEqual( + [image["image_id"] for image in first["data"]["images"]], + [image["image_id"] for image in second["data"]["images"]], + ) + self.assertEqual(self.queue_service.list_jobs(page=1, page_size=10).total, 1) + self.assertEqual(len(self.image_service.list_by_node(node_id)), 2) + self.assertEqual(len(self.event_bus.history("generation.node_queued")), 1) + def test_queue_service_rejects_invalid_task_transition(self): task = self.queue_service.create_task({"status": "succeeded"}, self.ctx)