Files
ComfyAssets-ComfyUI_PromptM…/web/js/workspace/system-overview.mjs
T
Vito 6505d339aa feat(system): thumbnails on Activity (#311)
* feat(system): run thumbnail generation as an Activity job

GET /prompt_manager/images/thumbnails/plan counts what a run would do
(targets, fresh, remaining past the cap, source labels) and writes
nothing. POST /prompt_manager/jobs/thumbnails {mode, size, quality}
starts the "thumbnails" job: admission guarded, cancellable at a file
boundary, outcome groups generated / skipped / errors. size is the
longest edge (128-2048), quality the encoder, and rebuild writes fresh
previews again through the same atomic rename, so a failed file keeps
its old preview and originals are only read.

The legacy gallery stream now starts or attaches to the same job and
streams its unchanged frames. A client that goes away no longer stops
the work; the gallery's Cancel asks the server to cancel the job.

* feat(activity): per-kind job descriptors

One descriptor table (activity-kinds.mjs) decides each job kind's pill
verb, toasts, line, tiles, outcomes, openable rows and labels; the
store re-exports it. The scan and image tagging views are unchanged.
A thumbnail job counts Generated, Skipped and Errors, reads
"Generating thumbnails" in the pill and "Thumbnails finished · N
generated · M errors" when it ends.

Any other kind (the health check, a held legacy-page operation) gets
the generic descriptor with no tiles and no Results, instead of the
scan's zero tiles. A running job without a known total shows an
indeterminate progress bar and no percentage, and only a job the
server can cancel shows Cancel.

* feat(system): review and start thumbnail jobs

Sources' Thumbnail generation -> Review options and Overview's Review
thumbnails open the concept's Thumbnail maintenance dialog: scope, quality
(preselected from Image loading quality) and preview size limit, a plan
line from the read-only thumbnail plan (D99) and Start, which starts the
thumbnails Activity job and opens it. A size outside 128-2048 requests
nothing; a refused start shows the busy link toast.

* fix(system): thumbnail job review fixes (#249 S5)

- The legacy stream's first frame is job {id, started}, sent after the
  subscription so no runner frame is missed; it reads the registry after
  prepare, so a job started in that gap is attached to, not refused.
- Every exit sets a truthful final status line; nothing to do never
  reads "Processing file 0 of 0".
- Cancel is checked per file during the planning walk; a job cancelled
  there publishes no start frame.
- The ffmpeg fallback keeps the chosen quality (-q:v) and the aspect
  ratio; the placeholder uses the chosen JPEG settings.
- A locked preview on Windows reads "Preview in use by another program;
  the old one was kept", not the raw WinError.
- Thumbnail work no longer defers the monitor's Needs review recording:
  it writes previews only, never records.
- The disconnect test now proves the job outlives its stream (one worker,
  9 files, three batches); the attach test waits on an event.

* fix(gallery): cancel the stream's own thumbnail job by id

The settings panel and the startup dialog cancel the job named by the
stream's job frame, and only one their stream started. A Cancel before
the frame waits for it, a double Cancel posts once, and a job another
tab or System started keeps running. The startup dialog now settles on
Cancel instead of staying on "Cancelling...".

* fix(activity): indeterminate pill bar and the nothing-to-do line

The pill's mini bar sweeps while a job's total is unknown instead of
showing an empty fill. A finished thumbnail job with nothing to do shows
the server's final line. Coverage floors raised for gallery.js and
activity.mjs.
2026-10-23 16:58:06 -07:00

434 lines
21 KiB
JavaScript
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
/**
* System › Overview (#249 System S2 Task 6): the concept's `renderSystem` "general" body (app.js 658–675) on real
* values, its Statistics dialog ("Usage statistics", a1600–1604) and its health report (`health-check`, a1439–1456).
*
* - The four `.summary-metrics` and the two `.two-col` surfaces ("Library health", "Workspace preferences") come from
* one `GET /prompt_manager/system/overview`. D93: metric 4 is the last health result (Not checked / Passed /
* N issues / Incomplete); the review, backup, thumbnail and sources rows say what the server reports, and nothing
* reads 0 before the read answers: a load shows a status line, a failure an alert and Retry. The thumbnail row is
* its own read of `/images/thumbnails/status` (a walk of every source): "Checking thumbnails…" until it answers.
* D99: its Review thumbnails opens the same "Thumbnail maintenance" dialog as Sources (thumbnail-review.mjs).
* - D96: the Statistics dialog lists the real runs and average rating per category, then "Library totals".
* - D95: the "Health report" lists every check the server ran, Missing files per image source, with a chip per real
* result and when it was checked. The check runs from Maintenance's notice ("Run health checks", D123) as a
* read job of the registry, tracked in the Activity store (its event stream); the report opens when it ends.
*
* Reads run through `latestOnly()` on the section's scope, so a late answer never repaints a newer section.
*/
import { createButton } from '../shared/toolkit/core.js';
import { navigateTo } from './state.mjs';
import { closeWorkspaceDialog, openContentDialog } from './workspace-dialogs.mjs';
import { showWorkspaceToast } from './toast.mjs';
import { noun } from './plural.mjs';
import { operationRow } from './system-controls.mjs';
import { openThumbnailReview } from './thumbnail-review.mjs';
export const OVERVIEW_URL = '/prompt_manager/system/overview';
export const STATISTICS_URL = '/prompt_manager/system/statistics';
export const HEALTH_URL = '/prompt_manager/system/health';
export const THUMBNAILS_URL = '/prompt_manager/images/thumbnails/status';
export const HEALTH_KIND = 'health';
export const LOADING_TEXT = 'Loading the overview…';
export const THUMBNAILS_LOADING = 'Checking thumbnails…';
export const LOAD_FAILED_TEXT = 'The overview could not be loaded. Your saved data has not changed.';
export const STATISTICS_FAILED_TEXT = 'Statistics could not be loaded. Your saved data has not changed.';
export const HEALTH_FAILED_TEXT = 'The health check could not finish. Nothing was changed.';
export const NOT_AVAILABLE = 'Not available yet.';
const number = value => Number(value).toLocaleString();
function el(tag, text, className) {
const node = document.createElement(tag);
if (text !== undefined) node.textContent = text;
if (className) node.className = className;
return node;
}
/**
* D93: metric 4, the last health result of this server session: the checks that found issues, even when another
* check could not run; otherwise Passed, or Incomplete while a check was unavailable or failed.
*/
export function integrityText(health) {
if (!health) return 'Not checked';
if (health.issues > 0) return `${number(health.issues)} ${noun(health.issues, 'issue')}`;
return health.status === 'passed' ? 'Passed' : 'Incomplete';
}
/** The concept's four metrics `[value, label]`, in its order. */
export function metricValues(overview) {
return [
[number(overview.library.positive_prompts), 'Positive prompts'],
[number(overview.library.negative_variants), 'Negative variants'],
[number(overview.images.indexed), 'Images'],
[integrityText(overview.health), 'Database integrity'],
];
}
/** D93 (Q6): the review row's title; a count only once the Needs review queue reports one. */
export function ambiguousTitle(needsReview) {
const pending = needsReview?.pending;
if (!Number.isSafeInteger(pending)) return 'Ambiguous image links';
return `${number(pending)} ambiguous image ${noun(pending, 'link')}`;
}
/** D93: the backup row; only a recorded, verified backup is ever named. */
export function backupText(backup) {
if (!backup) return 'No retained backup record.';
const when = new Date(backup.verified_at ?? backup.created_at);
return Number.isNaN(when.getTime()) ? 'No retained backup record.' : `Last verified backup ${when.toLocaleString()}.`;
}
/**
* D93: the thumbnail row's title from the `/images/thumbnails/status` answer: undefined while it is read, null when
* the read failed; with no image source (`sources.effective` 0) there is nothing to count.
*/
export function thumbnailTitle(status, sources) {
if (status === undefined) return THUMBNAILS_LOADING;
const missing = status?.pending;
if (!Number.isSafeInteger(missing) || sources?.effective === 0) return 'Thumbnail status unavailable';
if (missing === 0) return 'No missing thumbnails';
return `${number(missing)} missing ${noun(missing, 'thumbnail')}`;
}
const SOURCES_SHARED = 'Monitoring and enrichment share one source list.';
/** D93: the sources row, `[title, description]`: the sources in use and how they were chosen. */
export function sourcesCopy(sources) {
const { configured, effective, auto_detected: auto } = sources;
const title = `${number(effective)} output ${noun(effective, 'source')}`;
if (auto) return [title, `None configured is available; ComfyUI's output folder is used. ${SOURCES_SHARED}`];
if (configured !== effective) return [title, `${number(effective)} of ${number(configured)} configured ${noun(configured, 'source')} available. ${SOURCES_SHARED}`];
return [title, SOURCES_SHARED];
}
// D95: an issue chip names what was found; the concept's own wording for missing files and ambiguous metadata.
const ISSUE_NOUNS = Object.freeze({
integrity: ['problem found', 'problems found'],
foreign_keys: ['broken reference', 'broken references'],
canonical_hashes: ['hash does not match its text', 'hashes do not match their text'],
pair_uniqueness: ['duplicate pair row', 'duplicate pair rows'],
missing_files: ['link needs review', 'links need review'],
ambiguous_metadata: ['image needs review', 'images need review'],
consistency: ['inconsistency', 'inconsistencies'],
});
/** D95: a check's chip from its real status. */
export function checkChip(check) {
if (check.status === 'passed') return 'Passed';
if (check.status === 'failed') return 'Could not check';
if (check.status === 'unavailable') return check.id === 'ambiguous_metadata' ? NOT_AVAILABLE.slice(0, -1) : 'Not available';
const [one, many] = ISSUE_NOUNS[check.id] ?? ['issue', 'issues'];
if (!Number.isSafeInteger(check.count)) return 'Issues found';
// SQLite stops listing integrity problems at its limit, so a capped count is a lower bound ("100+").
if (check.capped === true) return `${number(check.count)}+ ${many}`;
return `${number(check.count)} ${check.count === 1 ? one : many}`;
}
function sourceChip(source) {
if (source.status !== 'checked') return 'Not available';
return source.count === 0 ? 'Passed' : checkChip({ id: 'missing_files', status: 'issues', count: source.count });
}
/** D95: the report's rows `[label, chip]` in the server's order; Missing files once per image source when several. */
export function healthRows(report) {
return report.checks.flatMap(check => {
const sources = check.id === 'missing_files' && Array.isArray(check.sources) ? check.sources : [];
if (sources.length < 2) return [[check.label, checkChip(check)]];
return sources.map(source => [`${check.label} · ${source.name}`, sourceChip(source)]);
});
}
/** D95: when the report was taken, and whether it is complete. */
export function healthSummary(report) {
const when = new Date(report.checked_at);
const time = Number.isNaN(when.getTime()) ? '' : `Checked ${when.toLocaleString()}. `;
if (report.status === 'passed') return `${time}Every check passed.`;
if (report.status === 'incomplete') return `${time}Some checks could not run, so this report is incomplete.`;
return `${time}Nothing was changed; review the checks with issues.`;
}
/** D96: the concept's "Runs by category" rows `[category, runs, average rating]`. */
export function categoryRows(statistics) {
return statistics.by_category.map(row => [
row.category ?? 'Uncategorized',
number(row.runs),
row.average_rating === null || row.average_rating === undefined ? 'Not rated'
: `${Number(row.average_rating).toLocaleString(undefined, { maximumFractionDigits: 2 })} / 5`,
]);
}
/** D96: the added "Library totals" rows `[label, count]` (the legacy statistics and the rated images). */
export function totalsRows(statistics) {
const { totals } = statistics;
return [['Prompts', totals.total_prompts], ['Tags', totals.total_tags], ['Images', totals.total_images],
['Rated images', statistics.rated_images]].map(([label, value]) => [label, number(value)]);
}
function table(caption, head, rows, empty) {
const node = el('table');
const header = el('tr');
for (const text of head) {
const cell = el('th', text);
cell.scope = 'col';
header.append(cell);
}
const thead = el('thead');
thead.append(header);
const tbody = el('tbody');
for (const values of rows) {
const row = el('tr');
row.append(...values.map(text => el('td', text)));
tbody.append(row);
}
if (rows.length === 0) {
const row = el('tr');
const cell = el('td', empty);
cell.colSpan = head.length;
row.append(cell);
tbody.append(row);
}
node.append(el('caption', caption), thead, tbody);
return node;
}
/** The Statistics dialog: "Runs by category" (the concept's table), then "Library totals" (D96). */
export function statisticsNodes(statistics) {
return [
table('Runs by category', ['Category', 'Runs', 'Avg. rating'], categoryRows(statistics), 'No prompts in the library yet.'),
table('Library totals', ['Total', 'Count'], totalsRows(statistics), ''),
];
}
/** The concept's health report body: `.operation-list` of `h3` + chip, the D95 summary, then Close / Review missing links. */
export function healthNodes(report, { scope, onReviewMissing }) {
const list = el('div', undefined, 'operation-list');
for (const [label, chip] of healthRows(report)) {
const row = el('div', undefined, 'operation');
row.append(el('h3', label), el('span', chip, 'chip'));
list.append(row);
}
const close = createButton('Close');
const review = createButton('Review missing links', 'ca-primary');
scope.listen(close, 'click', () => closeWorkspaceDialog());
scope.listen(review, 'click', () => onReviewMissing());
const actions = el('div', undefined, 'dialog-actions');
actions.append(close, review);
return [list, el('p', healthSummary(report), 'small'), actions];
}
/**
* Wait until the job `id` has ended, following it in the Activity store (`activity`), which streams the job's events
* and marks it lost when the server no longer lists it; nothing here polls. Resolves its final state ('finished',
* 'failed', 'cancelled' or 'lost').
*/
export function waitForJob(activity, id, { signal } = {}) {
if (signal?.aborted) return Promise.reject(signal.reason);
return new Promise((resolve, reject) => {
const check = () => {
const state = activity.find(id)?.state;
if (state && state !== 'running') finish(resolve, state);
};
const onAbort = () => finish(reject, signal.reason);
const unsubscribe = activity.subscribe(check);
function finish(settle, value) {
unsubscribe();
signal?.removeEventListener('abort', onAbort);
settle(value);
}
signal?.addEventListener('abort', onAbort, { once: true });
check();
});
}
/**
* Run the health check and resolve its report. The started job is tracked in the Activity store; a check already
* running (409 busy, another tab) is found in the store's job list and waited for instead of refused. Rejects when the
* check fails or ends without a report.
*/
export async function runHealthCheck(api, { activity, signal } = {}) {
let id;
try {
const { job } = await api.post(HEALTH_URL, {}, { signal });
id = activity.track(job).id;
} catch (error) {
if (error?.status !== 409 || error?.code !== 'busy') throw error;
await activity.load();
id = activity.running().find(job => job.kind === HEALTH_KIND)?.id;
// The other check ended between the refusal and this read: its report is the latest.
}
const state = id ? await waitForJob(activity, id, { signal }) : 'finished';
if (state !== 'finished') throw new Error(HEALTH_FAILED_TEXT);
const { report } = await api.get(HEALTH_URL, { signal, cache: 'no-store' });
if (!report) throw new Error(HEALTH_FAILED_TEXT);
return report;
}
/** Open the Health report for `report` (the Maintenance notice's and, from S7, its Check action's dialog). */
export function openHealthReport(report, { scope, trigger = null, navigate = navigateTo }) {
openContentDialog({ scope, title: 'Health report', trigger, nodes: healthNodes(report, { scope,
// Missing-link cleanup lives in Maintenance (its D94 hand-off until S7).
onReviewMissing: () => { closeWorkspaceDialog(); navigate('#/system/maintenance'); } }) });
}
/**
* The concept's Maintenance notice ("Check first. Review changes. Then apply." + "Run health checks", a689), which
* S2 delivers ahead of the rest of Maintenance (D123): the press runs the read-only check, then opens the report.
*/
export function healthNotice({ api, activity, scope, navigate = navigateTo, notify = showWorkspaceToast }) {
const notice = el('div', undefined, 'notice');
const text = el('div');
text.append(el('h2', 'Check first. Review changes. Then apply.'),
el('p', 'One home for database and media maintenance. Scanning is separate from changing or removing records.'));
const run = createButton('Run health checks', 'ca-primary');
notice.append(text, run);
scope.listen(run, 'click', async () => {
if (run.getAttribute('aria-disabled') === 'true') return;
run.setAttribute('aria-disabled', 'true');
run.textContent = 'Checking…';
try {
const report = await runHealthCheck(api, { activity, signal: scope.signal });
if (scope.signal.aborted) return;
openHealthReport(report, { scope, trigger: run, navigate });
} catch (error) {
if (!scope.signal.aborted) notify(HEALTH_FAILED_TEXT);
} finally {
if (!scope.signal.aborted) {
run.removeAttribute('aria-disabled');
run.textContent = 'Run health checks';
}
}
});
return notice;
}
function metricsNode(overview) {
const metrics = el('div', undefined, 'summary-metrics');
for (const [value, label] of metricValues(overview)) {
const metric = el('div', undefined, 'metric');
metric.append(el('strong', value), el('span', label));
metrics.append(metric);
}
return metrics;
}
function surface(heading, rows) {
const section = el('section', undefined, 'surface');
section.append(el('h2', heading), ...rows);
return section;
}
/** The Overview's nodes, and its thumbnail row (painted by its own read). */
function overviewNodes(overview, { scope, navigate, openStatistics, openThumbnails }) {
const go = section => () => navigate(`#/system/${section}`);
const review = operationRow({ scope, title: ambiguousTitle(overview.needs_review),
description: Number.isSafeInteger(overview.needs_review?.pending)
? 'Review metadata before assigning a positive / negative pair.' : NOT_AVAILABLE,
label: 'Review metadata', onClick: () => navigate('#/review') });
const [sourcesTitle, sourcesDescription] = sourcesCopy(overview.sources);
const thumbnails = operationRow({ scope, title: THUMBNAILS_LOADING, description: 'Generate only missing previews when necessary.',
label: 'Review thumbnails', onClick: openThumbnails });
const health = surface('Library health', [
review,
operationRow({ scope, title: 'Backup status', description: backupText(overview.backup), label: 'View backups',
onClick: go('backups') }),
// D99: Review thumbnails opens the thumbnail dialog (the concept's row starts a sample job directly).
thumbnails,
]);
const preferences = surface('Workspace preferences', [
operationRow({ scope, title: 'One display configuration', description: 'Grid and density settings are shared across views.',
label: 'Appearance', onClick: go('appearance') }),
operationRow({ scope, title: sourcesTitle, description: sourcesDescription, label: 'Manage sources', onClick: go('sources') }),
operationRow({ scope, title: 'Statistics', description: 'Runs and ratings by category, with library totals.', label: 'Explore',
onClick: openStatistics }),
]);
const columns = el('div', undefined, 'two-col');
columns.append(health, preferences);
return { nodes: [metricsNode(overview), columns], thumbnails };
}
/**
* The Overview section's mount (`mountSystem`'s `sections.overview`): returns its loading line, which the server's
* answer replaces in place (the concept's metrics and columns sit directly in `.settings-layout`). A read that a newer
* one superseded, or one answering after the section left, paints nothing.
*/
export function mountOverview(container, { api, activity, scope, navigate = navigateTo, notify = showWorkspaceToast,
latestOnly = window.ApiClient.latestOnly, STALE = window.ApiClient.STALE }) {
const overviewRead = latestOnly({ lifetime: scope.signal });
const statisticsRead = latestOnly({ lifetime: scope.signal });
const thumbnailsRead = latestOnly({ lifetime: scope.signal });
let shown = [];
// The thumbnail status (undefined while read, null when it failed), painted into the row whenever both are there.
let thumbnailStatus;
let thumbnailRow = null;
let sources = null;
const paintThumbnails = () => {
if (thumbnailRow) thumbnailRow.querySelector('h3').textContent = thumbnailTitle(thumbnailStatus, sources);
};
function swap(nodes) {
const anchor = shown.find(node => node.isConnected);
if (anchor) anchor.before(...nodes);
for (const node of shown) node.remove();
shown = nodes;
return nodes;
}
async function openStatistics(button) {
try {
const statistics = await statisticsRead(signal => api.get(STATISTICS_URL, { signal, cache: 'no-store' }));
if (statistics === STALE || scope.signal.aborted) return;
openContentDialog({ scope, title: 'Usage statistics', trigger: button, nodes: statisticsNodes(statistics) });
} catch (error) {
if (!scope.signal.aborted) notify(STATISTICS_FAILED_TEXT);
}
}
function loading() {
const status = el('p', LOADING_TEXT, 'small');
status.setAttribute('role', 'status');
return [status];
}
async function load() {
try {
const overview = await overviewRead(signal => api.get(OVERVIEW_URL, { signal, cache: 'no-store' }));
if (overview === STALE || scope.signal.aborted) return;
const { nodes, thumbnails } = overviewNodes(overview, { scope, navigate, openStatistics,
openThumbnails: trigger => openThumbnailReview({ api, store: activity, scope, trigger, navigate }) });
thumbnailRow = thumbnails;
sources = overview.sources;
swap(nodes);
paintThumbnails();
} catch (error) {
if (scope.signal.aborted) return;
const alert = el('p', LOAD_FAILED_TEXT);
alert.setAttribute('role', 'alert');
const retry = createButton('Retry');
scope.listen(retry, 'click', () => {
swap(loading());
load();
loadThumbnails();
});
const panel = el('section', undefined, 'surface');
panel.append(alert, retry);
swap([panel]);
}
}
async function loadThumbnails() {
let status;
try {
status = await thumbnailsRead(signal => api.get(THUMBNAILS_URL, { signal, cache: 'no-store' }));
} catch (error) {
status = null;
}
if (status === STALE || scope.signal.aborted) return;
thumbnailStatus = status ?? null;
paintThumbnails();
}
const first = swap(loading());
load();
loadThumbnails();
return first;
}