mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-11-01 18:52:21 +01:00
39303f19cd
* 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>
97 lines
4.1 KiB
Python
97 lines
4.1 KiB
Python
import re
|
|
from pathlib import Path
|
|
|
|
ROOT = Path(__file__).resolve().parents[1]
|
|
JS = (ROOT / "static" / "js" / "galleryEditor.js").read_text()
|
|
ROUTES = (ROOT / "routes" / "gallery" / "gallery_routes.py").read_text()
|
|
SW = (ROOT / "static" / "sw.js").read_text()
|
|
|
|
|
|
def test_client_gen_mode_generates():
|
|
assert "if (mode === 'gen')" in JS
|
|
assert "_runQuickControlOp('ai.generateImage'" in JS
|
|
assert "Generating an image…" in JS
|
|
assert "Generated an image." in JS
|
|
assert "Could not generate an image:" in JS
|
|
|
|
|
|
def test_client_gen_mode_runs_after_harmonize():
|
|
harm = JS.index("_isHarmonizeIntent(prompt))")
|
|
img = JS.index("if (mode === 'gen')")
|
|
assert harm < img
|
|
|
|
|
|
def test_editing_status_is_distinct_from_generating_status():
|
|
# Image mode makes a brand-new picture; every other mode edits the canvas.
|
|
assert "_setAiCommandStatus('Editing the image…', 'running');" in JS
|
|
assert "_setAiCommandStatus('Generating an image…', 'running');" in JS
|
|
assert "_setAiCommandStatus('Generating…', 'running');" not in JS
|
|
|
|
|
|
def test_server_generate_route_exists():
|
|
assert '@router.post("/api/image/generate")' in ROUTES
|
|
assert "do_generate_image" in ROUTES
|
|
assert "can_generate_images" in ROUTES.split('@router.post("/api/image/generate")', 1)[1][:1200]
|
|
|
|
|
|
def test_sw_cache_bumped():
|
|
m = re.search(r"CACHE_NAME = '(odysseus-v\d+-pr40-editor-precache)'", SW)
|
|
assert m and re.fullmatch(r"odysseus-v\d+-pr40-editor-precache", m.group(1))
|
|
|
|
|
|
def test_generate_route_forwards_the_picked_model():
|
|
"""The model picker's choice must reach do_generate_image.
|
|
|
|
Settings defaults may otherwise point at the local Qwen server and the
|
|
user's chosen OpenRouter model is never used.
|
|
"""
|
|
route = ROUTES.split('@router.post("/api/image/generate")', 1)[1][:2600]
|
|
assert 'model_choice = str((body or {}).get("model") or "").strip()' in route
|
|
assert 'payload["model"] = model_choice' in route
|
|
assert "content = _json.dumps(payload)" in route
|
|
operation = JS.split("'ai.generateImage':", 1)[1].split("\n", 1)[0]
|
|
generation = (ROOT / 'static/js/editor/image-generation.js').read_text()
|
|
assert '_generateImage(p || {})' in operation
|
|
assert "_use_image_settings: true" in generation
|
|
assert "document.getElementById('ge-ai-model')" not in operation
|
|
assert "_getSelectedQuickEditModel()" not in operation
|
|
assert "localStorage.getItem" not in operation
|
|
|
|
|
|
def test_ai_settings_separates_generation_from_editing_without_setup():
|
|
settings = (ROOT / "static/js/editor/ai-settings.js").read_text()
|
|
assert 'id="ge-ai-model"' in settings
|
|
assert 'id="ge-ai-command-model"' in settings
|
|
assert "Image generation model" in settings
|
|
assert "createPreflight" not in JS
|
|
assert "ge-setup-btn';" not in JS.split("const aiBtn", 1)[0]
|
|
|
|
|
|
def test_generate_uses_live_picker_and_auto_edit_fallback():
|
|
import subprocess
|
|
|
|
module = (ROOT / "static/js/editor/ai-models.js").as_uri()
|
|
script = """
|
|
import assert from 'node:assert/strict';
|
|
const {resolveQuickEditModel} = await import(MODULE);
|
|
const selected = 'https://openrouter.ai/api/v1::openai/gpt-5-image';
|
|
const option = {value: selected, textContent: 'GPT-5 Image'};
|
|
const picker = {value: selected, selectedIndex: 0, options: [option]};
|
|
const fallback = {value: '', options: [option]};
|
|
globalThis.document = {getElementById: id => id === 'ge-ai-command-model' ? picker : fallback};
|
|
globalThis.localStorage = {getItem: () => {throw new Error('must not read stale storage');}};
|
|
assert.equal(resolveQuickEditModel().model, 'openai/gpt-5-image');
|
|
picker.value = '';
|
|
assert.equal(resolveQuickEditModel().model, '');
|
|
""".replace("MODULE", repr(module))
|
|
subprocess.run(["node", "--input-type=module", "-e", script], check=True)
|
|
|
|
|
|
def test_cloud_image_model_is_resolved_before_the_local_fallback():
|
|
"""A gateway model must not be hijacked onto the local image endpoint."""
|
|
ai = (ROOT / "src" / "ai_interaction.py").read_text()
|
|
block = ai.split("async def _resolve_image_model(model_name: str):", 1)[1][:900]
|
|
plain = block.index("_resolve_model(model_name, owner=owner)")
|
|
typed = block.index('model_type="image"')
|
|
assert plain < typed
|