feat: add model routing and recognition prompt settings
这个提交存在于:
父节点
7041735142
当前提交
aa94d7c2ce
共有 23 个文件被更改,包括 499 次插入 和 117 次删除
|
|
@ -79,6 +79,18 @@
|
|||
"type": "bool",
|
||||
"default": true
|
||||
},
|
||||
"model_material_recognition": {"description":"素材导入解析使用的 Vision 路由。","type":"string","default":"material_vlm"},
|
||||
"model_profile_parse": {"description":"外部角色导入解析使用的文本模型路由。","type":"string","default":""},
|
||||
"model_persona_split": {"description":"角色设定拆解使用的文本模型路由。","type":"string","default":""},
|
||||
"model_prompt_planning": {"description":"提示词规划与扩写使用的文本模型路由。","type":"string","default":""},
|
||||
"model_cross_review_primary": {"description":"候选图交叉审核主 Vision 路由。","type":"string","default":"material_vlm"},
|
||||
"model_cross_review_secondary": {"description":"候选图交叉审核复核 Vision 路由。","type":"string","default":"material_vlm"},
|
||||
"model_quick_generation": {"description":"快速生图使用的模型路由。","type":"string","default":""},
|
||||
"model_portrait_generation": {"description":"头像草稿使用的生图路由。","type":"string","default":""},
|
||||
"model_halfbody_generation": {"description":"半身角色图使用的生图路由。","type":"string","default":""},
|
||||
"model_fullbody_generation": {"description":"全身角色图使用的生图路由。","type":"string","default":""},
|
||||
"model_sheet_generation": {"description":"设定图与姿势图使用的生图路由。","type":"string","default":""},
|
||||
"model_hires_fix": {"description":"高清修复使用的生图路由。","type":"string","default":""},
|
||||
"enable_private_companion_integration": {
|
||||
"description": "允许 astrbot_plugin_private_companion 调用 ImageStudio 的穿搭和素材集成接口。",
|
||||
"type": "bool",
|
||||
|
|
|
|||
|
|
@ -238,12 +238,15 @@ def _create_material_service() -> MaterialService:
|
|||
sync_vision_provider_from_config(model_provider_service, config)
|
||||
vision = config.get("vision") if isinstance(config.get("vision"), dict) else {}
|
||||
provider = vision.get("provider") if isinstance(vision.get("provider"), dict) else {}
|
||||
default_route = str(provider.get("route_name") or vision.get("default_route") or "material_vlm").strip()
|
||||
assignments = config.get("model_assignments") if isinstance(config.get("model_assignments"), dict) else {}
|
||||
recognition_prompts = config.get("recognition_prompts") if isinstance(config.get("recognition_prompts"), dict) else {}
|
||||
default_route = str(assignments.get("material_recognition") or provider.get("route_name") or vision.get("default_route") or "material_vlm").strip()
|
||||
return MaterialService(
|
||||
repository=MaterialRepository(database),
|
||||
audit_service=AuditService(database),
|
||||
vision_provider_factory=model_provider_runtime.vision_provider_for_route,
|
||||
default_recognition_route=default_route,
|
||||
recognition_prompt_config=recognition_prompts,
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -294,6 +294,7 @@ def _create_generation_service() -> GenerationService:
|
|||
config_payload = load_config_payload()
|
||||
sync_generation_provider_from_config(model_provider_service, config_payload)
|
||||
generation_config = config_payload.get("generation") if isinstance(config_payload.get("generation"), dict) else {}
|
||||
model_assignments = config_payload.get("model_assignments") if isinstance(config_payload.get("model_assignments"), dict) else {}
|
||||
return GenerationService(
|
||||
workflow_service=WorkflowService(
|
||||
workflow_repository=workflow_repository,
|
||||
|
|
@ -322,6 +323,7 @@ def _create_generation_service() -> GenerationService:
|
|||
default_model_route=str(generation_config.get("default_model") or "").strip() or None,
|
||||
require_resolved_model_route=True,
|
||||
material_resolver=MaterialRepository(database),
|
||||
model_assignments=model_assignments,
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ class GenerationService:
|
|||
default_model_route: str | None = None,
|
||||
require_resolved_model_route: bool = False,
|
||||
material_resolver: MaterialResolver | None = None,
|
||||
model_assignments: dict[str, Any] | None = None,
|
||||
):
|
||||
self.workflow_service = workflow_service
|
||||
self.queue_service = queue_service
|
||||
|
|
@ -66,6 +67,7 @@ class GenerationService:
|
|||
self.prompt_expansion_service = prompt_expansion_service
|
||||
self.event_bus = event_bus
|
||||
self.default_model_route = _optional_text(default_model_route)
|
||||
self.model_assignments = dict(model_assignments or {})
|
||||
self.require_resolved_model_route = require_resolved_model_route
|
||||
|
||||
def generate_node(self, node_id: str, payload: dict[str, Any], ctx: RequestContext) -> dict[str, Any]:
|
||||
|
|
@ -117,9 +119,11 @@ class GenerationService:
|
|||
)
|
||||
profile = self.workflow_service.profile_repository.get(workflow.profile_id)
|
||||
profile_model_route = _optional_text(getattr(profile, "default_model_route", None))
|
||||
assigned_route = _optional_text(self.model_assignments.get(_assignment_key(node)))
|
||||
model_route = str(
|
||||
payload.get("model_route")
|
||||
or node.model_route
|
||||
or assigned_route
|
||||
or profile_model_route
|
||||
or self.default_model_route
|
||||
or "image_low"
|
||||
|
|
@ -749,6 +753,26 @@ def _release_node_generation_lock(node_id: str, entry: _NodeGenerationLock) -> N
|
|||
_NODE_GENERATION_LOCKS.pop(key, None)
|
||||
|
||||
|
||||
def _assignment_key(node: Any) -> str:
|
||||
node_key = str(getattr(node, "node_key", "") or "").strip()
|
||||
node_type = str(getattr(node, "node_type", "") or "").strip()
|
||||
mapping = {
|
||||
"headshot": "portrait_generation",
|
||||
"half_body": "halfbody_generation",
|
||||
"full_body": "fullbody_generation",
|
||||
"expression_sheet": "sheet_generation",
|
||||
"pose_sheet": "sheet_generation",
|
||||
"style_lock": "hires_fix",
|
||||
"questionnaire": "quick_generation",
|
||||
"preview": "quick_generation",
|
||||
}
|
||||
if node_key in mapping:
|
||||
return mapping[node_key]
|
||||
if node_type == "virtual_single_image":
|
||||
return "quick_generation"
|
||||
return "quick_generation" if node_type in {"profile_draft", "profile_preview"} else node_key
|
||||
|
||||
|
||||
def _optional_text(value: Any) -> str | None:
|
||||
if value is None:
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -43,12 +43,14 @@ class MaterialService:
|
|||
*,
|
||||
vision_provider_factory: Callable[[dict[str, Any]], VisionProvider | None] | None = None,
|
||||
default_recognition_route: str = "material_vlm",
|
||||
recognition_prompt_config: dict[str, Any] | None = None,
|
||||
storage: VfsStorage | None = None,
|
||||
):
|
||||
self.repository = repository
|
||||
self.audit_service = audit_service
|
||||
self.vision_provider_factory = vision_provider_factory
|
||||
self.default_recognition_route = default_recognition_route
|
||||
self.recognition_prompt_config = recognition_prompt_config or {}
|
||||
self.storage = storage or VfsStorage()
|
||||
|
||||
def create_category(self, payload: dict[str, Any], ctx: RequestContext) -> MaterialCategory:
|
||||
|
|
@ -268,7 +270,7 @@ class MaterialService:
|
|||
},
|
||||
)
|
||||
|
||||
request = _vision_request(material, self.storage)
|
||||
request = _vision_request(material, self.storage, self._recognition_instruction(material))
|
||||
try:
|
||||
recognition = provider.recognize_material(request)
|
||||
except VisionProviderError as exc:
|
||||
|
|
@ -313,6 +315,25 @@ class MaterialService:
|
|||
)
|
||||
return after
|
||||
|
||||
def _recognition_instruction(self, material: Material) -> str:
|
||||
base = str(self.recognition_prompt_config.get("default_instruction") or "").strip()
|
||||
requirements = self.recognition_prompt_config.get("category_requirements")
|
||||
if not isinstance(requirements, list):
|
||||
return base
|
||||
category_name = ""
|
||||
if material.category_id:
|
||||
category = self.repository.get_category(material.category_id)
|
||||
category_name = category.name if category else ""
|
||||
additions: list[str] = []
|
||||
for item in requirements:
|
||||
if not isinstance(item, dict) or item.get("enabled") is False:
|
||||
continue
|
||||
category = str(item.get("category") or "").strip().lower()
|
||||
requirement = str(item.get("requirement") or "").strip()
|
||||
if requirement and (not category or category in {str(material.category_id or "").lower(), category_name.lower()}):
|
||||
additions.append(requirement)
|
||||
return "\n\n".join([part for part in [base, *additions] if part])
|
||||
|
||||
def _vision_provider(self, material: Material, route_name: str) -> VisionProvider | None:
|
||||
if self.vision_provider_factory is None:
|
||||
return None
|
||||
|
|
@ -418,7 +439,7 @@ def new_material_id() -> str:
|
|||
return f"mat_{uuid4().hex}"
|
||||
|
||||
|
||||
def _vision_request(material: Material, storage: VfsStorage) -> VisionRecognitionRequest:
|
||||
def _vision_request(material: Material, storage: VfsStorage, recognition_instruction: str = "") -> VisionRecognitionRequest:
|
||||
image_data_url, content_type, size_bytes = _storage_image_data_url(
|
||||
str(material.image_uri or ""),
|
||||
material.metadata,
|
||||
|
|
@ -433,6 +454,7 @@ def _vision_request(material: Material, storage: VfsStorage) -> VisionRecognitio
|
|||
tags=tuple(material.tags),
|
||||
metadata={
|
||||
**material.metadata,
|
||||
"recognition_instruction": recognition_instruction,
|
||||
"vision_input": {
|
||||
"source_uri": material.image_uri,
|
||||
"content_type": content_type,
|
||||
|
|
|
|||
|
|
@ -96,6 +96,33 @@ class SettingsService:
|
|||
_field("provider.enabled", "bool", label="启用 Vision 路由"),
|
||||
],
|
||||
},
|
||||
{
|
||||
"key": "model_assignments",
|
||||
"title": "模型分工",
|
||||
"fields": [
|
||||
_field("material_recognition", "string", label="素材解析路由"),
|
||||
_field("profile_parse", "string", label="角色导入解析路由"),
|
||||
_field("persona_split", "string", label="人设拆解路由"),
|
||||
_field("prompt_planning", "string", label="提示词规划路由"),
|
||||
_field("cross_review_primary", "string", label="交叉审核主模型路由"),
|
||||
_field("cross_review_secondary", "string", label="交叉审核复核模型路由"),
|
||||
_field("cross_review_routes", "list", label="交叉审核模型路由列表"),
|
||||
_field("quick_generation", "string", label="快速生图路由"),
|
||||
_field("portrait_generation", "string", label="头像生成路由"),
|
||||
_field("halfbody_generation", "string", label="半身生成路由"),
|
||||
_field("fullbody_generation", "string", label="全身生成路由"),
|
||||
_field("sheet_generation", "string", label="设定图生成路由"),
|
||||
_field("hires_fix", "string", label="高清修复路由"),
|
||||
],
|
||||
},
|
||||
{
|
||||
"key": "recognition_prompts",
|
||||
"title": "识别提示词",
|
||||
"fields": [
|
||||
_field("default_instruction", "text", label="默认素材识别指令"),
|
||||
_field("category_requirements", "list", label="分类附加要求"),
|
||||
],
|
||||
},
|
||||
{
|
||||
"key": "storage",
|
||||
"title": "存储",
|
||||
|
|
|
|||
23
config.yaml
23
config.yaml
|
|
@ -43,6 +43,29 @@ vision:
|
|||
priority: 10
|
||||
enabled: true
|
||||
|
||||
# 按功能分配模型路由。留空时回退到 generation.default_model 或 vision.default_route。
|
||||
model_assignments:
|
||||
material_recognition: material_vlm
|
||||
profile_parse: ""
|
||||
persona_split: ""
|
||||
prompt_planning: ""
|
||||
cross_review_primary: material_vlm
|
||||
cross_review_secondary: material_vlm
|
||||
cross_review_routes:
|
||||
- material_vlm
|
||||
- material_vlm
|
||||
quick_generation: ""
|
||||
portrait_generation: ""
|
||||
halfbody_generation: ""
|
||||
fullbody_generation: ""
|
||||
sheet_generation: ""
|
||||
hires_fix: ""
|
||||
|
||||
recognition_prompts:
|
||||
default_instruction: >-
|
||||
请先判断图片中素材的准确分类,再尽可能完整地提取所有可见事实,包括物品类型、主色与辅色、材质、纹理、结构、轮廓、图案、裁剪、缝线、褶皱、装饰、配件、状态、视角、光照及可复用的设计特征。不要把无法确认的推测写成事实,并明确区分确定信息与低置信度判断。根据识别结果生成一段细节充分、可直接用于生图且能够保留原素材设计的正向提示词,同时生成用于排除错误类别、错误材质、结构畸变、文字、水印和无关背景的负向提示词。仅返回 JSON,字段必须包含 prompt、negative_prompt、tags、confidence、description;tags 应简短、可检索,并包含分类、颜色、材质和关键设计元素。
|
||||
category_requirements: []
|
||||
|
||||
storage:
|
||||
# 这里使用逻辑 data/... 路径;AstrBot 运行时映射到
|
||||
# data/plugin_data/astrbot_plugin_imagestudio/...,本地开发仍映射到仓库 data/。
|
||||
|
|
|
|||
|
|
@ -107,10 +107,7 @@ class OpenAIVisionProvider:
|
|||
"messages": [
|
||||
{
|
||||
"role": "system",
|
||||
"content": (
|
||||
"Return compact JSON for a reusable outfit material with keys: "
|
||||
"prompt, negative_prompt, tags, confidence, description."
|
||||
),
|
||||
"content": _system_instruction(request),
|
||||
},
|
||||
{"role": "user", "content": _user_content(request)},
|
||||
],
|
||||
|
|
@ -176,6 +173,18 @@ def _user_content(request: VisionRecognitionRequest) -> list[dict[str, Any]]:
|
|||
return content
|
||||
|
||||
|
||||
def _system_instruction(request: VisionRecognitionRequest) -> str:
|
||||
configured = str(request.metadata.get("recognition_instruction") or "").strip()
|
||||
fallback = (
|
||||
"Analyze the visible material as exhaustively as possible. First identify its category, then extract only "
|
||||
"visible facts including object type, colors, materials, texture, construction, silhouette, patterns, trims, "
|
||||
"accessories, condition, viewpoint, lighting and reusable design features. Distinguish certainty from guesses. "
|
||||
"Produce a detailed image-generation prompt that preserves the recognized design, plus a useful negative prompt. "
|
||||
"Return JSON only with keys prompt, negative_prompt, tags, confidence, description. Tags must be concise and searchable."
|
||||
)
|
||||
return configured or fallback
|
||||
|
||||
|
||||
def _remote_image_url(value: str | None) -> str | None:
|
||||
text = str(value or "").strip()
|
||||
if text.startswith(("http://", "https://", "data:image/")):
|
||||
|
|
|
|||
|
|
@ -0,0 +1,113 @@
|
|||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from "vue"
|
||||
import { getJson } from "../../../../shared/api/client"
|
||||
import { endpoints } from "../../../../shared/api/endpoints"
|
||||
import type { CapabilityProfile } from "../../../../shared/types/discovery"
|
||||
|
||||
type Assignment = {
|
||||
key: string
|
||||
title: string
|
||||
description: string
|
||||
recommendation: string
|
||||
kind: "image" | "vision" | "text"
|
||||
runtime: "active" | "rules"
|
||||
}
|
||||
type AdapterOption = { name: string; route: string; model: string; enabled: boolean }
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: Record<string, unknown>
|
||||
adapters: AdapterOption[]
|
||||
visionRoute: string
|
||||
disabled: boolean
|
||||
}>()
|
||||
const emit = defineEmits<{ "update:modelValue": [value: Record<string, unknown>] }>()
|
||||
const profiles = ref<CapabilityProfile[]>([])
|
||||
|
||||
const cards: Assignment[] = [
|
||||
{ key: "material_recognition", title: "素材导入解析", description: "识别素材类别、描述、标签和生成提示词。", recommendation: "建议选择支持图片理解与结构化 JSON 输出的视觉模型;优先稳定和低成本,通常不需要最强推理模型。", kind: "vision", runtime: "active" },
|
||||
{ key: "profile_parse", title: "外部角色导入解析", description: "将外部角色文本拆成结构化角色字段。", recommendation: "建议选择指令遵循稳定、长文本处理好且支持 JSON 输出的文本模型;角色资料很长时关注上下文长度。", kind: "text", runtime: "rules" },
|
||||
{ key: "persona_split", title: "角色设定拆解", description: "拆解身份、外观、服装、关系和世界观。", recommendation: "建议使用语义理解和信息抽取能力较强的文本模型,重点避免遗漏设定或把推测内容当成事实。", kind: "text", runtime: "rules" },
|
||||
{ key: "prompt_planning", title: "提示词规划与扩写", description: "生成阶段提示词矩阵和负面提示词。", recommendation: "建议选择熟悉生图提示词、风格词和负面词的文本模型;创意能力优先于纯推理速度。", kind: "text", runtime: "rules" },
|
||||
{ key: "quick_generation", title: "快速生图", description: "单图生成和快速角色预览。", recommendation: "建议选择低延迟、低单价且提示词响应稳定的模型,以快速出草图为主,不必追求最高分辨率。", kind: "image", runtime: "active" },
|
||||
{ key: "portrait_generation", title: "头像草稿", description: "头像与面部细节候选生成。", recommendation: "建议选择人脸、眼睛和发型细节稳定的模型,并具备较好的角色一致性;优先测试近景表现。", kind: "image", runtime: "active" },
|
||||
{ key: "halfbody_generation", title: "半身角色图", description: "上半身服装、姿态和轮廓。", recommendation: "建议选择服装细节、手部和姿态表现均衡的模型,适合中景构图和角色立绘。", kind: "image", runtime: "active" },
|
||||
{ key: "fullbody_generation", title: "全身角色图", description: "全套服装、比例和全身设计。", recommendation: "建议选择人体比例、脚部、复杂服装结构较稳定的模型;优先支持纵向高分辨率。", kind: "image", runtime: "active" },
|
||||
{ key: "sheet_generation", title: "设定图与姿势图", description: "表情、动作和角色设定图。", recommendation: "建议选择多视图排版、角色一致性和动作控制能力强的模型,能稳定生成设定表或姿势组图。", kind: "image", runtime: "active" },
|
||||
{ key: "hires_fix", title: "高清修复", description: "最终放大、细节修复和风格统一。", recommendation: "建议选择支持高分辨率、图生图或重绘的模型,重点保留原角色身份与构图,避免放大时改变面部和服装。", kind: "image", runtime: "active" },
|
||||
]
|
||||
|
||||
const discovered = computed(() => profiles.value.map(item => `${item.provider_id}/${item.model_id}`))
|
||||
const reviewRoutes = computed(() => {
|
||||
const configured = props.modelValue.cross_review_routes
|
||||
if (Array.isArray(configured) && configured.length) return configured.map(String)
|
||||
return [String(props.modelValue.cross_review_primary || ""), String(props.modelValue.cross_review_secondary || "")]
|
||||
})
|
||||
function value(key: string) { return String(props.modelValue[key] || "") }
|
||||
function options(card: Assignment) {
|
||||
const adapterRoutes = props.adapters.filter(item => item.enabled && item.route).map(item => item.route)
|
||||
if (card.kind === "image") return Array.from(new Set(adapterRoutes))
|
||||
if (card.kind === "vision") return Array.from(new Set([props.visionRoute, ...adapterRoutes, ...discovered.value].filter(Boolean)))
|
||||
return Array.from(new Set([...adapterRoutes, ...discovered.value].filter(Boolean)))
|
||||
}
|
||||
function optionLabel(route: string) {
|
||||
const adapter = props.adapters.find(item => item.route === route)
|
||||
if (!adapter) return route
|
||||
return `${adapter.name}${adapter.model ? ` · ${adapter.model}` : ""} (${route})`
|
||||
}
|
||||
function update(key: string, next: string) { emit("update:modelValue", { ...props.modelValue, [key]: next }) }
|
||||
function updateReview(index: number, route: string) {
|
||||
const next = [...reviewRoutes.value]
|
||||
next[index] = route
|
||||
emit("update:modelValue", { ...props.modelValue, cross_review_routes: next, cross_review_primary: next[0] || "", cross_review_secondary: next[1] || "" })
|
||||
}
|
||||
function addReviewRoute() {
|
||||
emit("update:modelValue", { ...props.modelValue, cross_review_routes: [...reviewRoutes.value, ""] })
|
||||
}
|
||||
function removeReviewRoute(index: number) {
|
||||
if (reviewRoutes.value.length <= 2) return
|
||||
const next = reviewRoutes.value.filter((_, itemIndex) => itemIndex !== index)
|
||||
emit("update:modelValue", { ...props.modelValue, cross_review_routes: next, cross_review_primary: next[0] || "", cross_review_secondary: next[1] || "" })
|
||||
}
|
||||
function reviewOptions(index: number) {
|
||||
const selected = new Set(reviewRoutes.value.filter((route, itemIndex) => itemIndex !== index && route))
|
||||
const visionCard: Assignment = { key: "review", title: "", description: "", recommendation: "", kind: "vision", runtime: "rules" }
|
||||
return options(visionCard).filter(route => !selected.has(route) || route === reviewRoutes.value[index])
|
||||
}
|
||||
onMounted(async () => {
|
||||
try { profiles.value = await getJson<CapabilityProfile[]>(endpoints.apiDiscoveryCapabilities) }
|
||||
catch { profiles.value = [] }
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<section class="assignments">
|
||||
<header><div><span>模型分工</span><strong>按功能节点选择模型路由</strong><p>生图与素材识别配置会立即进入运行链;标记为“规则引擎”的节点当前保留模型路由,启用远程 LLM 后无需重新调整界面。</p></div></header>
|
||||
<div class="grid">
|
||||
<article v-for="card in cards" :key="card.key">
|
||||
<div class="card-head"><span :class="card.kind">{{ card.kind === 'image' ? '生图' : card.kind === 'vision' ? '视觉' : '文本' }}</span><em :class="card.runtime">{{ card.runtime === 'active' ? '已接入运行时' : '当前规则引擎' }}</em></div>
|
||||
<strong>{{ card.title }}</strong>
|
||||
<p>{{ card.description }}</p>
|
||||
<div class="recommendation"><b>选型建议</b><span>{{ card.recommendation }}</span></div>
|
||||
<label><span>模型路由</span><select :value="value(card.key)" :disabled="disabled" @change="update(card.key, ($event.target as HTMLSelectElement).value)"><option value="">自动选择默认路由</option><option v-for="route in options(card)" :key="route" :value="route">{{ optionLabel(route) }}</option></select></label>
|
||||
<small>{{ card.key }}</small>
|
||||
</article>
|
||||
<article class="review-group">
|
||||
<div class="card-head"><span class="vision">视觉</span><em class="rules">当前规则引擎</em></div>
|
||||
<div><strong>交叉审核</strong><p>使用多个不同模型独立检查候选图,综合角色一致性、构图、手部和服装缺陷。</p></div>
|
||||
<div class="recommendation"><b>选型建议</b><span>主审与复核建议选择不同厂商或不同模型家族,减少同源偏差。至少配置两路;继续添加可提高可靠性,但会增加审核成本。</span></div>
|
||||
<div class="review-routes">
|
||||
<label v-for="(route, index) in reviewRoutes" :key="index">
|
||||
<span>{{ index === 0 ? '主审核模型' : index === 1 ? '复核模型' : `附加审核模型 ${index}` }}</span>
|
||||
<div class="review-select"><select :value="route" :disabled="disabled" @change="updateReview(index, ($event.target as HTMLSelectElement).value)"><option value="">请选择不同的模型路由</option><option v-for="option in reviewOptions(index)" :key="option" :value="option">{{ optionLabel(option) }}</option></select><button v-if="index > 1" type="button" :disabled="disabled" title="移除此审核路由" @click="removeReviewRoute(index)">×</button></div>
|
||||
</label>
|
||||
</div>
|
||||
<button class="add-review" type="button" :disabled="disabled" @click="addReviewRoute">+ 添加审核路由</button>
|
||||
<small>cross_review_routes</small>
|
||||
</article>
|
||||
</div>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.assignments{display:grid;gap:14px}.assignments>header{border:1px solid var(--border);border-radius:10px;padding:15px;background:linear-gradient(105deg,var(--primary-soft),var(--panel-muted))}.assignments header>div{display:grid;gap:4px}.assignments header span{color:var(--text-soft);font-size:11px;font-weight:800}.assignments header p,.grid p{margin:0;color:var(--text-soft);line-height:1.5}.grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:11px}.grid article{display:grid;gap:9px;border:1px solid var(--border);border-radius:10px;padding:14px;background:var(--panel-muted)}.card-head{display:flex;justify-content:space-between}.card-head span,.card-head em{border-radius:5px;padding:3px 7px;font-size:10px;font-style:normal}.card-head span.image{color:#7757e8;background:var(--primary-soft)}.card-head span.vision{color:#25845a;background:color-mix(in srgb,#39aa72 13%,var(--panel))}.card-head span.text{color:#a06a12;background:color-mix(in srgb,#e1a53a 15%,var(--panel))}.card-head em{color:var(--text-soft);background:var(--panel)}.card-head em.active{color:#25845a}.recommendation{display:grid;grid-template-columns:auto 1fr;align-items:start;gap:8px;border-left:3px solid var(--primary);border-radius:4px;padding:8px 10px;background:color-mix(in srgb,var(--primary-soft) 55%,var(--panel))}.recommendation b{white-space:nowrap;color:var(--primary);font-size:11px}.recommendation span{color:var(--text-soft);font-size:12px;line-height:1.55}.grid label{display:grid;gap:5px}.grid label>span,.grid article>small{color:var(--text-soft);font-size:11px}.grid select{width:100%;min-height:39px;border:1px solid var(--border);border-radius:7px;padding:0 34px 0 10px;color:var(--text);background:var(--panel);font:inherit;cursor:pointer}.grid select:disabled{cursor:not-allowed;opacity:.65}.review-group{grid-column:1/-1}.review-routes{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px}.review-select{display:flex;gap:7px}.review-select button{flex:0 0 39px;border:1px solid var(--border);border-radius:7px;color:#c45151;background:var(--panel);font-size:20px}.add-review{justify-self:start;border:1px dashed var(--primary);border-radius:7px;padding:8px 13px;color:var(--primary);background:var(--panel);cursor:pointer}@media(max-width:760px){.grid,.review-routes{grid-template-columns:1fr}.recommendation{grid-template-columns:1fr}}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from "vue"
|
||||
import { getJson } from "../../../../shared/api/client"
|
||||
import { endpoints } from "../../../../shared/api/endpoints"
|
||||
import type { MaterialCategory } from "../../../../shared/types/material"
|
||||
|
||||
type Requirement = { category: string; requirement: string; enabled: boolean }
|
||||
const props = defineProps<{ modelValue: Record<string, unknown>; disabled: boolean }>()
|
||||
const emit = defineEmits<{ "update:modelValue": [value: Record<string, unknown>] }>()
|
||||
const fallbackCategories: MaterialCategory[] = ["风格", "构图", "服装", "鞋袜", "配饰"].map((name, index) => ({
|
||||
category_id: `cat_imagestudio_${name}`,
|
||||
name,
|
||||
parent_id: null,
|
||||
category_type: "material",
|
||||
sort_order: (index + 1) * 10,
|
||||
metadata: {},
|
||||
created_at: "",
|
||||
updated_at: "",
|
||||
}))
|
||||
const categories = ref<MaterialCategory[]>(fallbackCategories)
|
||||
const categoryError = ref("")
|
||||
const requirements = computed<Requirement[]>(() => Array.isArray(props.modelValue.category_requirements) ? props.modelValue.category_requirements.map(item => {
|
||||
const value = item && typeof item === "object" ? item as Record<string, unknown> : {}
|
||||
return { category: String(value.category || ""), requirement: String(value.requirement || ""), enabled: value.enabled !== false }
|
||||
}) : [])
|
||||
function updateInstruction(value: string) { emit("update:modelValue", { ...props.modelValue, default_instruction: value }) }
|
||||
function updateRequirement(index: number, key: keyof Requirement, value: string | boolean) {
|
||||
const next = requirements.value.map((item, itemIndex) => itemIndex === index ? { ...item, [key]: value } : item)
|
||||
emit("update:modelValue", { ...props.modelValue, category_requirements: next })
|
||||
}
|
||||
function addRequirement() { emit("update:modelValue", { ...props.modelValue, category_requirements: [...requirements.value, { category: "", requirement: "", enabled: true }] }) }
|
||||
function removeRequirement(index: number) { emit("update:modelValue", { ...props.modelValue, category_requirements: requirements.value.filter((_, itemIndex) => itemIndex !== index) }) }
|
||||
function categoryLabel(category: MaterialCategory) {
|
||||
const parent = categories.value.find(item => item.category_id === category.parent_id)
|
||||
return parent ? `${parent.name} / ${category.name}` : category.name
|
||||
}
|
||||
onMounted(async () => {
|
||||
try { categories.value = await getJson<MaterialCategory[]>(endpoints.materialCategories) }
|
||||
catch { categoryError.value = "当前使用工作台默认分类;连接后端后会自动同步真实分类。" }
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<section class="prompt-settings">
|
||||
<div class="intro"><span>素材识别</span><strong>识别与提示词生成要求</strong><p>默认指令会随素材图片发送给视觉模型。模型先判断分类,再应用匹配的分类附加要求。</p></div>
|
||||
<label class="instruction"><span>默认识别指令</span><textarea :value="String(modelValue.default_instruction || '')" :disabled="disabled" rows="11" @input="updateInstruction(($event.target as HTMLTextAreaElement).value)"></textarea><small>建议保留 JSON 字段约束:prompt、negative_prompt、tags、confidence、description。</small></label>
|
||||
<section class="category-rules"><header><div><span>分类附加要求</span><strong>按分类进一步榨取识别细节</strong></div><button type="button" :disabled="disabled" @click="addRequirement">+ 添加分类要求</button></header>
|
||||
<article v-for="(item, index) in requirements" :key="index">
|
||||
<label><span>素材分类</span><select :value="item.category" :disabled="disabled" @change="updateRequirement(index, 'category', ($event.target as HTMLSelectElement).value)"><option value="">请选择现有分类</option><option v-for="category in categories" :key="category.category_id" :value="category.category_id">{{ categoryLabel(category) }}</option></select></label>
|
||||
<label class="wide"><span>附加识别要求</span><textarea :value="item.requirement" :disabled="disabled" rows="3" placeholder="例如:重点识别领型、袖型、门襟、腰线、裁片、褶皱与装饰位置。" @input="updateRequirement(index, 'requirement', ($event.target as HTMLTextAreaElement).value)"></textarea></label>
|
||||
<label class="enabled"><input type="checkbox" :checked="item.enabled" :disabled="disabled" @change="updateRequirement(index, 'enabled', ($event.target as HTMLInputElement).checked)">启用</label>
|
||||
<button class="remove" type="button" :disabled="disabled" @click="removeRequirement(index)">删除</button>
|
||||
</article>
|
||||
<div v-if="categoryError" class="warning">{{ categoryError }}</div>
|
||||
<div v-if="!requirements.length" class="empty">暂无分类附加要求。默认识别指令仍会应用于所有素材。</div>
|
||||
</section>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.prompt-settings{display:grid;gap:14px}.intro{display:grid;gap:5px;border:1px solid var(--border);border-radius:10px;padding:15px;background:linear-gradient(105deg,var(--primary-soft),var(--panel-muted))}.intro span,.category-rules header span{color:var(--text-soft);font-size:11px;font-weight:800}.intro p{margin:0;color:var(--text-soft);line-height:1.55}.instruction{display:grid;gap:7px;border:1px solid var(--border);border-radius:10px;padding:14px;background:var(--panel-muted)}label>span{color:var(--text-soft);font-size:11px}.instruction textarea,.category-rules textarea,.category-rules select{width:100%;box-sizing:border-box;border:1px solid var(--border);border-radius:7px;padding:10px;color:var(--text);background:var(--panel);font:inherit;line-height:1.55}.instruction textarea,.category-rules textarea{resize:vertical}.category-rules select{min-height:42px;cursor:pointer}.instruction small{color:var(--text-soft)}.category-rules{display:grid;gap:10px}.category-rules>header{display:flex;align-items:center;justify-content:space-between;gap:12px}.category-rules header>div{display:grid;gap:3px}.category-rules button{border:1px solid var(--border);border-radius:7px;padding:8px 11px;color:var(--text);background:var(--panel);cursor:pointer}.category-rules>header button{border-style:dashed;border-color:var(--primary);color:var(--primary)}.category-rules article{display:grid;grid-template-columns:minmax(180px,.7fr) minmax(280px,1.5fr) auto auto;align-items:start;gap:10px;border:1px solid var(--border);border-radius:10px;padding:12px;background:var(--panel-muted)}.category-rules article label{display:grid;gap:5px}.enabled{display:flex!important;align-items:center;min-height:42px;margin-top:22px}.remove{align-self:start;margin-top:22px;min-height:42px;color:#c45151!important}.empty,.warning{border:1px dashed var(--border);border-radius:9px;padding:18px;text-align:center;color:var(--text-soft)}.warning{border-color:#d8a34b;color:#9a6818;background:color-mix(in srgb,#e1a53a 10%,var(--panel))}@media(max-width:900px){.category-rules article{grid-template-columns:1fr}.category-rules>header{align-items:flex-start;flex-direction:column}.enabled,.remove{margin-top:0}}
|
||||
</style>
|
||||
|
|
@ -9,6 +9,8 @@ import StorageMaintenance from "./StorageMaintenance.vue"
|
|||
import ReviewPolicyPanel from "./ReviewPolicyPanel.vue"
|
||||
import CapabilityProfilesPanel from "./CapabilityProfilesPanel.vue"
|
||||
import SystemManagementPanel from "./SystemManagementPanel.vue"
|
||||
import ModelAssignmentsPanel from "./ModelAssignmentsPanel.vue"
|
||||
import RecognitionPromptsPanel from "./RecognitionPromptsPanel.vue"
|
||||
|
||||
type ConfigValue = string | number | boolean | string[] | null
|
||||
type Adapter = { id:string; name:string; provider_type:string; base_url:string; image_endpoint:string; model_id:string; route_name:string; api_key_env_var:string; timeout_seconds:number; enabled:boolean }
|
||||
|
|
@ -18,6 +20,8 @@ const emit = defineEmits<{refresh:[];validate:[config:Record<string,unknown>];sa
|
|||
|
||||
const previewSchema: SettingsSchema = {schema_version:"3.0-preview",sections:[
|
||||
{key:"generation",title:"生成服务",fields:[]},
|
||||
{key:"model_assignments",title:"模型分工",fields:[]},
|
||||
{key:"recognition_prompts",title:"识别提示词",fields:[]},
|
||||
{key:"features",title:"功能开关",fields:[
|
||||
{key:"quick_profile",label:"快速角色",type:"bool",options:[],sensitive:false,readonly:false},{key:"workspace",label:"角色工作流",type:"bool",options:[],sensitive:false,readonly:false},{key:"material_library",label:"素材库",type:"bool",options:[],sensitive:false,readonly:false},{key:"wardrobe",label:"角色衣橱",type:"bool",options:[],sensitive:false,readonly:false},{key:"api_discovery",label:"能力探测",type:"bool",options:[],sensitive:false,readonly:false},{key:"private_companion_integration",label:"私伴插件集成",type:"bool",options:[],sensitive:false,readonly:false},
|
||||
]},
|
||||
|
|
@ -29,7 +33,7 @@ const previewSchema: SettingsSchema = {schema_version:"3.0-preview",sections:[
|
|||
]},
|
||||
{key:"backup",title:"数据备份",fields:[]},
|
||||
]}
|
||||
const previewConfig = computed<Record<string,unknown>>(()=>({generation:{default_model:"image_default",provider:{provider_id:"openai-compatible",base_url:"",image_endpoint:"/v1/images/generations",model_id:"",route_name:"image_default",api_key_env_var:"IMAGE_API_KEY",timeout_seconds:180}},features:{quick_profile:true,workspace:true,material_library:true,wardrobe:true,api_discovery:true,private_companion_integration:false},storage:{images_path:"data/images",thumbnails_path:"data/thumbnails",materials_path:"data/materials",styles_path:"data/styles",archives_path:"data/archives",temp_path:"data/temp"},database:{backend:"auto",sqlite:{path:"data/imagestudio.db"},postgresql:{enabled:false,host:"127.0.0.1",port:5432,database:"imagestudio",user:"",password:""}}}))
|
||||
const previewConfig = computed<Record<string,unknown>>(()=>({generation:{default_model:"image_default",provider:{provider_id:"openai-compatible",base_url:"",image_endpoint:"/v1/images/generations",model_id:"",route_name:"image_default",api_key_env_var:"IMAGE_API_KEY",timeout_seconds:180}},model_assignments:{material_recognition:"material_vlm",quick_generation:"image_default",portrait_generation:"image_default",halfbody_generation:"image_default",fullbody_generation:"image_default",sheet_generation:"image_default",hires_fix:"image_default"},recognition_prompts:{default_instruction:"请先判断图片中素材的准确分类,再尽可能完整提取所有可见事实,包括颜色、材质、纹理、结构、轮廓、图案、裁剪、装饰、配件、视角和光照。不要把推测写成事实。根据结果生成可直接用于生图的详细正向提示词和负向提示词。仅返回 JSON:prompt、negative_prompt、tags、confidence、description。",category_requirements:[]},features:{quick_profile:true,workspace:true,material_library:true,wardrobe:true,api_discovery:true,private_companion_integration:false},storage:{images_path:"data/images",thumbnails_path:"data/thumbnails",materials_path:"data/materials",styles_path:"data/styles",archives_path:"data/archives",temp_path:"data/temp"},database:{backend:"auto",sqlite:{path:"data/imagestudio.db"},postgresql:{enabled:false,host:"127.0.0.1",port:5432,database:"imagestudio",user:"",password:""}}}))
|
||||
const effectiveSchema=computed(()=>{const schema=clone(props.schema??previewSchema);for(const section of [{key:"review",title:"审查策略",fields:[]},{key:"capabilities",title:"能力档案",fields:[]},{key:"integration",title:"私伴集成",fields:[]},{key:"cost_guard",title:"成本保护",fields:[]},{key:"diagnostics",title:"系统诊断",fields:[]},{key:"backup",title:"数据备份",fields:[]}])if(!schema.sections.some(item=>item.key===section.key))schema.sections.push(section);return schema})
|
||||
const baseline=computed(()=>props.current?.config??previewConfig.value)
|
||||
const draft=ref<Record<string,unknown>>({})
|
||||
|
|
@ -51,6 +55,9 @@ const adapters=computed<Adapter[]>(()=>{
|
|||
const provider=obj(generation.provider)
|
||||
return [normalizeAdapter({...provider,id:String(provider.provider_id||"primary"),name:String(provider.display_name||provider.provider_id||"主生成服务")})]
|
||||
})
|
||||
const modelAssignments=computed(()=>obj(draft.value.model_assignments))
|
||||
const modelAdapterOptions=computed(()=>adapters.value.map(item=>({name:item.name,route:item.route_name,model:item.model_id,enabled:item.enabled})))
|
||||
const visionRouteOption=computed(()=>String(obj(draft.value.vision).default_route||obj(obj(draft.value.vision).provider).route_name||"material_vlm"))
|
||||
|
||||
watch(baseline,v=>{draft.value=clone(v);expandedAdapter.value=""},{immediate:true,deep:true})
|
||||
watch(effectiveSchema,s=>{if(!s.sections.some(x=>x.key===activeSectionKey.value))activeSectionKey.value=s.sections[0]?.key||""},{immediate:true})
|
||||
|
|
@ -77,13 +84,15 @@ function resetDraft(){draft.value=clone(baseline.value)}
|
|||
function fieldPath(k:string){return activeSection.value?`${activeSection.value.key}.${k}`:k}
|
||||
function fieldValue(path:string):ConfigValue{let c:unknown=draft.value;for(const p of path.split(".")){if(!c||typeof c!=="object"||Array.isArray(c))return "";c=(c as Record<string,unknown>)[p]}return Array.isArray(c)?c as string[]:typeof c==="string"||typeof c==="number"||typeof c==="boolean"||c===null?c:""}
|
||||
function updateField(path:string,value:ConfigValue){const next=clone(draft.value);const parts=path.split(".");let c=next;for(const p of parts.slice(0,-1)){if(!c[p]||typeof c[p]!=="object"||Array.isArray(c[p]))c[p]={};c=c[p] as Record<string,unknown>}c[parts.at(-1)!]=value;draft.value=next}
|
||||
function updateModelAssignments(value:Record<string,unknown>){draft.value={...clone(draft.value),model_assignments:value}}
|
||||
function updateRecognitionPrompts(value:Record<string,unknown>){draft.value={...clone(draft.value),recognition_prompts:value}}
|
||||
function inputValue(e:Event,type:string):ConfigValue{const t=e.target as HTMLInputElement|HTMLSelectElement;if(type==="bool"||type==="boolean")return t.value==="true";if(type==="number")return t.value===""?null:Number(t.value);return t.value}
|
||||
</script>
|
||||
|
||||
<template><section class="settings-page">
|
||||
<header class="hero"><div><span>系统设置</span><h2>插件与生成服务</h2><p>集中管理 ImageStudio 的生成适配器、运行参数与功能配置。</p></div><div class="actions"><button @click="emit('refresh')">刷新配置</button><button :disabled="busy||!backendConnected||!canManage" @click="emit('reload')">重载配置</button></div></header>
|
||||
<section v-if="error||message" :class="['notice',{error:!!error}]">{{error||message}}</section>
|
||||
<section class="workspace"><aside class="nav"><header><span>设置导航</span><strong>{{effectiveSchema.sections.length}}</strong></header><button v-for="s in effectiveSchema.sections" :key="s.key" :class="{active:activeSection?.key===s.key}" @click="activeSectionKey=s.key"><span>{{s.title}}</span><small>{{s.key==='generation'?`${adapters.length} 个适配器`:s.key==='backup'?'导入 / 导出':s.key==='review'?'规则管理':s.key==='capabilities'?'模型档案':s.key==='integration'?'凭据管理':s.key==='cost_guard'?'预算预检':s.key==='diagnostics'?'运行检查':`${s.fields.length} 项`}}</small></button></aside>
|
||||
<section class="workspace"><aside class="nav"><header><span>设置导航</span><strong>{{effectiveSchema.sections.length}}</strong></header><button v-for="s in effectiveSchema.sections" :key="s.key" :class="{active:activeSection?.key===s.key}" @click="activeSectionKey=s.key"><span>{{s.title}}</span><small>{{s.key==='generation'?`${adapters.length} 个适配器`:s.key==='model_assignments'?'12 个功能节点':s.key==='recognition_prompts'?'分类识别要求':s.key==='backup'?'导入 / 导出':s.key==='review'?'规则管理':s.key==='capabilities'?'模型档案':s.key==='integration'?'凭据管理':s.key==='cost_guard'?'预算预检':s.key==='diagnostics'?'运行检查':`${s.fields.length} 项`}}</small></button></aside>
|
||||
<main class="editor">
|
||||
<template v-if="activeSection?.key==='generation'"><header class="section-head"><div><span>生成服务</span><h3>API 适配器</h3><p>每个服务独立配置,展开卡片后填写 API 信息。首张卡片作为当前默认生成路由。</p></div></header>
|
||||
<div class="adapter-list"><article v-for="(a,index) in adapters" :key="a.id" class="adapter-card" :class="{connected:a.enabled&&!!a.base_url,disabled:!a.enabled}"><button class="adapter-summary" @click="expandedAdapter=a.id"><span class="adapter-icon">{{a.name.slice(0,1).toUpperCase()}}</span><span class="adapter-title"><strong>{{a.name}}</strong><small>{{a.enabled?(a.base_url?'链接已配置':'等待配置'):'已停用'}}</small></span><em v-if="index===0">默认</em><span class="corner" aria-hidden="true"></span></button></article></div>
|
||||
|
|
@ -103,6 +112,8 @@ function inputValue(e:Event,type:string):ConfigValue{const t=e.target as HTMLInp
|
|||
<SystemManagementPanel v-else-if="activeSection?.key==='integration'" mode="integration" :backend-connected="backendConnected" :can-manage="canManage" />
|
||||
<SystemManagementPanel v-else-if="activeSection?.key==='cost_guard'" mode="cost" :backend-connected="backendConnected" :can-manage="canManage" />
|
||||
<SystemManagementPanel v-else-if="activeSection?.key==='diagnostics'" mode="diagnostics" :backend-connected="backendConnected" :can-manage="canManage" />
|
||||
<ModelAssignmentsPanel v-else-if="activeSection?.key==='model_assignments'" :model-value="modelAssignments" :adapters="modelAdapterOptions" :vision-route="visionRouteOption" :disabled="backendConnected&&!canManage" @update:model-value="updateModelAssignments" />
|
||||
<RecognitionPromptsPanel v-else-if="activeSection?.key==='recognition_prompts'" :model-value="obj(draft.recognition_prompts)" :disabled="backendConnected&&!canManage" @update:model-value="updateRecognitionPrompts" />
|
||||
<div v-else-if="activeSection?.key==='features'" class="feature-grid"><article v-for="f in activeSection.fields" :key="f.key" class="feature-card" :class="{enabled:fieldValue(fieldPath(f.key))===true}"><div class="feature-mark">{{f.label.slice(0,1)}}</div><div><strong>{{f.label}}</strong><p>{{featureDescription(f.key)}}</p></div><label class="toggle"><input type="checkbox" :checked="fieldValue(fieldPath(f.key))===true" @change="updateField(fieldPath(f.key),($event.target as HTMLInputElement).checked)"><span></span></label></article></div>
|
||||
<div v-else class="config-panel"><div class="config-banner"><div class="config-symbol">{{activeSection?.key==='storage'?'▣':'DB'}}</div><div><strong>{{activeSection?.key==='storage'?'存储目录规划':'数据库连接'}}</strong><p>{{activeSection?.key==='storage'?'支持相对插件数据目录或绝对路径,保存前请确保 AstrBot 进程具备写入权限。':'auto 会优先使用已配置的 PostgreSQL,否则回退到本地 SQLite。'}}</p></div></div><div class="fields"><label v-for="f in activeSection?.fields||[]" :key="f.key"><span>{{f.label}}</span><select v-if="f.options.length||f.type==='bool'||f.type==='boolean'" :value="String(fieldValue(fieldPath(f.key)))" @change="updateField(fieldPath(f.key),inputValue($event,f.type))"><option v-if="f.type==='bool'||f.type==='boolean'" value="true">开启</option><option v-if="f.type==='bool'||f.type==='boolean'" value="false">关闭</option><option v-for="o in f.options" :key="o" :value="o">{{o}}</option></select><input v-else :type="f.type==='number'?'number':f.sensitive?'password':'text'" :placeholder="f.type==='path'?'输入目录或文件路径':''" :value="fieldValue(fieldPath(f.key)) as any" @input="updateField(fieldPath(f.key),inputValue($event,f.type))"><small>{{fieldPath(f.key)}}</small></label></div><StorageMaintenance v-if="activeSection?.key==='storage'" :can-manage="canManage" :backend-connected="backendConnected" /></div>
|
||||
</template>
|
||||
|
|
|
|||
31
main.py
31
main.py
|
|
@ -291,6 +291,18 @@ def _mapping_from_runtime_config(config: Any | None) -> dict[str, Any]:
|
|||
"vision_provider_api_key_env_var",
|
||||
"vision_provider_timeout_seconds",
|
||||
"vision_provider_enabled",
|
||||
"model_material_recognition",
|
||||
"model_profile_parse",
|
||||
"model_persona_split",
|
||||
"model_prompt_planning",
|
||||
"model_cross_review_primary",
|
||||
"model_cross_review_secondary",
|
||||
"model_quick_generation",
|
||||
"model_portrait_generation",
|
||||
"model_halfbody_generation",
|
||||
"model_fullbody_generation",
|
||||
"model_sheet_generation",
|
||||
"model_hires_fix",
|
||||
"enable_private_companion_integration",
|
||||
"database_backend",
|
||||
"sqlite_path",
|
||||
|
|
@ -425,6 +437,25 @@ def _runtime_config_patch_from_mapping(mapping: Mapping[str, Any]) -> dict[str,
|
|||
if vision_provider:
|
||||
_set_nested(patch, ("vision", "provider"), vision_provider)
|
||||
|
||||
assignment_fields = {
|
||||
"material_recognition": "model_material_recognition",
|
||||
"profile_parse": "model_profile_parse",
|
||||
"persona_split": "model_persona_split",
|
||||
"prompt_planning": "model_prompt_planning",
|
||||
"cross_review_primary": "model_cross_review_primary",
|
||||
"cross_review_secondary": "model_cross_review_secondary",
|
||||
"quick_generation": "model_quick_generation",
|
||||
"portrait_generation": "model_portrait_generation",
|
||||
"halfbody_generation": "model_halfbody_generation",
|
||||
"fullbody_generation": "model_fullbody_generation",
|
||||
"sheet_generation": "model_sheet_generation",
|
||||
"hires_fix": "model_hires_fix",
|
||||
}
|
||||
for target_key, source_key in assignment_fields.items():
|
||||
value = _runtime_text(_runtime_value(mapping, source_key))
|
||||
if value:
|
||||
_set_nested(patch, ("model_assignments", target_key), value)
|
||||
|
||||
private_companion = _runtime_value(
|
||||
mapping,
|
||||
"enable_private_companion_integration",
|
||||
|
|
|
|||
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
|
|
@ -4,8 +4,8 @@
|
|||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>AstrBot ImageStudio</title>
|
||||
<script type="module" crossorigin src="./assets/index-BKG3cNQ-.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="./assets/index-Dx9JF8Lp.css">
|
||||
<script type="module" crossorigin src="./assets/index-S8PI1-k-.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="./assets/index-DoRMtpTr.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
|
|
|||
43
tests/test_model_assignments.py
普通文件
43
tests/test_model_assignments.py
普通文件
|
|
@ -0,0 +1,43 @@
|
|||
from __future__ import annotations
|
||||
|
||||
import unittest
|
||||
from types import SimpleNamespace
|
||||
|
||||
from backend.services.generation_service import _assignment_key
|
||||
from backend.services.settings_service import SettingsService
|
||||
|
||||
|
||||
class ModelAssignmentTests(unittest.TestCase):
|
||||
def test_generation_nodes_map_to_function_assignments(self):
|
||||
cases = {
|
||||
"headshot": "portrait_generation",
|
||||
"half_body": "halfbody_generation",
|
||||
"full_body": "fullbody_generation",
|
||||
"expression_sheet": "sheet_generation",
|
||||
"pose_sheet": "sheet_generation",
|
||||
"style_lock": "hires_fix",
|
||||
}
|
||||
for node_key, expected in cases.items():
|
||||
with self.subTest(node_key=node_key):
|
||||
self.assertEqual(_assignment_key(SimpleNamespace(node_key=node_key, node_type="generation")), expected)
|
||||
|
||||
def test_virtual_single_image_uses_quick_generation(self):
|
||||
self.assertEqual(
|
||||
_assignment_key(SimpleNamespace(node_key="single", node_type="virtual_single_image")),
|
||||
"quick_generation",
|
||||
)
|
||||
|
||||
def test_settings_schema_exposes_model_assignment_section(self):
|
||||
schema = SettingsService().get_schema()
|
||||
section = next(item for item in schema["sections"] if item["key"] == "model_assignments")
|
||||
keys = {field["key"] for field in section["fields"]}
|
||||
self.assertIn("material_recognition", keys)
|
||||
self.assertIn("cross_review_primary", keys)
|
||||
self.assertIn("cross_review_secondary", keys)
|
||||
self.assertIn("cross_review_routes", keys)
|
||||
self.assertIn("quick_generation", keys)
|
||||
self.assertIn("hires_fix", keys)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
51
web/assets/index-DyWLLdwX.js
普通文件
51
web/assets/index-DyWLLdwX.js
普通文件
文件差异因一行或多行过长而隐藏
|
|
@ -4,8 +4,8 @@
|
|||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>AstrBot ImageStudio</title>
|
||||
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-Cm1uzzf8.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-BZytriHv.css">
|
||||
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-DyWLLdwX.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-D1gSt_ux.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
|
|
|||
正在加载…
添加表格
在新工单中引用