Vito
4040007264
The gallery root scope and the Images listing cursor were keyed with a per-process random key, so every ComfyUI restart made an open tab's scopes answer 409 source-changed (blank Tag image preview, a Generate that did nothing) and its cursors fail Load more. - utils/workspace_keys.py: one random secret in workspace-scope.key beside the database (owner-only, never config.json or the database), two derived keys; per-process fallback with a warning. Move library copies it. - Cursor v2 binds the listing scope in its MAC instead of sending an unkeyed hash of the root paths; an unverifiable cursor answers 400 cursor-stale and Images offers Refresh instead of a dead Retry. - POST /prompt_manager/images/rescope maps a stale target to its current root only when the held scope was issued for it. - Images finds a renumbered file again from the inspector, the viewer and the Tag image dialog (the dialog stays open, draft kept); nothing else is kept by an old root_index:path key. - Tag image dialog: a state that blocks Save shows its reason above the actions with Refresh, disabled actions look disabled, and an empty preview says "Preview unavailable" (D147).
67 lines
2.4 KiB
Python
67 lines
2.4 KiB
Python
"""Source changes under an open workspace page (#430), undone by every reset.
|
||
|
||
- ``POST /__test__/sources/reverse``: the image sources are listed in reverse
|
||
order, as System › Sources would renumber them, so every held
|
||
``root_scope`` names another index and the page must re-scope its file.
|
||
- ``POST /__test__/scope-key/rotate``: the API's scope and cursor keys
|
||
change, as when ``workspace-scope.key`` is lost before a restart: a held
|
||
scope then cannot be mapped and the page offers Refresh.
|
||
"""
|
||
|
||
from __future__ import annotations
|
||
|
||
import secrets
|
||
from typing import TYPE_CHECKING, Callable
|
||
|
||
from aiohttp import web
|
||
|
||
from utils.workspace_keys import WorkspaceKeys
|
||
|
||
if TYPE_CHECKING:
|
||
from py.api import PromptManagerAPI
|
||
|
||
_CACHE = "_workspace_keys_cache"
|
||
|
||
|
||
def register_source_change_commands(
|
||
routes: web.RouteTableDef, api: PromptManagerAPI
|
||
) -> Callable[[], None]:
|
||
"""Register the commands; returns the restore every reset runs."""
|
||
# Imported here: py.config needs the host stubs create_app installs first.
|
||
from py.config import GalleryConfig
|
||
|
||
saved: dict = {}
|
||
|
||
def restore() -> None:
|
||
if "roots" in saved:
|
||
GalleryConfig.MONITORING_DIRECTORIES = saved.pop("roots")
|
||
api.invalidate_gallery_cache(retire=True)
|
||
if "keys" in saved:
|
||
keys = saved.pop("keys")
|
||
if keys is None:
|
||
api.__dict__.pop(_CACHE, None)
|
||
else:
|
||
api.__dict__[_CACHE] = keys
|
||
|
||
@routes.post("/__test__/sources/reverse")
|
||
async def reverse(request: web.Request) -> web.Response:
|
||
if request.query or request.can_read_body:
|
||
raise web.HTTPBadRequest()
|
||
roots = list(GalleryConfig.MONITORING_DIRECTORIES)
|
||
saved.setdefault("roots", roots)
|
||
GalleryConfig.MONITORING_DIRECTORIES = roots[::-1]
|
||
await api._run_in_executor(api.invalidate_gallery_cache, True)
|
||
return web.json_response({"success": True})
|
||
|
||
@routes.post("/__test__/scope-key/rotate")
|
||
async def rotate(request: web.Request) -> web.Response:
|
||
if request.query or request.can_read_body:
|
||
raise web.HTTPBadRequest()
|
||
saved.setdefault("keys", api.__dict__.get(_CACHE))
|
||
api.__dict__[_CACHE] = WorkspaceKeys(
|
||
secrets.token_bytes(32), secrets.token_bytes(32), False
|
||
)
|
||
return web.json_response({"success": True})
|
||
|
||
return restore
|