Persist review policy settings
这个提交存在于:
父节点
cdcb5f55c5
当前提交
6d2c413b4c
共有 17 个文件被更改,包括 164 次插入 和 29 次删除
|
|
@ -56,6 +56,7 @@ ROUTES: tuple[RouteSpec, ...] = (
|
||||||
RouteSpec("POST", "nodes/{node_id}/adopt-image", "backend.routes.history_routes.adopt_node_image", "write"),
|
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("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/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}/review", "backend.routes.review_routes.review_node", "read"),
|
||||||
RouteSpec("GET", "nodes/{node_id}/images", "backend.routes.image_routes.list_node_images", "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"),
|
RouteSpec("GET", "workflows/{workflow_id}/review", "backend.routes.review_routes.review_workflow", "read"),
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,20 @@ def validate_review_policy(
|
||||||
return handle_request(ctx, action)
|
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:
|
def _create_review_service() -> ReviewService:
|
||||||
database = Database(load_database_settings())
|
database = Database(load_database_settings())
|
||||||
workflow_service = WorkflowService(
|
workflow_service = WorkflowService(
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,13 @@ from __future__ import annotations
|
||||||
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
|
from backend.dto.common import ApiError, ErrorCode
|
||||||
from backend.services.workflow_service import WorkflowService
|
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 database.repositories.image_repository import ImageRepository
|
||||||
from engines.review_flow import ReviewFlowEngine
|
from engines.review_flow import ReviewFlowEngine, ReviewPolicy
|
||||||
|
|
||||||
|
|
||||||
class ReviewService:
|
class ReviewService:
|
||||||
|
|
@ -15,10 +19,12 @@ class ReviewService:
|
||||||
workflow_service: WorkflowService,
|
workflow_service: WorkflowService,
|
||||||
image_repository: ImageRepository,
|
image_repository: ImageRepository,
|
||||||
review_engine: ReviewFlowEngine | None = None,
|
review_engine: ReviewFlowEngine | None = None,
|
||||||
|
config_service: ConfigService | None = None,
|
||||||
):
|
):
|
||||||
self.workflow_service = workflow_service
|
self.workflow_service = workflow_service
|
||||||
self.image_repository = image_repository
|
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]:
|
def get_policy(self) -> dict[str, Any]:
|
||||||
return self.review_engine.policy_snapshot()
|
return self.review_engine.policy_snapshot()
|
||||||
|
|
@ -26,6 +32,17 @@ class ReviewService:
|
||||||
def validate_policy(self, payload: dict[str, Any]) -> dict[str, Any]:
|
def validate_policy(self, payload: dict[str, Any]) -> dict[str, Any]:
|
||||||
return self.review_engine.validate_policy(payload)
|
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]:
|
def review_node(self, node_id: str) -> dict[str, Any]:
|
||||||
node = self.workflow_service.get_node(node_id)
|
node = self.workflow_service.get_node(node_id)
|
||||||
images = self.image_repository.list_by_node(node_id, include_archived=True)
|
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)
|
detail = self.workflow_service.get_workflow(workflow_id)
|
||||||
node_results = [self.review_node(node.node_id) for node in detail.nodes]
|
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)
|
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"))
|
||||||
|
|
|
||||||
|
|
@ -215,9 +215,15 @@ def _load_yaml_subset(text: str) -> dict[str, Any]:
|
||||||
indent = len(line) - len(line.lstrip(" "))
|
indent = len(line) - len(line.lstrip(" "))
|
||||||
stripped = line.strip()
|
stripped = line.strip()
|
||||||
if stripped.startswith("- "):
|
if stripped.startswith("- "):
|
||||||
parent = stack[-1][1]
|
|
||||||
list_key = last_key_by_indent.get(indent - 2)
|
list_key = last_key_by_indent.get(indent - 2)
|
||||||
if list_key:
|
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:]))
|
parent.setdefault(list_key, []).append(_parse_scalar(stripped[2:]))
|
||||||
continue
|
continue
|
||||||
if ":" not in stripped:
|
if ":" not in stripped:
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ export const endpoints = {
|
||||||
nodeAdoptImage: (nodeId: string) => `nodes/${nodeId}/adopt-image`,
|
nodeAdoptImage: (nodeId: string) => `nodes/${nodeId}/adopt-image`,
|
||||||
reviewPolicy: "review/policy",
|
reviewPolicy: "review/policy",
|
||||||
reviewPolicyValidate: "review/policy/validate",
|
reviewPolicyValidate: "review/policy/validate",
|
||||||
|
reviewPolicySave: "review/policy/save",
|
||||||
nodeReview: (nodeId: string) => `nodes/${nodeId}/review`,
|
nodeReview: (nodeId: string) => `nodes/${nodeId}/review`,
|
||||||
nodeImages: (nodeId: string) => `nodes/${nodeId}/images`,
|
nodeImages: (nodeId: string) => `nodes/${nodeId}/images`,
|
||||||
workflowReview: (workflowId: string) => `workflows/${workflowId}/review`,
|
workflowReview: (workflowId: string) => `workflows/${workflowId}/review`,
|
||||||
|
|
|
||||||
|
|
@ -28,3 +28,8 @@ export interface ReviewPolicyValidation {
|
||||||
policy: ReviewPolicy
|
policy: ReviewPolicy
|
||||||
errors: ReviewMessage[]
|
errors: ReviewMessage[]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ReviewPolicySaveResult {
|
||||||
|
saved: boolean
|
||||||
|
policy: ReviewPolicy
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ import type { GenerationJob, JobListResult } from "../../shared/types/job"
|
||||||
import type { EventStreamResult, LogBundle } from "../../shared/types/logs"
|
import type { EventStreamResult, LogBundle } from "../../shared/types/logs"
|
||||||
import type { Material, MaterialCategory, MaterialListResult } from "../../shared/types/material"
|
import type { Material, MaterialCategory, MaterialListResult } from "../../shared/types/material"
|
||||||
import type { CharacterProfile, ProfileListResult, QuickProfileDraftResult } from "../../shared/types/profile"
|
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 {
|
import type {
|
||||||
CurrentSettings,
|
CurrentSettings,
|
||||||
DiffSettingsResult,
|
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<ReviewPolicySaveResult>(endpoints.reviewPolicySave, payload)
|
||||||
|
setReviewPolicy(result.policy)
|
||||||
|
reviewPolicyValidation.value = { valid: true, policy: result.policy, errors: [] }
|
||||||
|
return result
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
function generateSelectedNode() {
|
function generateSelectedNode() {
|
||||||
const nodeId = selectedNodeId.value
|
const nodeId = selectedNodeId.value
|
||||||
if (!nodeId) return Promise.resolve()
|
if (!nodeId) return Promise.resolve()
|
||||||
|
|
@ -2174,6 +2194,9 @@ function planAssetImportPack() {
|
||||||
<button type="button" :disabled="Boolean(busy) || !reviewPolicyDraft" @click="validateReviewPolicyDraft">
|
<button type="button" :disabled="Boolean(busy) || !reviewPolicyDraft" @click="validateReviewPolicyDraft">
|
||||||
{{ text.validatePolicy }}
|
{{ text.validatePolicy }}
|
||||||
</button>
|
</button>
|
||||||
|
<button type="button" :disabled="Boolean(busy) || !reviewPolicyDraft" @click="saveReviewPolicyDraft">
|
||||||
|
{{ text.save }}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<textarea v-model="reviewPolicyDraft" spellcheck="false" />
|
<textarea v-model="reviewPolicyDraft" spellcheck="false" />
|
||||||
|
|
|
||||||
文件差异因一行或多行过长而隐藏
|
|
@ -1,3 +1,3 @@
|
||||||
<script type="module" crossorigin src="/assets/index-CKDvZfFU.js"></script>
|
<script type="module" crossorigin src="/assets/index-BmeDOVPT.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/index-DJ52Rx93.css">
|
<link rel="stylesheet" crossorigin href="/assets/index-DJ52Rx93.css">
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,20 @@ import tempfile
|
||||||
import unittest
|
import unittest
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from backend.routes.review_routes import get_review_policy, review_node, review_workflow, validate_review_policy
|
from backend.routes.review_routes import (
|
||||||
|
get_review_policy,
|
||||||
|
review_node,
|
||||||
|
review_workflow,
|
||||||
|
save_review_policy,
|
||||||
|
validate_review_policy,
|
||||||
|
)
|
||||||
from backend.services.history_service import HistoryService
|
from backend.services.history_service import HistoryService
|
||||||
from backend.services.image_service import ImageService
|
from backend.services.image_service import ImageService
|
||||||
from backend.services.profile_service import ProfileService
|
from backend.services.profile_service import ProfileService
|
||||||
from backend.services.review_service import ReviewService
|
from backend.services.review_service import ReviewService
|
||||||
from backend.services.workflow_service import WorkflowService
|
from backend.services.workflow_service import WorkflowService
|
||||||
from core.audit_service import AuditService
|
from core.audit_service import AuditService
|
||||||
|
from core.config_service import ConfigService
|
||||||
from core.identity import RequestContext
|
from core.identity import RequestContext
|
||||||
from database.db_helper import Database, DatabaseSettings, SqliteSettings
|
from database.db_helper import Database, DatabaseSettings, SqliteSettings
|
||||||
from database.repositories.image_repository import ImageRepository
|
from database.repositories.image_repository import ImageRepository
|
||||||
|
|
@ -21,6 +28,8 @@ from database.repositories.workflow_repository import WorkflowRepository
|
||||||
class ReviewServiceTests(unittest.TestCase):
|
class ReviewServiceTests(unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.tmp = tempfile.TemporaryDirectory()
|
self.tmp = tempfile.TemporaryDirectory()
|
||||||
|
self.config_path = Path(self.tmp.name) / "config.yaml"
|
||||||
|
self.config_service = ConfigService(self.config_path)
|
||||||
self.database = Database(
|
self.database = Database(
|
||||||
DatabaseSettings(sqlite=SqliteSettings(path=str(Path(self.tmp.name) / "imagestudio.db")))
|
DatabaseSettings(sqlite=SqliteSettings(path=str(Path(self.tmp.name) / "imagestudio.db")))
|
||||||
)
|
)
|
||||||
|
|
@ -46,7 +55,7 @@ class ReviewServiceTests(unittest.TestCase):
|
||||||
self.image_service,
|
self.image_service,
|
||||||
self.audit_service,
|
self.audit_service,
|
||||||
)
|
)
|
||||||
self.review_service = ReviewService(self.workflow_service, self.image_repository)
|
self.review_service = ReviewService(self.workflow_service, self.image_repository, config_service=self.config_service)
|
||||||
self.ctx = RequestContext.from_astrbot(
|
self.ctx = RequestContext.from_astrbot(
|
||||||
username="admin",
|
username="admin",
|
||||||
user_id="user_001",
|
user_id="user_001",
|
||||||
|
|
@ -150,6 +159,38 @@ class ReviewServiceTests(unittest.TestCase):
|
||||||
self.assertFalse(response["ok"])
|
self.assertFalse(response["ok"])
|
||||||
self.assertEqual(response["error_code"], "FORBIDDEN")
|
self.assertEqual(response["error_code"], "FORBIDDEN")
|
||||||
|
|
||||||
|
def test_review_policy_can_be_saved_and_reloaded(self):
|
||||||
|
saved = save_review_policy(
|
||||||
|
self.ctx,
|
||||||
|
{
|
||||||
|
"version": "custom-v2",
|
||||||
|
"warn_without_images": False,
|
||||||
|
"require_selected_image_for_statuses": ["selected"],
|
||||||
|
"workflow_terminal_statuses": ["selected", "skipped"],
|
||||||
|
},
|
||||||
|
self.review_service,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertTrue(saved["ok"])
|
||||||
|
self.assertTrue(saved["data"]["saved"])
|
||||||
|
self.assertEqual(saved["data"]["policy"]["version"], "custom-v2")
|
||||||
|
self.assertIn("review_policy:", self.config_path.read_text(encoding="utf-8"))
|
||||||
|
|
||||||
|
reloaded = ReviewService(self.workflow_service, self.image_repository, config_service=self.config_service)
|
||||||
|
self.assertEqual(reloaded.get_policy()["version"], "custom-v2")
|
||||||
|
self.assertFalse(reloaded.get_policy()["warn_without_images"])
|
||||||
|
|
||||||
|
invalid = save_review_policy(
|
||||||
|
self.ctx,
|
||||||
|
{
|
||||||
|
"warn_without_images": "no",
|
||||||
|
"workflow_terminal_statuses": ["unknown"],
|
||||||
|
},
|
||||||
|
self.review_service,
|
||||||
|
)
|
||||||
|
self.assertFalse(invalid["ok"])
|
||||||
|
self.assertEqual(invalid["error_code"], "VALIDATION_FAILED")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@ class RouteRegistryTests(unittest.TestCase):
|
||||||
self.assertIn(("GET", "workflows/{workflow_id}/review"), keys)
|
self.assertIn(("GET", "workflows/{workflow_id}/review"), keys)
|
||||||
self.assertIn(("GET", "review/policy"), keys)
|
self.assertIn(("GET", "review/policy"), keys)
|
||||||
self.assertIn(("POST", "review/policy/validate"), keys)
|
self.assertIn(("POST", "review/policy/validate"), keys)
|
||||||
|
self.assertIn(("POST", "review/policy/save"), keys)
|
||||||
self.assertIn(("POST", "nodes/{node_id}/retry"), keys)
|
self.assertIn(("POST", "nodes/{node_id}/retry"), keys)
|
||||||
self.assertIn(("POST", "nodes/{node_id}/complete"), keys)
|
self.assertIn(("POST", "nodes/{node_id}/complete"), keys)
|
||||||
self.assertIn(("POST", "nodes/{node_id}/mark-completed"), keys)
|
self.assertIn(("POST", "nodes/{node_id}/mark-completed"), keys)
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ from pathlib import Path
|
||||||
from backend.dto.common import ErrorCode, error_response, success_response
|
from backend.dto.common import ErrorCode, error_response, success_response
|
||||||
from core.audit_service import AuditService
|
from core.audit_service import AuditService
|
||||||
from core.identity import RequestContext
|
from core.identity import RequestContext
|
||||||
from database.db_helper import Database, DatabaseSettings, PostgresSettings, SqliteSettings
|
from database.db_helper import Database, DatabaseSettings, PostgresSettings, SqliteSettings, _load_yaml_subset
|
||||||
from database.models import table_spec
|
from database.models import table_spec
|
||||||
from database.seed import DEFAULT_MATERIAL_CATEGORIES, seed_default_material_categories
|
from database.seed import DEFAULT_MATERIAL_CATEGORIES, seed_default_material_categories
|
||||||
|
|
||||||
|
|
@ -47,6 +47,22 @@ class DatabaseSettingsTests(unittest.TestCase):
|
||||||
|
|
||||||
self.assertEqual(settings.selected_backend, "sqlite")
|
self.assertEqual(settings.selected_backend, "sqlite")
|
||||||
|
|
||||||
|
def test_yaml_subset_parses_nested_lists(self):
|
||||||
|
payload = _load_yaml_subset(
|
||||||
|
"""
|
||||||
|
review_policy:
|
||||||
|
version: custom-v2
|
||||||
|
require_selected_image_for_statuses:
|
||||||
|
- selected
|
||||||
|
workflow_terminal_statuses:
|
||||||
|
- selected
|
||||||
|
- skipped
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertEqual(payload["review_policy"]["require_selected_image_for_statuses"], ["selected"])
|
||||||
|
self.assertEqual(payload["review_policy"]["workflow_terminal_statuses"], ["selected", "skipped"])
|
||||||
|
|
||||||
|
|
||||||
class DatabaseMetadataTests(unittest.TestCase):
|
class DatabaseMetadataTests(unittest.TestCase):
|
||||||
def test_table_spec_exposes_known_tables(self):
|
def test_table_spec_exposes_known_tables(self):
|
||||||
|
|
|
||||||
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
17
web/assets/index-zKJSSm0e.js
普通文件
17
web/assets/index-zKJSSm0e.js
普通文件
文件差异因一行或多行过长而隐藏
|
|
@ -1,3 +1,3 @@
|
||||||
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-BujCScST.js"></script>
|
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-zKJSSm0e.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-58gAPxni.css">
|
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-BJt-KVrZ.css">
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用