From 75286e1c54bc24082f51193fc4c016fd25fc62d4 Mon Sep 17 00:00:00 2001 From: YokiiroBW Date: Mon, 20 Jul 2026 18:59:06 +0800 Subject: [PATCH] fix: bridge dedicated consensus route settings --- CHANGELOG.md | 4 ++++ _conf_schema.json | 1 + config.yaml | 2 +- core/config_service.py | 2 +- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- main.py | 3 +++ metadata.yaml | 2 +- tests/test_astrbot_runtime_config_bridge.py | 4 ++++ 9 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7cab4d..2e8742c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.55 + +- Fix AstrBot runtime-config bridging for the independent `advanced_style_consensus` route so the selected model is actually used. + ## 1.0.54 - Add an independent `advanced_style_consensus` vision route for multi-image style cross-analysis; blank keeps the recognition-route fallback. diff --git a/_conf_schema.json b/_conf_schema.json index f5f8a78..f026248 100644 --- a/_conf_schema.json +++ b/_conf_schema.json @@ -80,6 +80,7 @@ "default": true }, "model_material_recognition": {"description":"素材导入解析使用的 Vision 路由。","type":"string","default":"material_vlm"}, + "model_advanced_style_consensus": {"description":"\u8fdb\u9636\u753b\u98ce\u591a\u56fe\u4ea4\u53c9\u5f52\u7eb3\u4f7f\u7528\u7684 Vision \u8def\u7531\uff1b\u7559\u7a7a\u65f6\u6cbf\u7528\u8fdb\u9636\u7d20\u6750\u8bc6\u522b\u8def\u7531\u3002","type":"string","default":""}, "model_advanced_material_recognition": {"description":"进阶素材导入与高保真特征提取使用的 Vision 路由。","type":"string","default":"material_vlm"}, "model_advanced_material_validation_generation": {"description":"进阶素材还原度验证图使用的生图路由。留空时回退到默认生图路由。","type":"string","default":""}, "advanced_material_budget_enabled": {"description":"启用进阶素材验证图预算守卫。","type":"bool","default":false}, diff --git a/config.yaml b/config.yaml index 4537d51..394b12c 100644 --- a/config.yaml +++ b/config.yaml @@ -1,7 +1,7 @@ plugin: name: astrbot_plugin_imagestudio display_name: ImageStudio - version: 1.0.54 + version: 1.0.55 features: quick_profile: true diff --git a/core/config_service.py b/core/config_service.py index 1a0fae6..159b23f 100644 --- a/core/config_service.py +++ b/core/config_service.py @@ -10,7 +10,7 @@ from core.runtime_paths import resolve_config_path from database.db_helper import load_config_payload -PLUGIN_VERSION = "1.0.54" +PLUGIN_VERSION = "1.0.55" @dataclass(frozen=True) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e2d0bb0..934a37c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.54", + "version": "1.0.55", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.54", + "version": "1.0.55", "dependencies": { "@vitejs/plugin-vue": "^5.2.0", "pinia": "^2.3.0", diff --git a/frontend/package.json b/frontend/package.json index fb3925e..9c975a2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.54", + "version": "1.0.55", "private": true, "type": "module", "scripts": { diff --git a/main.py b/main.py index c10f60b..b81478f 100644 --- a/main.py +++ b/main.py @@ -126,6 +126,7 @@ _RUNTIME_PATH_TO_ASTRBOT_KEY = { "vision.provider.enabled": "vision_provider_enabled", "model_assignments.material_recognition": "model_material_recognition", "model_assignments.advanced_material_recognition": "model_advanced_material_recognition", + "model_assignments.advanced_style_consensus": "model_advanced_style_consensus", "model_assignments.advanced_material_validation_generation": "model_advanced_material_validation_generation", "advanced_materials.cost_budget.enabled": "advanced_material_budget_enabled", "advanced_materials.cost_budget.days": "advanced_material_budget_days", @@ -1797,6 +1798,7 @@ def _mapping_from_runtime_config(config: Any | None) -> dict[str, Any]: "vision_provider_enabled", "model_material_recognition", "model_advanced_material_recognition", + "model_advanced_style_consensus", "model_advanced_material_validation_generation", "advanced_material_budget_enabled", "advanced_material_budget_days", @@ -2039,6 +2041,7 @@ def _runtime_config_patch_from_mapping(mapping: Mapping[str, Any]) -> dict[str, # fallback without a stale AstrBot runtime override restoring it. for target_key, source_key in { "advanced_material_recognition": "model_advanced_material_recognition", + "advanced_style_consensus": "model_advanced_style_consensus", "advanced_material_validation_generation": "model_advanced_material_validation_generation", }.items(): value = _runtime_value(mapping, source_key) diff --git a/metadata.yaml b/metadata.yaml index 7c6176f..6304f76 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -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.54 +version: 1.0.55 author: YokiiroBW repo: "http://192.168.31.210:18085/YokiiroBW/astrbot_plugin_imagestudio" astrbot_version: ">=4.25.0,<5" diff --git a/tests/test_astrbot_runtime_config_bridge.py b/tests/test_astrbot_runtime_config_bridge.py index 7cb5b4c..367ad88 100644 --- a/tests/test_astrbot_runtime_config_bridge.py +++ b/tests/test_astrbot_runtime_config_bridge.py @@ -30,6 +30,8 @@ def _cross_review_config() -> _AstrBotConfig: "model_generation_cross_review_primary": "image-primary", "model_generation_cross_review_secondary": "image-secondary", "model_generation_cross_review_routes": ["image-primary", "image-secondary"], + "model_advanced_material_recognition": "vision-fast", + "model_advanced_style_consensus": "vision-long-context", } ) @@ -54,6 +56,8 @@ def test_cross_review_assignments_map_from_flat_astrbot_config() -> None: assert patch["model_assignments"] == { "visual_review_routes": ["vision-primary", "vision-secondary"], + "advanced_material_recognition": "vision-fast", + "advanced_style_consensus": "vision-long-context", "cross_review_primary": "vision-primary", "cross_review_secondary": "vision-secondary", "cross_review_routes": ["vision-primary", "vision-secondary"],