From d95086b82ff1f63e6c6635b29f18f1c173e5aa69 Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Tue, 9 Dec 2025 10:45:32 -0800 Subject: [PATCH] make all fields optional but nonnullable --- .../queue/job/JobDetailsPopover.stories.ts | 5 ----- src/platform/remote/comfyui/jobs/jobTypes.ts | 14 +++++++------- .../tests/composables/useResultGallery.test.ts | 4 ---- .../remote/comfyui/history/reconciliation.test.ts | 5 ----- .../remote/comfyui/jobs/fetchJobs.test.ts | 5 ----- tests-ui/tests/store/assetsStore.test.ts | 4 ---- tests-ui/tests/store/queueStore.test.ts | 5 ----- .../tests/stores/queueStore.loadWorkflow.test.ts | 15 --------------- 8 files changed, 7 insertions(+), 50 deletions(-) diff --git a/src/components/queue/job/JobDetailsPopover.stories.ts b/src/components/queue/job/JobDetailsPopover.stories.ts index 6215977be..22388f5d6 100644 --- a/src/components/queue/job/JobDetailsPopover.stories.ts +++ b/src/components/queue/job/JobDetailsPopover.stories.ts @@ -46,11 +46,6 @@ function makeTask( const job: JobListItem = { id, priority, - execution_start_time: null, - execution_end_time: null, - preview_output: null, - outputs_count: null, - workflow_id: null, ...overrides } return new TaskItemImpl(job) diff --git a/src/platform/remote/comfyui/jobs/jobTypes.ts b/src/platform/remote/comfyui/jobs/jobTypes.ts index 47aa6ea15..314ba549e 100644 --- a/src/platform/remote/comfyui/jobs/jobTypes.ts +++ b/src/platform/remote/comfyui/jobs/jobTypes.ts @@ -38,8 +38,8 @@ const zExecutionError = z exception_message: z.string(), exception_type: z.string(), traceback: z.array(z.string()), - current_inputs: z.unknown(), - current_outputs: z.unknown() + current_inputs: z.record(z.string(), z.unknown()), + current_outputs: z.record(z.string(), z.unknown()) }) .passthrough() @@ -53,12 +53,12 @@ const zRawJobListItem = z id: z.string(), status: zJobStatus, create_time: z.number(), - execution_start_time: z.number().nullable(), - execution_end_time: z.number().nullable(), - preview_output: zPreviewOutput.nullable(), - outputs_count: z.number().nullable(), + execution_start_time: z.number().optional(), + execution_end_time: z.number().optional(), + preview_output: zPreviewOutput.optional(), + outputs_count: z.number().optional(), execution_error: zExecutionError.optional(), - workflow_id: z.string().nullable(), + workflow_id: z.string().optional(), priority: z.number().optional() }) .passthrough() diff --git a/tests-ui/tests/composables/useResultGallery.test.ts b/tests-ui/tests/composables/useResultGallery.test.ts index 2cf5ad3b5..49b0c3205 100644 --- a/tests-ui/tests/composables/useResultGallery.test.ts +++ b/tests-ui/tests/composables/useResultGallery.test.ts @@ -26,11 +26,7 @@ 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 4365e21e9..e0eee5fc7 100644 --- a/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts +++ b/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts @@ -11,11 +11,6 @@ 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 31b29b828..a25497863 100644 --- a/tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts +++ b/tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts @@ -23,11 +23,6 @@ function createMockJob( id, status, create_time: Date.now(), - execution_start_time: null, - 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 8429d1291..420f9de9a 100644 --- a/tests-ui/tests/store/assetsStore.test.ts +++ b/tests-ui/tests/store/assetsStore.test.ts @@ -95,15 +95,11 @@ describe('assetsStore - Refactored (Option A)', () => { id: `prompt_${index}`, status: 'completed', create_time: 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 }) diff --git a/tests-ui/tests/store/queueStore.test.ts b/tests-ui/tests/store/queueStore.test.ts index 402e1a305..747f2dd1e 100644 --- a/tests-ui/tests/store/queueStore.test.ts +++ b/tests-ui/tests/store/queueStore.test.ts @@ -17,11 +17,6 @@ function createJob( id, status, 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/stores/queueStore.loadWorkflow.test.ts b/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts index 2a48320ec..9b776879a 100644 --- a/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts +++ b/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts @@ -35,11 +35,6 @@ const mockJobDetail = { id: 'test-prompt-id', status: 'completed' as const, create_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: { @@ -58,11 +53,6 @@ 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 } } @@ -73,11 +63,6 @@ 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 } }