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
6 changes: 6 additions & 0 deletions browser_tests/fixtures/ComfyPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class ComfyPropertiesPanel {

class ComfyMenu {
private _appsTab: SidebarTab | null = null
private _jobHistoryTab: SidebarTab | null = null
private _assetsTab: AssetsSidebarTab | null = null
private _modelLibraryTab: ModelLibrarySidebarTab | null = null
private _nodeLibraryTab: NodeLibrarySidebarTab | null = null
Expand Down Expand Up @@ -136,6 +137,11 @@ class ComfyMenu {
return this._appsTab
}

get jobHistoryTab() {
this._jobHistoryTab ??= new SidebarTab(this.page, 'job-history')
return this._jobHistoryTab
}

get assetsTab() {
this._assetsTab ??= new AssetsSidebarTab(this.page)
return this._assetsTab
Expand Down
20 changes: 20 additions & 0 deletions browser_tests/fixtures/components/HdrViewerDialog.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { expect } from '@playwright/test'
import type { Locator, Page } from '@playwright/test'

import { BaseDialog } from '@e2e/fixtures/components/BaseDialog'

export class HdrViewerDialog extends BaseDialog {
readonly resolution: Locator
readonly loadError: Locator

constructor(page: Page, filename: string) {
super(page, page.getByRole('dialog').filter({ hasText: filename }))
this.resolution = this.root.getByText('Resolution', { exact: true })
this.loadError = this.root.getByRole('alert')
}

async expectDecoded() {
await expect(this.resolution).toBeVisible()
await expect(this.loadError).toBeHidden()
}
}
79 changes: 79 additions & 0 deletions browser_tests/tests/sidebar/hdrOutputViewer.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import { expect, mergeTests } from '@playwright/test'

import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
import {
createRouteMockJob,
jobsRouteFixture,
routeMockJobTimestamp
} from '@e2e/fixtures/jobsRouteFixture'
import { HdrViewerDialog } from '@e2e/fixtures/components/HdrViewerDialog'
import { mockViewFiles } from '@e2e/fixtures/utils/viewFileMocks'

const hdrJob = createRouteMockJob({
id: 'hdr-job',
create_time: routeMockJobTimestamp - 1_000,
execution_start_time: routeMockJobTimestamp - 1_000,
execution_end_time: routeMockJobTimestamp,
preview_output: {
filename: 'sky.exr',
subfolder: 'renders',
type: 'output',
nodeId: '1',
mediaType: 'images'
}
})

const test = mergeTests(comfyPageFixture, jobsRouteFixture).extend<{
mockHdrJob: void
}>({
mockHdrJob: [
async ({ jobsRoutes, page }, use) => {
await jobsRoutes.mockJobsScenario({ history: [hdrJob], queue: [] })
await jobsRoutes.mockJobsHistory([hdrJob])
await mockViewFiles(page, {
'sky.exr': {
path: 'browser_tests/assets/test_upload_image.exr',
contentType: 'image/x-exr'
}
})
await page.route('**/api/view**', async (route) => {
const url = new URL(route.request().url())
const wrongLocation =
url.searchParams.get('filename') === 'sky.exr' &&
(url.searchParams.get('type') !== 'output' ||
url.searchParams.get('subfolder') !== 'renders')
await (wrongLocation
? route.fulfill({ status: 404 })
: route.fallback())
})
await use()
},
{ auto: true }
]
})

test.describe('HDR outputs open in the HDR viewer', { tag: '@ui' }, () => {
test.describe('from job history', () => {
test.use({ initialSettings: { 'Comfy.Queue.QPOV2': true } })

test('opens the job output instead of the image lightbox', async ({
comfyPage
}) => {
await comfyPage.menu.jobHistoryTab.open()
await comfyPage.queuePanel.jobRow('hdr-job').dblclick()
await new HdrViewerDialog(comfyPage.page, 'sky.exr').expectDecoded()
await expect(comfyPage.page.getByRole('dialog')).toHaveCount(1)
})
})

test.describe('from the assets sidebar', () => {
test('opens a generated HDR card on double click', async ({
comfyPage
}) => {
const tab = comfyPage.menu.assetsTab
await tab.open()
await tab.getAssetCardByName('sky').dblclick()
await new HdrViewerDialog(comfyPage.page, 'sky.exr').expectDecoded()
})
})
})
10 changes: 9 additions & 1 deletion src/components/sidebar/tabs/AssetsSidebarTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -233,18 +233,21 @@ import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
import { getAssetDisplayName } from '@/platform/assets/utils/assetMetadataUtils'
import {
getAssetFileUrl,
getAssetSubfolder
getAssetSubfolder,
getAssetViewUrl
} from '@/platform/assets/utils/assetUrlUtil'
import type { MediaKind } from '@/platform/assets/schemas/mediaAssetSchema'
import { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil'
import { isCloud } from '@/platform/distribution/types'
import { openHdrViewer } from '@/services/hdrViewerService'
import { useAssetsStore } from '@/stores/assetsStore'
import { useDialogStore } from '@/stores/dialogStore'
import {
formatDuration,
getMediaTypeFromFilename,
isPreviewableMediaType
} from '@/utils/formatUtil'
import { isHdrImageFilename } from '@/utils/hdrFormatUtil'
import type { AugmentedResultItem } from '@/utils/resultItem'

const Load3dViewerContent = defineAsyncComponent(
Expand Down Expand Up @@ -561,6 +564,11 @@ const handleDeleteSelected = async () => {
}

const handleZoomClick = (asset: AssetItem) => {
if (isHdrImageFilename(asset.name)) {
openHdrViewer(getAssetViewUrl(asset))
return
}

const mediaType = getMediaTypeFromFilename(asset.name)
if (!isPreviewableMediaType(mediaType)) {
return
Expand Down
22 changes: 22 additions & 0 deletions src/composables/node/useNodeDragAndDrop.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,28 @@ describe('useNodeDragAndDrop', () => {
expect(onDrop).toHaveBeenCalledWith([keep])
})

it('onDragDrop passes an untyped HDR file to an image filter as an image', async () => {
const onDrop = vi.fn().mockResolvedValue([])
const node = createNode()

useNodeDragAndDrop(node, {
onDrop,
fileFilter: (file) => file.type.startsWith('image/')
})

const result = await node.onDragDrop?.(
createDragEvent({
files: [createFile('sky.exr', '')],
items: [{ kind: 'file' }]
})
)

expect(result).toBe(true)
expect(onDrop).toHaveBeenCalledWith([
expect.objectContaining({ name: 'sky.exr', type: 'image/x-exr' })
])
})

it('onDragDrop returns false for invalid drops', async () => {
const onDrop = vi.fn().mockResolvedValue([])
const node = createNode()
Expand Down
3 changes: 2 additions & 1 deletion src/composables/node/useNodeDragAndDrop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useChainCallback } from '@/composables/functional/useChainCallback'
import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
import { parseAssetInfo } from '@/platform/assets/schemas/mediaAssetSchema'
import type { ResultItem } from '@/platform/remote/comfyui/execution/types'
import { withHdrImageType } from '@/utils/eventUtils'

type DragHandler = (e: DragEvent) => boolean
type DropHandler<T> = (files: File[]) => Promise<T[]>
Expand All @@ -27,7 +28,7 @@ export const useNodeDragAndDrop = <T>(
!!Array.from(items).find((f) => f.kind === 'file')

const filterFiles = (files: FileList | File[]) =>
Array.from(files).filter(fileFilter)
Array.from(files, withHdrImageType).filter(fileFilter)

const hasValidFiles = (files: FileList) => filterFiles(files).length > 0

Expand Down
75 changes: 75 additions & 0 deletions src/composables/queue/useResultGallery.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { describe, expect, it, vi } from 'vitest'

vi.mock(import('@/platform/assets/composables/media/assetMappers'))
vi.mock(import('@/services/hdrViewerService'))

import { useResultGallery } from '@/composables/queue/useResultGallery'
import { openHdrViewer } from '@/services/hdrViewerService'
import type { JobListItem as JobListViewItem } from '@/composables/queue/useJobList'
import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
import { TaskItemImpl } from '@/stores/queueStore'
Expand Down Expand Up @@ -160,4 +162,77 @@ describe('useResultGallery', () => {
expect(galleryItems.value).toEqual(fullOutputs)
expect(galleryActiveIndex.value).toBe(0)
})

it('opens the HDR viewer for a job whose cover is HDR, even with image outputs', async () => {
const image = createResultItem('image.png')
const exr = {
...createResultItem('/api/view?filename=out.exr'),
filename: 'out.exr'
}
const task = createTask(exr, [image, exr])

const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
() => [task]
)

await onViewItem(createJobViewItem('job-mixed', task))

expect(openHdrViewer).toHaveBeenCalledWith('/api/view?filename=out.exr')
expect(galleryItems.value).toEqual([])
expect(galleryActiveIndex.value).toBe(-1)
})

it('opens a job with an image cover in the gallery without its HDR outputs', async () => {
const image = createResultItem('image.png')
const exr = {
...createResultItem('/api/view?filename=out.exr'),
filename: 'out.exr'
}
const task = createTask(image, [exr, image])

const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
() => [task]
)

await onViewItem(createJobViewItem('job-mixed', task))

expect(galleryItems.value).toEqual([image])
expect(galleryActiveIndex.value).toBe(0)
expect(openHdrViewer).not.toHaveBeenCalled()
})

it.for(['resolves', 'rejects'])(
'does not open a slower gallery request that %s over a later HDR selection',
async (outcome) => {
const image = createResultItem('image.png')
const exr = {
...createResultItem('/api/view?filename=out.exr'),
filename: 'out.exr'
}
const imageJob = createMockJob('slow-image-job', 2)
const imageTask = new TaskItemImpl(imageJob, {}, [image])
let settle!: () => void
imageTask.loadFullOutputs = () =>
new Promise((resolve, reject) => {
settle = () =>
outcome === 'resolves'
? resolve(new TaskItemImpl(imageJob, {}, [image, image]))
: reject(new Error('load failed'))
})
const hdrTask = createTask(exr)

const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
() => [imageTask, hdrTask]
)

const imageView = onViewItem(createJobViewItem('job-image', imageTask))
await onViewItem(createJobViewItem('job-hdr', hdrTask))
settle()
await imageView

expect(openHdrViewer).toHaveBeenCalledOnce()
expect(galleryItems.value).toEqual([])
expect(galleryActiveIndex.value).toBe(-1)
}
)
})
19 changes: 13 additions & 6 deletions src/composables/queue/useResultGallery.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { ref, shallowRef } from 'vue'

import type { JobListItem } from '@/composables/queue/useJobList'
import { openHdrViewer } from '@/services/hdrViewerService'
import { findActiveIndex, getOutputsForTask } from '@/services/jobOutputCache'
import type { TaskItemImpl } from '@/stores/queueStore'
import { isHdrImageFilename } from '@/utils/hdrFormatUtil'
import type { AugmentedResultItem } from '@/utils/resultItem'
import { resultItemUrl } from '@/utils/resultItemUrl'

Expand All @@ -25,15 +27,20 @@ export function useResultGallery(getFilteredTasks: () => TaskItemImpl[]) {
// Request was superseded by a newer one
if (targetOutputs === null && targetTask) return

// Use target's outputs if available, otherwise fall back to all previews
const items = targetOutputs?.length
? targetOutputs
: tasks.map((t) => t.previewOutput).filter((o) => !!o)

const previewOutput = targetTask?.previewOutput
if (previewOutput && isHdrImageFilename(previewOutput.filename)) {
openHdrViewer(resultItemUrl(previewOutput))
return
}

const items = (
targetOutputs?.length
? targetOutputs
: tasks.map((t) => t.previewOutput).filter((o) => !!o)
).filter((o) => !isHdrImageFilename(o.filename))
if (!items.length) return

galleryItems.value = items
const previewOutput = item.taskRef?.previewOutput
galleryActiveIndex.value = findActiveIndex(
items,
previewOutput ? resultItemUrl(previewOutput) : undefined
Expand Down
15 changes: 15 additions & 0 deletions src/platform/assets/components/MediaAssetCard.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,21 @@ describe('MediaAssetCard', () => {
).toHaveAttribute('src', previewUrl)
})

it('inspects an HDR asset on double click', async () => {
const user = userEvent.setup()
const hdrAsset = {
...asset,
name: 'sky.exr',
preview_url: '/api/assets/sky-preview/content'
}
const { emitted } = renderCard({ loading: false, asset: hdrAsset })
const preview = await screen.findByRole('img', { name: 'sky.exr' })

await user.dblClick(preview)

expect(emitted().zoom).toEqual([[hdrAsset]])
})

it('selects non-video assets from the preview', async () => {
const user = userEvent.setup()
const { container, emitted } = renderCard({
Expand Down
10 changes: 7 additions & 3 deletions src/platform/assets/components/MediaAssetCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div
class="relative aspect-square overflow-hidden p-0"
@click.stop="handlePreviewClick"
@dblclick.stop="fileKind === 'image' && handleZoomClick()"
@dblclick.stop="(fileKind === 'image' || isHdr) && handleZoomClick()"
>
<!-- Loading State -->
<div
Expand Down Expand Up @@ -257,12 +257,16 @@ const fileKind = computed((): MediaKind => {
return getMediaTypeFromFilename(asset?.name || '')
})

const isHdr = computed(() => isHdrImageFilename(asset?.name))

const previewKind = computed((): PreviewKind => {
if (asset?.preview_url && isHdrImageFilename(asset.name)) return 'image'
if (asset?.preview_url && isHdr.value) return 'image'
return getMediaTypeFromFilename(asset?.name || '')
})

const canInspect = computed(() => isPreviewableMediaType(fileKind.value))
const canInspect = computed(
() => isPreviewableMediaType(fileKind.value) || isHdr.value
)

// Get filename without extension
const fileName = computed(() => {
Expand Down
Loading
Loading