Agent Zero AI framework
Refactor: Unify frontend to Alpine Store pattern
keyboardstaff2e4b0241175a
diff --git a/plugins/_model_config/extensions/webui/chat-input-start/model-switcher.html b/plugins/_model_config/extensions/webui/chat-input-start/model-switcher.htmlindex 7d5bc239f..6cc3cc682 100644--- a/plugins/_model_config/extensions/webui/chat-input-start/model-switcher.html+++ b/plugins/_model_config/extensions/webui/chat-input-start/model-switcher.html@@ -1,103 +1,59 @@<!-- Model Switcher - Floating Preset Selector -->-<div x-data="{- allowed: false,- override: null,- loading: true,- showDropdown: false,- presets: [],- _fns: null,+<script type="module">+ import { store } from "/plugins/_model_config/webui/model-config-store.js";+</script>- async init() {- this._fns = await import('/plugins/_model_config/webui/model-switcher.js');- await this.refresh();- this.$watch('$store.chats.selected', () => this.refresh());- },-- async refresh() {- this.loading = true;- try {- const contextId = this.$store.chats?.selected || '';- const state = await this._fns.loadSwitcherState(contextId);- this.allowed = state.allowed;- this.presets = state.presets;- this.override = state.override;- } catch (e) {- console.error('Model switcher refresh failed:', e);- } finally {- this.loading = false;- }- },-- get currentLabel() {- if (!this.override) return 'Default';- if (this.override.preset_name) return this.override.preset_name;- const p = this.override.provider || '';- const n = this.override.name || '';- return n || p || 'Custom';- },-- get hasOverride() {- return !!this.override;- },-- async selectPreset(presetName) {- const contextId = this.$store.chats?.selected || '';- if (!contextId) return;- const ok = await this._fns.setPresetOverride(contextId, presetName);- if (ok) {- this.override = { preset_name: presetName };- justToast('Switched to ' + presetName, 'success');- }- this.showDropdown = false;- },-- async clearOverride() {- const contextId = this.$store.chats?.selected || '';- if (!contextId) return;- const ok = await this._fns.clearOverride(contextId);- if (ok) {- this.override = null;- justToast('Reverted to default model', 'info');- }- this.showDropdown = false;- }-}">- <template x-if="allowed && !loading">+<div x-data>+<template x-if="$store.modelConfig">+<div x-data="{ showDropdown: false }"+ x-init="+ await $store.modelConfig.refreshSwitcher($store.chats?.selected || '');+ $watch('$store.chats.selected', v => $store.modelConfig.refreshSwitcher(v || ''));+ ">+ <template x-if="$store.modelConfig.switcherAllowed && !$store.modelConfig.switcherLoading"><div class="model-switcher-container"><div class="model-switcher-anchor"><button class="model-switcher-btn"- :class="{ 'has-override': hasOverride }"+ :class="{ 'has-override': !!$store.modelConfig.switcherOverride }"@click="showDropdown = !showDropdown"@click.outside="showDropdown = false"><span class="material-symbols-outlined" style="font-size: 15px;">swap_horiz</span>- <span class="model-switcher-label" x-text="currentLabel"></span>+ <span class="model-switcher-label" x-text="$store.modelConfig.getSwitcherLabel()"></span><span class="material-symbols-outlined" style="font-size: 14px;"x-text="showDropdown ? 'expand_less' : 'expand_more'"></span></button><div class="model-switcher-dropdown" x-show="showDropdown" x-transition.opacity><!-- Use Default -->- <template x-if="hasOverride">- <div class="model-switcher-item revert" @click="clearOverride()">+ <template x-if="$store.modelConfig.switcherOverride">+ <div class="model-switcher-item revert" @click="+ $store.modelConfig.clearOverrideSwitch($store.chats?.selected || '');+ justToast('Reverted to default model', 'info');+ showDropdown = false;+ "><span class="material-symbols-outlined" style="font-size: 15px;">undo</span><span>Use Default</span></div></template>- <div class="model-switcher-divider" x-show="hasOverride"></div>+ <div class="model-switcher-divider" x-show="$store.modelConfig.switcherOverride"></div><!-- No presets message -->- <template x-if="presets.length === 0">+ <template x-if="$store.modelConfig.switcherPresets.length === 0"><div class="model-switcher-item disabled">No presets configured</div></template><!-- Preset list -->- <template x-for="preset in presets" :key="preset.name">+ <template x-for="preset in $store.modelConfig.switcherPresets" :key="preset.name"><div class="model-switcher-item"- :class="{ 'active': override?.preset_name === preset.name }"- @click="selectPreset(preset.name)">+ :class="{ 'active': $store.modelConfig.switcherOverride?.preset_name === preset.name }"+ @click="+ $store.modelConfig.selectPresetSwitch($store.chats?.selected || '', preset.name);+ justToast('Switched to ' + preset.name, 'success');+ showDropdown = false;+ "><div class="model-switcher-preset-name" x-text="preset.name"></div><div class="model-switcher-preset-detail"- x-text="_fns.getPresetSummary(preset)"></div>+ x-text="$store.modelConfig.getPresetSummary(preset)"></div></div></template></div>@@ -105,6 +61,8 @@</div></template></div>+</template>+</div><style>.model-switcher-container {diff --git a/plugins/_model_config/webui/api-keys.html b/plugins/_model_config/webui/api-keys.htmlindex f743a401a..4730425d0 100644--- a/plugins/_model_config/webui/api-keys.html+++ b/plugins/_model_config/webui/api-keys.html@@ -4,73 +4,18 @@</head><body>-<div x-data="{- _fns: null,- providers: [],- keys: {},- loading: true,- _debounceTimers: {},+<script type="module">+ import { store } from "/plugins/_model_config/webui/model-config-store.js";+</script>- async init() {- this._fns = await import('/plugins/_model_config/webui/config-store.js');- this.loading = true;- try {- const data = await this._fns.loadConfigData();- const chatProviders = data.chat_providers || [];- const embedProviders = data.embedding_providers || [];- const apiKeyStatus = data.api_key_status || {};-- // Deduplicate providers- const seen = new Set();- this.providers = [];- for (const p of [...chatProviders, ...embedProviders]) {- if (!p.value || seen.has(p.value.toLowerCase())) continue;- seen.add(p.value.toLowerCase());- this.providers.push({- value: p.value,- label: p.label || p.value,- has_key: !!apiKeyStatus[p.value]- });- }- this.providers.sort((a, b) => a.label.localeCompare(b.label));-- this.keys = {};- for (const p of this.providers) {- this.keys[p.value] = '';- }- } catch (e) {- console.error('Failed to load API key providers:', e);- } finally {- this.loading = false;- }- },-- onKeyInput(provider) {- clearTimeout(this._debounceTimers[provider]);- this._debounceTimers[provider] = setTimeout(() => this.saveKey(provider), 800);- },-- async saveKey(provider) {- const val = this.keys[provider];- if (!val) return;- try {- await this._fns.saveApiKey(provider, val);- const p = this.providers.find(x => x.value === provider);- if (p) p.has_key = true;- } catch (e) {- console.error('Failed to save API key:', e);- }- },-- async revealKey(provider) {- try {- const val = await this._fns.revealApiKey(provider);- if (val) this.keys[provider] = val;- } catch (e) {- console.error('Failed to reveal API key:', e);- }- }-}">+<div x-data>+<template x-if="$store.modelConfig">+<div x-data="{ keys: {}, loading: true }"+ x-init="+ await $store.modelConfig.ensureLoaded();+ $store.modelConfig.allProviders.forEach(p => keys[p.value] = '');+ loading = false;+ "><div class="api-keys-section"><div class="section-title">API Keys</div>@@ -84,7 +29,7 @@</div><div x-show="!loading">- <template x-for="provider in providers" :key="provider.value">+ <template x-for="provider in $store.modelConfig.allProviders" :key="provider.value"><div class="field"><div class="field-label"><div class="field-title" x-text="provider.label"></div>@@ -94,13 +39,13 @@x-model="keys[provider.value]":placeholder="provider.has_key ? '••••••••••••' : ''"autocomplete="off"- @input="onKeyInput(provider.value)"+ @input.debounce.800ms="keys[provider.value] && $store.modelConfig.saveApiKey(provider.value, keys[provider.value])"style="padding-right:32px;" /><span class="material-symbols-outlined eye-toggle"@click="showKey = !showKey;if (showKey && !keys[provider.value] && provider.has_key) {- revealKey(provider.value);+ $store.modelConfig.revealApiKey(provider.value).then(v => { if (v) keys[provider.value] = v; });}"x-text="showKey ? 'visibility' : 'visibility_off'"></span>@@ -114,6 +59,8 @@<button class="btn btn-cancel" @click="closeModal()">Close</button></div></div>+</template>+</div><style>.api-keys-section {diff --git a/plugins/_model_config/webui/config-store.js b/plugins/_model_config/webui/config-store.jsdeleted file mode 100644index 7b30db4c3..000000000--- a/plugins/_model_config/webui/config-store.js+++ /dev/null@@ -1,115 +0,0 @@-export const MODEL_SECTIONS = [- { key: 'chat_model', title: 'Main Model', desc: 'Primary model for chat, reasoning, and browser tasks.' },- { key: 'utility_model', title: 'Utility Model', desc: 'Lightweight model for background tasks: memory management, prompt preparation, summarization.' },- { key: 'embedding_model', title: 'Embedding Model', desc: 'Model for generating vector embeddings used in knowledge retrieval.' }-];--export function kwargsToText(obj) {- if (!obj || typeof obj !== 'object') return '';- return Object.entries(obj).map(([k, v]) => {- if (typeof v === 'string') return k + '=' + JSON.stringify(v);- return k + '=' + (typeof v === 'object' ? JSON.stringify(v) : String(v));- }).join('\n');-}--export function textToKwargs(text) {- const d = {};- (text || '').split('\n').forEach(l => {- l = l.trim();- if (!l || l.startsWith('#')) return;- const i = l.indexOf('=');- if (i > 0) {- const key = l.substring(0, i).trim();- let val = l.substring(i + 1).trim();- try { val = JSON.parse(val); } catch {}- d[key] = val;- }- });- return d;-}--export function textToHeaders(text) {- const d = {};- (text || '').split('\n').forEach(l => {- l = l.trim();- if (!l || l.startsWith('#')) return;- const i = l.indexOf('=');- if (i > 0) d[l.substring(0, i).trim()] = l.substring(i + 1).trim();- });- return d;-}--export async function loadConfigData() {- const res = await fetchApi('/plugins/_model_config/model_config_get', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({})- });- return await res.json();-}--export async function saveApiKey(provider, value) {- await fetchApi('/plugins/_model_config/api_keys', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ action: 'set', keys: { [provider]: value } })- });-}--export async function revealApiKey(provider) {- const res = await fetchApi('/plugins/_model_config/api_keys', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ action: 'reveal', provider })- });- const data = await res.json();- return data.value || '';-}--export async function searchModels(provider, query, modelType, apiBase) {- if (!provider) return [];- try {- const res = await fetchApi('/plugins/_model_config/model_search', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ provider, query: query || '', model_type: modelType || 'chat', api_base: apiBase || '' })- });- const data = await res.json();- return data.models || [];- } catch (e) {- console.error('Model search failed:', e);- return [];- }-}--export function initConfigFields(config) {- if (config?.chat_model) config.chat_model._kwargs_text = kwargsToText(config.chat_model.kwargs);- if (config?.utility_model) config.utility_model._kwargs_text = kwargsToText(config.utility_model.kwargs);- if (config?.embedding_model) config.embedding_model._kwargs_text = kwargsToText(config.embedding_model.kwargs);- if (config) config._browser_headers_text = Object.entries(config.browser_http_headers || {}).map(([k, v]) => k + '=' + v).join('\n');- if (config) {- if (!config.model_presets) config.model_presets = [];- config.model_presets = config.model_presets.map(p => ({- name: p.name || '',- chat: { provider: '', name: '', api_key: '', api_base: '', ...(p.chat || {}) },- utility: { provider: '', name: '', api_key: '', api_base: '', ...(p.utility || {}) },- }));- }-}--export async function initConfigComponent(comp, config) {- const data = await loadConfigData();- comp.chatProviders = data.chat_providers || [];- comp.embeddingProviders = data.embedding_providers || [];- comp.apiKeyStatus = data.api_key_status || {};- const allProviders = [...comp.chatProviders, ...comp.embeddingProviders];- const newKeys = { ...comp.apiKeyValues };- const seen = new Set();- for (const p of allProviders) {- if (!p.value || seen.has(p.value)) continue;- seen.add(p.value);- if (!(p.value in newKeys)) newKeys[p.value] = '';- }- comp.apiKeyValues = newKeys;- initConfigFields(config);-}diff --git a/plugins/_model_config/webui/config.html b/plugins/_model_config/webui/config.htmlindex d7e11cc3f..e31fd8114 100644--- a/plugins/_model_config/webui/config.html+++ b/plugins/_model_config/webui/config.html@@ -1,41 +1,18 @@<html><head><title>Model Configuration</title>+ <script type="module">+ import { store } from "/plugins/_model_config/webui/model-config-store.js";+ </script></head><body>- <div x-data="{- _fns: null,- chatProviders: [],- embeddingProviders: [],- apiKeyStatus: {},- apiKeyValues: {},- providersReady: false,- _debounceTimers: {},- modelSections: [],- getProviders(key) { return key === 'embedding_model' ? this.embeddingProviders : this.chatProviders; },- getSearchType(key) { return key === 'embedding_model' ? 'embedding' : 'chat'; },- onApiKeyInput(provider) {- clearTimeout(this._debounceTimers['ak_' + provider]);- this._debounceTimers['ak_' + provider] = setTimeout(() => this._saveKey(provider), 800);- },- async _saveKey(provider) {- if (!this.apiKeyValues[provider] || !this._fns) return;- try {- await this._fns.saveApiKey(provider, this.apiKeyValues[provider]);- this.apiKeyStatus = { ...this.apiKeyStatus, [provider]: true };- } catch (e) { console.error('Failed to save API key:', e); }- }- }"+ <div x-datax-init="- _fns = await import('/plugins/_model_config/webui/config-store.js');- modelSections = _fns.MODEL_SECTIONS;- try {- await _fns.initConfigComponent($data, config);- } catch (e) { console.error('Config init failed:', e); }- providersReady = true;+ await $store.modelConfig.ensureLoaded();+ $store.modelConfig.initConfigFields(config);">- <template x-if="config && providersReady">+ <template x-if="config && $store.modelConfig._loaded"><div class="model-config-sections"><!-- Per-Chat Override -->@@ -96,9 +73,9 @@</div><div class="field-control"><select x-model="preset.chat.provider"- x-effect="$nextTick(() => { if (chatProviders.length) $el.value = preset.chat.provider })">+ x-effect="$nextTick(() => { if ($store.modelConfig.chatProviders.length) $el.value = preset.chat.provider })"><option value="">— select —</option>- <template x-for="p in chatProviders" :key="p.value">+ <template x-for="p in $store.modelConfig.chatProviders" :key="p.value"><option :value="p.value" x-text="p.label"></option></template></select>@@ -111,7 +88,7 @@</div><div class="field-control" style="position:relative;"x-data="{ results: [], open: false, searching: false,- doSearch() { this.searching = true; _fns.searchModels(preset.chat.provider, preset.chat.name, 'chat', preset.chat.api_base).then(r => { this.results = r; this.open = true; }).finally(() => this.searching = false); }+ doSearch() { this.searching = true; $store.modelConfig.searchModels(preset.chat.provider, preset.chat.name, 'chat', preset.chat.api_base).then(r => { this.results = r; this.open = true; }).finally(() => this.searching = false); }}"@click.outside="open = false"><input type="text" x-model="preset.chat.name" style="padding-right:32px;"@@ -135,17 +112,17 @@<div class="field"><div class="field-label"><div class="field-title">API key</div>- <div class="field-description">Leave empty to use the global API key for this provider.</div>+ <div class="field-description">Leave empty to use the default API key for this provider.</div></div><div class="field-control" style="position:relative;" x-data="{ showKey: false, _revealed: '' }"><input :type="showKey ? 'text' : 'password'" x-model="preset.chat.api_key" autocomplete="off"- :placeholder="apiKeyStatus[preset.chat.provider] ? '••••••••••••' : ''"+ :placeholder="$store.modelConfig.apiKeyStatus[preset.chat.provider] ? '••••••••••••' : ''"style="padding-right:32px;" /><span class="material-symbols-outlined eye-toggle"@click="showKey = !showKey;- if (showKey && !preset.chat.api_key && apiKeyStatus[preset.chat.provider]) {- _fns.revealApiKey(preset.chat.provider).then(v => { if (v) { preset.chat.api_key = v; _revealed = v; } });+ if (showKey && !preset.chat.api_key && $store.modelConfig.apiKeyStatus[preset.chat.provider]) {+ $store.modelConfig.revealApiKey(preset.chat.provider).then(v => { if (v) { preset.chat.api_key = v; _revealed = v; } });}if (!showKey && _revealed && preset.chat.api_key === _revealed) {preset.chat.api_key = ''; _revealed = '';@@ -162,17 +139,17 @@<div class="field-control"><input type="text" x-model="preset.chat.api_base" /></div></div>- <div class="preset-subheader">Utility Model <span style="opacity:0.5; font-size:0.75rem;">(optional — falls back to global Utility Model)</span></div>+ <div class="preset-subheader">Utility Model <span style="opacity:0.5; font-size:0.75rem;">(optional — falls back to Default Utility Model)</span></div><div class="field"><div class="field-label"><div class="field-title">Provider</div>- <div class="field-description">Leave empty to use the global Utility Model provider.</div>+ <div class="field-description">Leave empty to use the Default Utility Model provider.</div></div><div class="field-control"><select x-model="preset.utility.provider"- x-effect="$nextTick(() => { if (chatProviders.length) $el.value = preset.utility.provider })">+ x-effect="$nextTick(() => { if ($store.modelConfig.chatProviders.length) $el.value = preset.utility.provider })"><option value="">— default —</option>- <template x-for="p in chatProviders" :key="p.value">+ <template x-for="p in $store.modelConfig.chatProviders" :key="p.value"><option :value="p.value" x-text="p.label"></option></template></select>@@ -181,14 +158,14 @@<div class="field"><div class="field-label"><div class="field-title">Model name</div>- <div class="field-description">Model for background tasks. Leave empty to use the global Utility Model.</div>+ <div class="field-description">Leave empty to use the Default Utility Model.</div></div><div class="field-control" style="position:relative;"x-data="{ results: [], open: false, searching: false,- doSearch() { this.searching = true; _fns.searchModels(preset.utility.provider || preset.chat.provider, preset.utility.name, 'chat', preset.utility.api_base || preset.chat.api_base).then(r => { this.results = r; this.open = true; }).finally(() => this.searching = false); }+ doSearch() { this.searching = true; $store.modelConfig.searchModels(preset.utility.provider || preset.chat.provider, preset.utility.name, 'chat', preset.utility.api_base || preset.chat.api_base).then(r => { this.results = r; this.open = true; }).finally(() => this.searching = false); }}"@click.outside="open = false">- <input type="text" x-model="preset.utility.name" placeholder="Leave empty for default" style="padding-right:32px;"+ <input type="text" x-model="preset.utility.name" style="padding-right:32px;"@keydown.enter.prevent="doSearch()" /><span class="model-search-btn"@click="if (!searching) doSearch()"@@ -209,18 +186,18 @@<div class="field"><div class="field-label"><div class="field-title">API key</div>- <div class="field-description">Leave empty to use the global API key for this provider.</div>+ <div class="field-description">Leave empty to use the default API key for this provider.</div></div><div class="field-control" style="position:relative;" x-data="{ showKey: false, _revealed: '' }"><input :type="showKey ? 'text' : 'password'" x-model="preset.utility.api_key" autocomplete="off"- :placeholder="apiKeyStatus[preset.utility.provider || preset.chat.provider] ? '••••••••••••' : ''"+ :placeholder="$store.modelConfig.apiKeyStatus[preset.utility.provider || preset.chat.provider] ? '••••••••••••' : ''"style="padding-right:32px;" /><span class="material-symbols-outlined eye-toggle"@click="const prov = preset.utility.provider || preset.chat.provider;showKey = !showKey;- if (showKey && !preset.utility.api_key && apiKeyStatus[prov]) {- _fns.revealApiKey(prov).then(v => { if (v) { preset.utility.api_key = v; _revealed = v; } });+ if (showKey && !preset.utility.api_key && $store.modelConfig.apiKeyStatus[prov]) {+ $store.modelConfig.revealApiKey(prov).then(v => { if (v) { preset.utility.api_key = v; _revealed = v; } });}if (!showKey && _revealed && preset.utility.api_key === _revealed) {preset.utility.api_key = ''; _revealed = '';@@ -255,7 +232,7 @@</div><!-- Model Sections (Main, Utility, Embedding) -->- <template x-for="section in modelSections" :key="section.key">+ <template x-for="section in $store.modelConfig.MODEL_SECTIONS" :key="section.key"><div class="model-section"><div class="section-title" x-text="section.title"></div><div class="section-description" x-text="section.desc"></div>@@ -268,8 +245,8 @@</div><div class="field-control"><select x-model="config[section.key].provider"- x-effect="$nextTick(() => { if (getProviders(section.key).length) $el.value = config[section.key].provider })">- <template x-for="p in getProviders(section.key)" :key="p.value">+ x-effect="$nextTick(() => { if ($store.modelConfig.getProviders(section.key).length) $el.value = config[section.key].provider })">+ <template x-for="p in $store.modelConfig.getProviders(section.key)" :key="p.value"><option :value="p.value" x-text="p.label"></option></template></select>@@ -284,7 +261,7 @@</div><div class="field-control" style="position:relative;"x-data="{ results: [], open: false, searching: false,- doSearch() { this.searching = true; _fns.searchModels(config[section.key].provider, config[section.key].name, getSearchType(section.key), config[section.key].api_base).then(r => { this.results = r; this.open = true; }).finally(() => this.searching = false); }+ doSearch() { this.searching = true; $store.modelConfig.searchModels(config[section.key].provider, config[section.key].name, $store.modelConfig.getSearchType(section.key), config[section.key].api_base).then(r => { this.results = r; this.open = true; }).finally(() => this.searching = false); }}"@click.outside="open = false"><input type="text" x-model="config[section.key].name" style="padding-right:32px;"@@ -314,17 +291,17 @@</div><div class="field-control" style="position:relative;" x-data="{ showKey: false }"><input :type="showKey ? 'text' : 'password'"- x-model="apiKeyValues[config[section.key].provider]"- :placeholder="apiKeyStatus[config[section.key].provider] ? '••••••••••••' : ''"+ x-model="$store.modelConfig.apiKeyValues[config[section.key].provider]"+ :placeholder="$store.modelConfig.apiKeyStatus[config[section.key].provider] ? '••••••••••••' : ''"autocomplete="off"- @input="onApiKeyInput(config[section.key].provider)"+ @input.debounce.800ms="$store.modelConfig.saveApiKeyIfSet(config[section.key].provider)"style="padding-right:32px;" /><span class="material-symbols-outlined eye-toggle"@click="showKey = !showKey;const prov = config[section.key].provider;- if (showKey && !apiKeyValues[prov] && apiKeyStatus[prov]) {- _fns.revealApiKey(prov).then(v => { if (v) apiKeyValues[prov] = v; });+ if (showKey && !$store.modelConfig.apiKeyValues[prov] && $store.modelConfig.apiKeyStatus[prov]) {+ $store.modelConfig.revealApiKey(prov).then(v => { if (v) $store.modelConfig.apiKeyValues[prov] = v; });}"x-text="showKey ? 'visibility' : 'visibility_off'"></span>@@ -454,7 +431,7 @@</div><div class="field-control"><textarea x-model="config[section.key]._kwargs_text"- @change="config[section.key].kwargs = _fns.textToKwargs(config[section.key]._kwargs_text)"></textarea>+ @change="config[section.key].kwargs = $store.modelConfig.textToKwargs(config[section.key]._kwargs_text)"></textarea></div></div>@@ -469,7 +446,7 @@</div><div class="field-control"><textarea x-model="config._browser_headers_text"- @change="config.browser_http_headers = _fns.textToHeaders(config._browser_headers_text)"></textarea>+ @change="config.browser_http_headers = $store.modelConfig.textToHeaders(config._browser_headers_text)"></textarea></div></div></template>diff --git a/plugins/_model_config/webui/model-config-store.js b/plugins/_model_config/webui/model-config-store.jsnew file mode 100644index 000000000..46810d63d--- /dev/null+++ b/plugins/_model_config/webui/model-config-store.js@@ -0,0 +1,287 @@+import { createStore } from "/js/AlpineStore.js";+++export const MODEL_SECTIONS = [+ { key: 'chat_model', title: 'Main Model', desc: 'Primary model for chat, reasoning, and browser tasks.' },+ { key: 'utility_model', title: 'Utility Model', desc: 'Lightweight model for background tasks: memory management, prompt preparation, summarization.' },+ { key: 'embedding_model', title: 'Embedding Model', desc: 'Model for generating vector embeddings used in knowledge retrieval.' }+];++export function kwargsToText(obj) {+ if (!obj || typeof obj !== 'object') return '';+ return Object.entries(obj).map(([k, v]) => {+ if (typeof v === 'string') return k + '=' + JSON.stringify(v);+ return k + '=' + (typeof v === 'object' ? JSON.stringify(v) : String(v));+ }).join('\n');+}++export function textToKwargs(text) {+ const d = {};+ (text || '').split('\n').forEach(l => {+ l = l.trim();+ if (!l || l.startsWith('#')) return;+ const i = l.indexOf('=');+ if (i > 0) {+ const key = l.substring(0, i).trim();+ let val = l.substring(i + 1).trim();+ try { val = JSON.parse(val); } catch {}+ d[key] = val;+ }+ });+ return d;+}++export function textToHeaders(text) {+ const d = {};+ (text || '').split('\n').forEach(l => {+ l = l.trim();+ if (!l || l.startsWith('#')) return;+ const i = l.indexOf('=');+ if (i > 0) d[l.substring(0, i).trim()] = l.substring(i + 1).trim();+ });+ return d;+}++// ── Alpine Store ──++const API_BASE = "/plugins/_model_config";++export const store = createStore("modelConfig", {+ // Shared state+ chatProviders: [],+ embeddingProviders: [],+ apiKeyStatus: {},+ apiKeyValues: {},+ allProviders: [],+ _loaded: false,++ // Switcher state+ switcherAllowed: false,+ switcherOverride: null,+ switcherPresets: [],+ switcherLoading: true,++ init() {},++ async ensureLoaded() {+ if (this._loaded) return;+ const data = await this._fetchConfigData();+ this.chatProviders = data.chat_providers || [];+ this.embeddingProviders = data.embedding_providers || [];+ this.apiKeyStatus = data.api_key_status || {};+ const keys = {};+ const seen = new Set();+ for (const p of [...this.chatProviders, ...this.embeddingProviders]) {+ if (!p.value || seen.has(p.value)) continue;+ seen.add(p.value);+ if (!(p.value in keys)) keys[p.value] = '';+ }+ this.apiKeyValues = keys;++ const allProviders = [];+ const provSeen = new Set();+ for (const p of [...this.chatProviders, ...this.embeddingProviders]) {+ if (!p.value || provSeen.has(p.value.toLowerCase())) continue;+ provSeen.add(p.value.toLowerCase());+ allProviders.push({ value: p.value, label: p.label || p.value, has_key: !!this.apiKeyStatus[p.value] });+ }+ allProviders.sort((a, b) => a.label.localeCompare(b.label));+ this.allProviders = allProviders;++ this._loaded = true;+ },++ async _fetchConfigData() {+ const res = await fetchApi(`${API_BASE}/model_config_get`, {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({})+ });+ return await res.json();+ },++ // Config field initialization (converts kwargs dicts to editable text)+ initConfigFields(config) {+ if (config?.chat_model) config.chat_model._kwargs_text = kwargsToText(config.chat_model.kwargs);+ if (config?.utility_model) config.utility_model._kwargs_text = kwargsToText(config.utility_model.kwargs);+ if (config?.embedding_model) config.embedding_model._kwargs_text = kwargsToText(config.embedding_model.kwargs);+ if (config) config._browser_headers_text = Object.entries(config.browser_http_headers || {}).map(([k, v]) => k + '=' + v).join('\n');+ if (config) {+ if (!config.model_presets) config.model_presets = [];+ config.model_presets = config.model_presets.map(p => ({+ name: p.name || '',+ chat: { provider: '', name: '', api_key: '', api_base: '', ...(p.chat || {}) },+ utility: { provider: '', name: '', api_key: '', api_base: '', ...(p.utility || {}) },+ }));+ }+ },++ // API Key operations+ async saveApiKey(provider, value) {+ await fetchApi(`${API_BASE}/api_keys`, {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ action: 'set', keys: { [provider]: value } })+ });+ this.apiKeyStatus = { ...this.apiKeyStatus, [provider]: true };+ const ap = this.allProviders.find(x => x.value === provider);+ if (ap) ap.has_key = true;+ },++ saveApiKeyIfSet(provider) {+ const val = this.apiKeyValues[provider];+ if (val) return this.saveApiKey(provider, val);+ },++ async revealApiKey(provider) {+ const res = await fetchApi(`${API_BASE}/api_keys`, {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ action: 'reveal', provider })+ });+ const data = await res.json();+ return data.value || '';+ },++ // Model search+ getProviders(key) {+ return key === 'embedding_model' ? this.embeddingProviders : this.chatProviders;+ },++ getSearchType(key) {+ return key === 'embedding_model' ? 'embedding' : 'chat';+ },++ async searchModels(provider, query, modelType, apiBase) {+ if (!provider) return [];+ try {+ const res = await fetchApi(`${API_BASE}/model_search`, {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ provider, query: query || '', model_type: modelType || 'chat', api_base: apiBase || '' })+ });+ const data = await res.json();+ return data.models || [];+ } catch (e) {+ console.error('Model search failed:', e);+ return [];+ }+ },++ // Model Switcher+ async loadSwitcherState(contextId) {+ const result = { allowed: false, presets: [], override: null };+ try {+ const cfgData = await this._fetchConfigData();+ const chatCfg = cfgData.config?.chat_model || {};+ result.allowed = !!chatCfg.allow_chat_override;+ result.presets = cfgData.config?.model_presets || [];+ if (!result.allowed) return result;+ if (contextId) {+ const overRes = await fetchApi(`${API_BASE}/model_override`, {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ action: "get", context_id: contextId }),+ });+ const overData = await overRes.json();+ result.override = overData.override || null;+ }+ } catch (e) {+ console.error("Model switcher load failed:", e);+ }+ return result;+ },++ async setPresetOverride(contextId, presetName) {+ try {+ const res = await fetchApi(`${API_BASE}/model_override`, {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ action: "set_preset", context_id: contextId, preset_name: presetName }),+ });+ return !!(await res.json()).ok;+ } catch (e) {+ console.error("Failed to set preset override:", e);+ return false;+ }+ },++ async clearOverride(contextId) {+ try {+ const res = await fetchApi(`${API_BASE}/model_override`, {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ action: "clear", context_id: contextId }),+ });+ return !!(await res.json()).ok;+ } catch (e) {+ console.error("Failed to clear override:", e);+ return false;+ }+ },++ getPresetLabel(preset) {+ return preset?.name || "Unnamed";+ },++ getPresetSummary(preset) {+ if (!preset) return "";+ const parts = [];+ if (preset.chat?.name) parts.push(preset.chat.name);+ if (preset.utility?.name) parts.push(preset.utility.name);+ return parts.join(" / ");+ },++ // Model summary for agent-settings page+ async loadModelsSummary() {+ const data = await this._fetchConfigData();+ const cfg = data.config || {};+ const chatP = data.chat_providers || [];+ const embedP = data.embedding_providers || [];+ const label = (list, id) => (list.find(x => x.value === id) || {}).label || id || '\u2014';+ return [+ { icon: 'chat', title: 'Main', cfg: cfg.chat_model, pList: chatP },+ { icon: 'manufacturing', title: 'Utility', cfg: cfg.utility_model, pList: chatP },+ { icon: 'database', title: 'Embedding', cfg: cfg.embedding_model, pList: embedP },+ ].map(s => ({ icon: s.icon, title: s.title, provider: label(s.pList, s.cfg?.provider), name: s.cfg?.name || '\u2014' }));+ },++ // Switcher high-level methods+ async refreshSwitcher(contextId) {+ this.switcherLoading = true;+ try {+ const state = await this.loadSwitcherState(contextId);+ this.switcherAllowed = state.allowed;+ this.switcherPresets = state.presets;+ this.switcherOverride = state.override;+ } catch (e) {+ console.error('Model switcher refresh failed:', e);+ } finally {+ this.switcherLoading = false;+ }+ },++ async selectPresetSwitch(contextId, presetName) {+ const ok = await this.setPresetOverride(contextId, presetName);+ if (ok) this.switcherOverride = { preset_name: presetName };+ return ok;+ },++ async clearOverrideSwitch(contextId) {+ const ok = await this.clearOverride(contextId);+ if (ok) this.switcherOverride = null;+ return ok;+ },++ getSwitcherLabel() {+ const o = this.switcherOverride;+ if (!o) return 'Default';+ return o.preset_name || o.name || o.provider || 'Custom';+ },++ // Text conversion utilities (accessible from templates via $store.modelConfig)+ textToKwargs,+ textToHeaders,+ kwargsToText,+ MODEL_SECTIONS,+});diff --git a/plugins/_model_config/webui/model-switcher.js b/plugins/_model_config/webui/model-switcher.jsdeleted file mode 100644index f5a4ce445..000000000--- a/plugins/_model_config/webui/model-switcher.js+++ /dev/null@@ -1,87 +0,0 @@-const API_BASE = "/plugins/_model_config";--export async function loadSwitcherState(contextId) {- const result = {- allowed: false,- presets: [],- chatProviders: [],- override: null,- };-- try {- const cfgRes = await fetchApi(`${API_BASE}/model_config_get`, {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({}),- });- const cfgData = await cfgRes.json();- const chatCfg = cfgData.config?.chat_model || {};-- result.allowed = !!chatCfg.allow_chat_override;- result.chatProviders = cfgData.chat_providers || [];- result.presets = cfgData.config?.model_presets || [];-- if (!result.allowed) return result;-- // Fetch current override status- if (contextId) {- const overRes = await fetchApi(`${API_BASE}/model_override`, {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ action: "get", context_id: contextId }),- });- const overData = await overRes.json();- result.override = overData.override || null;- }- } catch (e) {- console.error("Model switcher load failed:", e);- }-- return result;-}--export async function setPresetOverride(contextId, presetName) {- try {- const res = await fetchApi(`${API_BASE}/model_override`, {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({- action: "set_preset",- context_id: contextId,- preset_name: presetName,- }),- });- const data = await res.json();- return !!data.ok;- } catch (e) {- console.error("Failed to set preset override:", e);- return false;- }-}--export async function clearOverride(contextId) {- try {- const res = await fetchApi(`${API_BASE}/model_override`, {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ action: "clear", context_id: contextId }),- });- const data = await res.json();- return !!data.ok;- } catch (e) {- console.error("Failed to clear override:", e);- return false;- }-}--export function getPresetLabel(preset) {- return preset?.name || "Unnamed";-}--export function getPresetSummary(preset) {- if (!preset) return "";- const parts = [];- if (preset.chat?.name) parts.push(preset.chat.name);- if (preset.utility?.name) parts.push(preset.utility.name);- return parts.join(" / ");-}diff --git a/plugins/_model_config/webui/models-summary.html b/plugins/_model_config/webui/models-summary.htmlindex 6cf58cc14..f696c8b4a 100644--- a/plugins/_model_config/webui/models-summary.html+++ b/plugins/_model_config/webui/models-summary.html@@ -4,7 +4,13 @@</head><body>+ <script type="module">+ import { store } from "/plugins/_model_config/webui/model-config-store.js";+ </script>+<div x-data>+ <template x-if="$store.modelConfig">+ <div><div class="section-title">Model Configuration</div><div class="section-description">Model settings are managed through the Model Configuration plugin, supporting per-project and per-agent overrides.@@ -25,39 +31,12 @@</div><!-- Read-only model config summary -->- <div x-data="{- loading: true,- models: [],- async init() {- try {- const res = await fetchApi('/plugins/_model_config/model_config_get', {- method: 'POST',- headers: {'Content-Type': 'application/json'},- body: JSON.stringify({})- });- const data = await res.json();- const cfg = data.config || {};- const chatP = data.chat_providers || [];- const embedP = data.embedding_providers || [];- const label = (list, id) => (list.find(x => x.value === id) || {}).label || id || '\u2014';- this.models = [- { icon: 'chat', title: 'Main', cfg: cfg.chat_model, pList: chatP },- { icon: 'manufacturing', title: 'Utility', cfg: cfg.utility_model, pList: chatP },- { icon: 'database', title: 'Embedding', cfg: cfg.embedding_model, pList: embedP },- ].map(s => ({- icon: s.icon,- title: s.title,- provider: label(s.pList, s.cfg?.provider),- name: s.cfg?.name || '\u2014'- }));- } catch (e) {- console.error('Model summary load failed:', e);- this.models = [];- } finally {- this.loading = false;- }- }- }" class="model-summary">+ <div x-data="{ loading: true, models: [] }"+ x-init="+ models = await $store.modelConfig.loadModelsSummary().catch(() => []);+ loading = false;+ "+ class="model-summary"><div x-show="loading" style="text-align:center; padding:12px;"><span class="material-symbols-outlined spinning" style="font-size:18px;">progress_activity</span></div>@@ -77,6 +56,8 @@</div></template></div>+ </div>+ </template></div><style>