From 7ad6f3e36af32ab0090a3e63c76a0ecaff32a99b Mon Sep 17 00:00:00 2001 From: YokiiroBW Date: Mon, 20 Jul 2026 19:05:49 +0800 Subject: [PATCH] fix: honor consensus route on retries --- CHANGELOG.md | 4 ++++ backend/services/advanced_style_set_service.py | 4 ++-- config.yaml | 2 +- core/config_service.py | 2 +- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- main.py | 5 ++++- metadata.yaml | 2 +- tests/test_astrbot_runtime_config_bridge.py | 8 ++++++++ 9 files changed, 24 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e8742c..9aecae9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.56 + +- Ensure the dedicated consensus route overrides stale task snapshots and survives blank AstrBot runtime defaults. + ## 1.0.55 - Fix AstrBot runtime-config bridging for the independent `advanced_style_consensus` route so the selected model is actually used. diff --git a/backend/services/advanced_style_set_service.py b/backend/services/advanced_style_set_service.py index 0c6f399..c284e9d 100644 --- a/backend/services/advanced_style_set_service.py +++ b/backend/services/advanced_style_set_service.py @@ -1421,7 +1421,7 @@ class AdvancedStyleSetService: ], "automatic_review_feedback": automatic_review_feedback, } - route_name = consensus.model_route or self.owner._consensus_route() + route_name = self.owner._consensus_route() or consensus.model_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} ) @@ -2043,7 +2043,7 @@ class AdvancedStyleSetService: ) except Exception as exc: return {"status": "review_failed", "error": _safe_failure(exc)}, None - route_name = consensus.model_route or record.recognition_model_route or self.owner._recognition_route() + route_name = self.owner._consensus_route() or consensus.model_route or record.recognition_model_route or self.owner._recognition_route() provider = self.model_provider_runtime.vision_provider_for_route( { "route_name": route_name, diff --git a/config.yaml b/config.yaml index 394b12c..a05854d 100644 --- a/config.yaml +++ b/config.yaml @@ -1,7 +1,7 @@ plugin: name: astrbot_plugin_imagestudio display_name: ImageStudio - version: 1.0.55 + version: 1.0.56 features: quick_profile: true diff --git a/core/config_service.py b/core/config_service.py index 159b23f..0fc2702 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.55" +PLUGIN_VERSION = "1.0.56" @dataclass(frozen=True) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 934a37c..f48b60c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.55", + "version": "1.0.56", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.55", + "version": "1.0.56", "dependencies": { "@vitejs/plugin-vue": "^5.2.0", "pinia": "^2.3.0", diff --git a/frontend/package.json b/frontend/package.json index 9c975a2..e6514fb 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.55", + "version": "1.0.56", "private": true, "type": "module", "scripts": { diff --git a/main.py b/main.py index b81478f..ef69fe6 100644 --- a/main.py +++ b/main.py @@ -2041,13 +2041,16 @@ 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) if value is not _MISSING: _set_nested(patch, ("model_assignments", target_key), _runtime_text(value)) + consensus_route = _runtime_text(_runtime_value(mapping, "model_advanced_style_consensus")) + if consensus_route: + _set_nested(patch, ("model_assignments", "advanced_style_consensus"), consensus_route) + advanced_materials_path = _runtime_text( _runtime_value( mapping, diff --git a/metadata.yaml b/metadata.yaml index 6304f76..47e29a5 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.55 +version: 1.0.56 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 367ad88..6a5d4f2 100644 --- a/tests/test_astrbot_runtime_config_bridge.py +++ b/tests/test_astrbot_runtime_config_bridge.py @@ -201,3 +201,11 @@ def test_cross_review_ui_save_round_trips_through_astrbot_config( finally: db_helper.set_runtime_config_persister(None) db_helper.set_runtime_config_overrides({}) + + +def test_blank_dedicated_consensus_route_does_not_override_plugin_data() -> None: + patch = main._runtime_config_patch_from_mapping({ + "model_advanced_style_consensus": "", + }) + + assert patch.get("model_assignments", {}).get("advanced_style_consensus") is None