Agent Zero AI framework
Reflect connector model overrides in Web UI
Alessandro7b61ceb241ed
diff --git a/plugins/_a0_connector/api/v1/model_switcher.py b/plugins/_a0_connector/api/v1/model_switcher.pyindex 70b7c0f6f..f3204daba 100644--- a/plugins/_a0_connector/api/v1/model_switcher.py+++ b/plugins/_a0_connector/api/v1/model_switcher.py@@ -1,11 +1,14 @@"""POST /api/plugins/_a0_connector/v1/model_switcher."""from __future__ import annotations+import timefrom typing import Callablefrom helpers.api import Request, Responseimport plugins._a0_connector.api.v1.base as connector_base+_MODEL_OVERRIDE_REVISION_KEY = "_model_config_override_revision"+def _model_payload(config: dict | None, *, has_api_key: bool = False) -> dict[str, object]:config = config or {}@@ -76,6 +79,18 @@ def _provider_payload(return options+def _notify_model_override_changed(context: object, context_id: str) -> None:+ if hasattr(context, "set_output_data"):+ context.set_output_data(_MODEL_OVERRIDE_REVISION_KEY, time.time())++ try:+ from helpers.state_monitor_integration import mark_dirty_for_context++ mark_dirty_for_context(context_id, reason="a0_connector.model_switcher")+ except Exception:+ pass++class ModelSwitcher(connector_base.ProtectedConnectorApiHandler):async def process(self, input: dict, request: Request) -> dict | Response:from agent import AgentContext@@ -142,11 +157,13 @@ class ModelSwitcher(connector_base.ProtectedConnectorApiHandler):return Response(status=404, response=f"Preset '{preset_name}' not found")context.set_data("chat_model_override", {"preset_name": preset_name})save_tmp_chat(context)+ _notify_model_override_changed(context, context_id)return build_state()if action == "clear":context.set_data("chat_model_override", None)save_tmp_chat(context)+ _notify_model_override_changed(context, context_id)return build_state()if action == "set_override":@@ -162,6 +179,7 @@ class ModelSwitcher(connector_base.ProtectedConnectorApiHandler):override["utility"] = utility_modelcontext.set_data("chat_model_override", override)save_tmp_chat(context)+ _notify_model_override_changed(context, context_id)return build_state()return Response(status=400, response=f"Unknown action: {action}")diff --git a/plugins/_model_config/api/model_override.py b/plugins/_model_config/api/model_override.pyindex 038969edb..663c4adbd 100644--- a/plugins/_model_config/api/model_override.py+++ b/plugins/_model_config/api/model_override.py@@ -1,8 +1,23 @@+import time+from helpers.api import ApiHandler, Request, Responsefrom helpers.persist_chat import save_tmp_chatfrom agent import AgentContextfrom plugins._model_config.helpers import model_config+_MODEL_OVERRIDE_REVISION_KEY = "_model_config_override_revision"+++def _notify_model_override_changed(ctx: AgentContext) -> None:+ ctx.set_output_data(_MODEL_OVERRIDE_REVISION_KEY, time.time())++ try:+ from helpers.state_monitor_integration import mark_dirty_for_context++ mark_dirty_for_context(ctx.id, reason="model_config.model_override")+ except Exception:+ pass+class ModelOverride(ApiHandler):async def process(self, input: dict, request: Request) -> dict | Response:@@ -29,6 +44,7 @@ class ModelOverride(ApiHandler):return Response(status=400, response="Missing or invalid override config")ctx.set_data("chat_model_override", override_config)save_tmp_chat(ctx)+ _notify_model_override_changed(ctx)return {"ok": True, "override": override_config}elif action == "set_preset":@@ -45,11 +61,13 @@ class ModelOverride(ApiHandler):override_value = {"preset_name": preset_name}ctx.set_data("chat_model_override", override_value)save_tmp_chat(ctx)+ _notify_model_override_changed(ctx)return {"ok": True, "preset_name": preset_name}elif action == "clear":ctx.set_data("chat_model_override", None)save_tmp_chat(ctx)+ _notify_model_override_changed(ctx)return {"ok": True, "override": None}return Response(status=400, response=f"Unknown action: {action}")diff --git a/plugins/_model_config/extensions/webui/apply_snapshot_before/refresh-switcher.js b/plugins/_model_config/extensions/webui/apply_snapshot_before/refresh-switcher.jsnew file mode 100644index 000000000..839fb34ae--- /dev/null+++ b/plugins/_model_config/extensions/webui/apply_snapshot_before/refresh-switcher.js@@ -0,0 +1,27 @@+import { store as modelConfigStore } from "/plugins/_model_config/webui/model-config-store.js";++const OVERRIDE_REVISION_KEY = "_model_config_override_revision";++let lastContextId = "";+let lastRevision = null;++export default async function refreshSwitcherOnOverrideRevision(ctx) {+ const snapshot = ctx?.snapshot;+ const contextId = String(snapshot?.context || "");++ if (!contextId) {+ lastContextId = "";+ lastRevision = null;+ return;+ }++ const contexts = Array.isArray(snapshot?.contexts) ? snapshot.contexts : [];+ const activeContext = contexts.find(item => item?.id === contextId) || null;+ const revision = activeContext?.[OVERRIDE_REVISION_KEY] || null;++ if (contextId === lastContextId && revision === lastRevision) return;++ lastContextId = contextId;+ lastRevision = revision;+ await modelConfigStore.refreshSwitcher(contextId);+}diff --git a/plugins/_model_config/webui/switcher-mixin.js b/plugins/_model_config/webui/switcher-mixin.jsindex 14b50a0d7..d1fda99c9 100644--- a/plugins/_model_config/webui/switcher-mixin.js+++ b/plugins/_model_config/webui/switcher-mixin.js@@ -5,6 +5,20 @@ const CREATE_AGENT_PROFILE_PROMPT = `I want to create a new Agent Zero agent proUse the a0-create-agent skill. Guide me gently with one or two questions per turn. Start by asking what this agent should be excellent at, infer sensible defaults, and only produce the AgentProfileBlueprint JSON after we confirm the compact profile summary. Prefer a normal user profile in /a0/usr/agents unless I choose another scope.`;+function normalizeModelIdentity(value) {+ if (!value || typeof value !== "object") return null;+ const provider = String(value.provider || "").trim();+ const name = String(value.name || "").trim();+ if (!provider && !name) return null;+ return { provider, name };+}++function formatModelIdentity(value) {+ if (!value) return "";+ if (value.provider && value.name) return `${value.provider}/${value.name}`;+ return value.name || value.provider || "";+}+export const switcherState = {switcherAllowed: false,switcherOverride: null,@@ -216,7 +230,10 @@ export const switcherMethods = {getSwitcherLabel() {const o = this.switcherOverride;if (!o) return 'Default LLM';- return o.preset_name || o.name || o.provider || 'Custom';+ if (o.preset_name) return o.preset_name;++ const models = this.getCustomOverrideModels();+ return formatModelIdentity(models.main) || formatModelIdentity(models.utility) || o.name || o.provider || 'Custom';},getActivePreset() {@@ -227,10 +244,21 @@ export const switcherMethods = {getActiveModels() {const preset = this.getActivePreset();- if (!preset) return { main: null, utility: null };+ if (preset) {+ return {+ main: normalizeModelIdentity(preset.chat),+ utility: normalizeModelIdentity(preset.utility),+ };+ }+ return this.getCustomOverrideModels();+ },++ getCustomOverrideModels() {+ const o = this.switcherOverride;+ if (!o || o.preset_name) return { main: null, utility: null };return {- main: preset.chat?.name ? { provider: preset.chat.provider, name: preset.chat.name } : null,- utility: preset.utility?.name ? { provider: preset.utility.provider, name: preset.utility.name } : null,+ main: normalizeModelIdentity(o.chat || o),+ utility: normalizeModelIdentity(o.utility),};},};diff --git a/tests/test_model_config_api_keys.py b/tests/test_model_config_api_keys.pyindex 41ba694f9..c5717dc11 100644--- a/tests/test_model_config_api_keys.py+++ b/tests/test_model_config_api_keys.py@@ -118,6 +118,84 @@ def test_model_config_frontend_tracks_inline_api_key_edits():assert "$store.modelConfig.resetApiKeyDrafts();" in modal_content+def test_model_switcher_frontend_renders_custom_overrides():+ switcher_path = PROJECT_ROOT / "plugins" / "_model_config" / "webui" / "switcher-mixin.js"+ refresh_extension_path = (+ PROJECT_ROOT+ / "plugins"+ / "_model_config"+ / "extensions"+ / "webui"+ / "apply_snapshot_before"+ / "refresh-switcher.js"+ )++ switcher_content = switcher_path.read_text(encoding="utf-8")+ refresh_extension_content = refresh_extension_path.read_text(encoding="utf-8")++ assert "function normalizeModelIdentity(value)" in switcher_content+ assert "formatModelIdentity(models.main)" in switcher_content+ assert "formatModelIdentity(models.utility)" in switcher_content+ assert "normalizeModelIdentity(o.chat || o)" in switcher_content+ assert "normalizeModelIdentity(o.utility)" in switcher_content+ assert "_model_config_override_revision" in refresh_extension_content+ assert "modelConfigStore.refreshSwitcher(contextId)" in refresh_extension_content+++def test_model_override_notifies_state_sync(monkeypatch):+ from helpers import state_monitor_integration+ from plugins._model_config.api import model_override++ calls = []++ class FakeContext:+ id = "ctx-1"++ def __init__(self):+ self.output_data = {}++ def set_output_data(self, key, value):+ self.output_data[key] = value++ ctx = FakeContext()+ monkeypatch.setattr(+ state_monitor_integration,+ "mark_dirty_for_context",+ lambda context_id, *, reason=None: calls.append((context_id, reason)),+ )++ model_override._notify_model_override_changed(ctx)++ assert "_model_config_override_revision" in ctx.output_data+ assert calls == [("ctx-1", "model_config.model_override")]+++def test_connector_model_switcher_notifies_state_sync(monkeypatch):+ from helpers import state_monitor_integration+ from plugins._a0_connector.api.v1 import model_switcher++ calls = []++ class FakeContext:+ def __init__(self):+ self.output_data = {}++ def set_output_data(self, key, value):+ self.output_data[key] = value++ ctx = FakeContext()+ monkeypatch.setattr(+ state_monitor_integration,+ "mark_dirty_for_context",+ lambda context_id, *, reason=None: calls.append((context_id, reason)),+ )++ model_switcher._notify_model_override_changed(ctx, "ctx-1")++ assert "_model_config_override_revision" in ctx.output_data+ assert calls == [("ctx-1", "a0_connector.model_switcher")]++def test_model_config_provider_switch_resets_custom_api_base():model_field_path = PROJECT_ROOT / "plugins" / "_model_config" / "webui" / "model-field.html"content = model_field_path.read_text(encoding="utf-8")