From 1934be3be7f7cf887cc75c7142017640a0ad5780 Mon Sep 17 00:00:00 2001 From: YokiiroBW Date: Mon, 6 Jul 2026 02:01:45 +0800 Subject: [PATCH] =?UTF-8?q?S80=20=E6=A8=A1=E5=9E=8B=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=94=9F=E6=88=90=E9=93=BE=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/routes/node_routes.py | 3 ++ backend/services/generation_service.py | 43 ++++++++++++++++++++++---- tests/test_single_flow_generation.py | 43 ++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 6 deletions(-) diff --git a/backend/routes/node_routes.py b/backend/routes/node_routes.py index 3c15031..8b0292c 100644 --- a/backend/routes/node_routes.py +++ b/backend/routes/node_routes.py @@ -10,6 +10,7 @@ from backend.routes.common import handle_request from backend.services.event_stream_service import get_default_event_bus from backend.services.generation_service import GenerationService from backend.services.image_service import ImageService +from backend.services.model_provider_service import ModelProviderService from backend.services.queue_service import QueueService from backend.services.workflow_service import WorkflowService from core.audit_service import AuditService @@ -18,6 +19,7 @@ from core.security import require_authenticated, require_write from database.db_helper import Database, load_database_settings from database.repositories.image_repository import ImageRepository from database.repositories.job_repository import JobRepository +from database.repositories.model_provider_repository import ModelProviderRepository from database.repositories.profile_repository import ProfileRepository from database.repositories.workflow_repository import WorkflowRepository @@ -226,5 +228,6 @@ def _create_generation_service() -> GenerationService: workflow_repository=workflow_repository, audit_service=audit_service, ), + model_provider_service=ModelProviderService(ModelProviderRepository(database)), event_bus=event_bus, ) diff --git a/backend/services/generation_service.py b/backend/services/generation_service.py index ec5cd52..3ba00f0 100644 --- a/backend/services/generation_service.py +++ b/backend/services/generation_service.py @@ -7,6 +7,7 @@ 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.model_provider_service import ModelProviderService from backend.services.queue_service import QueueService from backend.services.workflow_service import WorkflowService from core.event_bus import EventBus @@ -21,17 +22,26 @@ class GenerationService: queue_service: QueueService, image_service: ImageService, single_flow_engine: SingleFlowEngine | None = None, + model_provider_service: ModelProviderService | None = None, event_bus: EventBus | None = None, ): self.workflow_service = workflow_service self.queue_service = queue_service self.image_service = image_service self.single_flow_engine = single_flow_engine or SingleFlowEngine() + self.model_provider_service = model_provider_service self.event_bus = event_bus 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 + model_route = str(payload.get("model_route") or node.model_route or "image_low") + route_resolution = self._resolve_model_route(model_route) + generation_request = { + **payload, + "model_route": model_route, + "resolved_model_route": route_resolution, + } idempotency_key = _optional_text(payload.get("idempotency_key")) if idempotency_key: existing_task = self.queue_service.get_job_by_idempotency_key(idempotency_key) @@ -53,10 +63,13 @@ class GenerationService: "workflow_id": workflow.workflow_id, "node_id": node_id, "status": "queued", - "model_route": payload.get("model_route") or node.model_route, + "model_route": model_route, "idempotency_key": idempotency_key, - "request": payload, - "metadata": {"source": "nodes.generate"}, + "request": generation_request, + "metadata": { + "source": "nodes.generate", + "model_route_resolution": route_resolution, + }, }, ctx, ) @@ -68,11 +81,11 @@ class GenerationService: node_id, { "status": "queued", - "model_route": payload.get("model_route") or node.model_route, + "model_route": model_route, "metadata": { **node.metadata, "last_task_id": task.task_id, - "last_generate_request": payload, + "last_generate_request": generation_request, }, }, ctx, @@ -83,7 +96,7 @@ class GenerationService: "generation.node_running", {"workflow_id": workflow.workflow_id, "node_id": node_id, "task_id": task.task_id}, ) - assets = self.single_flow_engine.generate(running_node, task, payload) + assets = self.single_flow_engine.generate(running_node, task, generation_request) images = [ self.image_service.create_image( { @@ -148,6 +161,24 @@ class GenerationService: "idempotent_replay": True, } + def _resolve_model_route(self, route_name: str) -> dict[str, Any]: + if not self.model_provider_service: + return {"route_name": route_name, "status": "unresolved"} + resolved = self.model_provider_service.resolve_route(route_name, modality="image_generation") + if not resolved: + return {"route_name": route_name, "status": "unresolved"} + provider = resolved.get("provider") or {} + return { + "route_name": resolved["route_name"], + "route_id": resolved["route_id"], + "status": "resolved", + "provider_id": resolved["provider_id"], + "provider_type": provider.get("provider_type"), + "model_id": resolved["model_id"], + "modality": resolved["modality"], + "priority": resolved["priority"], + } + def _publish(self, event_type: str, payload: dict[str, Any]) -> None: if self.event_bus: self.event_bus.publish(event_type, payload) diff --git a/tests/test_single_flow_generation.py b/tests/test_single_flow_generation.py index 7b7a943..0216561 100644 --- a/tests/test_single_flow_generation.py +++ b/tests/test_single_flow_generation.py @@ -10,6 +10,7 @@ from backend.dto.job_dto import GenerationTask from backend.dto.workflow_dto import WorkflowNode from backend.services.generation_service import GenerationService from backend.services.image_service import ImageService +from backend.services.model_provider_service import ModelProviderService from backend.services.profile_service import ProfileService from backend.services.queue_service import QueueService from backend.services.workflow_service import WorkflowService @@ -21,6 +22,7 @@ from core.storage import VfsStorage from database.db_helper import Database, DatabaseSettings, SqliteSettings from database.repositories.image_repository import ImageRepository from database.repositories.job_repository import JobRepository +from database.repositories.model_provider_repository import ModelProviderRepository from database.repositories.profile_repository import ProfileRepository from database.repositories.workflow_repository import WorkflowRepository from engines.single_flow import SingleFlowEngine @@ -57,6 +59,7 @@ storage: self.workflow_repository = WorkflowRepository(self.database) self.image_repository = ImageRepository(self.database) self.job_repository = JobRepository(self.database) + self.model_provider_service = ModelProviderService(ModelProviderRepository(self.database)) self.profile_service = ProfileService(self.profile_repository, self.audit_service) self.workflow_service = WorkflowService( self.workflow_repository, @@ -76,6 +79,7 @@ storage: queue_service=self.queue_service, image_service=self.image_service, single_flow_engine=SingleFlowEngine(VfsStorage(self.config_service)), + model_provider_service=self.model_provider_service, event_bus=self.event_bus, ) self.ctx = RequestContext.from_astrbot( @@ -158,6 +162,45 @@ storage: 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_generate_node_records_resolved_model_route(self): + self.model_provider_service.upsert_provider( + { + "provider_id": "site_b", + "base_url": "https://botcf.com", + "image_endpoint": "/v1/images/generations", + "api_key_secret_ref": "secret/site_b", + } + ) + self.model_provider_service.upsert_route( + { + "route_name": "image_high", + "provider_id": "site_b", + "model_id": "image2", + "priority": 5, + } + ) + 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, + ) + + response = generate_node( + self.ctx, + workflow.nodes[0].node_id, + {"prompt_patch": "white shirt", "model_route": "image_high"}, + generation_service=self.generation_service, + ) + + task = self.queue_service.get_job(response["data"]["task_id"]) + resolution = task.metadata["model_route_resolution"] + self.assertEqual(resolution["status"], "resolved") + self.assertEqual(resolution["provider_id"], "site_b") + self.assertEqual(resolution["model_id"], "image2") + self.assertNotIn("api_key_secret_ref", str(task.metadata)) + self.assertEqual(task.request["resolved_model_route"]["route_id"], "route_image_high_site_b_image2") + def test_single_flow_engine_keeps_mock_outputs_vfs_safe(self): node = WorkflowNode( node_id="node_001",