mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-03-21 21:22:11 -03:00
feat(lora-cycler): implement batch queue synchronization with dual-index mechanism
- Add execution_index and next_index fields to CyclerConfig interface - Introduce beforeQueued hook in widget to handle index shifting for batch executions - Use execution_index when provided, fall back to current_index for single executions - Track execution state with Symbol to differentiate first vs subsequent executions - Update state management to handle dual-index logic for proper LoRA cycling in batch queues
This commit is contained in:
@@ -34,6 +34,9 @@ const props = defineProps<{
|
||||
// State management
|
||||
const state = useLoraCyclerState(props.widget)
|
||||
|
||||
// Symbol to track if the widget has been executed at least once
|
||||
const HAS_EXECUTED = Symbol('HAS_EXECUTED')
|
||||
|
||||
// Track last known pool config hash
|
||||
const lastPoolConfigHash = ref('')
|
||||
|
||||
@@ -124,6 +127,28 @@ onMounted(async () => {
|
||||
state.restoreFromConfig(props.widget.value as CyclerConfig)
|
||||
}
|
||||
|
||||
// Add beforeQueued hook to handle index shifting for batch queue synchronization
|
||||
// This ensures each execution uses a different LoRA in the cycle
|
||||
;(props.widget as any).beforeQueued = () => {
|
||||
if ((props.widget as any)[HAS_EXECUTED]) {
|
||||
// After first execution: shift indices (previous next_index becomes execution_index)
|
||||
state.generateNextIndex()
|
||||
} else {
|
||||
// First execution: just initialize next_index (execution_index stays null)
|
||||
// This means first execution uses current_index from widget
|
||||
state.initializeNextIndex()
|
||||
;(props.widget as any)[HAS_EXECUTED] = true
|
||||
}
|
||||
|
||||
// Update the widget value so the indices are included in the serialized config
|
||||
const config = state.buildConfig()
|
||||
if ((props.widget as any).updateConfig) {
|
||||
;(props.widget as any).updateConfig(config)
|
||||
} else {
|
||||
props.widget.value = config
|
||||
}
|
||||
}
|
||||
|
||||
// Mark component as mounted
|
||||
isMounted.value = true
|
||||
|
||||
|
||||
@@ -93,6 +93,9 @@ export interface CyclerConfig {
|
||||
sort_by: 'filename' | 'model_name'
|
||||
current_lora_name: string // For display
|
||||
current_lora_filename: string
|
||||
// Dual-index mechanism for batch queue synchronization
|
||||
execution_index?: number | null // Index to use for current execution
|
||||
next_index?: number | null // Index for display after execution
|
||||
}
|
||||
|
||||
export interface ComponentWidget {
|
||||
|
||||
@@ -19,6 +19,12 @@ export function useLoraCyclerState(widget: ComponentWidget) {
|
||||
const currentLoraFilename = ref('')
|
||||
const isLoading = ref(false)
|
||||
|
||||
// Dual-index mechanism for batch queue synchronization
|
||||
// execution_index: index for generating execution_stack (= previous next_index)
|
||||
// next_index: index for UI display (= what will be shown after execution)
|
||||
const executionIndex = ref<number | null>(null)
|
||||
const nextIndex = ref<number | null>(null)
|
||||
|
||||
// Build config object from current state
|
||||
const buildConfig = (): CyclerConfig => ({
|
||||
current_index: currentIndex.value,
|
||||
@@ -30,6 +36,8 @@ export function useLoraCyclerState(widget: ComponentWidget) {
|
||||
sort_by: sortBy.value,
|
||||
current_lora_name: currentLoraName.value,
|
||||
current_lora_filename: currentLoraFilename.value,
|
||||
execution_index: executionIndex.value,
|
||||
next_index: nextIndex.value,
|
||||
})
|
||||
|
||||
// Restore state from config object
|
||||
@@ -43,6 +51,33 @@ export function useLoraCyclerState(widget: ComponentWidget) {
|
||||
sortBy.value = config.sort_by || 'filename'
|
||||
currentLoraName.value = config.current_lora_name || ''
|
||||
currentLoraFilename.value = config.current_lora_filename || ''
|
||||
// Note: execution_index and next_index are not restored from config
|
||||
// as they are transient values used only during batch execution
|
||||
}
|
||||
|
||||
// Shift indices for batch queue synchronization
|
||||
// Previous next_index becomes current execution_index, and generate a new next_index
|
||||
const generateNextIndex = () => {
|
||||
executionIndex.value = nextIndex.value // Previous next becomes current execution
|
||||
// Calculate the next index (wrap to 1 if at end)
|
||||
const current = executionIndex.value ?? currentIndex.value
|
||||
let next = current + 1
|
||||
if (totalCount.value > 0 && next > totalCount.value) {
|
||||
next = 1
|
||||
}
|
||||
nextIndex.value = next
|
||||
}
|
||||
|
||||
// Initialize next_index for first execution (execution_index stays null)
|
||||
const initializeNextIndex = () => {
|
||||
if (nextIndex.value === null) {
|
||||
// First execution uses current_index, so next is current + 1
|
||||
let next = currentIndex.value + 1
|
||||
if (totalCount.value > 0 && next > totalCount.value) {
|
||||
next = 1
|
||||
}
|
||||
nextIndex.value = next
|
||||
}
|
||||
}
|
||||
|
||||
// Generate hash from pool config for change detection
|
||||
@@ -193,6 +228,8 @@ export function useLoraCyclerState(widget: ComponentWidget) {
|
||||
currentLoraName,
|
||||
currentLoraFilename,
|
||||
isLoading,
|
||||
executionIndex,
|
||||
nextIndex,
|
||||
|
||||
// Computed
|
||||
isClipStrengthDisabled,
|
||||
@@ -204,5 +241,7 @@ export function useLoraCyclerState(widget: ComponentWidget) {
|
||||
fetchCyclerList,
|
||||
refreshList,
|
||||
setIndex,
|
||||
generateNextIndex,
|
||||
initializeNextIndex,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user