Files
ComfyUI_frontend/src/stores/queueStore.ts
Christian Byrne 1a019437ee [bugfix] fix queue history reconciliation to use prompt_id instead of priority (#6263)
## Summary

Fixes queue history reconciliation broken by cloud distribution removing
the `priority` field from task items.

## Problem

The reconciliation logic in `queueStore.ts` was using the `priority`
field to determine which existing history items to keep:
- Created a Set of all `priority` values from server history
- Filtered local history items to keep only those whose `queueIndex`
(priority) exists in server

Since cloud does not have unique `priority` fields, reconciliation was
failing completely - which could be reproduced with the steps:

* Clear all tasks
* Run 2 jobs and let complete
* Delete one
* Check the refresh (GET history) triggered by queueStore.update
* response will only have 1 item
* Queue panel will still show 2, since it's checking which of the
previous (existing state) priorrity (queue_index) are in the new (new
state)

## Solution

Changed reconciliation to use `prompt_id` instead of `priority`:
- `allIndex` now uses `prompt_id` (string) instead of `priority`
(number)
- `existingHistoryItems` filter now checks `item.promptId` instead of
`item.queueIndex`

## Notes

- This fix is separate from deduplication (already uses `prompt_id`) and
sorting (uses timestamps)
- `prompt_id` is a stable, unique identifier that always exists
- Typecheck passed

┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6263-bugfix-fix-queue-history-reconciliation-to-use-prompt_id-instead-of-priority-2966d73d365081709480d2132905116a)
by [Unito](https://www.unito.io)
2025-10-24 16:53:07 -07:00

572 lines
14 KiB
TypeScript

import _ from 'es-toolkit/compat'
import { defineStore } from 'pinia'
import { computed, ref, toRaw } from 'vue'
import type {
ComfyWorkflowJSON,
NodeId
} from '@/platform/workflow/validation/schemas/workflowSchema'
import type {
ResultItem,
StatusWsMessageStatus,
TaskItem,
TaskOutput,
TaskPrompt,
TaskStatus,
TaskType
} from '@/schemas/apiSchema'
import { api } from '@/scripts/api'
import type { ComfyApp } from '@/scripts/app'
import { useExtensionService } from '@/services/extensionService'
import { useNodeOutputStore } from '@/stores/imagePreviewStore'
// Task type used in the API.
type APITaskType = 'queue' | 'history'
export enum TaskItemDisplayStatus {
Running = 'Running',
Pending = 'Pending',
Completed = 'Completed',
Failed = 'Failed',
Cancelled = 'Cancelled'
}
export class ResultItemImpl {
filename: string
subfolder: string
type: string
nodeId: NodeId
// 'audio' | 'images' | ...
mediaType: string
// VHS output specific fields
format?: string
frame_rate?: number
constructor(obj: Record<string, any>) {
this.filename = obj.filename ?? ''
this.subfolder = obj.subfolder ?? ''
this.type = obj.type ?? ''
this.nodeId = obj.nodeId
this.mediaType = obj.mediaType
this.format = obj.format
this.frame_rate = obj.frame_rate
}
get urlParams(): URLSearchParams {
const params = new URLSearchParams()
params.set('filename', this.filename)
params.set('type', this.type)
params.set('subfolder', this.subfolder)
const clientId = window.name
if (clientId) {
params.set('client_id', clientId)
}
if (this.format) {
params.set('format', this.format)
}
if (this.frame_rate) {
params.set('frame_rate', this.frame_rate.toString())
}
return params
}
/**
* VHS advanced preview URL. `/viewvideo` endpoint is provided by VHS node.
*
* `/viewvideo` always returns a webm file.
*/
get vhsAdvancedPreviewUrl(): string {
return api.apiURL('/viewvideo?' + this.urlParams)
}
get url(): string {
return api.apiURL('/view?' + this.urlParams)
}
get urlWithTimestamp(): string {
return `${this.url}&t=${+new Date()}`
}
get isVhsFormat(): boolean {
return !!this.format && !!this.frame_rate
}
get htmlVideoType(): string | undefined {
if (this.isWebm) {
return 'video/webm'
}
if (this.isMp4) {
return 'video/mp4'
}
if (this.isVhsFormat) {
if (this.format?.endsWith('webm')) {
return 'video/webm'
}
if (this.format?.endsWith('mp4')) {
return 'video/mp4'
}
}
return undefined
}
get htmlAudioType(): string | undefined {
if (this.isMp3) {
return 'audio/mpeg'
}
if (this.isWav) {
return 'audio/wav'
}
if (this.isOgg) {
return 'audio/ogg'
}
if (this.isFlac) {
return 'audio/flac'
}
return undefined
}
get isGif(): boolean {
return this.filename.endsWith('.gif')
}
get isWebp(): boolean {
return this.filename.endsWith('.webp')
}
get isWebm(): boolean {
return this.filename.endsWith('.webm')
}
get isMp4(): boolean {
return this.filename.endsWith('.mp4')
}
get isVideoBySuffix(): boolean {
return this.isWebm || this.isMp4
}
get isImageBySuffix(): boolean {
return this.isGif || this.isWebp
}
get isMp3(): boolean {
return this.filename.endsWith('.mp3')
}
get isWav(): boolean {
return this.filename.endsWith('.wav')
}
get isOgg(): boolean {
return this.filename.endsWith('.ogg')
}
get isFlac(): boolean {
return this.filename.endsWith('.flac')
}
get isAudioBySuffix(): boolean {
return this.isMp3 || this.isWav || this.isOgg || this.isFlac
}
get isVideo(): boolean {
const isVideoByType =
this.mediaType === 'video' || !!this.format?.startsWith('video/')
return (
this.isVideoBySuffix ||
(isVideoByType && !this.isImageBySuffix && !this.isAudioBySuffix)
)
}
get isImage(): boolean {
return (
this.isImageBySuffix ||
(this.mediaType === 'images' &&
!this.isVideoBySuffix &&
!this.isAudioBySuffix)
)
}
get isAudio(): boolean {
const isAudioByType =
this.mediaType === 'audio' || !!this.format?.startsWith('audio/')
return (
this.isAudioBySuffix ||
(isAudioByType && !this.isImageBySuffix && !this.isVideoBySuffix)
)
}
get supportsPreview(): boolean {
return this.isImage || this.isVideo || this.isAudio
}
}
export class TaskItemImpl {
readonly taskType: TaskType
readonly prompt: TaskPrompt
readonly status?: TaskStatus
readonly outputs: TaskOutput
readonly flatOutputs: ReadonlyArray<ResultItemImpl>
constructor(
taskType: TaskType,
prompt: TaskPrompt,
status?: TaskStatus,
outputs?: TaskOutput,
flatOutputs?: ReadonlyArray<ResultItemImpl>
) {
this.taskType = taskType
this.prompt = prompt
this.status = status
// Remove animated outputs from the outputs object
// outputs.animated is an array of boolean values that indicates if the images
// array in the result are animated or not.
// The queueStore does not use this information.
// It is part of the legacy API response. We should redesign the backend API.
// https://github.com/Comfy-Org/ComfyUI_frontend/issues/2739
this.outputs = _.mapValues(outputs ?? {}, (nodeOutputs) =>
_.omit(nodeOutputs, 'animated')
)
this.flatOutputs = flatOutputs ?? this.calculateFlatOutputs()
}
calculateFlatOutputs(): ReadonlyArray<ResultItemImpl> {
if (!this.outputs) {
return []
}
return Object.entries(this.outputs).flatMap(([nodeId, nodeOutputs]) =>
Object.entries(nodeOutputs).flatMap(([mediaType, items]) =>
(items as ResultItem[]).map(
(item: ResultItem) =>
new ResultItemImpl({
...item,
nodeId,
mediaType
})
)
)
)
}
get previewOutput(): ResultItemImpl | undefined {
return (
this.flatOutputs.find(
// Prefer saved media files over the temp previews
(output) => output.type === 'output' && output.supportsPreview
) ?? this.flatOutputs.find((output) => output.supportsPreview)
)
}
get apiTaskType(): APITaskType {
switch (this.taskType) {
case 'Running':
case 'Pending':
return 'queue'
case 'History':
return 'history'
}
}
get key() {
return this.promptId + this.displayStatus
}
get queueIndex() {
return this.prompt.priority
}
get promptId() {
return this.prompt.prompt_id
}
get extraData() {
return this.prompt.extra_data
}
get extraPngInfo() {
return this.extraData.extra_pnginfo
}
get clientId() {
return this.extraData.client_id
}
get workflow(): ComfyWorkflowJSON | undefined {
return this.extraPngInfo?.workflow
}
get messages() {
return this.status?.messages || []
}
get interrupted() {
return _.some(
this.messages,
(message) => message[0] === 'execution_interrupted'
)
}
get isHistory() {
return this.taskType === 'History'
}
get isRunning() {
return this.taskType === 'Running'
}
get displayStatus(): TaskItemDisplayStatus {
switch (this.taskType) {
case 'Running':
return TaskItemDisplayStatus.Running
case 'Pending':
return TaskItemDisplayStatus.Pending
case 'History':
if (this.interrupted) return TaskItemDisplayStatus.Cancelled
switch (this.status!.status_str) {
case 'success':
return TaskItemDisplayStatus.Completed
case 'error':
return TaskItemDisplayStatus.Failed
}
}
}
get executionStartTimestamp() {
const message = this.messages.find(
(message) => message[0] === 'execution_start'
)
return message ? message[1].timestamp : undefined
}
get executionEndTimestamp() {
const messages = this.messages.filter((message) =>
[
'execution_success',
'execution_interrupted',
'execution_error'
].includes(message[0])
)
if (!messages.length) {
return undefined
}
return _.max(messages.map((message) => message[1].timestamp))
}
get executionTime() {
if (!this.executionStartTimestamp || !this.executionEndTimestamp) {
return undefined
}
return this.executionEndTimestamp - this.executionStartTimestamp
}
get executionTimeInSeconds() {
return this.executionTime !== undefined
? this.executionTime / 1000
: undefined
}
public async loadWorkflow(app: ComfyApp) {
if (!this.workflow) {
return
}
await app.loadGraphData(toRaw(this.workflow))
if (this.outputs) {
const nodeOutputsStore = useNodeOutputStore()
const rawOutputs = toRaw(this.outputs)
for (const nodeExecutionId in rawOutputs) {
nodeOutputsStore.setNodeOutputsByExecutionId(
nodeExecutionId,
rawOutputs[nodeExecutionId]
)
}
useExtensionService().invokeExtensions(
'onNodeOutputsUpdated',
app.nodeOutputs
)
}
}
public flatten(): TaskItemImpl[] {
if (this.displayStatus !== TaskItemDisplayStatus.Completed) {
return [this]
}
return this.flatOutputs.map(
(output: ResultItemImpl, i: number) =>
new TaskItemImpl(
this.taskType,
{
priority: this.queueIndex,
prompt_id: `${this.promptId}-${i}`,
extra_data: this.extraData
},
this.status,
{
[output.nodeId]: {
[output.mediaType]: [output]
}
},
[output]
)
)
}
}
function executionStartTimestamp(taskItem: TaskItem) {
const status = 'status' in taskItem ? taskItem.status : undefined
const messages = status?.messages || []
const message = messages.find((message) => message[0] === 'execution_start')
return message ? message[1].timestamp : undefined
}
export const useQueueStore = defineStore('queue', () => {
const runningTasks = ref<TaskItemImpl[]>([])
const pendingTasks = ref<TaskItemImpl[]>([])
const historyTasks = ref<TaskItemImpl[]>([])
const maxHistoryItems = ref(64)
const isLoading = ref(false)
const tasks = computed<TaskItemImpl[]>(
() =>
[
...pendingTasks.value,
...runningTasks.value,
...historyTasks.value
] as TaskItemImpl[]
)
const flatTasks = computed<TaskItemImpl[]>(() =>
tasks.value.flatMap((task: TaskItemImpl) => task.flatten())
)
const lastExecutionStartTimestamp = computed<number>(() => {
const latestItemWithTimestamp = historyTasks.value.length
? historyTasks.value.find((item) => item.executionStartTimestamp != null)
: undefined
return latestItemWithTimestamp?.executionStartTimestamp ?? -1
})
const hasPendingTasks = computed<boolean>(() => pendingTasks.value.length > 0)
const update = async () => {
isLoading.value = true
try {
const [queue, history] = await Promise.all([
api.getQueue(),
api.getHistory(maxHistoryItems.value)
])
const toClassAll = (tasks: TaskItem[]): TaskItemImpl[] =>
tasks
.map(
(task: TaskItem) =>
new TaskItemImpl(
task.taskType,
task.prompt,
// status and outputs only exist on history tasks
'status' in task ? task.status : undefined,
'outputs' in task ? task.outputs : undefined
)
)
.sort((a, b) => b.queueIndex - a.queueIndex)
runningTasks.value = toClassAll(queue.Running)
pendingTasks.value = toClassAll(queue.Pending)
const allIndex = new Set<string>(
history.History.map((item: TaskItem) => item.prompt.prompt_id)
)
const newHistoryItems = toClassAll(
history.History.filter(
(item) =>
(executionStartTimestamp(item) ?? Number.MAX_SAFE_INTEGER) >
lastExecutionStartTimestamp.value
)
)
const existingHistoryItems = historyTasks.value.filter((item) =>
allIndex.has(item.promptId)
)
const sortedTasks = [...newHistoryItems, ...existingHistoryItems]
.slice(0, maxHistoryItems.value)
.sort((a, b) => {
const aTime = a.executionStartTimestamp ?? 0
const bTime = b.executionStartTimestamp ?? 0
return bTime - aTime
})
const foundPromptIds = new Set()
const deduplicatedTasks = sortedTasks.filter((item) => {
if (!foundPromptIds.has(item.promptId)) {
foundPromptIds.add(item.promptId)
return true
}
return false
})
historyTasks.value = deduplicatedTasks
} finally {
isLoading.value = false
}
}
const clear = async (
targets: ('queue' | 'history')[] = ['queue', 'history']
) => {
if (targets.length === 0) {
return
}
await Promise.all(targets.map((type) => api.clearItems(type)))
await update()
}
const deleteTask = async (task: TaskItemImpl) => {
await api.deleteItem(task.apiTaskType, task.promptId)
await update()
}
return {
runningTasks,
pendingTasks,
historyTasks,
maxHistoryItems,
isLoading,
tasks,
flatTasks,
hasPendingTasks,
update,
clear,
delete: deleteTask
}
})
export const useQueuePendingTaskCountStore = defineStore(
'queuePendingTaskCount',
{
state: () => ({
count: 0
}),
actions: {
update(e: CustomEvent<StatusWsMessageStatus>) {
this.count = e.detail?.exec_info?.queue_remaining || 0
}
}
}
)
export type AutoQueueMode = 'disabled' | 'instant' | 'change'
export const useQueueSettingsStore = defineStore('queueSettingsStore', {
state: () => ({
mode: 'disabled' as AutoQueueMode,
batchCount: 1
})
})