diff --git a/backend/route_registry.py b/backend/route_registry.py index c4e9910..5d30c6f 100644 --- a/backend/route_registry.py +++ b/backend/route_registry.py @@ -56,6 +56,7 @@ ROUTES: tuple[RouteSpec, ...] = ( RouteSpec("POST", "nodes/{node_id}/adopt-image", "backend.routes.history_routes.adopt_node_image", "write"), RouteSpec("GET", "review/policy", "backend.routes.review_routes.get_review_policy", "read"), RouteSpec("POST", "review/policy/validate", "backend.routes.review_routes.validate_review_policy", "config"), + RouteSpec("POST", "review/policy/save", "backend.routes.review_routes.save_review_policy", "config"), RouteSpec("GET", "nodes/{node_id}/review", "backend.routes.review_routes.review_node", "read"), RouteSpec("GET", "nodes/{node_id}/images", "backend.routes.image_routes.list_node_images", "read"), RouteSpec("GET", "workflows/{workflow_id}/review", "backend.routes.review_routes.review_workflow", "read"), diff --git a/backend/routes/review_routes.py b/backend/routes/review_routes.py index 0d7b664..9fd709e 100644 --- a/backend/routes/review_routes.py +++ b/backend/routes/review_routes.py @@ -71,6 +71,20 @@ def validate_review_policy( return handle_request(ctx, action) +def save_review_policy( + ctx: RequestContext, + payload: dict[str, Any], + service: ReviewService | None = None, +) -> dict: + review_service = service or _create_review_service() + + def action() -> dict[str, Any]: + require_config_manager(ctx) + return review_service.save_policy(payload) + + return handle_request(ctx, action) + + def _create_review_service() -> ReviewService: database = Database(load_database_settings()) workflow_service = WorkflowService( diff --git a/backend/services/review_service.py b/backend/services/review_service.py index 78c579c..84f48a9 100644 --- a/backend/services/review_service.py +++ b/backend/services/review_service.py @@ -4,9 +4,13 @@ from __future__ import annotations from typing import Any +from backend.dto.common import ApiError, ErrorCode from backend.services.workflow_service import WorkflowService +from backend.services.settings_service import _dump_yaml +from core.config_service import ConfigService +from database.db_helper import _load_yaml_subset from database.repositories.image_repository import ImageRepository -from engines.review_flow import ReviewFlowEngine +from engines.review_flow import ReviewFlowEngine, ReviewPolicy class ReviewService: @@ -15,10 +19,12 @@ class ReviewService: workflow_service: WorkflowService, image_repository: ImageRepository, review_engine: ReviewFlowEngine | None = None, + config_service: ConfigService | None = None, ): self.workflow_service = workflow_service self.image_repository = image_repository - self.review_engine = review_engine or ReviewFlowEngine() + self.config_service = config_service or ConfigService() + self.review_engine = review_engine or ReviewFlowEngine(self._load_policy()) def get_policy(self) -> dict[str, Any]: return self.review_engine.policy_snapshot() @@ -26,6 +32,17 @@ class ReviewService: def validate_policy(self, payload: dict[str, Any]) -> dict[str, Any]: return self.review_engine.validate_policy(payload) + def save_policy(self, payload: dict[str, Any]) -> dict[str, Any]: + validation = self.validate_policy(payload) + if not validation["valid"]: + raise ApiError(ErrorCode.VALIDATION_FAILED, "review policy validation failed", validation) + config = self._load_config_mapping() + config["review_policy"] = validation["policy"] + self.config_service.config_path.parent.mkdir(parents=True, exist_ok=True) + self.config_service.config_path.write_text(_dump_yaml(config), encoding="utf-8") + self.review_engine = ReviewFlowEngine(ReviewPolicy.from_mapping(validation["policy"])[0]) + return {"saved": True, "policy": self.get_policy()} + def review_node(self, node_id: str) -> dict[str, Any]: node = self.workflow_service.get_node(node_id) images = self.image_repository.list_by_node(node_id, include_archived=True) @@ -35,3 +52,13 @@ class ReviewService: detail = self.workflow_service.get_workflow(workflow_id) node_results = [self.review_node(node.node_id) for node in detail.nodes] return self.review_engine.review_workflow(detail.workflow, detail.nodes, node_results) + + def _load_policy(self) -> ReviewPolicy: + policy, errors = ReviewPolicy.from_mapping(self._load_config_mapping().get("review_policy", {})) + return ReviewPolicy() if errors else policy + + def _load_config_mapping(self) -> dict[str, Any]: + path = self.config_service.config_path + if not path.exists(): + return {} + return _load_yaml_subset(path.read_text(encoding="utf-8")) diff --git a/database/db_helper.py b/database/db_helper.py index 959ac44..a46931d 100644 --- a/database/db_helper.py +++ b/database/db_helper.py @@ -215,9 +215,15 @@ def _load_yaml_subset(text: str) -> dict[str, Any]: indent = len(line) - len(line.lstrip(" ")) stripped = line.strip() if stripped.startswith("- "): - parent = stack[-1][1] list_key = last_key_by_indent.get(indent - 2) if list_key: + parent = stack[-1][1] + if not isinstance(parent.get(list_key), list) and len(stack) >= 2: + previous_parent = stack[-2][1] + if previous_parent.get(list_key) is parent or isinstance(previous_parent.get(list_key), list): + parent = previous_parent + if not isinstance(parent.get(list_key), list): + parent[list_key] = [] parent.setdefault(list_key, []).append(_parse_scalar(stripped[2:])) continue if ":" not in stripped: diff --git a/frontend/shared/api/endpoints.ts b/frontend/shared/api/endpoints.ts index 5f3ed12..05f9f8a 100644 --- a/frontend/shared/api/endpoints.ts +++ b/frontend/shared/api/endpoints.ts @@ -26,6 +26,7 @@ export const endpoints = { nodeAdoptImage: (nodeId: string) => `nodes/${nodeId}/adopt-image`, reviewPolicy: "review/policy", reviewPolicyValidate: "review/policy/validate", + reviewPolicySave: "review/policy/save", nodeReview: (nodeId: string) => `nodes/${nodeId}/review`, nodeImages: (nodeId: string) => `nodes/${nodeId}/images`, workflowReview: (workflowId: string) => `workflows/${workflowId}/review`, diff --git a/frontend/shared/types/review.ts b/frontend/shared/types/review.ts index 4df6ae9..cdc33ca 100644 --- a/frontend/shared/types/review.ts +++ b/frontend/shared/types/review.ts @@ -28,3 +28,8 @@ export interface ReviewPolicyValidation { policy: ReviewPolicy errors: ReviewMessage[] } + +export interface ReviewPolicySaveResult { + saved: boolean + policy: ReviewPolicy +} diff --git a/frontend/standalone-web/src/App.vue b/frontend/standalone-web/src/App.vue index 25e1066..fabb800 100644 --- a/frontend/standalone-web/src/App.vue +++ b/frontend/standalone-web/src/App.vue @@ -12,7 +12,7 @@ import type { GenerationJob, JobListResult } from "../../shared/types/job" import type { EventStreamResult, LogBundle } from "../../shared/types/logs" import type { Material, MaterialCategory, MaterialListResult } from "../../shared/types/material" import type { CharacterProfile, ProfileListResult, QuickProfileDraftResult } from "../../shared/types/profile" -import type { ReviewPolicy, ReviewPolicyValidation, ReviewResult } from "../../shared/types/review" +import type { ReviewPolicy, ReviewPolicySaveResult, ReviewPolicyValidation, ReviewResult } from "../../shared/types/review" import type { CurrentSettings, DiffSettingsResult, @@ -1050,6 +1050,26 @@ function validateReviewPolicyDraft() { ) } +function saveReviewPolicyDraft() { + let payload: unknown + try { + payload = JSON.parse(reviewPolicyDraft.value || "{}") + } catch { + lastOperation.value = text.policyDraftInvalid + return Promise.resolve() + } + return runOperation( + text.save, + async () => { + const result = await postJson(endpoints.reviewPolicySave, payload) + setReviewPolicy(result.policy) + reviewPolicyValidation.value = { valid: true, policy: result.policy, errors: [] } + return result + }, + false, + ) +} + function generateSelectedNode() { const nodeId = selectedNodeId.value if (!nodeId) return Promise.resolve() @@ -2174,6 +2194,9 @@ function planAssetImportPack() { +