mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-11-01 18:52:21 +01:00
* fix(editor): stabilize image workflows and editing controls
* docs(editor): add desktop and mobile visual validation evidence
* fix(editor): synchronize quick edit model events and register imagePreferences in test coordinator
* fix(settings): enforce authoritative global image-gen policy and non-admin preference persistence
- Enforce authoritative administrator global image_gen_enabled disable in get_user_setting, do_generate_image, and image_editing_provider_available, preventing non-admin user preference overrides while preserving user-disabled opt-outs and can_generate_images privilege checks across direct, gallery, and editor paths.
- Filter non-admin preference persistence in saveImagePreferences to user preference keys only (image_model, image_edit_model, image_quality), preventing global policy toggles from leaking into user preferences.
- Return accurate 200 OK Response from saveImagePreferences after fallback persistence succeeds so settings UI displays 'Saved' instead of false 403 error, while retaining visibility of real errors.
- Load per-user preferences via readImagePreferences in initImageSettings so non-admin selections persist and display correctly after page reload.
- Clear per-user model preferences on successful admin save (POST /api/auth/settings) via PUT /api/prefs/{key} with value: null to prevent stale per-user preferences from shadowing updated global settings.
- Support clearing keys in PUT /api/prefs/{key} when value is null.
- Add comprehensive Python regression tests for global-disabled/user-enabled, global-enabled/user-disabled, and authorized generation, plus Node and browser regression tests for non-admin persistence, toggle isolation, reload, and admin clearing.
* fix(settings): invalidate shared appConfig cache near auth settings write
* fix(test): isolate test_tool_policy unit suite from external model endpoint state
* fix(test): isolate web_fetch failure regression from contextual follow-up heuristics
* fix(test): isolate test_tool_policy from cross-test approval gate state
Ensure _patch_loop_basics disables TOOL_APPROVAL_GATE_ENABLED so routing tests in test_tool_policy run in the intended opt-out posture even when prior tests populate DATA_DIR with skills or untrusted context. Remove unnecessary forced_tools and contextual web mock workarounds.
* fix(settings): isolate non-admin image toggle and surface preference cleanup errors
- Restrict image generation availability toggle to admin users in imageModels.js, disabling the switch for non-admins and reverting unauthorized changes with an explicit message.
- Separate non-admin image model preference saves from global toggle updates.
- Track preference cleanup results on admin save in imagePreferences.js, propagating cleanup failures instead of ignoring them.
- Require valid preference keys on 403 fallback so toggle-only attempts reject cleanly.
- Add /api/prefs route mock to test_image_model_settings_sync_both_directions_and_survive_reopening.
- Add regression coverage for admin cleanup failures and non-admin toggle rejection.
* fix(settings): reconcile admin toggle on partial cleanup failure and report errors
- In imagePreferences.js, distinguish pre-persistence failures from post-save cleanup failures using err.globalSaved and err.phase.
- In imagePreferences.js, notify listeners of global policy updates on partial success before propagating cleanup failure.
- In imageModels.js, retain the persisted target state on admin toggle when global persistence succeeds but cleanup fails.
- In imageModels.js, reconcile admin toggle with authoritative server state via readImagePreferences() after ambiguous or partial failures.
- In imageModels.js, report partial success accurately without suppressing preference cleanup error messages.
- Add regression coverage in test_settings_save_response_ok_js.py for cleanup HTTP 500, cleanup network rejection, successful cleanup, and failed global POST.
---------
Co-authored-by: pewdiepie-archdaemon <pewdiepie-archdaemon@users.noreply.github.com>
Co-authored-by: Alexandre Teixeira <general@alexandreteixeira.dev>
180 lines
7.6 KiB
JavaScript
180 lines
7.6 KiB
JavaScript
// Image-model settings panel.
|
|
// Extracted verbatim from static/js/settings.js. Behaviour is unchanged: the
|
|
// functions moved, their bodies did not. settings.js imports them and calls
|
|
// them from the same places, so load order and init sequence are untouched.
|
|
|
|
import { byId as el } from './dom.js';
|
|
import { saveImagePreferences as _postSettings, readImagePreferences } from './imagePreferences.js';
|
|
import { modelCaps } from '../editor/ai-models.js';
|
|
import { sortModelIds } from '../modelSort.js';
|
|
let preferencesListener = null;
|
|
|
|
export async function initImageSettings() {
|
|
const modelSel = el('set-imgModelSelect');
|
|
const editModelSel = el('set-imgEditModelSelect');
|
|
const qualSel = el('set-imgQualitySelect');
|
|
const msg = el('set-imgSettingsMsg');
|
|
const enabledToggle = el('set-imgEnabledToggle');
|
|
const configWrap = modelSel ? modelSel.closest('div[style*="flex-direction"]') : null;
|
|
try {
|
|
const endpointsRes = await fetch('/api/model-endpoints', { credentials: 'same-origin' });
|
|
const endpoints = await endpointsRes.json();
|
|
const imageModels = new Set();
|
|
const editModels = new Set();
|
|
(Array.isArray(endpoints) ? endpoints : []).forEach(endpoint => {
|
|
if (!endpoint.is_enabled || !endpoint.online) return;
|
|
(Array.isArray(endpoint.models) ? endpoint.models : []).forEach(modelId => {
|
|
if (modelId && modelCaps(modelId, '', endpoint.model_type).gen) imageModels.add(String(modelId));
|
|
if (modelId && modelCaps(modelId, '', endpoint.model_type).inpaint) editModels.add(String(modelId));
|
|
});
|
|
});
|
|
modelSel.length = 1;
|
|
sortModelIds(Array.from(imageModels)).forEach(mid => {
|
|
const opt = document.createElement('option');
|
|
opt.value = mid;
|
|
opt.textContent = mid;
|
|
modelSel.appendChild(opt);
|
|
});
|
|
if (editModelSel) {
|
|
editModelSel.length = 1;
|
|
for (const mid of sortModelIds(Array.from(editModels))) {
|
|
const option = document.createElement('option');
|
|
option.value = mid;
|
|
option.textContent = mid;
|
|
editModelSel.appendChild(option);
|
|
}
|
|
}
|
|
} catch (e) { console.warn('Failed to load models for image settings', e); }
|
|
let currentEnabled = enabledToggle ? enabledToggle.checked : false;
|
|
try {
|
|
const settings = await readImagePreferences();
|
|
if (modelSel && 'image_model' in settings) modelSel.value = settings.image_model || '';
|
|
if (editModelSel && 'image_edit_model' in settings) editModelSel.value = settings.image_edit_model || '';
|
|
if (qualSel && 'image_quality' in settings) qualSel.value = settings.image_quality || 'medium';
|
|
if (enabledToggle) {
|
|
enabledToggle.checked = settings.image_gen_enabled === true;
|
|
currentEnabled = enabledToggle.checked;
|
|
}
|
|
} catch (e) { console.warn('Failed to load settings', e); }
|
|
|
|
function syncImgDisabled() {
|
|
var off = enabledToggle && !enabledToggle.checked;
|
|
var card = enabledToggle ? enabledToggle.closest('.admin-card') : null;
|
|
if (card) card.style.opacity = off ? '0.45' : '';
|
|
if (configWrap) configWrap.style.pointerEvents = off ? 'none' : '';
|
|
}
|
|
syncImgDisabled();
|
|
|
|
function checkIsAdmin() {
|
|
return typeof window !== 'undefined' && !!window._isAdmin;
|
|
}
|
|
|
|
function applyAdminToggleState() {
|
|
if (!enabledToggle) return;
|
|
const admin = checkIsAdmin();
|
|
if (!admin) {
|
|
enabledToggle.disabled = true;
|
|
const adminTitle = 'Admin access is required to change image generation availability.';
|
|
enabledToggle.title = adminTitle;
|
|
if (enabledToggle.parentElement) enabledToggle.parentElement.title = adminTitle;
|
|
} else {
|
|
enabledToggle.disabled = false;
|
|
const adminTitle = 'Enable or disable image generation globally';
|
|
enabledToggle.title = adminTitle;
|
|
if (enabledToggle.parentElement) enabledToggle.parentElement.title = adminTitle;
|
|
}
|
|
}
|
|
applyAdminToggleState();
|
|
|
|
async function saveModelPreferences() {
|
|
try {
|
|
const res = await _postSettings({
|
|
image_model: modelSel ? modelSel.value : '',
|
|
image_edit_model: editModelSel?.value || '',
|
|
image_quality: qualSel ? qualSel.value : 'medium',
|
|
});
|
|
if (!res.ok) throw new Error(await res.text().catch(() => `HTTP ${res.status}`));
|
|
msg.textContent = 'Saved'; msg.style.color = 'var(--fg)'; setTimeout(() => { msg.textContent = ''; }, 2000);
|
|
} catch (e) {
|
|
if (e.globalSaved) {
|
|
msg.textContent = 'Policy saved, but failed to clear preferences: ' + (e.message || 'cleanup error');
|
|
msg.style.color = 'var(--red)';
|
|
} else {
|
|
msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save';
|
|
msg.style.color = 'var(--red)';
|
|
}
|
|
}
|
|
}
|
|
|
|
async function saveToggle() {
|
|
if (!checkIsAdmin()) {
|
|
if (enabledToggle) enabledToggle.checked = currentEnabled;
|
|
syncImgDisabled();
|
|
msg.textContent = 'Admin access is required to change these settings.';
|
|
msg.style.color = 'var(--red)';
|
|
return;
|
|
}
|
|
const targetState = enabledToggle ? enabledToggle.checked : false;
|
|
try {
|
|
const res = await _postSettings({ image_gen_enabled: targetState });
|
|
if (!res.ok) throw new Error(await res.text().catch(() => `HTTP ${res.status}`));
|
|
if (enabledToggle) currentEnabled = enabledToggle.checked;
|
|
msg.textContent = 'Saved'; msg.style.color = 'var(--fg)'; setTimeout(() => { msg.textContent = ''; }, 2000);
|
|
} catch (e) {
|
|
if (e.globalSaved) {
|
|
currentEnabled = targetState;
|
|
try {
|
|
const authSettings = await readImagePreferences();
|
|
if (typeof authSettings.image_gen_enabled === 'boolean') {
|
|
currentEnabled = authSettings.image_gen_enabled;
|
|
}
|
|
} catch (_) {}
|
|
if (enabledToggle) enabledToggle.checked = currentEnabled;
|
|
syncImgDisabled();
|
|
msg.textContent = 'Policy saved, but failed to clear preferences: ' + (e.message || 'cleanup error');
|
|
msg.style.color = 'var(--red)';
|
|
} else {
|
|
try {
|
|
const authSettings = await readImagePreferences();
|
|
if (typeof authSettings.image_gen_enabled === 'boolean') {
|
|
currentEnabled = authSettings.image_gen_enabled;
|
|
}
|
|
} catch (_) {}
|
|
if (enabledToggle) enabledToggle.checked = currentEnabled;
|
|
syncImgDisabled();
|
|
msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save';
|
|
msg.style.color = 'var(--red)';
|
|
}
|
|
}
|
|
}
|
|
|
|
if (modelSel) modelSel.addEventListener('change', saveModelPreferences);
|
|
if (editModelSel) editModelSel.addEventListener('change', saveModelPreferences);
|
|
if (qualSel) qualSel.addEventListener('change', saveModelPreferences);
|
|
if (enabledToggle) {
|
|
enabledToggle.addEventListener('change', async function() {
|
|
if (!checkIsAdmin()) {
|
|
enabledToggle.checked = currentEnabled;
|
|
syncImgDisabled();
|
|
msg.textContent = 'Admin access is required to change these settings.';
|
|
msg.style.color = 'var(--red)';
|
|
return;
|
|
}
|
|
syncImgDisabled();
|
|
await saveToggle();
|
|
});
|
|
}
|
|
|
|
if (preferencesListener) window.removeEventListener('image-preferences-changed', preferencesListener);
|
|
preferencesListener = event => {
|
|
if ('image_model' in event.detail && modelSel) modelSel.value = event.detail.image_model || '';
|
|
if (editModelSel && 'image_edit_model' in event.detail) editModelSel.value = event.detail.image_edit_model || '';
|
|
if ('image_gen_enabled' in event.detail && enabledToggle) {
|
|
enabledToggle.checked = event.detail.image_gen_enabled === true;
|
|
currentEnabled = enabledToggle.checked;
|
|
syncImgDisabled();
|
|
}
|
|
};
|
|
window.addEventListener('image-preferences-changed', preferencesListener);
|
|
}
|