From bca0b1ba67597dbc5759d07c7f3adc904943d32f Mon Sep 17 00:00:00 2001 From: Simon Pinfold Date: Mon, 12 Oct 2026 09:16:27 -0700 Subject: [PATCH 1/6] fix: open HDR outputs in the HDR viewer and type untyped HDR drops Follow-up to #20740 for surfaces that still treated EXR/HDR outputs as ordinary images: - the job queue / Job History open the HDR viewer for an HDR-only job and the gallery on a mixed job's other outputs - double-click and Inspect in the assets panel open the HDR viewer, on the asset's own file rather than its preview - HDR files insert as Load Image - untyped .exr/.hdr drops are typed by extension - the Download Assets dialog shows HDR outputs by their preview_id --- .../fixtures/components/HdrViewerDialog.ts | 24 +++++ .../tests/sidebar/hdrOutputViewer.spec.ts | 94 +++++++++++++++++++ .../sidebar/tabs/AssetsSidebarTab.test.ts | 33 +++++++ .../sidebar/tabs/AssetsSidebarTab.vue | 14 ++- .../node/useNodeDragAndDrop.test.ts | 22 +++++ src/composables/node/useNodeDragAndDrop.ts | 3 +- .../queue/useResultGallery.test.ts | 62 ++++++++++++ src/composables/queue/useResultGallery.ts | 15 ++- .../assets/components/MediaAssetCard.test.ts | 15 +++ .../assets/components/MediaAssetCard.vue | 8 +- .../NodeOutputsExportDialog.test.ts | 16 +++- .../components/NodeOutputsExportDialog.vue | 2 +- .../composables/useNodeOutputsExport.test.ts | 19 ++++ .../composables/useNodeOutputsExport.ts | 11 ++- .../assets/utils/assetUrlUtil.test.ts | 39 +++++++- src/platform/assets/utils/assetUrlUtil.ts | 19 ++++ src/utils/eventUtils.test.ts | 37 +++++++- src/utils/eventUtils.ts | 16 +++- src/utils/loaderNodeUtil.test.ts | 19 ++++ src/utils/loaderNodeUtil.ts | 5 + 20 files changed, 456 insertions(+), 17 deletions(-) create mode 100644 browser_tests/fixtures/components/HdrViewerDialog.ts create mode 100644 browser_tests/tests/sidebar/hdrOutputViewer.spec.ts create mode 100644 src/utils/loaderNodeUtil.test.ts diff --git a/browser_tests/fixtures/components/HdrViewerDialog.ts b/browser_tests/fixtures/components/HdrViewerDialog.ts new file mode 100644 index 00000000000..3c55e55051a --- /dev/null +++ b/browser_tests/fixtures/components/HdrViewerDialog.ts @@ -0,0 +1,24 @@ +import { expect } from '@playwright/test' +import type { Locator, Page } from '@playwright/test' + +/** The HDR viewer dialog showing one file. */ +export class HdrViewerDialog { + public readonly root: Locator + + constructor( + public readonly page: Page, + filename: string + ) { + this.root = page.getByRole('dialog').filter({ hasText: filename }) + } + + /** Waits for the file to decode: statistics only render after that. */ + async expectLoaded() { + await expect( + this.root.getByText('Resolution', { exact: true }) + ).toBeVisible() + await expect(this.root.getByRole('alert')).toBeHidden() + // The image lightbox would be a second dialog. + await expect(this.page.getByRole('dialog')).toHaveCount(1) + } +} diff --git a/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts b/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts new file mode 100644 index 00000000000..8b8d3edba9b --- /dev/null +++ b/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts @@ -0,0 +1,94 @@ +import { 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 { TestIds } from '@e2e/fixtures/selectors' +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) => { + // Job history and the assets sidebar page jobs with different limits. + 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' + } + }) + // Only the subfolder URL serves the EXR, so a decoded viewer proves the URL. + await page.route('**/api/view**', async (route) => { + const url = new URL(route.request().url()) + const wrongFolder = + url.searchParams.get('filename') === 'sky.exr' && + url.searchParams.get('subfolder') !== 'renders' + await (wrongFolder ? route.fulfill({ status: 404 }) : route.fallback()) + }) + await use() + }, + { auto: true } + ] +}) + +// History-mode routing to the viewer; the assets-mode by-id URL is pinned in +// AssetsSidebarTab.test.ts. +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.page + .getByTestId(TestIds.sidebar.toolbar) + .getByRole('button', { name: 'Job History', exact: true }) + .click() + const row = comfyPage.queuePanel.jobRow('hdr-job') + await row.dblclick() + await new HdrViewerDialog(comfyPage.page, 'sky.exr').expectLoaded() + }) + }) + + 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').expectLoaded() + }) + + test('opens a generated HDR card from Inspect asset', async ({ + comfyPage + }) => { + const tab = comfyPage.menu.assetsTab + await tab.open() + await tab.rightClickAsset('sky') + await comfyPage.contextMenu.clickMenuItemExact('Inspect asset') + await new HdrViewerDialog(comfyPage.page, 'sky.exr').expectLoaded() + }) + }) +}) diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.test.ts b/src/components/sidebar/tabs/AssetsSidebarTab.test.ts index e23dba9e463..49868f0cc23 100644 --- a/src/components/sidebar/tabs/AssetsSidebarTab.test.ts +++ b/src/components/sidebar/tabs/AssetsSidebarTab.test.ts @@ -11,6 +11,7 @@ import { createI18n } from 'vue-i18n' import { useMediaAssetActions } from '@/platform/assets/composables/useMediaAssetActions' import { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil' +import { openHdrViewer } from '@/services/hdrViewerService' import { useAssetsStore } from '@/stores/assetsStore' import AssetsSidebarTab from './AssetsSidebarTab.vue' @@ -82,6 +83,8 @@ vi.mock(import('@/platform/assets/composables/useMediaAssetActions')) vi.mock(import('@/platform/assets/utils/outputAssetUtil')) +vi.mock(import('@/services/hdrViewerService')) + const i18n = createI18n({ legacy: false, locale: 'en', @@ -197,6 +200,36 @@ it('shows the sidebar close button when mounted as a sidebar tab', () => { }) describe('AssetsSidebarTab context menu', () => { + it('inspects an HDR output in the HDR viewer and offers it as a node', async () => { + useAssetsStore().outputAssets.items = [ + { + ...folderAsset, + name: 'sky.exr', + loader_path: 'renders/sky.exr', + preview_url: '/api/assets/sky-preview/content' + } + ] + renderTab() + + await fireEvent.contextMenu( + screen.getByRole('button', { name: 'Enter output folder' }) + ) + expect( + await screen.findByRole('menuitem', { + name: 'mediaAsset.actions.insertAsNodeInWorkflow' + }) + ).toBeInTheDocument() + await userEvent.click( + screen.getByRole('menuitem', { name: 'mediaAsset.actions.inspect' }) + ) + + expect(openHdrViewer).toHaveBeenCalledWith( + expect.stringMatching( + /\/view\?filename=sky\.exr&type=output&subfolder=renders$/ + ) + ) + }) + it('inserts a loadable image as a node', async () => { const asset = { ...folderAsset, name: 'image.png' } useAssetsStore().outputAssets.items = [asset] diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.vue b/src/components/sidebar/tabs/AssetsSidebarTab.vue index c99c1423077..fe913f56eb7 100644 --- a/src/components/sidebar/tabs/AssetsSidebarTab.vue +++ b/src/components/sidebar/tabs/AssetsSidebarTab.vue @@ -210,11 +210,13 @@ 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 { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil' import { isCloud } from '@/platform/distribution/types' import { supportsWorkflowMetadata } from '@/platform/workflow/utils/workflowExtractionUtil' +import { openHdrViewer } from '@/services/hdrViewerService' import { useAssetsStore } from '@/stores/assetsStore' import { useDialogStore } from '@/stores/dialogStore' import { @@ -222,6 +224,7 @@ import { getMediaTypeFromFilename, isPreviewableMediaType } from '@/utils/formatUtil' +import { isHdrImageFilename } from '@/utils/hdrFormatUtil' import { detectNodeTypeFromFilename } from '@/utils/loaderNodeUtil' import type { AugmentedResultItem } from '@/utils/resultItem' @@ -543,7 +546,9 @@ function handleAssetContextMenu(event: MouseEvent, asset: AssetItem) { { label: t('mediaAsset.actions.inspect'), icon: 'icon-[lucide--zoom-in]', - visible: isPreviewableMediaType(getMediaTypeFromFilename(asset.name)), + visible: + isPreviewableMediaType(getMediaTypeFromFilename(asset.name)) || + isHdrImageFilename(asset.name), command: () => handleZoomClick(asset) }, { @@ -618,6 +623,11 @@ const handleBulkExportWorkflow = async (assets: AssetItem[]) => { } const handleZoomClick = (asset: AssetItem) => { + if (isHdrImageFilename(asset.name)) { + openHdrViewer(getAssetViewUrl(asset)) + return + } + const mediaType = getMediaTypeFromFilename(asset.name) if (!isPreviewableMediaType(mediaType)) { return diff --git a/src/composables/node/useNodeDragAndDrop.test.ts b/src/composables/node/useNodeDragAndDrop.test.ts index efafee4ff01..35b5062bb21 100644 --- a/src/composables/node/useNodeDragAndDrop.test.ts +++ b/src/composables/node/useNodeDragAndDrop.test.ts @@ -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() diff --git a/src/composables/node/useNodeDragAndDrop.ts b/src/composables/node/useNodeDragAndDrop.ts index e66efbcba0e..b5d121d8c1d 100644 --- a/src/composables/node/useNodeDragAndDrop.ts +++ b/src/composables/node/useNodeDragAndDrop.ts @@ -3,6 +3,7 @@ import { partition } from 'es-toolkit' 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 = (files: File[]) => Promise @@ -51,7 +52,7 @@ export const useNodeDragAndDrop = ( const { dataTransfer } = e if (!dataTransfer) return false - const droppedFiles = Array.from(dataTransfer.files) + const droppedFiles = Array.from(dataTransfer.files, withHdrImageType) const [files, rejectedFiles] = partition(droppedFiles, fileFilter) const rejectedFilesClaimed = handleRejectedFiles(rejectedFiles) if (files.length) { diff --git a/src/composables/queue/useResultGallery.test.ts b/src/composables/queue/useResultGallery.test.ts index d02e6c09f01..147826a7005 100644 --- a/src/composables/queue/useResultGallery.test.ts +++ b/src/composables/queue/useResultGallery.test.ts @@ -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' @@ -160,4 +162,64 @@ describe('useResultGallery', () => { expect(galleryItems.value).toEqual(fullOutputs) expect(galleryActiveIndex.value).toBe(0) }) + + it('opens an HDR preview output in the HDR viewer instead of the gallery', async () => { + const exr = createResultItem('/api/view?filename=out.exr&subfolder=qa') + exr.filename = 'out.exr' + const task = createTask(exr) + + const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery( + () => [task] + ) + + await onViewItem(createJobViewItem('job-hdr', task)) + + expect(openHdrViewer).toHaveBeenCalledWith( + '/api/view?filename=out.exr&subfolder=qa' + ) + expect(galleryItems.value).toEqual([]) + expect(galleryActiveIndex.value).toBe(-1) + }) + + it('opens a job with HDR and image outputs in the gallery on its images', async () => { + const image = createResultItem('image.png') + const exr = createResultItem('/api/view?filename=out.exr') + exr.filename = 'out.exr' + const task = createTask(exr, [image, exr]) + + 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('does not open a slower gallery request over a later HDR selection', async () => { + const image = createResultItem('image.png') + const exr = createResultItem('/api/view?filename=out.exr') + exr.filename = 'out.exr' + const imageJob = createMockJob('slow-image-job', 2) + const imageTask = new TaskItemImpl(imageJob, {}, [image]) + let resolveFullOutputs!: (task: TaskItemImpl) => void + imageTask.loadFullOutputs = () => + new Promise((resolve) => (resolveFullOutputs = resolve)) + const hdrTask = createTask(exr) + + const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery( + () => [imageTask, hdrTask] + ) + + const imageView = onViewItem(createJobViewItem('job-image', imageTask)) + await onViewItem(createJobViewItem('job-hdr', hdrTask)) + resolveFullOutputs(new TaskItemImpl(imageJob, {}, [image, image])) + await imageView + + expect(openHdrViewer).toHaveBeenCalledOnce() + expect(galleryItems.value).toEqual([]) + expect(galleryActiveIndex.value).toBe(-1) + }) }) diff --git a/src/composables/queue/useResultGallery.ts b/src/composables/queue/useResultGallery.ts index 5cda6845f66..24b37acf347 100644 --- a/src/composables/queue/useResultGallery.ts +++ b/src/composables/queue/useResultGallery.ts @@ -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' @@ -26,14 +28,21 @@ export function useResultGallery(getFilteredTasks: () => TaskItemImpl[]) { if (targetOutputs === null && targetTask) return // Use target's outputs if available, otherwise fall back to all previews - const items = targetOutputs?.length + const outputs = targetOutputs?.length ? targetOutputs : tasks.map((t) => t.previewOutput).filter((o) => !!o) + // The gallery can't render HDR; a job with only HDR outputs opens the viewer. + const items = outputs.filter((o) => !isHdrImageFilename(o.filename)) - if (!items.length) return + const previewOutput = targetTask?.previewOutput + if (!items.length) { + if (previewOutput && isHdrImageFilename(previewOutput.filename)) { + openHdrViewer(resultItemUrl(previewOutput)) + } + return + } galleryItems.value = items - const previewOutput = item.taskRef?.previewOutput galleryActiveIndex.value = findActiveIndex( items, previewOutput ? resultItemUrl(previewOutput) : undefined diff --git a/src/platform/assets/components/MediaAssetCard.test.ts b/src/platform/assets/components/MediaAssetCard.test.ts index 281c47c076a..65dfbe96eb2 100644 --- a/src/platform/assets/components/MediaAssetCard.test.ts +++ b/src/platform/assets/components/MediaAssetCard.test.ts @@ -260,6 +260,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: undefined } + const { container, emitted } = renderCard({ + loading: false, + asset: hdrAsset + }) + // oxlint-disable-next-line testing-library/no-container, testing-library/no-node-access -- the preview area has no role of its own + const preview = container.querySelector('.aspect-square')! + + 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({ diff --git a/src/platform/assets/components/MediaAssetCard.vue b/src/platform/assets/components/MediaAssetCard.vue index fd1a2616ca4..fdb3297db7b 100644 --- a/src/platform/assets/components/MediaAssetCard.vue +++ b/src/platform/assets/components/MediaAssetCard.vue @@ -24,7 +24,7 @@
{ return getMediaTypeFromFilename(asset?.name || '') }) -const canInspect = computed(() => isPreviewableMediaType(fileKind.value)) +const isHdr = computed(() => isHdrImageFilename(asset?.name)) + +const canInspect = computed( + () => isPreviewableMediaType(fileKind.value) || isHdr.value +) // Get filename without extension const fileName = computed(() => { diff --git a/src/platform/assets/components/NodeOutputsExportDialog.test.ts b/src/platform/assets/components/NodeOutputsExportDialog.test.ts index cef90df9127..583699dad0e 100644 --- a/src/platform/assets/components/NodeOutputsExportDialog.test.ts +++ b/src/platform/assets/components/NodeOutputsExportDialog.test.ts @@ -12,11 +12,11 @@ const items = [ { name: 'shot_003.exr', thumbnailUrl: '/api/view?filename=shot_003.exr' } ] -function renderDialog() { +function renderDialog(dialogItems = items) { const onExport = vi.fn<(selectedIndices: number[]) => void>() const onCancel = vi.fn<() => void>() render(NodeOutputsExportDialog, { - props: { items, onExport, onCancel }, + props: { items: dialogItems, onExport, onCancel }, global: { plugins: [i18n] } }) return { onExport, onCancel, user: userEvent.setup() } @@ -77,6 +77,18 @@ describe('NodeOutputsExportDialog', () => { ) }) + it('shows a placeholder for an output with no thumbnail', () => { + renderDialog([ + { name: 'shot_001.exr', thumbnailUrl: '' }, + { name: 'shot_002.png', thumbnailUrl: '/api/view?filename=shot_002.png' } + ]) + + expect(screen.getAllByTestId('output-thumbnail')).toHaveLength(1) + expect(screen.getAllByTestId('output-thumbnail-placeholder')).toHaveLength( + 1 + ) + }) + it('cancels without exporting', async () => { const { onExport, onCancel, user } = renderDialog() diff --git a/src/platform/assets/components/NodeOutputsExportDialog.vue b/src/platform/assets/components/NodeOutputsExportDialog.vue index ef7f0ab28a5..69eeccaa421 100644 --- a/src/platform/assets/components/NodeOutputsExportDialog.vue +++ b/src/platform/assets/components/NodeOutputsExportDialog.vue @@ -16,7 +16,7 @@