feat: complete ImageStudio UI redesign rollout #3

已合并
YokiiroBW 已将来自 codex/ui-redesign-gallery 的 14 提交合并入 main 2026-07-22 00:46:17 +08:00
共有 18 个文件被更改,包括 67 次插入 和 19 次删除
仅显示提交 f2366c4361 的更改 - 显示所有提交

查看文件

@ -1,3 +1,8 @@
## 1.0.54
- Add an independent `advanced_style_consensus` vision route for multi-image style cross-analysis; blank keeps the recognition-route fallback.
- Isolate large cross-image vision requests from the single-image recognition route.
## 1.0.53
- Limit concurrent advanced-material vision requests per route to avoid GPT-5.6 relay timeouts when eight images fan out at once.

查看文件

@ -1484,6 +1484,16 @@ class AdvancedMaterialService:
or "material_vlm"
).strip()
def _consensus_route(self) -> str:
assignments = self.config.get("model_assignments") if isinstance(self.config.get("model_assignments"), dict) else {}
return str(
assignments.get("advanced_style_consensus")
or assignments.get("advanced_material_recognition")
or assignments.get("material_recognition")
or self._recognition_route()
or "material_vlm"
).strip()
def _generation_route(self) -> str:
assignments = self.config.get("model_assignments") if isinstance(self.config.get("model_assignments"), dict) else {}
generation = self.config.get("generation") if isinstance(self.config.get("generation"), dict) else {}

查看文件

@ -688,7 +688,7 @@ class AdvancedStyleSetService:
"import_id": import_id,
"revision": revision,
"status": "queued",
"model_route": record.recognition_model_route or self.owner._recognition_route(),
"model_route": self.owner._consensus_route(),
"source_ids": [item.source_id for item in succeeded],
"metadata": {
"adjustment_text": style_adjustment,
@ -1421,7 +1421,7 @@ class AdvancedStyleSetService:
],
"automatic_review_feedback": automatic_review_feedback,
}
route_name = consensus.model_route or record.recognition_model_route or self.owner._recognition_route()
route_name = consensus.model_route or self.owner._consensus_route()
provider = self.model_provider_runtime.vision_provider_for_route(
{"route_name": route_name, "modality": "vision_recognition", "material_id": consensus_id, "image_uri": sources[0].source_image_uri}
)

查看文件

@ -103,6 +103,7 @@ class SettingsService:
"fields": [
_field("material_recognition", "string", label="素材解析路由"),
_field("advanced_material_recognition", "string", label="进阶素材识别路由"),
_field("advanced_style_consensus", "string", label="进阶画风交叉归纳路由"),
_field("advanced_material_validation_generation", "string", label="进阶素材验证生图路由"),
_field("profile_parse", "string", label="角色导入解析路由"),
_field("persona_split", "string", label="人设拆解路由"),

查看文件

@ -1,7 +1,7 @@
plugin:
name: astrbot_plugin_imagestudio
display_name: ImageStudio
version: 1.0.53
version: 1.0.54
features:
quick_profile: true
@ -47,6 +47,8 @@ vision:
model_assignments:
material_recognition: material_vlm
advanced_material_recognition: material_vlm
# 留空时沿用进阶素材识别路由;填写后仅多图画风交叉归纳使用该视觉路由。
advanced_style_consensus: ""
advanced_material_validation_generation: ""
profile_parse: ""
persona_split: ""

查看文件

@ -10,7 +10,7 @@ from core.runtime_paths import resolve_config_path
from database.db_helper import load_config_payload
PLUGIN_VERSION = "1.0.53"
PLUGIN_VERSION = "1.0.54"
@dataclass(frozen=True)

查看文件

@ -1,12 +1,12 @@
{
"name": "astrbot-plugin-imagestudio-frontend",
"version": "1.0.53",
"version": "1.0.54",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "astrbot-plugin-imagestudio-frontend",
"version": "1.0.53",
"version": "1.0.54",
"dependencies": {
"@vitejs/plugin-vue": "^5.2.0",
"pinia": "^2.3.0",

查看文件

@ -1,6 +1,6 @@
{
"name": "astrbot-plugin-imagestudio-frontend",
"version": "1.0.53",
"version": "1.0.54",
"private": true,
"type": "module",
"scripts": {

查看文件

@ -36,6 +36,7 @@ const runtimeModels = ref<RuntimeModel[]>([])
const cards: Assignment[] = [
{ key: "material_recognition", title: "素材导入解析", description: "识别素材类别、描述、标签和生成提示词。", recommendation: "建议选择支持图片理解与结构化 JSON 输出的视觉模型;优先稳定和低成本,通常不需要最强推理模型。", kind: "vision", runtime: "active" },
{ key: "advanced_material_recognition", title: "进阶素材高保真识别", description: "尽可能完整提取颜色、材质、纹理、轮廓、结构和装饰细节,作为还原验证的文字基线。", recommendation: "建议选择视觉细节提取稳定、结构化 JSON 输出可靠的模型;这里应优先识别完整度,而不是创意改写能力。", kind: "vision", runtime: "active" },
{ key: "advanced_style_consensus", title: "进阶画风交叉归纳", description: "对多张已识别样本进行共性、差异和画师签名归纳。", recommendation: "建议选择支持多图输入、长上下文和稳定 JSON 输出的视觉模型;可与单图识别模型分开,降低大请求超时风险。", kind: "vision", runtime: "active" },
{ key: "advanced_material_validation_generation", title: "进阶素材验证生图", description: "仅根据识别提示词生成一张验证图,用于判断文字描述能否还原原素材。", recommendation: "建议选择提示词遵循和材质、结构还原能力稳定的生图模型;验证阶段不会把原图作为参考图传入。", kind: "image", runtime: "active" },
{ key: "profile_parse", title: "外部角色导入解析", description: "将外部角色文本拆成结构化角色字段。", recommendation: "建议选择指令遵循稳定、长文本处理好且支持 JSON 输出的文本模型;角色资料很长时关注上下文长度。", kind: "text", runtime: "rules" },
{ key: "persona_split", title: "角色设定拆解", description: "拆解身份、外观、服装、关系和世界观。", recommendation: "建议使用语义理解和信息抽取能力较强的文本模型,重点避免遗漏设定或把推测内容当成事实。", kind: "text", runtime: "rules" },

查看文件

@ -38,7 +38,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}},model_assignments:{material_recognition:"material_vlm",advanced_material_recognition:"material_vlm",advanced_material_validation_generation:"image_default",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:[]},advanced_materials:{cost_budget:{enabled:false,days:30,max_task_count:null,max_image_count:null,max_estimated_cost:null,price_key:"",per_request:0,per_image:0,per_1k_tokens:0}},chat_access:{group_allowlist:[],user_allowlist:[]},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",advanced_materials_path:"data/advanced_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",advanced_material_recognition:"material_vlm",advanced_style_consensus:"",advanced_material_validation_generation:"image_default",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:[]},advanced_materials:{cost_budget:{enabled:false,days:30,max_task_count:null,max_image_count:null,max_estimated_cost:null,price_key:"",per_request:0,per_image:0,per_1k_tokens:0}},chat_access:{group_allowlist:[],user_allowlist:[]},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",advanced_materials_path:"data/advanced_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:"advanced_materials",title:"进阶素材",fields:[]},{key:"prompt_governance",title:"提示词与内容分流",fields:[]},{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>>({})

查看文件

@ -2,7 +2,7 @@ name: astrbot_plugin_imagestudio
display_name: ImageStudio
desc: AstrBot >=4.25 ImageStudio role asset and image-generation workspace for Windows, Linux, macOS and Docker.
short_desc: AstrBot 鍐呯殑瑙掕壊璧勪骇銆佸伐浣滄祦涓庡浘鐗囩敓鎴愮鐞嗗伐浣滃彴銆?
version: 1.0.53
version: 1.0.54
author: YokiiroBW
repo: "http://192.168.31.210:18085/YokiiroBW/astrbot_plugin_imagestudio"
astrbot_version: ">=4.25.0,<5"

查看文件

@ -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-w6jYgE11.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-vON1Mq3d.css">
<script type="module" crossorigin src="./assets/index-B46TB2JW.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-CzoN1_Mb.css">
</head>
<body>
<div id="app"></div>

查看文件

@ -0,0 +1,29 @@
from backend.services.advanced_material_service import AdvancedMaterialService
def _service(config):
service = AdvancedMaterialService.__new__(AdvancedMaterialService)
service.config = config
return service
def test_style_consensus_route_can_be_configured_independently():
service = _service({
"model_assignments": {
"advanced_material_recognition": "gpt-vision-fast",
"advanced_style_consensus": "gpt-vision-long-context",
}
})
assert service._consensus_route() == "gpt-vision-long-context"
def test_style_consensus_route_falls_back_to_recognition_route_when_empty():
service = _service({
"model_assignments": {
"advanced_material_recognition": "gpt-vision-fast",
"advanced_style_consensus": "",
}
})
assert service._consensus_route() == "gpt-vision-fast"

文件差异因一行或多行过长而隐藏

文件差异因一行或多行过长而隐藏

查看文件

@ -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-D3hLsIA0.js"></script>
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-sCOYj51_.css">
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-CNbT4M0c.js"></script>
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-D0xKI0Zx.css">
</head>
<body>
<div id="app"></div>