mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-03-23 22:22:11 -03:00
- Extract common mode change logic from lora_randomizer.js and lora_stacker.js into new mode-change-handler.ts TypeScript module - Add LORA_PROVIDER_NODE_TYPES constant to centralize LoRA provider node types - Update getActiveLorasFromNode in utils.js to support Lora Cycler's cycler_config widget (single current_lora_filename) - Update getConnectedInputStackers and updateDownstreamLoaders to use isLoraProviderNode helper instead of hardcoded class checks - Register mode change handlers in main.ts for all LoRA provider nodes (Lora Stacker, Lora Randomizer, Lora Cycler) - Add value change callback to Lora Cycler widget to trigger updateDownstreamLoaders when current_lora_filename changes - Remove duplicate mode change logic from lora_stacker.js - Delete lora_randomizer.js (logic now centralized) Co-Authored-By: Claude <noreply@anthropic.com>
446 lines
12 KiB
TypeScript
446 lines
12 KiB
TypeScript
import { createApp, type App as VueApp } from 'vue'
|
|
import PrimeVue from 'primevue/config'
|
|
import LoraPoolWidget from '@/components/LoraPoolWidget.vue'
|
|
import LoraRandomizerWidget from '@/components/LoraRandomizerWidget.vue'
|
|
import LoraCyclerWidget from '@/components/LoraCyclerWidget.vue'
|
|
import JsonDisplayWidget from '@/components/JsonDisplayWidget.vue'
|
|
import type { LoraPoolConfig, LegacyLoraPoolConfig, RandomizerConfig, CyclerConfig } from './composables/types'
|
|
import {
|
|
setupModeChangeHandler,
|
|
createModeChangeCallback,
|
|
LORA_PROVIDER_NODE_TYPES
|
|
} from './mode-change-handler'
|
|
|
|
const LORA_POOL_WIDGET_MIN_WIDTH = 500
|
|
const LORA_POOL_WIDGET_MIN_HEIGHT = 400
|
|
const LORA_RANDOMIZER_WIDGET_MIN_WIDTH = 500
|
|
const LORA_RANDOMIZER_WIDGET_MIN_HEIGHT = 448
|
|
const LORA_RANDOMIZER_WIDGET_MAX_HEIGHT = LORA_RANDOMIZER_WIDGET_MIN_HEIGHT
|
|
const LORA_CYCLER_WIDGET_MIN_WIDTH = 380
|
|
const LORA_CYCLER_WIDGET_MIN_HEIGHT = 316
|
|
const LORA_CYCLER_WIDGET_MAX_HEIGHT = LORA_CYCLER_WIDGET_MIN_HEIGHT
|
|
const JSON_DISPLAY_WIDGET_MIN_WIDTH = 300
|
|
const JSON_DISPLAY_WIDGET_MIN_HEIGHT = 200
|
|
|
|
// @ts-ignore - ComfyUI external module
|
|
import { app } from '../../../scripts/app.js'
|
|
// @ts-ignore
|
|
import { getPoolConfigFromConnectedNode, getActiveLorasFromNode, updateConnectedTriggerWords, updateDownstreamLoaders } from '../../web/comfyui/utils.js'
|
|
|
|
function forwardMiddleMouseToCanvas(container: HTMLElement) {
|
|
if (!container) return
|
|
|
|
container.addEventListener('pointerdown', (event) => {
|
|
if (event.button === 1) {
|
|
const canvas = app.canvas
|
|
if (canvas && typeof canvas.processMouseDown === 'function') {
|
|
canvas.processMouseDown(event)
|
|
}
|
|
}
|
|
})
|
|
|
|
container.addEventListener('pointermove', (event) => {
|
|
if ((event.buttons & 4) === 4) {
|
|
const canvas = app.canvas
|
|
if (canvas && typeof canvas.processMouseMove === 'function') {
|
|
canvas.processMouseMove(event)
|
|
}
|
|
}
|
|
})
|
|
|
|
container.addEventListener('pointerup', (event) => {
|
|
if (event.button === 1) {
|
|
const canvas = app.canvas
|
|
if (canvas && typeof canvas.processMouseUp === 'function') {
|
|
canvas.processMouseUp(event)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
const vueApps = new Map<number, VueApp>()
|
|
|
|
// Cache for dynamically loaded addLorasWidget module
|
|
let addLorasWidgetCache: any = null
|
|
|
|
// @ts-ignore
|
|
function createLoraPoolWidget(node) {
|
|
const container = document.createElement('div')
|
|
container.id = `lora-pool-widget-${node.id}`
|
|
container.style.width = '100%'
|
|
container.style.height = '100%'
|
|
container.style.display = 'flex'
|
|
container.style.flexDirection = 'column'
|
|
container.style.overflow = 'hidden'
|
|
|
|
forwardMiddleMouseToCanvas(container)
|
|
|
|
let internalValue: LoraPoolConfig | LegacyLoraPoolConfig | undefined
|
|
|
|
const widget = node.addDOMWidget(
|
|
'pool_config',
|
|
'LORA_POOL_CONFIG',
|
|
container,
|
|
{
|
|
getValue() {
|
|
return internalValue
|
|
},
|
|
setValue(v: LoraPoolConfig | LegacyLoraPoolConfig) {
|
|
internalValue = v
|
|
if (typeof widget.onSetValue === 'function') {
|
|
widget.onSetValue(v)
|
|
}
|
|
},
|
|
serialize: true,
|
|
// Per dev guide: providing getMinHeight via options allows the system to
|
|
// skip expensive DOM measurements during rendering loop, improving performance
|
|
getMinHeight() {
|
|
return LORA_POOL_WIDGET_MIN_HEIGHT
|
|
}
|
|
}
|
|
)
|
|
|
|
widget.updateConfig = (v: LoraPoolConfig) => {
|
|
internalValue = v
|
|
}
|
|
|
|
const vueApp = createApp(LoraPoolWidget, {
|
|
widget,
|
|
node
|
|
})
|
|
|
|
vueApp.use(PrimeVue, {
|
|
unstyled: true,
|
|
ripple: false
|
|
})
|
|
|
|
vueApp.mount(container)
|
|
vueApps.set(node.id, vueApp)
|
|
|
|
widget.computeLayoutSize = () => {
|
|
const minWidth = LORA_POOL_WIDGET_MIN_WIDTH
|
|
const minHeight = LORA_POOL_WIDGET_MIN_HEIGHT
|
|
|
|
return { minHeight, minWidth }
|
|
}
|
|
|
|
widget.onRemove = () => {
|
|
const vueApp = vueApps.get(node.id)
|
|
if (vueApp) {
|
|
vueApp.unmount()
|
|
vueApps.delete(node.id)
|
|
}
|
|
}
|
|
|
|
return { widget }
|
|
}
|
|
|
|
// @ts-ignore
|
|
function createLoraRandomizerWidget(node) {
|
|
const container = document.createElement('div')
|
|
container.id = `lora-randomizer-widget-${node.id}`
|
|
container.style.width = '100%'
|
|
container.style.height = '100%'
|
|
container.style.display = 'flex'
|
|
container.style.flexDirection = 'column'
|
|
container.style.overflow = 'hidden'
|
|
|
|
forwardMiddleMouseToCanvas(container)
|
|
|
|
let internalValue: RandomizerConfig | undefined
|
|
|
|
const widget = node.addDOMWidget(
|
|
'randomizer_config',
|
|
'RANDOMIZER_CONFIG',
|
|
container,
|
|
{
|
|
getValue() {
|
|
return internalValue
|
|
},
|
|
setValue(v: RandomizerConfig) {
|
|
internalValue = v
|
|
console.log('randomizer widget value update: ', internalValue)
|
|
if (typeof widget.onSetValue === 'function') {
|
|
widget.onSetValue(v)
|
|
}
|
|
},
|
|
serialize: true,
|
|
getMinHeight() {
|
|
return LORA_RANDOMIZER_WIDGET_MIN_HEIGHT
|
|
}
|
|
}
|
|
)
|
|
|
|
widget.updateConfig = (v: RandomizerConfig) => {
|
|
internalValue = v
|
|
}
|
|
|
|
// Add method to get pool config from connected node
|
|
node.getPoolConfig = () => getPoolConfigFromConnectedNode(node)
|
|
|
|
// Handle roll event from Vue component
|
|
widget.onRoll = (randomLoras: any[]) => {
|
|
// Find the loras widget on this node and update it
|
|
const lorasWidget = node.widgets.find((w: any) => w.name === 'loras')
|
|
if (lorasWidget) {
|
|
lorasWidget.value = randomLoras
|
|
}
|
|
}
|
|
|
|
const vueApp = createApp(LoraRandomizerWidget, {
|
|
widget,
|
|
node
|
|
})
|
|
|
|
vueApp.use(PrimeVue, {
|
|
unstyled: true,
|
|
ripple: false
|
|
})
|
|
|
|
vueApp.mount(container)
|
|
vueApps.set(node.id + 10000, vueApp) // Offset to avoid collision with pool widget
|
|
|
|
widget.computeLayoutSize = () => {
|
|
const minWidth = LORA_RANDOMIZER_WIDGET_MIN_WIDTH
|
|
const minHeight = LORA_RANDOMIZER_WIDGET_MIN_HEIGHT
|
|
const maxHeight = LORA_RANDOMIZER_WIDGET_MAX_HEIGHT
|
|
|
|
return { minHeight, minWidth, maxHeight }
|
|
}
|
|
|
|
widget.onRemove = () => {
|
|
const vueApp = vueApps.get(node.id + 10000)
|
|
if (vueApp) {
|
|
vueApp.unmount()
|
|
vueApps.delete(node.id + 10000)
|
|
}
|
|
}
|
|
|
|
return { widget }
|
|
}
|
|
|
|
// @ts-ignore
|
|
function createLoraCyclerWidget(node) {
|
|
const container = document.createElement('div')
|
|
container.id = `lora-cycler-widget-${node.id}`
|
|
container.style.width = '100%'
|
|
container.style.height = '100%'
|
|
container.style.display = 'flex'
|
|
container.style.flexDirection = 'column'
|
|
container.style.overflow = 'hidden'
|
|
|
|
forwardMiddleMouseToCanvas(container)
|
|
|
|
let internalValue: CyclerConfig | undefined
|
|
|
|
const widget = node.addDOMWidget(
|
|
'cycler_config',
|
|
'CYCLER_CONFIG',
|
|
container,
|
|
{
|
|
getValue() {
|
|
return internalValue
|
|
},
|
|
setValue(v: CyclerConfig) {
|
|
const oldFilename = internalValue?.current_lora_filename
|
|
internalValue = v
|
|
if (typeof widget.onSetValue === 'function') {
|
|
widget.onSetValue(v)
|
|
}
|
|
// Update downstream loaders when the active LoRA filename changes
|
|
if (oldFilename !== v?.current_lora_filename) {
|
|
updateDownstreamLoaders(node)
|
|
}
|
|
},
|
|
serialize: true,
|
|
getMinHeight() {
|
|
return LORA_CYCLER_WIDGET_MIN_HEIGHT
|
|
}
|
|
}
|
|
)
|
|
|
|
widget.updateConfig = (v: CyclerConfig) => {
|
|
const oldFilename = internalValue?.current_lora_filename
|
|
internalValue = v
|
|
// Update downstream loaders when the active LoRA filename changes
|
|
if (oldFilename !== v?.current_lora_filename) {
|
|
updateDownstreamLoaders(node)
|
|
}
|
|
}
|
|
|
|
// Add method to get pool config from connected node
|
|
node.getPoolConfig = () => getPoolConfigFromConnectedNode(node)
|
|
|
|
const vueApp = createApp(LoraCyclerWidget, {
|
|
widget,
|
|
node
|
|
})
|
|
|
|
vueApp.use(PrimeVue, {
|
|
unstyled: true,
|
|
ripple: false
|
|
})
|
|
|
|
vueApp.mount(container)
|
|
vueApps.set(node.id + 30000, vueApp) // Offset to avoid collision with other widgets
|
|
|
|
widget.computeLayoutSize = () => {
|
|
const minWidth = LORA_CYCLER_WIDGET_MIN_WIDTH
|
|
const minHeight = LORA_CYCLER_WIDGET_MIN_HEIGHT
|
|
const maxHeight = LORA_CYCLER_WIDGET_MAX_HEIGHT
|
|
|
|
return { minHeight, minWidth, maxHeight }
|
|
}
|
|
|
|
widget.onRemove = () => {
|
|
const vueApp = vueApps.get(node.id + 30000)
|
|
if (vueApp) {
|
|
vueApp.unmount()
|
|
vueApps.delete(node.id + 30000)
|
|
}
|
|
}
|
|
|
|
return { widget }
|
|
}
|
|
|
|
// @ts-ignore
|
|
function createJsonDisplayWidget(node) {
|
|
const container = document.createElement('div')
|
|
container.id = `json-display-widget-${node.id}`
|
|
container.style.width = '100%'
|
|
container.style.height = '100%'
|
|
container.style.display = 'flex'
|
|
container.style.flexDirection = 'column'
|
|
container.style.overflow = 'hidden'
|
|
|
|
forwardMiddleMouseToCanvas(container)
|
|
|
|
let internalValue: Record<string, unknown> | undefined
|
|
|
|
const widget = node.addDOMWidget(
|
|
'metadata',
|
|
'JSON_DISPLAY',
|
|
container,
|
|
{
|
|
getValue() {
|
|
return internalValue
|
|
},
|
|
setValue(v: Record<string, unknown>) {
|
|
internalValue = v
|
|
if (typeof widget.onSetValue === 'function') {
|
|
widget.onSetValue(v)
|
|
}
|
|
},
|
|
serialize: false, // Display-only widget - don't save metadata in workflows
|
|
getMinHeight() {
|
|
return JSON_DISPLAY_WIDGET_MIN_HEIGHT
|
|
}
|
|
}
|
|
)
|
|
|
|
const vueApp = createApp(JsonDisplayWidget, {
|
|
widget,
|
|
node
|
|
})
|
|
|
|
vueApp.use(PrimeVue, {
|
|
unstyled: true,
|
|
ripple: false
|
|
})
|
|
|
|
vueApp.mount(container)
|
|
vueApps.set(node.id + 20000, vueApp) // Offset to avoid collision with other widgets
|
|
|
|
widget.computeLayoutSize = () => {
|
|
const minWidth = JSON_DISPLAY_WIDGET_MIN_WIDTH
|
|
const minHeight = JSON_DISPLAY_WIDGET_MIN_HEIGHT
|
|
|
|
return { minHeight, minWidth }
|
|
}
|
|
|
|
widget.onRemove = () => {
|
|
const vueApp = vueApps.get(node.id + 20000)
|
|
if (vueApp) {
|
|
vueApp.unmount()
|
|
vueApps.delete(node.id + 20000)
|
|
}
|
|
}
|
|
|
|
return { widget }
|
|
}
|
|
|
|
app.registerExtension({
|
|
name: 'LoraManager.VueWidgets',
|
|
|
|
getCustomWidgets() {
|
|
return {
|
|
// @ts-ignore
|
|
LORA_POOL_CONFIG(node) {
|
|
return createLoraPoolWidget(node)
|
|
},
|
|
// @ts-ignore
|
|
RANDOMIZER_CONFIG(node) {
|
|
return createLoraRandomizerWidget(node)
|
|
},
|
|
// @ts-ignore
|
|
CYCLER_CONFIG(node) {
|
|
return createLoraCyclerWidget(node)
|
|
},
|
|
// @ts-ignore
|
|
async LORAS(node: any) {
|
|
if (!addLorasWidgetCache) {
|
|
// @ts-ignore
|
|
const module = await import(/* @vite-ignore */ '../loras_widget.js')
|
|
addLorasWidgetCache = module.addLorasWidget
|
|
}
|
|
// Check if this is a randomizer node to enable lock buttons
|
|
const isRandomizerNode = node.comfyClass === 'Lora Randomizer (LoraManager)'
|
|
|
|
// For randomizer nodes, add a callback to update connected trigger words
|
|
const callback = isRandomizerNode ? () => {
|
|
updateDownstreamLoaders(node)
|
|
} : null
|
|
|
|
return addLorasWidgetCache(node, 'loras', { isRandomizerNode }, callback)
|
|
}
|
|
}
|
|
},
|
|
|
|
// Add display-only widget to Debug Metadata node
|
|
// Register mode change handlers for LoRA provider nodes
|
|
// @ts-ignore
|
|
async beforeRegisterNodeDef(nodeType, nodeData) {
|
|
const comfyClass = nodeType.comfyClass
|
|
|
|
// Register mode change handlers for LoRA provider nodes
|
|
if (LORA_PROVIDER_NODE_TYPES.includes(comfyClass)) {
|
|
const originalOnNodeCreated = nodeType.prototype.onNodeCreated
|
|
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
originalOnNodeCreated?.apply(this, arguments)
|
|
|
|
// Create node-specific callback for Lora Stacker (updates direct trigger toggles)
|
|
const nodeSpecificCallback = comfyClass === "Lora Stacker (LoraManager)"
|
|
? (activeLoraNames: Set<string>) => updateConnectedTriggerWords(this, activeLoraNames)
|
|
: undefined
|
|
|
|
// Create and set up the mode change handler
|
|
const onModeChange = createModeChangeCallback(this, updateDownstreamLoaders, nodeSpecificCallback)
|
|
setupModeChangeHandler(this, onModeChange)
|
|
}
|
|
}
|
|
|
|
// Add the JSON display widget to Debug Metadata node
|
|
if (nodeData.name === 'Debug Metadata (LoraManager)') {
|
|
const onNodeCreated = nodeType.prototype.onNodeCreated
|
|
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
onNodeCreated?.apply(this, [])
|
|
|
|
// Add the JSON display widget
|
|
createJsonDisplayWidget(this)
|
|
}
|
|
}
|
|
}
|
|
})
|