mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-11-01 10:42:23 +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>
61 lines
3.0 KiB
Python
61 lines
3.0 KiB
Python
"""Quick Edit must report image-generation failures in plain language.
|
|
|
|
Three cases are covered, each asserting both layers:
|
|
1. image server unreachable / timed out -> fixed "offline" sentence
|
|
2. server up but generation switched off -> fixed "disabled" sentence (HTTP 503)
|
|
3. anything else -> the server's own short reason
|
|
"""
|
|
from pathlib import Path
|
|
|
|
ROOT = Path(__file__).resolve().parents[1]
|
|
EDITOR = (ROOT / "static" / "js" / "galleryEditor.js").read_text()
|
|
ROUTES = (ROOT / "routes" / "gallery" / "gallery_routes.py").read_text()
|
|
|
|
|
|
def test_offline_message_mapping():
|
|
assert "Image server is offline right now, so I cannot generate. Try again later." in EDITOR
|
|
assert "_GEN_OFFLINE_MSG" in EDITOR
|
|
# network failure, a timeout, or an unreachable image server => offline
|
|
assert "if (network || timedOut || unreachable || status === 0) return _GEN_OFFLINE_MSG;" in EDITOR
|
|
assert "const unreachable = /unreachable|offline|timed out|timeout|connection|connect |refused|no route|network|failed to fetch/.test(low);" in EDITOR
|
|
# client never hangs forever
|
|
assert "_generationErrorMessage({ status: lastStatus" in EDITOR
|
|
# server side: unreachable endpoints are a 502 (gateway), not a 503
|
|
assert "Image server unreachable" in ROUTES
|
|
assert 'raise HTTPException(504, f"Image server timed out' in ROUTES
|
|
|
|
|
|
def test_disabled_message_mapping():
|
|
assert "Image generation is switched off on the server at the moment." in EDITOR
|
|
assert "_GEN_DISABLED_MSG" in EDITOR
|
|
assert "if (status === 503) return _GEN_DISABLED_MSG;" in EDITOR
|
|
# server side: generation disabled by the admin -> 503
|
|
assert '"Image generation is switched off on the server at the moment."' in ROUTES
|
|
assert 'if "disabled" in low or "switched off" in low or "not enabled" in low:' in ROUTES
|
|
|
|
|
|
def test_other_errors_show_the_server_reason():
|
|
assert "return reason ? `Could not generate: ${reason}`" in EDITOR
|
|
assert 'raise HTTPException(502, msg)' in ROUTES
|
|
|
|
|
|
def test_quick_edit_shows_the_generation_message_verbatim():
|
|
"""The card prints the mapped sentence itself (no generic prefix) and resets."""
|
|
assert "_isGenOfflineMsg" in EDITOR
|
|
assert "_setAiCommandStatus(_isGenOfflineMsg(_genErr) ? _genErr : `Could not generate that edit: ${_genErr}`, 'error');" in EDITOR
|
|
assert "_setAiCommandStatus(_isGenOfflineMsg(msg) ? msg : `Could not generate an image: ${msg}`, 'error');" in EDITOR
|
|
# The extracted generation action keeps the shared failure classifier.
|
|
generation = (ROOT / 'static/js/editor/image-generation.js').read_text()
|
|
assert "formatError: _generationErrorMessage" in EDITOR
|
|
assert "formatError({ network: true" in generation
|
|
assert "formatError({ status: response.status" in generation
|
|
|
|
|
|
def test_sw_cache_is_bumped():
|
|
import re
|
|
|
|
sw = (ROOT / "static" / "sw.js").read_text()
|
|
m = re.search(r"CACHE_NAME = '([^']+)'", sw)
|
|
assert m, "CACHE_NAME not found"
|
|
assert re.fullmatch(r"odysseus-v\d+-pr40-editor-precache", m.group(1)), m.group(1)
|