fix: honor consensus route on retries
这个提交存在于:
父节点
75286e1c54
当前提交
7ad6f3e36a
共有 9 个文件被更改,包括 24 次插入 和 9 次删除
|
|
@ -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
|
## 1.0.55
|
||||||
|
|
||||||
- Fix AstrBot runtime-config bridging for the independent `advanced_style_consensus` route so the selected model is actually used.
|
- Fix AstrBot runtime-config bridging for the independent `advanced_style_consensus` route so the selected model is actually used.
|
||||||
|
|
|
||||||
|
|
@ -1421,7 +1421,7 @@ class AdvancedStyleSetService:
|
||||||
],
|
],
|
||||||
"automatic_review_feedback": automatic_review_feedback,
|
"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(
|
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}
|
{"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:
|
except Exception as exc:
|
||||||
return {"status": "review_failed", "error": _safe_failure(exc)}, None
|
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(
|
provider = self.model_provider_runtime.vision_provider_for_route(
|
||||||
{
|
{
|
||||||
"route_name": route_name,
|
"route_name": route_name,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
plugin:
|
plugin:
|
||||||
name: astrbot_plugin_imagestudio
|
name: astrbot_plugin_imagestudio
|
||||||
display_name: ImageStudio
|
display_name: ImageStudio
|
||||||
version: 1.0.55
|
version: 1.0.56
|
||||||
|
|
||||||
features:
|
features:
|
||||||
quick_profile: true
|
quick_profile: true
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ from core.runtime_paths import resolve_config_path
|
||||||
from database.db_helper import load_config_payload
|
from database.db_helper import load_config_payload
|
||||||
|
|
||||||
|
|
||||||
PLUGIN_VERSION = "1.0.55"
|
PLUGIN_VERSION = "1.0.56"
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
@dataclass(frozen=True)
|
||||||
|
|
|
||||||
4
frontend/package-lock.json
自动生成
4
frontend/package-lock.json
自动生成
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "astrbot-plugin-imagestudio-frontend",
|
"name": "astrbot-plugin-imagestudio-frontend",
|
||||||
"version": "1.0.55",
|
"version": "1.0.56",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "astrbot-plugin-imagestudio-frontend",
|
"name": "astrbot-plugin-imagestudio-frontend",
|
||||||
"version": "1.0.55",
|
"version": "1.0.56",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vitejs/plugin-vue": "^5.2.0",
|
"@vitejs/plugin-vue": "^5.2.0",
|
||||||
"pinia": "^2.3.0",
|
"pinia": "^2.3.0",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "astrbot-plugin-imagestudio-frontend",
|
"name": "astrbot-plugin-imagestudio-frontend",
|
||||||
"version": "1.0.55",
|
"version": "1.0.56",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
||||||
5
main.py
5
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.
|
# fallback without a stale AstrBot runtime override restoring it.
|
||||||
for target_key, source_key in {
|
for target_key, source_key in {
|
||||||
"advanced_material_recognition": "model_advanced_material_recognition",
|
"advanced_material_recognition": "model_advanced_material_recognition",
|
||||||
"advanced_style_consensus": "model_advanced_style_consensus",
|
|
||||||
"advanced_material_validation_generation": "model_advanced_material_validation_generation",
|
"advanced_material_validation_generation": "model_advanced_material_validation_generation",
|
||||||
}.items():
|
}.items():
|
||||||
value = _runtime_value(mapping, source_key)
|
value = _runtime_value(mapping, source_key)
|
||||||
if value is not _MISSING:
|
if value is not _MISSING:
|
||||||
_set_nested(patch, ("model_assignments", target_key), _runtime_text(value))
|
_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(
|
advanced_materials_path = _runtime_text(
|
||||||
_runtime_value(
|
_runtime_value(
|
||||||
mapping,
|
mapping,
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ name: astrbot_plugin_imagestudio
|
||||||
display_name: ImageStudio
|
display_name: ImageStudio
|
||||||
desc: AstrBot >=4.25 ImageStudio role asset and image-generation workspace for Windows, Linux, macOS and Docker.
|
desc: AstrBot >=4.25 ImageStudio role asset and image-generation workspace for Windows, Linux, macOS and Docker.
|
||||||
short_desc: AstrBot 鍐呯殑瑙掕壊璧勪骇銆佸伐浣滄祦涓庡浘鐗囩敓鎴愮鐞嗗伐浣滃彴銆?
|
short_desc: AstrBot 鍐呯殑瑙掕壊璧勪骇銆佸伐浣滄祦涓庡浘鐗囩敓鎴愮鐞嗗伐浣滃彴銆?
|
||||||
version: 1.0.55
|
version: 1.0.56
|
||||||
author: YokiiroBW
|
author: YokiiroBW
|
||||||
repo: "http://192.168.31.210:18085/YokiiroBW/astrbot_plugin_imagestudio"
|
repo: "http://192.168.31.210:18085/YokiiroBW/astrbot_plugin_imagestudio"
|
||||||
astrbot_version: ">=4.25.0,<5"
|
astrbot_version: ">=4.25.0,<5"
|
||||||
|
|
|
||||||
|
|
@ -201,3 +201,11 @@ def test_cross_review_ui_save_round_trips_through_astrbot_config(
|
||||||
finally:
|
finally:
|
||||||
db_helper.set_runtime_config_persister(None)
|
db_helper.set_runtime_config_persister(None)
|
||||||
db_helper.set_runtime_config_overrides({})
|
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
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用