From eec107ccd986acc4a58f39ec88003e84658b6035 Mon Sep 17 00:00:00 2001 From: Austin Mroz Date: Fri, 9 Oct 2026 20:00:51 -0700 Subject: [PATCH 1/6] Liter exr previews. Only display backend renders --- .../assets/components/MediaAssetCard.test.ts | 12 ++++ .../assets/components/MediaAssetCard.vue | 2 + .../remote/comfyui/execution/types.ts | 3 +- .../vueNodes/components/ImagePreview.test.ts | 17 +++++ .../vueNodes/components/ImagePreview.vue | 65 ++++++++++++++----- src/stores/nodeOutputStore.test.ts | 15 +++++ src/utils/hdrFormatUtil.test.ts | 19 ++++++ src/utils/hdrFormatUtil.ts | 15 +++++ src/utils/resultItemUrl.test.ts | 53 +++++++++++++++ src/utils/resultItemUrl.ts | 3 + 10 files changed, 187 insertions(+), 17 deletions(-) create mode 100644 src/utils/resultItemUrl.test.ts diff --git a/src/platform/assets/components/MediaAssetCard.test.ts b/src/platform/assets/components/MediaAssetCard.test.ts index 7202d85c8dd..281c47c076a 100644 --- a/src/platform/assets/components/MediaAssetCard.test.ts +++ b/src/platform/assets/components/MediaAssetCard.test.ts @@ -248,6 +248,18 @@ describe('MediaAssetCard', () => { expect(emitted().zoom).toEqual([[asset]]) }) + it('previews an exr asset from its preview_url', async () => { + const previewUrl = '/api/assets/exr-preview/content' + renderCard({ + loading: false, + asset: { ...asset, name: 'render.exr', preview_url: previewUrl } + }) + + expect( + await screen.findByRole('img', { name: 'render.exr' }) + ).toHaveAttribute('src', previewUrl) + }) + 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 dbcbbeaf2f3..fd1a2616ca4 100644 --- a/src/platform/assets/components/MediaAssetCard.vue +++ b/src/platform/assets/components/MediaAssetCard.vue @@ -175,6 +175,7 @@ import { getMediaTypeFromFilename, isPreviewableMediaType } from '@/utils/formatUtil' +import { isHdrImageFilename } from '@/utils/hdrFormatUtil' import { getAssetType } from '../composables/media/assetMappers' import { startAssetDrag } from '../utils/assetDragUtil' @@ -255,6 +256,7 @@ const fileKind = computed((): MediaKind => { }) const previewKind = computed((): PreviewKind => { + if (asset?.preview_url && isHdrImageFilename(asset.name)) return 'image' return getMediaTypeFromFilename(asset?.name || '') }) diff --git a/src/platform/remote/comfyui/execution/types.ts b/src/platform/remote/comfyui/execution/types.ts index 65255056d3b..e51a3756997 100644 --- a/src/platform/remote/comfyui/execution/types.ts +++ b/src/platform/remote/comfyui/execution/types.ts @@ -11,7 +11,8 @@ export const zResultItem = z.object({ subfolder: z.string().optional(), type: resultItemType.optional(), display_name: z.string().optional(), - id: z.string().optional() + id: z.string().optional(), + preview_id: z.string().optional() }) export type ResultItem = z.infer // Uses .passthrough() because custom nodes can output arbitrary keys. diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts index 4793037f0f9..67ca61237cf 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts @@ -12,6 +12,7 @@ import { useTelemetry } from '@/platform/telemetry' import { downloadFile } from '@/base/common/downloadUtil' import type { ResultItem } from '@/platform/remote/comfyui/execution/types' import ImagePreview from '@/renderer/extensions/vueNodes/components/ImagePreview.vue' +import { openHdrViewer } from '@/services/hdrViewerService' import { useNodeOutputStore } from '@/stores/nodeOutputStore' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' import { resolveNode } from '@/utils/litegraphUtil' @@ -168,6 +169,22 @@ describe('ImagePreview', () => { expect(screen.queryByTestId('main-image')).not.toBeInTheDocument() }) + it('shows the server preview of an exr output and still offers the HDR viewer', async () => { + const exrUrl = '/api/view?filename=out.exr&type=output&preview_id=p1' + renderImagePreview({ imageUrls: [exrUrl] }) + const user = userEvent.setup() + + expect(screen.getByTestId('main-image')).toHaveAttribute( + 'src', + '/api/assets/p1/content?disposition=inline' + ) + expect(screen.getByText('HDR image')).toBeInTheDocument() + + await user.click(screen.getByRole('button', { name: 'Open in HDR Viewer' })) + + expect(openHdrViewer).toHaveBeenCalledWith(exrUrl) + }) + it('displays calculating dimensions text in gallery mode', async () => { renderImagePreview({ imageUrls: [defaultProps.imageUrls[0]] diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.vue b/src/renderer/extensions/vueNodes/components/ImagePreview.vue index 90d4859f4f9..6a3c59e54bf 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.vue +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.vue @@ -26,14 +26,22 @@ " @click="handleGridClick(index)" > - +
+ + +
+ +