diff --git a/src/components/queue/job/JobDetailsPopover.stories.ts b/src/components/queue/job/JobDetailsPopover.stories.ts index 866b88ddb..6215977be 100644 --- a/src/components/queue/job/JobDetailsPopover.stories.ts +++ b/src/components/queue/job/JobDetailsPopover.stories.ts @@ -41,12 +41,16 @@ function makeTask( id: string, priority: number, overrides: Omit, 'id' | 'priority'> & - Pick + Pick ): TaskItemImpl { const job: JobListItem = { id, priority, - last_state_update: null, + execution_start_time: null, + execution_end_time: null, + preview_output: null, + outputs_count: null, + workflow_id: null, ...overrides } return new TaskItemImpl(job) @@ -59,8 +63,7 @@ function makePendingTask( ): TaskItemImpl { return makeTask(id, priority, { status: 'pending', - create_time: createTimeMs, - update_time: createTimeMs + create_time: createTimeMs }) } @@ -71,8 +74,7 @@ function makeRunningTask( ): TaskItemImpl { return makeTask(id, priority, { status: 'in_progress', - create_time: createTimeMs, - update_time: createTimeMs + create_time: createTimeMs }) } @@ -85,7 +87,7 @@ function makeRunningTaskWithStart( return makeTask(id, priority, { status: 'in_progress', create_time: start - 5000, - update_time: start + execution_start_time: start }) } @@ -102,22 +104,21 @@ function makeHistoryTask( return makeTask(id, priority, { status: ok ? 'completed' : 'failed', create_time: executionStartTime - 5000, - update_time: now, execution_start_time: executionStartTime, execution_end_time: executionEndTime, - execution_error: errorMessage - ? { - prompt_id: id, - timestamp: now, - node_id: '1', - node_type: 'ExampleNode', - exception_message: errorMessage, - exception_type: 'RuntimeError', - traceback: [], - current_inputs: {}, - current_outputs: {} - } - : undefined + ...(errorMessage && { + execution_error: { + prompt_id: id, + timestamp: now, + node_id: '1', + node_type: 'ExampleNode', + exception_message: errorMessage, + exception_type: 'RuntimeError', + traceback: [], + current_inputs: {}, + current_outputs: {} + } + }) }) } diff --git a/src/platform/remote/comfyui/jobs/jobTypes.ts b/src/platform/remote/comfyui/jobs/jobTypes.ts index e73ad2471..47aa6ea15 100644 --- a/src/platform/remote/comfyui/jobs/jobTypes.ts +++ b/src/platform/remote/comfyui/jobs/jobTypes.ts @@ -53,12 +53,12 @@ const zRawJobListItem = z id: z.string(), status: zJobStatus, create_time: z.number(), - execution_start_time: z.number().nullable().optional(), - execution_end_time: z.number().nullable().optional(), - preview_output: zPreviewOutput.nullable().optional(), - outputs_count: z.number().nullable().optional(), - execution_error: zExecutionError.nullable().optional(), - workflow_id: z.string().nullable().optional(), + execution_start_time: z.number().nullable(), + execution_end_time: z.number().nullable(), + preview_output: zPreviewOutput.nullable(), + outputs_count: z.number().nullable(), + execution_error: zExecutionError.optional(), + workflow_id: z.string().nullable(), priority: z.number().optional() }) .passthrough() diff --git a/tests-ui/tests/composables/useResultGallery.test.ts b/tests-ui/tests/composables/useResultGallery.test.ts index b68ef4bb0..2cf5ad3b5 100644 --- a/tests-ui/tests/composables/useResultGallery.test.ts +++ b/tests-ui/tests/composables/useResultGallery.test.ts @@ -26,8 +26,11 @@ const createMockJob = (id: string, outputsCount = 1): JobListItem => ({ id, status: 'completed', create_time: Date.now(), + execution_start_time: null, + execution_end_time: null, preview_output: null, outputs_count: outputsCount, + workflow_id: null, priority: 0 }) diff --git a/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts b/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts index e0eee5fc7..4365e21e9 100644 --- a/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts +++ b/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts @@ -11,6 +11,11 @@ function createJob(id: string, createTime = 0, priority?: number): JobListItem { id, status: 'completed', create_time: createTime, + execution_start_time: null, + execution_end_time: null, + preview_output: null, + outputs_count: null, + workflow_id: null, priority: priority ?? createTime } } diff --git a/tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts b/tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts index f3b2ad5a8..31b29b828 100644 --- a/tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts +++ b/tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts @@ -27,6 +27,7 @@ function createMockJob( execution_end_time: null, preview_output: null, outputs_count: 0, + workflow_id: null, ...overrides } } diff --git a/tests-ui/tests/store/assetsStore.test.ts b/tests-ui/tests/store/assetsStore.test.ts index 4f5924f34..8429d1291 100644 --- a/tests-ui/tests/store/assetsStore.test.ts +++ b/tests-ui/tests/store/assetsStore.test.ts @@ -95,14 +95,16 @@ describe('assetsStore - Refactored (Option A)', () => { id: `prompt_${index}`, status: 'completed', create_time: 1000 + index, - update_time: 1000 + index, - last_state_update: 1000 + index, - priority: 1000 + index, + execution_start_time: null, + execution_end_time: null, preview_output: { filename: `output_${index}.png`, subfolder: '', type: 'output' - } + }, + outputs_count: null, + workflow_id: null, + priority: 1000 + index }) beforeEach(() => { diff --git a/tests-ui/tests/store/queueStore.test.ts b/tests-ui/tests/store/queueStore.test.ts index d185a7a59..402e1a305 100644 --- a/tests-ui/tests/store/queueStore.test.ts +++ b/tests-ui/tests/store/queueStore.test.ts @@ -17,8 +17,11 @@ function createJob( id, status, create_time: createTime, - update_time: createTime, - last_state_update: createTime, + execution_start_time: null, + execution_end_time: null, + preview_output: null, + outputs_count: null, + workflow_id: null, priority: priority ?? createTime } } diff --git a/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts b/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts index 2b6450b81..2a48320ec 100644 --- a/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts +++ b/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts @@ -35,7 +35,11 @@ const mockJobDetail = { id: 'test-prompt-id', status: 'completed' as const, create_time: Date.now(), - update_time: Date.now(), + execution_start_time: null, + execution_end_time: null, + preview_output: null, + outputs_count: null, + workflow_id: null, workflow: { extra_data: { extra_pnginfo: { @@ -54,6 +58,11 @@ function createHistoryJob(id: string): JobListItem { id, status: 'completed', create_time: now, + execution_start_time: null, + execution_end_time: null, + preview_output: null, + outputs_count: null, + workflow_id: null, priority: now } } @@ -64,6 +73,11 @@ function createRunningJob(id: string): JobListItem { id, status: 'in_progress', create_time: now, + execution_start_time: null, + execution_end_time: null, + preview_output: null, + outputs_count: null, + workflow_id: null, priority: now } }