Vito
8bf759d6f8
* feat(system): resolve every library path in one place utils/library_location.py decides where the library lives: the PROMPT_MANAGER_DATA_DIR folder (validated: absolute, never inside a folder ComfyUI or Prompt Manager serves), an explicit database.default_path as before, a node-folder library that was not moved, else ComfyUI's user/__promptmanager. The database, diagnostics, config.json, logs and the LoRA image cache all ask it, so a new install never writes into the node folder and an existing one keeps every path until the user moves it. "Keep it here" is persisted as library.keep_in_node_folder. * feat(system): move the library as a verified Activity job POST /prompt_manager/system/library/move starts "Move library", an exclusive, non-cancellable job (database/library_move.py). It checks the target volume's free space, copies the database with SQLite's backup API from one read snapshot, verifies the copy (integrity check, every workflow document, the same rows in every table), copies the safety and pre-migration backups and config.json (owner-only, checked by size and SHA-256), then publishes under the old file's write lock and switches the live process (every PromptModel, the review and history observers, the API's plans and health report). The old prompts.db and config.json are renamed *.moved-to-<folder> only after the switch. A failure removes everything it wrote and leaves the old library in use; a marker in the new folder makes a restart after any crash pick the right library. GET /prompt_manager/system/library and the Overview's "location" say where the library lives and why; POST .../keep persists "Keep it here". * feat(system): show where the library lives and offer the move D129. System > Overview's Library health gains a "Library location" row (the database path, why it is there, the "Keep it here" choice and any PROMPT_MANAGER_DATA_DIR problem) with Move library for a node-folder library and Details otherwise. While a node-folder library is not kept there, the workspace shows the concept's .notice above every page: "Keep it here" saves the choice on the server and stops the notice; "Move library" opens the shared review (From, To, Size, what moves, what happens to the old files) and starts the exclusive job in Activity. The notice and the Overview read the location again when the job ends. The Overview comparison maps the inserted row; a new comparison holds the notice to the concept's Sources notice (markup, tokens, alignment, both themes and widths) with a mutation check. * feat(system): close the browser server's log files before its root goes The logs now live in the library's data folder, which for the browser test server is <root>/user/__promptmanager; Windows could not remove the temp root while the server still held prompt_manager.log open. The API test's node folder is spelled in lower case because public paths are case-folded on Windows. * feat(system): show the library location on the legacy admin page A line under the admin page's statistics names the database path and why it is there (ComfyUI's user folder, PROMPT_MANAGER_DATA_DIR, config.json, or the node folder with a pointer to Move library), read once from GET /prompt_manager/system/library. * feat(system): prove a fresh host keeps its library in user/__promptmanager The execution suite starts one pinned CPU ComfyUI with no configuration at all on an OS-chosen port: the library is created in user/__promptmanager (database and logs), nothing but byte code is added to the node folder, the location route reports the default folder, and ComfyUI's /userdata API serves none of it (traversal spellings, a listing, a system-user header). * feat(system): document where the library lives and how it moves README: where the library lives, the upgrade path (Move library / Keep it here), PROMPT_MANAGER_DATA_DIR, explicit paths unchanged, and the way back to an older version. TESTING.md: D129 and the library location contract (resolution order, move steps, crash windows, coded refusals, Windows handling). * wip(system): library move fix round in progress * fix(system): retry a fallback image link that races the library switch The image monitor's fallback and recent-prompt links went through PromptDatabase.link_image_to_prompt, which logs and returns 0 on any error, so survive_switch never saw a "database is locked" or closed connection during Move library and the link was lost in both files. The monitor now links through link_image_to_prompt_or_raise (one transaction per attempt); link_image_to_prompt keeps its log-and-return-0 contract for other callers. A link that returns 0 is no longer logged as "Successfully linked image 0". A switch that fails after repointing the models now closes the old file's detached connections instead of leaving them to GC: switch() adds them to a list the mover owns. The mocked retry test is replaced by a real-lock race asserting the image row lands in the new library only. * fix(system): say which source is the default and where a symlinked library lives Sources & scans: with no source configured, ComfyUI's output folder now reads "ComfyUI/output · watching · default" on its own row instead of a separate note line. GET /settings marks each effective source with in_comfyui (its public path is relative to the ComfyUI base) so only those get the "ComfyUI/" prefix; the scan still sends the server's public path. Library location: a library in the node folder reads through the node folder's unresolved place in custom_nodes, so a node folder symlinked to a checkout outside ComfyUI shows custom_nodes/promptmanager/prompts.db instead of prompts.db (System library row, Move review, admin Library line). Never absolute or "..", else the shared _public_path, which sources and jobs keep using unchanged.
160 lines
10 KiB
JavaScript
160 lines
10 KiB
JavaScript
// System › Sources & scans (#249 System S4 Task 11): the concept's "Image sources" list (app.js 679–681) built from the
|
||
// server's configured, effective and watched sources (GET /settings), the host draft of `gallery_root_paths`, the
|
||
// 3.2.0 update notice's dismissal and the Refresh files toast (D98).
|
||
const test = require('node:test');
|
||
const assert = require('node:assert/strict');
|
||
|
||
const sourcesModule = import('../../web/js/workspace/system-sources.mjs');
|
||
|
||
const STATUS = Object.freeze({
|
||
configured: [
|
||
{ label: 'ComfyUI output', path: 'output', valid: true, code: null, reason: null },
|
||
{ label: 'ComfyUI input', path: 'input', valid: true, code: null, reason: null },
|
||
],
|
||
effective: [
|
||
{ label: 'ComfyUI output', path: 'output', root_index: 0, watch: 'watching' },
|
||
{ label: 'ComfyUI input', path: 'input', root_index: 1, watch: 'manual' },
|
||
],
|
||
auto_detected: false,
|
||
});
|
||
|
||
test('each effective source is the concept row: label, "<path> · watching|manual scan", Scan changes or Scan folder', async () => {
|
||
const { sourceRows } = await sourcesModule;
|
||
const saved = ['output', 'input'];
|
||
const { rows, note } = sourceRows({ sources: STATUS, saved, current: saved });
|
||
assert.equal(note, null);
|
||
assert.deepEqual(rows, [
|
||
{ key: 'output', title: 'ComfyUI output', description: 'output · watching', scan: { label: 'Scan changes', root: 0, path: 'output' },
|
||
remove: 'output' },
|
||
{ key: 'input', title: 'ComfyUI input', description: 'input · manual scan', scan: { label: 'Scan folder', root: 1, path: 'input' },
|
||
remove: 'input' },
|
||
]);
|
||
});
|
||
|
||
test('watching only with a live observer; restart pending otherwise (D98)', async () => {
|
||
const { sourceRows, WATCH_COPY } = await sourcesModule;
|
||
assert.deepEqual(WATCH_COPY, { watching: 'watching', stopping: 'watching until restart', manual: 'manual scan',
|
||
restart_pending: 'restart pending' });
|
||
const sources = { ...STATUS, effective: STATUS.effective.map(source => ({ ...source, watch: 'restart_pending' })) };
|
||
const { rows } = sourceRows({ sources, saved: ['output', 'input'], current: ['output', 'input'] });
|
||
assert.deepEqual(rows.map(row => [row.description, row.scan.label]),
|
||
[['output · restart pending', 'Scan folder'], ['input · restart pending', 'Scan folder']]);
|
||
});
|
||
|
||
test('a configured source that cannot be used shows the server reason and only Remove', async () => {
|
||
const { sourceRows } = await sourcesModule;
|
||
const sources = { ...STATUS, configured: [...STATUS.configured,
|
||
{ label: 'unmounted-drive', path: 'unmounted-drive', valid: false, code: 'not-found', reason: 'Gallery root does not exist' }] };
|
||
const saved = ['output', 'input', 'unmounted-drive'];
|
||
const { rows } = sourceRows({ sources, saved, current: saved });
|
||
assert.deepEqual(rows.at(-1), { key: 'unmounted-drive', title: 'unmounted-drive',
|
||
description: 'unmounted-drive · Gallery root does not exist', scan: null, remove: 'unmounted-drive' });
|
||
});
|
||
|
||
test('an added source is listed as not saved yet with its validated label; a removed one leaves the list', async () => {
|
||
const { sourceRows } = await sourcesModule;
|
||
const labels = new Map([['output/archive', 'archive']]);
|
||
const { rows, note } = sourceRows({ sources: STATUS, saved: ['output', 'input'], current: ['input', 'output/archive'], labels });
|
||
assert.equal(note, null);
|
||
assert.deepEqual(rows.map(row => [row.title, row.description, row.scan?.label ?? null, row.remove]), [
|
||
['ComfyUI input', 'input · manual scan', 'Scan folder', 'input'],
|
||
['archive', 'output/archive · not saved yet', null, 'output/archive'],
|
||
]);
|
||
// Without a recorded label (a reload of System), the folder name stands in.
|
||
assert.equal(sourceRows({ sources: STATUS, saved: [], current: ['output/new-collection'] }).rows[0].title, 'new-collection');
|
||
});
|
||
|
||
test('removing the last entry states auto-detect (D98)', async () => {
|
||
const { sourceRows, NOTES } = await sourcesModule;
|
||
const { rows, note } = sourceRows({ sources: STATUS, saved: ['output', 'input'], current: [] });
|
||
assert.deepEqual(rows, []);
|
||
assert.equal(note, NOTES.removedAll);
|
||
assert.equal(NOTES.removedAll, 'No source is configured. After saving, ComfyUI’s output folder is used.');
|
||
});
|
||
|
||
test('auto-detected sources are listed without Remove and read as the default: "ComfyUI/<path> · <watch> · default"', async () => {
|
||
const { sourceRows, NOTES } = await sourcesModule;
|
||
const auto = { configured: [], auto_detected: true,
|
||
effective: [{ label: 'ComfyUI output', path: 'output', root_index: 0, watch: 'watching', in_comfyui: true }] };
|
||
// The row says it is the default, so no line under the list repeats it; the scan keeps the server's public path.
|
||
assert.deepEqual(sourceRows({ sources: auto, saved: [], current: [] }), { rows: [
|
||
{ key: 'auto:0', title: 'ComfyUI output', description: 'ComfyUI/output · watching · default',
|
||
scan: { label: 'Scan changes', root: 0, path: 'output' }, remove: null },
|
||
], note: null });
|
||
assert.equal('autoDetected' in NOTES, false);
|
||
// An output folder outside the ComfyUI base (--output-directory) is shown by its own name.
|
||
const outside = { ...auto, effective: [{ label: 'Renders', path: 'Renders', root_index: 0, watch: 'manual', in_comfyui: false }] };
|
||
assert.equal(sourceRows({ sources: outside, saved: [], current: [] }).rows[0].description, 'Renders · manual scan · default');
|
||
// Every configured source unusable: ComfyUI's output folder is used instead, and the line says why.
|
||
const fallback = { ...auto, configured: [{ label: 'gone', path: 'gone', valid: false, code: 'not-found', reason: 'Gallery root does not exist' }] };
|
||
const result = sourceRows({ sources: fallback, saved: ['gone'], current: ['gone'] });
|
||
assert.deepEqual(result.rows.map(row => [row.title, row.description, row.remove]),
|
||
[['gone', 'gone · Gallery root does not exist', 'gone'], ['ComfyUI output', 'ComfyUI/output · watching · default', null]]);
|
||
assert.equal(result.note, NOTES.fallback);
|
||
assert.equal(sourceRows({ sources: { configured: [], effective: [], auto_detected: false }, saved: [], current: [] }).note, NOTES.none);
|
||
});
|
||
|
||
test('a configured source keeps its plain public path even inside ComfyUI', async () => {
|
||
const { sourceRows } = await sourcesModule;
|
||
const sources = { ...STATUS, effective: STATUS.effective.map(source => ({ ...source, in_comfyui: true })) };
|
||
const { rows } = sourceRows({ sources, saved: ['output', 'input'], current: ['output', 'input'] });
|
||
assert.deepEqual(rows.map(row => row.description), ['output · watching', 'input · manual scan']);
|
||
});
|
||
|
||
test('a path listed twice in the draft is one row', async () => {
|
||
const { sourceRows } = await sourcesModule;
|
||
assert.equal(sourceRows({ sources: STATUS, saved: ['output', 'input'], current: ['output', 'output'] }).rows.length, 1);
|
||
});
|
||
|
||
test('roots equal to the saved list are the saved list itself, so the draft is clean again', async () => {
|
||
const { draftRoots } = await sourcesModule;
|
||
const saved = ['output', 'input'];
|
||
assert.equal(draftRoots(['output', 'input'], saved), saved);
|
||
assert.deepEqual(draftRoots(['input'], saved), ['input']);
|
||
assert.notEqual(draftRoots(['input', 'output'], saved), saved);
|
||
assert.deepEqual(draftRoots([], undefined), []);
|
||
});
|
||
|
||
test('notice Later persists the 3.2.0 dismissal (pm_update_notice_dismissed); storage that throws keeps it for this view', async () => {
|
||
const { noticeDismissed, dismissNotice, NOTICE_KEY, NOTICE_VERSION } = await sourcesModule;
|
||
assert.deepEqual([NOTICE_KEY, NOTICE_VERSION], ['pm_update_notice_dismissed', '3.2.0']);
|
||
const values = new Map();
|
||
const storage = { getItem: key => values.get(key) ?? null, setItem: (key, value) => values.set(key, String(value)) };
|
||
assert.equal(noticeDismissed(() => storage), false);
|
||
values.set(NOTICE_KEY, '3.1.0');
|
||
assert.equal(noticeDismissed(() => storage), false);
|
||
assert.equal(dismissNotice(() => storage), true);
|
||
assert.equal(values.get(NOTICE_KEY), '3.2.0');
|
||
assert.equal(noticeDismissed(() => storage), true);
|
||
const denied = () => { throw new Error('SecurityError'); };
|
||
assert.equal(noticeDismissed(denied), false);
|
||
assert.equal(dismissNotice(denied), false);
|
||
assert.equal(dismissNotice(() => ({ setItem() { throw new Error('QuotaExceededError'); } })), false);
|
||
});
|
||
|
||
test('Refresh files toasts the rescan counts, or says it finished when they are missing', async () => {
|
||
const { refreshedText } = await sourcesModule;
|
||
assert.equal(refreshedText({ total: 1234, roots: 2 }), 'Files refreshed. 1,234 files in 2 output folders.');
|
||
assert.equal(refreshedText({ total: 1, roots: 1 }), 'Files refreshed. 1 file in 1 output folder.');
|
||
assert.equal(refreshedText({ total: -1, roots: 1 }), 'Files refreshed.');
|
||
assert.equal(refreshedText(null), 'Files refreshed.');
|
||
});
|
||
|
||
test('monitoring switched off: a source still watched says so until the restart (D128)', async () => {
|
||
const { sourceRows } = await sourcesModule;
|
||
const sources = { ...STATUS, effective: [{ ...STATUS.effective[0], watch: 'stopping' }, STATUS.effective[1]] };
|
||
const { rows } = sourceRows({ sources, saved: ['output', 'input'], current: ['output', 'input'] });
|
||
assert.deepEqual(rows.map(row => [row.description, row.scan.label]),
|
||
[['output · watching until restart', 'Scan changes'], ['input · manual scan', 'Scan folder']]);
|
||
});
|
||
|
||
test('a valid configured source missing from the effective list is another spelling of a listed folder (D128)', async () => {
|
||
const { sourceRows, DUPLICATE_SOURCE } = await sourcesModule;
|
||
assert.equal(DUPLICATE_SOURCE, 'same folder as another source');
|
||
const sources = { ...STATUS, configured: [...STATUS.configured,
|
||
{ label: 'output', path: 'output/.', valid: true, code: null, reason: null }] };
|
||
const saved = ['output', 'input', 'output/.'];
|
||
assert.deepEqual(sourceRows({ sources, saved, current: saved }).rows.at(-1), { key: 'output/.', title: 'output',
|
||
description: 'output/. · same folder as another source', scan: null, remove: 'output/.' });
|
||
});
|