Add custom nodes, Civitai loras (LFS), and vast.ai setup script
Some checks failed
Python Linting / Run Ruff (push) Has been cancelled
Python Linting / Run Pylint (push) Has been cancelled
Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.10, [self-hosted Linux], stable) (push) Has been cancelled
Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.11, [self-hosted Linux], stable) (push) Has been cancelled
Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.12, [self-hosted Linux], stable) (push) Has been cancelled
Full Comfy CI Workflow Runs / test-unix-nightly (12.1, , linux, 3.11, [self-hosted Linux], nightly) (push) Has been cancelled
Execution Tests / test (macos-latest) (push) Has been cancelled
Execution Tests / test (ubuntu-latest) (push) Has been cancelled
Execution Tests / test (windows-latest) (push) Has been cancelled
Test server launches without errors / test (push) Has been cancelled
Unit Tests / test (macos-latest) (push) Has been cancelled
Unit Tests / test (ubuntu-latest) (push) Has been cancelled
Unit Tests / test (windows-2022) (push) Has been cancelled
Some checks failed
Python Linting / Run Ruff (push) Has been cancelled
Python Linting / Run Pylint (push) Has been cancelled
Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.10, [self-hosted Linux], stable) (push) Has been cancelled
Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.11, [self-hosted Linux], stable) (push) Has been cancelled
Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.12, [self-hosted Linux], stable) (push) Has been cancelled
Full Comfy CI Workflow Runs / test-unix-nightly (12.1, , linux, 3.11, [self-hosted Linux], nightly) (push) Has been cancelled
Execution Tests / test (macos-latest) (push) Has been cancelled
Execution Tests / test (ubuntu-latest) (push) Has been cancelled
Execution Tests / test (windows-latest) (push) Has been cancelled
Test server launches without errors / test (push) Has been cancelled
Unit Tests / test (macos-latest) (push) Has been cancelled
Unit Tests / test (ubuntu-latest) (push) Has been cancelled
Unit Tests / test (windows-2022) (push) Has been cancelled
Includes 30 custom nodes committed directly, 7 Civitai-exclusive loras stored via Git LFS, and a setup script that installs all dependencies and downloads HuggingFace-hosted models on vast.ai. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
250
custom_nodes/ComfyUI-Crystools/web/monitorUI.ts
Normal file
250
custom_nodes/ComfyUI-Crystools/web/monitorUI.ts
Normal file
@@ -0,0 +1,250 @@
|
||||
import { ProgressBarUIBase } from './progressBarUIBase.js';
|
||||
import { createStyleSheet, formatBytes } from './utils.js';
|
||||
|
||||
export class MonitorUI extends ProgressBarUIBase {
|
||||
lastMonitor = 1; // just for order on monitors section
|
||||
styleSheet: HTMLStyleElement;
|
||||
maxVRAMUsed: Record<number, number> = {}; // Add this to track max VRAM per GPU
|
||||
|
||||
constructor(
|
||||
public override rootElement: HTMLElement,
|
||||
private monitorCPUElement: TMonitorSettings,
|
||||
private monitorRAMElement: TMonitorSettings,
|
||||
private monitorHDDElement: TMonitorSettings,
|
||||
private monitorGPUSettings: TMonitorSettings[],
|
||||
private monitorVRAMSettings: TMonitorSettings[],
|
||||
private monitorTemperatureSettings: TMonitorSettings[],
|
||||
private currentRate: number,
|
||||
) {
|
||||
super('crystools-monitors-root', rootElement);
|
||||
this.createDOM();
|
||||
|
||||
this.styleSheet = createStyleSheet('crystools-monitors-size');
|
||||
}
|
||||
|
||||
createDOM = (): void => {
|
||||
if (!this.rootElement) {
|
||||
throw Error('Crystools: MonitorUI - Container not found');
|
||||
}
|
||||
|
||||
// this.container.style.order = '2';
|
||||
this.rootElement.appendChild(this.createMonitor(this.monitorCPUElement));
|
||||
this.rootElement.appendChild(this.createMonitor(this.monitorRAMElement));
|
||||
this.rootElement.appendChild(this.createMonitor(this.monitorHDDElement));
|
||||
this.updateAllAnimationDuration(this.currentRate);
|
||||
};
|
||||
|
||||
createDOMGPUMonitor = (monitorSettings?: TMonitorSettings): void => {
|
||||
if (!(monitorSettings && this.rootElement)) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.rootElement.appendChild(this.createMonitor(monitorSettings));
|
||||
this.updateAllAnimationDuration(this.currentRate);
|
||||
};
|
||||
|
||||
orderMonitors = (): void => {
|
||||
try {
|
||||
// @ts-ignore
|
||||
this.monitorCPUElement.htmlMonitorRef.style.order = '' + this.lastMonitor++;
|
||||
// @ts-ignore
|
||||
this.monitorRAMElement.htmlMonitorRef.style.order = '' + this.lastMonitor++;
|
||||
// @ts-ignore
|
||||
this.monitorGPUSettings.forEach((_monitorSettings, index) => {
|
||||
// @ts-ignore
|
||||
this.monitorGPUSettings[index].htmlMonitorRef.style.order = '' + this.lastMonitor++;
|
||||
// @ts-ignore
|
||||
this.monitorVRAMSettings[index].htmlMonitorRef.style.order = '' + this.lastMonitor++;
|
||||
// @ts-ignore
|
||||
this.monitorTemperatureSettings[index].htmlMonitorRef.style.order = '' + this.lastMonitor++;
|
||||
});
|
||||
// @ts-ignore
|
||||
this.monitorHDDElement.htmlMonitorRef.style.order = '' + this.lastMonitor++;
|
||||
} catch (error) {
|
||||
console.error('orderMonitors', error);
|
||||
}
|
||||
};
|
||||
|
||||
updateDisplay = (data: TStatsData): void => {
|
||||
this.updateMonitor(this.monitorCPUElement, data.cpu_utilization);
|
||||
this.updateMonitor(this.monitorRAMElement, data.ram_used_percent, data.ram_used, data.ram_total);
|
||||
this.updateMonitor(this.monitorHDDElement, data.hdd_used_percent, data.hdd_used, data.hdd_total);
|
||||
|
||||
if (data.gpus === undefined || data.gpus.length === 0) {
|
||||
console.warn('UpdateAllMonitors: no GPU data');
|
||||
return;
|
||||
}
|
||||
|
||||
this.monitorGPUSettings.forEach((monitorSettings, index) => {
|
||||
if (data.gpus[index]) {
|
||||
const gpu = data.gpus[index];
|
||||
if (gpu === undefined) {
|
||||
// console.error('UpdateAllMonitors: no GPU data for index', index);
|
||||
return;
|
||||
}
|
||||
|
||||
this.updateMonitor(monitorSettings, gpu.gpu_utilization);
|
||||
} else {
|
||||
// console.error('UpdateAllMonitors: no GPU data for index', index);
|
||||
}
|
||||
});
|
||||
|
||||
this.monitorVRAMSettings.forEach((monitorSettings, index) => {
|
||||
if (data.gpus[index]) {
|
||||
const gpu = data.gpus[index];
|
||||
if (gpu === undefined) {
|
||||
// console.error('UpdateAllMonitors: no GPU VRAM data for index', index);
|
||||
return;
|
||||
}
|
||||
|
||||
this.updateMonitor(monitorSettings, gpu.vram_used_percent, gpu.vram_used, gpu.vram_total);
|
||||
} else {
|
||||
// console.error('UpdateAllMonitors: no GPU VRAM data for index', index);
|
||||
}
|
||||
});
|
||||
|
||||
this.monitorTemperatureSettings.forEach((monitorSettings, index) => {
|
||||
if (data.gpus[index]) {
|
||||
const gpu = data.gpus[index];
|
||||
if (gpu === undefined) {
|
||||
// console.error('UpdateAllMonitors: no GPU VRAM data for index', index);
|
||||
return;
|
||||
}
|
||||
|
||||
this.updateMonitor(monitorSettings, gpu.gpu_temperature);
|
||||
if (monitorSettings.cssColorFinal && monitorSettings.htmlMonitorSliderRef) {
|
||||
monitorSettings.htmlMonitorSliderRef.style.backgroundColor =
|
||||
`color-mix(in srgb, ${monitorSettings.cssColorFinal} ${gpu.gpu_temperature}%, ${monitorSettings.cssColor})`;
|
||||
}
|
||||
} else {
|
||||
// console.error('UpdateAllMonitors: no GPU VRAM data for index', index);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// eslint-disable-next-line complexity
|
||||
updateMonitor = (monitorSettings: TMonitorSettings, percent: number, used?: number, total?: number): void => {
|
||||
if (!(monitorSettings.htmlMonitorSliderRef && monitorSettings.htmlMonitorLabelRef)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (percent < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const prefix = monitorSettings.monitorTitle ? monitorSettings.monitorTitle + ' - ' : '';
|
||||
let title = `${Math.floor(percent)}${monitorSettings.symbol}`;
|
||||
let postfix = '';
|
||||
|
||||
// Add max VRAM tracking for VRAM monitors
|
||||
if (used !== undefined && total !== undefined) {
|
||||
// Extract GPU index from monitorTitle (assuming format "X: GPU Name")
|
||||
const gpuIndex = parseInt(monitorSettings.monitorTitle?.split(':')[0] || '0');
|
||||
|
||||
// Initialize max VRAM if not set or glitch
|
||||
if (!this.maxVRAMUsed[gpuIndex] || this.maxVRAMUsed[gpuIndex]! > total) {
|
||||
this.maxVRAMUsed[gpuIndex] = 0;
|
||||
}
|
||||
|
||||
// Update max VRAM if current usage is higher
|
||||
if ( used > this.maxVRAMUsed[gpuIndex]!) {
|
||||
this.maxVRAMUsed[gpuIndex] = used;
|
||||
}
|
||||
|
||||
postfix = ` - ${formatBytes(used)} / ${formatBytes(total)}`;
|
||||
// Add max VRAM to tooltip
|
||||
postfix += ` Max: ${formatBytes(this.maxVRAMUsed[gpuIndex]!)}`;
|
||||
}
|
||||
|
||||
title = `${prefix}${title}${postfix}`;
|
||||
|
||||
if (monitorSettings.htmlMonitorRef) {
|
||||
monitorSettings.htmlMonitorRef.title = title;
|
||||
}
|
||||
monitorSettings.htmlMonitorLabelRef.innerHTML = `${Math.floor(percent)}${monitorSettings.symbol}`;
|
||||
monitorSettings.htmlMonitorSliderRef.style.width = `${Math.floor(percent)}%`;
|
||||
};
|
||||
|
||||
updateAllAnimationDuration = (value: number): void => {
|
||||
this.updatedAnimationDuration(this.monitorCPUElement, value);
|
||||
this.updatedAnimationDuration(this.monitorRAMElement, value);
|
||||
this.updatedAnimationDuration(this.monitorHDDElement, value);
|
||||
this.monitorGPUSettings.forEach((monitorSettings) => {
|
||||
monitorSettings && this.updatedAnimationDuration(monitorSettings, value);
|
||||
});
|
||||
this.monitorVRAMSettings.forEach((monitorSettings) => {
|
||||
monitorSettings && this.updatedAnimationDuration(monitorSettings, value);
|
||||
});
|
||||
this.monitorTemperatureSettings.forEach((monitorSettings) => {
|
||||
monitorSettings && this.updatedAnimationDuration(monitorSettings, value);
|
||||
});
|
||||
};
|
||||
|
||||
updatedAnimationDuration = (monitorSettings: TMonitorSettings, value: number): void => {
|
||||
const slider = monitorSettings.htmlMonitorSliderRef;
|
||||
if (!slider) {
|
||||
return;
|
||||
}
|
||||
|
||||
slider.style.transition = `width ${value.toFixed(1)}s`;
|
||||
};
|
||||
|
||||
createMonitor = (monitorSettings?: TMonitorSettings): HTMLDivElement => {
|
||||
if (!monitorSettings) {
|
||||
// just for typescript
|
||||
return document.createElement('div');
|
||||
}
|
||||
|
||||
const htmlMain = document.createElement('div');
|
||||
htmlMain.classList.add(monitorSettings.id);
|
||||
htmlMain.classList.add('crystools-monitor');
|
||||
|
||||
monitorSettings.htmlMonitorRef = htmlMain;
|
||||
|
||||
if (monitorSettings.title) {
|
||||
htmlMain.title = monitorSettings.title;
|
||||
}
|
||||
|
||||
const htmlMonitorText = document.createElement('div');
|
||||
htmlMonitorText.classList.add('crystools-text');
|
||||
htmlMonitorText.innerHTML = monitorSettings.label;
|
||||
htmlMain.append(htmlMonitorText);
|
||||
|
||||
const htmlMonitorContent = document.createElement('div');
|
||||
htmlMonitorContent.classList.add('crystools-content');
|
||||
htmlMain.append(htmlMonitorContent);
|
||||
|
||||
const htmlMonitorSlider = document.createElement('div');
|
||||
htmlMonitorSlider.classList.add('crystools-slider');
|
||||
if (monitorSettings.cssColorFinal) {
|
||||
htmlMonitorSlider.style.backgroundColor =
|
||||
`color-mix(in srgb, ${monitorSettings.cssColorFinal} 0%, ${monitorSettings.cssColor})`;
|
||||
} else {
|
||||
htmlMonitorSlider.style.backgroundColor = monitorSettings.cssColor;
|
||||
}
|
||||
monitorSettings.htmlMonitorSliderRef = htmlMonitorSlider;
|
||||
htmlMonitorContent.append(htmlMonitorSlider);
|
||||
|
||||
const htmlMonitorLabel = document.createElement('div');
|
||||
htmlMonitorLabel.classList.add('crystools-label');
|
||||
monitorSettings.htmlMonitorLabelRef = htmlMonitorLabel;
|
||||
htmlMonitorContent.append(htmlMonitorLabel);
|
||||
htmlMonitorLabel.innerHTML = '0%';
|
||||
return monitorSettings.htmlMonitorRef;
|
||||
};
|
||||
|
||||
updateMonitorSize = (width: number, height: number): void => {
|
||||
// eslint-disable-next-line max-len
|
||||
this.styleSheet.innerText = `#crystools-monitors-root .crystools-monitor .crystools-content {height: ${height}px; width: ${width}px;}`;
|
||||
};
|
||||
|
||||
showMonitor = (monitorSettings: TMonitorSettings, value: boolean): void => {
|
||||
if (monitorSettings.htmlMonitorRef) {
|
||||
monitorSettings.htmlMonitorRef.style.display = value ? 'flex' : 'none';
|
||||
}
|
||||
};
|
||||
|
||||
resetMaxVRAM = (): void => {
|
||||
this.maxVRAMUsed = {};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user