Agent Zero AI framework
Avoid repeated preset reads during embedding comparisons
Alessandroecf1d35d1b66
diff --git a/plugins/_model_config/AGENTS.md b/plugins/_model_config/AGENTS.mdindex 0047327d3..e015aff87 100644--- a/plugins/_model_config/AGENTS.md+++ b/plugins/_model_config/AGENTS.md@@ -49,6 +49,7 @@its loading lifecycle.- Preset editor reset actions must remove the user override through the preset API and refresh the open draft from bundled defaults.- Preset rename, delete, and reset actions must repair scoped config and durable/live chat references; removed definitions fall back to `Default`.+- Save/reset embedding comparisons use the matching before/after preset snapshots, including Default inheritance. Do not reload the collection per preset or persist a cross-request cache for this comparison.- Migration must preserve existing definitions and distinct scoped model choices, back up replaced user files once, strip inline secrets, and remain idempotent.- Venice migration applies chat-only kwargs to chat slots and removes them from embedding slots without discarding embedding-specific kwargs.- On every startup after migration, short-circuit when `usr/plugins/_model_config/presets.yaml` exists. Only a missing collection may fetch `agent0ai/a0-presets`; parse remote and plugin-local fallback YAML through the same validator, strip secrets before persistence, and persist `mode_presets_fallback.yaml` when download or validation fails.diff --git a/plugins/_model_config/api/model_presets.py b/plugins/_model_config/api/model_presets.pyindex 6c994ddd8..f5d7df94a 100644--- a/plugins/_model_config/api/model_presets.py+++ b/plugins/_model_config/api/model_presets.py@@ -98,10 +98,11 @@ def _retired_preset_references(]-def _embedding_signature(preset: dict | None):+def _embedding_signature(preset: dict | None, default: dict | None = None):if not isinstance(preset, dict):return {}- default = model_config.resolve_preset(model_config.DEFAULT_PRESET_NAME) or {}+ if default is None:+ default = model_config.resolve_preset(model_config.DEFAULT_PRESET_NAME) or {}config = model_config.preset_to_config(default)if str(preset.get("name") or "") != model_config.DEFAULT_PRESET_NAME:config = model_config.build_config_from_preset(@@ -113,6 +114,17 @@ def _embedding_signature(preset: dict | None):return embedding if isinstance(embedding, dict) else {}+def _embedding_signatures(presets: list) -> dict:+ default = next(+ (preset for preset in presets if preset.get("name") == model_config.DEFAULT_PRESET_NAME),+ {},+ )+ return {+ str(preset.get("name") or ""): _embedding_signature(preset, default)+ for preset in presets+ }++def _notify_embedding_changed() -> None:defer.DeferredTask().start_task(call_extensions_async, "embedding_model_changed")@@ -157,48 +169,34 @@ class ModelPresets(ApiHandler):status=400,response="Preset definitions are global; select a global preset for this project.",)- previous_names = {- str(preset.get("name") or "") for preset in model_config.get_presets()- }- previous_embeddings = {- str(preset.get("name") or ""): _embedding_signature(preset)- for preset in model_config.get_presets()- }+ previous = model_config.get_presets()+ previous_names = {str(preset.get("name") or "") for preset in previous}+ previous_embeddings = _embedding_signatures(previous)try:model_config.save_presets(presets)except ValueError as exc:return Response(status=400, response=str(exc))- saved_names = {- str(preset.get("name") or "") for preset in model_config.get_presets()- }+ saved = model_config.get_presets()+ saved_names = {str(preset.get("name") or "") for preset in saved}retired = _retired_preset_references(previous_names, saved_names)renames = input.get("renames") if isinstance(input.get("renames"), list) else []_rename_preset_references([*retired, *renames])- saved_embeddings = {- str(preset.get("name") or ""): _embedding_signature(preset)- for preset in model_config.get_presets()- }+ saved_embeddings = _embedding_signatures(saved)if previous_embeddings != saved_embeddings:_notify_embedding_changed()- return {"ok": True, "presets": model_config.get_presets()}+ return {"ok": True, "presets": saved}elif action == "reset":if scope == "project" or project_name:return Response(status=400, response="Project presets cannot be reset.")previous = model_config.get_presets()- previous_embeddings = {- str(preset.get("name") or ""): _embedding_signature(preset)- for preset in previous- }+ previous_embeddings = _embedding_signatures(previous)presets = model_config.reset_presets()saved_names = {str(preset.get("name") or "") for preset in presets}previous_names = {str(preset.get("name") or "") for preset in previous}retired = _retired_preset_references(previous_names, saved_names)_rename_preset_references(retired)- current_embeddings = {- str(preset.get("name") or ""): _embedding_signature(preset)- for preset in presets- }+ current_embeddings = _embedding_signatures(presets)if previous_embeddings != current_embeddings:_notify_embedding_changed()return {"ok": True, "presets": presets}diff --git a/tests/test_model_config_project_presets.py b/tests/test_model_config_project_presets.pyindex 467e57391..bde58525c 100644--- a/tests/test_model_config_project_presets.py+++ b/tests/test_model_config_project_presets.py@@ -1349,3 +1349,51 @@ def test_missing_scoped_preset_falls_back_to_default(monkeypatch, tmp_path):resolved = model_config.get_config(project_name="demo")assert resolved["model_preset"] == "Default"assert resolved["chat_model"]["name"] == "default-chat"++[email protected]('action', ['save', 'reset'])[email protected]('change', ['none', 'default', 'explicit'])+async def test_collection_write_compares_embedding_snapshots_without_reloading_per_preset(monkeypatch, action, change):+ from copy import deepcopy+ from plugins._model_config.api import model_presets+ from plugins._model_config.helpers import model_config++ before = [+ {'name': 'Default', 'embedding': {'provider': 'test', 'name': 'base'}},+ {'name': 'Inherited'},+ {'name': 'Explicit', 'embedding': {'provider': 'test', 'name': 'custom'}},+ ]+ after = deepcopy(before)+ if change == 'default':+ after[0]['embedding']['name'] = 'new-base'+ elif change == 'explicit':+ after[2]['embedding']['name'] = 'new-custom'+ current = before+ reads = 0+ notifications = []++ def get_presets():+ nonlocal reads+ reads += 1+ return deepcopy(current)++ def save_presets(presets):+ nonlocal current+ assert presets == after+ current = after++ monkeypatch.setattr(model_config, 'get_presets', get_presets)+ monkeypatch.setattr(model_config, 'save_presets', save_presets)+ monkeypatch.setattr(model_config, 'reset_presets', lambda: deepcopy(after))+ monkeypatch.setattr(model_presets, '_notify_embedding_changed', lambda: notifications.append(True))+ monkeypatch.setattr(model_presets, '_rename_preset_references', lambda renames: None)+ handler = model_presets.ModelPresets(Flask(__name__), threading.Lock())+ result = await handler.process({'action': action, 'presets': after}, None)+ assert result == {'ok': True, 'presets': after}+ assert reads == (2 if action == 'save' else 1)+ assert notifications == ([] if change == 'none' else [True])+ signatures = model_presets._embedding_signatures(after)+ assert signatures['Inherited'] == signatures['Default']+ assert signatures['Explicit'] == after[2]['embedding']+ assert before[0]['embedding']['name'] == 'base'