Skip to content
Merged
74 changes: 74 additions & 0 deletions browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,80 @@ test.describe('Model import progress toast', { tag: ['@screenshot'] }, () => {
})
})

test('a dismissed unconfirmed cancellation stays hidden from late progress', async ({
comfyPage
}) => {
test.setTimeout(30_000)
const { page } = comfyPage
const taskId = '1396cc07-bab2-4f12-9b54-741f83f9224e'
const assetName = 'unconfirmed-cancel-model.safetensors'
await page.route(`**/tasks/${taskId}`, async (route) => {
if (route.request().method() === 'DELETE') {
await route.fulfill({ status: 204 })
return
}
await route.fulfill({
json: {
id: taskId,
idempotency_key: taskId,
task_name: 'task:download_file',
payload: {},
status: 'running',
create_time: new Date().toISOString(),
update_time: new Date().toISOString()
} satisfies TaskResponse
})
})

await comfyPage.assets.dispatchDownload({
task_id: taskId,
asset_name: assetName,
bytes_total: 1000,
bytes_downloaded: 200,
progress: 20,
status: 'running'
})

const toast = page.getByRole('status').filter({ hasText: assetName })
await expect(toast).toBeVisible()
await toast.getByRole('button', { name: 'Expand' }).click()
const cancellation = page.waitForResponse(
(candidate) =>
candidate.url().endsWith(`/tasks/${taskId}`) &&
candidate.request().method() === 'DELETE'
)
await toast.getByRole('button', { name: 'Cancel Download' }).click()
await cancellation
await expect(
toast.getByText('Cancelled', { exact: true }).first()
).toBeVisible()

const advanceReconciliation = async () => {
const response = page.waitForResponse(
(candidate) =>
candidate.url().endsWith(`/tasks/${taskId}`) &&
candidate.request().method() === 'GET'
)
await (await response).finished()
}
await advanceReconciliation()
await expect(
toast.getByText('Cancelled', { exact: true }).first()
).toBeVisible()
await toast.getByRole('button', { name: 'Close' }).click()
await expect(toast).toBeHidden()

await comfyPage.assets.dispatchDownload({
task_id: taskId,
asset_name: assetName,
bytes_total: 1000,
bytes_downloaded: 750,
progress: 75,
status: 'running'
})
await expect(toast).toBeHidden()
})

test('closing a failed download while polling does not reopen its toast', async ({
comfyPage
}) => {
Expand Down
2 changes: 2 additions & 0 deletions src/locales/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4934,6 +4934,7 @@
"failed": "Failed",
"finished": "Finished",
"pending": "Pending",
"taskUnavailable": "The download task is no longer available.",
"progressCount": "{completed} of {total}",
"filter": {
"all": "All",
Expand All @@ -4953,6 +4954,7 @@
"exportFailedSingle": "Failed to create ZIP export",
"downloadExport": "Download export",
"downloadFailed": "Failed to download \"{name}\"",
"unsupportedDownloadUrl": "Unsupported export download URL",
"retryDownload": "Retry download"
},
"workspace": {
Expand Down
215 changes: 214 additions & 1 deletion src/platform/assets/composables/useUploadModelWizard.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ vi.mock<unknown>(import('@/platform/assets/services/assetService'), () => ({
assetService: {
getAssetMetadata: vi.fn(),
uploadAssetAsync: vi.fn(),
uploadAssetPreviewImage: vi.fn()
uploadAssetFromBase64: vi.fn(),
deleteAsset: vi.fn()
}
}))

Expand Down Expand Up @@ -105,6 +106,218 @@ describe('useUploadModelWizard', () => {
}
})

it('does not start an upload after reset while preview creation is pending', async () => {
const { assetService } =
await import('@/platform/assets/services/assetService')
let finishPreview!: () => void
vi.mocked(assetService.uploadAssetFromBase64).mockReturnValue(
new Promise((resolve) => {
finishPreview = () =>
resolve(fromPartial({ id: 'preview-id', created_new: true }))
})
)

const wizard = setupUploadModelWizard(modelTypes)
wizard.wizardData.value.url = 'https://civitai.com/models/stale-preview'
wizard.wizardData.value.previewImage = 'data:image/png;base64,cHJldmlldw=='
wizard.selectedModelType.value = 'checkpoints'

const upload = wizard.uploadModel()
await vi.waitFor(() => {
expect(assetService.uploadAssetFromBase64).toHaveBeenCalledOnce()
})
wizard.resetWizard()
finishPreview()

await expect(upload).resolves.toBeNull()
expect(assetService.uploadAssetAsync).not.toHaveBeenCalled()
expect(assetService.deleteAsset).toHaveBeenCalledWith('preview-id')
expect(wizard.currentStep.value).toBe(1)
expect(wizard.isUploading.value).toBe(false)
})

it('does not delete a deduplicated preview after reset', async () => {
const { assetService } =
await import('@/platform/assets/services/assetService')
let finishPreview!: () => void
vi.mocked(assetService.uploadAssetFromBase64).mockReturnValue(
new Promise((resolve) => {
finishPreview = () =>
resolve(fromPartial({ id: 'shared-preview', created_new: false }))
})
)
const wizard = setupUploadModelWizard(modelTypes)
wizard.wizardData.value.url = 'https://civitai.com/models/shared-preview'
wizard.wizardData.value.previewImage = 'data:image/png;base64,cHJldmlldw=='
wizard.selectedModelType.value = 'checkpoints'

const upload = wizard.uploadModel()
await vi.waitFor(() => {
expect(assetService.uploadAssetFromBase64).toHaveBeenCalledOnce()
})
wizard.resetWizard()
finishPreview()

await expect(upload).resolves.toBeNull()
expect(assetService.deleteAsset).not.toHaveBeenCalled()
})

it('does not reopen a reset wizard after a synchronous refresh finishes', async () => {
const { assetService } =
await import('@/platform/assets/services/assetService')
vi.mocked(assetService.uploadAssetAsync).mockResolvedValue({
type: 'sync',
asset: fromPartial({
id: 'asset-1',
name: 'model.safetensors',
tags: ['models', 'checkpoints']
})
})
let finishRefresh!: () => void
const refreshPending = new Promise<void>((resolve) => {
finishRefresh = resolve
})
vi.spyOn(useModelToNodeStore(), 'getAllNodeProviders').mockReturnValue([
fromPartial({ nodeDef: { name: 'CheckpointLoaderSimple' } })
])
vi.spyOn(useAssetsStore(), 'updateModelsForNodeType').mockReturnValue(
refreshPending
)

const wizard = setupUploadModelWizard(modelTypes)
wizard.wizardData.value.url = 'https://civitai.com/models/sync'
wizard.selectedModelType.value = 'checkpoints'
const upload = wizard.uploadModel()
await vi.waitFor(() => {
expect(useAssetsStore().updateModelsForNodeType).toHaveBeenCalledOnce()
})

wizard.resetWizard()
finishRefresh()

await expect(upload).resolves.toBeNull()
expect(wizard.currentStep.value).toBe(1)
expect(wizard.uploadStatus.value).toBeUndefined()
})

it('tracks a backend task that resolves after the wizard is reset', async () => {
const { assetService } =
await import('@/platform/assets/services/assetService')
let finishUpload!: (value: AsyncUploadResponse) => void
vi.mocked(assetService.uploadAssetAsync).mockReturnValue(
new Promise((resolve) => {
finishUpload = resolve
})
)

const wizard = setupUploadModelWizard(modelTypes)
wizard.wizardData.value.url = 'https://civitai.com/models/stale-response'
wizard.selectedModelType.value = 'checkpoints'

const upload = wizard.uploadModel()
await vi.waitFor(() => {
expect(assetService.uploadAssetAsync).toHaveBeenCalledOnce()
})
wizard.resetWizard()
finishUpload({
type: 'async',
task: {
task_id: 'task-after-reset',
status: 'created',
message: 'Download queued'
}
})

await expect(upload).resolves.toBeNull()
expect(useAssetDownloadStore().downloadList).toEqual([
expect.objectContaining({
taskId: 'task-after-reset',
modelType: 'checkpoints'
})
])
expect(wizard.currentStep.value).toBe(1)
})

it('refreshes model caches when a synchronous import finishes after reset', async () => {
const { assetService } =
await import('@/platform/assets/services/assetService')
let finishUpload!: (value: AsyncUploadResponse) => void
vi.mocked(assetService.uploadAssetAsync).mockReturnValue(
new Promise((resolve) => {
finishUpload = resolve
})
)
vi.spyOn(useModelToNodeStore(), 'getAllNodeProviders').mockReturnValue([
fromPartial({ nodeDef: { name: 'CheckpointLoaderSimple' } })
])
const refresh = vi
.spyOn(useAssetsStore(), 'updateModelsForNodeType')
.mockResolvedValue(undefined)

const wizard = setupUploadModelWizard(modelTypes)
wizard.wizardData.value.url = 'https://civitai.com/models/stale-sync'
wizard.selectedModelType.value = 'checkpoints'
const upload = wizard.uploadModel()
await vi.waitFor(() => {
expect(assetService.uploadAssetAsync).toHaveBeenCalledOnce()
})
wizard.resetWizard()
finishUpload({
type: 'sync',
asset: fromPartial({
id: 'asset-after-reset',
name: 'model.safetensors',
tags: ['models', 'checkpoints']
})
})

await expect(upload).resolves.toBeNull()
expect(refresh).toHaveBeenCalledWith('CheckpointLoaderSimple')
expect(wizard.currentStep.value).toBe(1)
})

it('does not let a stale failure overwrite a replacement upload', async () => {
const { assetService } =
await import('@/platform/assets/services/assetService')
let failFirstUpload!: (error: Error) => void
vi.mocked(assetService.uploadAssetAsync)
.mockReturnValueOnce(
new Promise((_, reject) => {
failFirstUpload = reject
})
)
.mockResolvedValueOnce({
type: 'async',
task: {
task_id: 'replacement-task',
status: 'created',
message: 'Download queued'
}
})

const wizard = setupUploadModelWizard(modelTypes)
wizard.wizardData.value.url = 'https://civitai.com/models/first'
wizard.selectedModelType.value = 'checkpoints'
const staleUpload = wizard.uploadModel()
await vi.waitFor(() => {
expect(assetService.uploadAssetAsync).toHaveBeenCalledOnce()
})

wizard.resetWizard()
wizard.wizardData.value.url = 'https://civitai.com/models/replacement'
wizard.selectedModelType.value = 'checkpoints'
await expect(wizard.uploadModel()).resolves.toMatchObject({
taskId: 'replacement-task',
status: 'processing'
})

failFirstUpload(new Error('stale failure'))
await expect(staleUpload).resolves.toBeNull()
expect(wizard.uploadStatus.value).toBe('processing')
expect(wizard.uploadError.value).toBe('')
expect(wizard.currentStep.value).toBe(3)
})

it('updates uploadStatus to success when async download completes', async () => {
const { assetService } =
await import('@/platform/assets/services/assetService')
Expand Down
Loading
Loading