mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-28 15:45:22 -04:00
fix: group selection drop-downs recreation and repopulation logic (#3424)
* fix: include in-memory templates in group participant character list _getCharacterList() only fetched user templates from the /api/presets/templates endpoint. When a character was just created in the Character tab, the async auto-save to the templates API might not have completed by the time the Group tab loaded its participant dropdown — causing newly created characters to be missing. Now also merges the in-memory userTemplates array from presets.js as a fallback. These are updated as soon as the async save completes (via the loadUserTemplates callback), so they bridge the gap between character creation and API persistence. Fixes #3207 * fix: optimistic userTemplates update on character save Update the in-memory userTemplates array immediately when saveCustomPreset() succeeds, before the fire-and-forget templates API POST completes. This bridges the timing gap where _getCharacterList() calls getUserTemplates() and gets stale data because loadUserTemplates() hasn't been triggered yet. * test: verify group participant dropdown merges in-memory templates Source-level guards for the #3207 fix: - group.js imports and calls getUserTemplates() to merge in-memory templates - presets.js exports getUserTemplates and does optimistic in-memory update on save 5 tests ensuring the fix can't be silently reverted. * fix: generate client-side id for optimistic update, return shallow copy from getUserTemplates 1. New characters now get a 'user-<hex>' id immediately on save, matching the server's convention (uuid.uuid4().hex[:8]). Previously the id was '' which the merge guard in _getCharacterList filtered as falsy. 2. getUserTemplates() now returns [...userTemplates] so callers cannot accidentally mutate module state. * fix(group.js): fix selection drop-downs behavior - add an identifier to the selection drop-downs based on what type it is. - fix behavior of continuously adding a row when a user clicks the "Group" tab button. - fix behavior of not repopulating existing selection drop-downs whenever a user clicks the "Group" tab button. * fix(#3207): remove duplicate of latest persona - fix the duplication of the latest persona or character being shown in selection drop-downs. - remove unnecessary blocks of code in `_getCharacterList()` - add functionality to show error toast if saving a preset template/character fails. - add functionality to revert optimistic update of preset template/character if saving fails. * chore(group.js,preset.js): fix test & format errors remove trailing whitespaces in lines 230 and 232 in /static/group.js add back the expected syntax from tests/test_group_character_dropdown.py * fix(presets.js,group.js): fix runtime errors as stated in a comment by @alteixeira20, runtime errors exist for the applied fixes. fixes: - missing ending `]` querySelectorAll("select.preset-input[data-selection-type=character") in `group.js` - spelling error in `modelSelection.vale` in `group.js` - fix the ordering logic error in optimistic rollback where `Object.assign` is called first before the clone happens in `saveCustomPreset` in `presets.js`. - add tests for the cloning logic bug with the same format as previous tests by checking the order of LOC in `tests/test_group_character_dropdown.py`. --------- Co-authored-by: michaelxer <michaelxer@users.noreply.github.com> Co-authored-by: Alexandre Teixeira <111787685+alteixeira20@users.noreply.github.com>
This commit is contained in:
+72
-13
@@ -6,7 +6,7 @@ import markdownModule from './markdown.js';
|
||||
import chatRenderer from './chatRenderer.js';
|
||||
import spinnerModule from './spinner.js';
|
||||
import { providerLogo } from './providers.js';
|
||||
import { PROMPT_TEMPLATES, getAllPresets } from './presets.js';
|
||||
import { PROMPT_TEMPLATES, getUserTemplates } from './presets.js';
|
||||
import { sortModelObjects } from './modelSort.js';
|
||||
import Storage from './storage.js';
|
||||
|
||||
@@ -89,12 +89,16 @@ function _initGroupTab() {
|
||||
|
||||
const charSel = document.createElement('select');
|
||||
charSel.className = 'preset-input';
|
||||
// add an identifier that this is a character selection
|
||||
charSel.dataset.selectionType = "character"
|
||||
charSel.style.cssText = 'font-size:11px;flex:1;height:26px;';
|
||||
charSel.innerHTML = '<option value="">Empty...</option>' +
|
||||
characters.map(c => '<option value="' + c.id + '">' + uiModule.esc(c.name) + '</option>').join('');
|
||||
|
||||
const modelSel = document.createElement('select');
|
||||
modelSel.className = 'preset-input';
|
||||
// add an identifier that this is a model selection
|
||||
modelSel.dataset.selectionType = "model"
|
||||
modelSel.style.cssText = 'font-size:11px;flex:1;height:26px;';
|
||||
modelSel.innerHTML = '<option value="">Model…</option>' +
|
||||
models.map(m => '<option value="' + m.mid + '">' + uiModule.esc(m.display) + '</option>').join('');
|
||||
@@ -196,15 +200,67 @@ function _initGroupTab() {
|
||||
});
|
||||
|
||||
const groupTab = document.querySelector('.preset-tab[data-chartab="group"]');
|
||||
// whenever a user navigates to the Group tab
|
||||
if (groupTab) groupTab.addEventListener('click', () => {
|
||||
_modelsCache = null;
|
||||
if (startBtn) startBtn.textContent = 'Start Group';
|
||||
_loadGroupPresets();
|
||||
if (_groupParticipants.length === 0) {
|
||||
|
||||
const isGroupTabUnInitialized =
|
||||
_groupParticipants.length === 0 && participantsEl.children.length === 0;
|
||||
|
||||
if (isGroupTabUnInitialized) {
|
||||
setTimeout(() => addBtn.click(), 100);
|
||||
} else {
|
||||
// queue this asynchronously since repopulating the selection drop-downs
|
||||
// do not need to be visible right away; it can be safely delayed before
|
||||
// the next event loop
|
||||
queueMicrotask(() => {
|
||||
repopulateExistingSelections();
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
async function repopulateExistingSelections() {
|
||||
const EMPTY = "";
|
||||
|
||||
const characterSelections = participantsEl.querySelectorAll("select.preset-input[data-selection-type=character]");
|
||||
const modelSelections = participantsEl.querySelectorAll("select.preset-input[data-selection-type=model]");
|
||||
|
||||
if (characterSelections.length !== 0) {
|
||||
const characters = await _getCharacterList();
|
||||
|
||||
characterSelections.forEach((characterSelection) => {
|
||||
|
||||
const chosenCharacter = characterSelection.value;
|
||||
const isChosenCharacterExisting = chosenCharacter !== EMPTY
|
||||
&& characters.findIndex((char) => char.id === chosenCharacter) !== -1;
|
||||
|
||||
characterSelection.innerHTML = '<option value="">Empty...</option>' +
|
||||
characters.map(c => '<option value="' + c.id + '">' + uiModule.esc(c.name) + '</option>').join('');
|
||||
if (isChosenCharacterExisting) {
|
||||
characterSelection.value = chosenCharacter;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (modelSelections.length !== 0) {
|
||||
const models = await _getModels();
|
||||
|
||||
modelSelections.forEach((modelSelection) => {
|
||||
const chosenModel = modelSelection.value;
|
||||
const isChosenModelExisting = chosenModel !== EMPTY
|
||||
&& models.findIndex((model) => model.mid === chosenModel) !== -1;
|
||||
|
||||
modelSelection.innerHTML = '<option value="">Model…</option>' +
|
||||
models.map(m => '<option value="' + m.mid + '">' + uiModule.esc(m.display) + '</option>').join('');
|
||||
if (isChosenModelExisting) {
|
||||
modelSelection.value = chosenModel;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Load and render saved group presets
|
||||
async function _loadGroupPresets() {
|
||||
try {
|
||||
@@ -288,17 +344,6 @@ async function _getCharacterList() {
|
||||
const chars = PROMPT_TEMPLATES.filter(t => t.isCharacter).map(t => ({
|
||||
id: t.id, name: t.name, prompt: t.prompt,
|
||||
}));
|
||||
// User-created characters from presets
|
||||
try {
|
||||
const allPresets = getAllPresets();
|
||||
if (allPresets && allPresets.custom && allPresets.custom.character_name) {
|
||||
chars.push({
|
||||
id: 'custom',
|
||||
name: allPresets.custom.character_name,
|
||||
prompt: allPresets.custom.system_prompt || allPresets.custom.prompt || '',
|
||||
});
|
||||
}
|
||||
} catch (e) {}
|
||||
// Load user templates and wait for them before returning.
|
||||
// The endpoint returns a JSON array directly (not {templates:[...]}).
|
||||
// All user templates are personas by definition — no isCharacter filter needed.
|
||||
@@ -306,12 +351,26 @@ async function _getCharacterList() {
|
||||
const r = await fetch(API_BASE + '/api/presets/templates', { credentials: 'same-origin' });
|
||||
const data = await r.json();
|
||||
const templates = Array.isArray(data) ? data : (data.templates || []);
|
||||
|
||||
templates.forEach(t => {
|
||||
if (t.id && t.name && !chars.find(c => c.id === t.id)) {
|
||||
chars.push({ id: t.id, name: t.name, prompt: t.system_prompt || t.prompt || '' });
|
||||
}
|
||||
});
|
||||
} catch (e) {}
|
||||
|
||||
// Also merge in-memory templates from presets.js — these may include
|
||||
// newly created characters whose async save-to-API hasn't completed yet.
|
||||
const memTemplates = getUserTemplates();
|
||||
|
||||
if (Array.isArray(memTemplates)) {
|
||||
memTemplates.forEach(t => {
|
||||
if (t.id && t.name && !chars.find(c => c.id === t.id)) {
|
||||
chars.push({ id: t.id, name: t.name, prompt: t.system_prompt || t.prompt || '' });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return chars;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user