Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,10 @@ 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.clock.install()
await page.route(`**/tasks/${taskId}`, async (route) => {
if (route.request().method() === 'DELETE') {
await route.fulfill({ status: 204 })
Expand Down Expand Up @@ -295,17 +295,24 @@ test.describe('Model import progress toast', { tag: ['@screenshot'] }, () => {
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 page.clock.runFor(10_001)
await (await response).finished()
await page.clock.runFor(1)
}
await advanceReconciliation()
await expect(
Expand Down
109 changes: 107 additions & 2 deletions 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(),
uploadAssetFromBase64: vi.fn()
uploadAssetFromBase64: vi.fn(),
deleteAsset: vi.fn()
}
}))

Expand Down Expand Up @@ -108,7 +109,8 @@ describe('useUploadModelWizard', () => {
let finishPreview!: () => void
vi.mocked(assetService.uploadAssetFromBase64).mockReturnValue(
new Promise((resolve) => {
finishPreview = () => resolve(fromPartial({ id: 'preview-id' }))
finishPreview = () =>
resolve(fromPartial({ id: 'preview-id', created_new: true }))
})
)

Expand All @@ -126,10 +128,75 @@ describe('useUploadModelWizard', () => {

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')
Expand Down Expand Up @@ -168,6 +235,44 @@ describe('useUploadModelWizard', () => {
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')
Expand Down
38 changes: 27 additions & 11 deletions src/platform/assets/composables/useUploadModelWizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ export function useUploadModelWizard(

async function uploadPreviewImage(
filename: string
): Promise<string | undefined> {
): Promise<{ id: string; createdNew: boolean } | undefined> {
if (!wizardData.value.previewImage) return undefined

try {
Expand All @@ -251,19 +251,20 @@ export function useUploadModelWizard(
name: `${baseFilename}_preview.${extension}`,
tags: ['preview']
})
return previewAsset.id
return {
id: previewAsset.id,
createdNew: previewAsset.created_new
}
} catch (error) {
console.error('Failed to upload preview image:', error)
return undefined
}
}

async function refreshModelCaches() {
if (!resolvedModelType.value) return
async function refreshModelCaches(modelType = resolvedModelType.value) {
if (!modelType) return

const providers = modelToNodeStore.getAllNodeProviders(
resolvedModelType.value
)
const providers = modelToNodeStore.getAllNodeProviders(modelType)
const results = await Promise.allSettled(
providers.map((provider) =>
assetsStore.updateModelsForNodeType(provider.nodeDef.name)
Expand Down Expand Up @@ -418,8 +419,17 @@ export function useUploadModelWizard(
wizardData.value.metadata?.name ||
'model'

const previewId = await uploadPreviewImage(filename)
if (isStaleUpload(generation)) return null
const preview = await uploadPreviewImage(filename)
if (isStaleUpload(generation)) {
if (preview?.createdNew) {
try {
await assetService.deleteAsset(preview.id)
} catch (error) {
console.error('Failed to clean up stale preview image:', error)
}
}
return null
}
Comment thread
christian-byrne marked this conversation as resolved.
Resolved

const userMetadata = {
source: source.type,
Expand All @@ -431,7 +441,7 @@ export function useUploadModelWizard(
source_url: wizardData.value.url,
tags,
user_metadata: userMetadata,
preview_id: previewId
preview_id: preview?.id
})

if (result.type === 'async' && result.task.status !== 'completed') {
Expand All @@ -444,7 +454,12 @@ export function useUploadModelWizard(
}
}

if (isStaleUpload(generation)) return null
if (isStaleUpload(generation)) {
if (result.type === 'sync' || result.task.status === 'completed') {
await refreshModelCaches(modelType)
}
return null
}

if (result.type === 'async' && result.task.status !== 'completed') {
uploadSuccess = watchAsyncUpload(
Expand All @@ -465,6 +480,7 @@ export function useUploadModelWizard(

uploadStatus.value = 'success'
Comment thread
christian-byrne marked this conversation as resolved.
Resolved
await refreshModelCaches()
if (isStaleUpload(generation)) return null
uploadSuccess = {
filename:
result.type === 'sync' ? getAssetFilename(result.asset) : filename,
Expand Down
Loading
Loading