diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts index 5b262798a54..25007af1546 100644 --- a/browser_tests/fixtures/ComfyPage.ts +++ b/browser_tests/fixtures/ComfyPage.ts @@ -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 @@ -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 diff --git a/browser_tests/fixtures/components/HdrViewerDialog.ts b/browser_tests/fixtures/components/HdrViewerDialog.ts new file mode 100644 index 00000000000..0dbf3c22f07 --- /dev/null +++ b/browser_tests/fixtures/components/HdrViewerDialog.ts @@ -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() + } +} diff --git a/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts b/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts new file mode 100644 index 00000000000..0862bc72b3d --- /dev/null +++ b/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts @@ -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() + }) + }) +}) diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.vue b/src/components/sidebar/tabs/AssetsSidebarTab.vue index c89f30a5720..e75163d471c 100644 --- a/src/components/sidebar/tabs/AssetsSidebarTab.vue +++ b/src/components/sidebar/tabs/AssetsSidebarTab.vue @@ -233,11 +233,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 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 { @@ -245,6 +247,7 @@ import { getMediaTypeFromFilename, isPreviewableMediaType } from '@/utils/formatUtil' +import { isHdrImageFilename } from '@/utils/hdrFormatUtil' import type { AugmentedResultItem } from '@/utils/resultItem' const Load3dViewerContent = defineAsyncComponent( @@ -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 diff --git a/src/composables/node/useNodeDragAndDrop.test.ts b/src/composables/node/useNodeDragAndDrop.test.ts index d8b83b2fcd6..b23e6d0d0f0 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 27105de3d74..9f37a5d89db 100644 --- a/src/composables/node/useNodeDragAndDrop.ts +++ b/src/composables/node/useNodeDragAndDrop.ts @@ -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 = (files: File[]) => Promise @@ -27,7 +28,7 @@ export const useNodeDragAndDrop = ( !!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 diff --git a/src/composables/queue/useResultGallery.test.ts b/src/composables/queue/useResultGallery.test.ts index d02e6c09f01..e9d079db98c 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,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) + } + ) }) diff --git a/src/composables/queue/useResultGallery.ts b/src/composables/queue/useResultGallery.ts index 5cda6845f66..71a36610879 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' @@ -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 diff --git a/src/platform/assets/components/MediaAssetCard.test.ts b/src/platform/assets/components/MediaAssetCard.test.ts index b10ca9a173b..ee347671e78 100644 --- a/src/platform/assets/components/MediaAssetCard.test.ts +++ b/src/platform/assets/components/MediaAssetCard.test.ts @@ -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({ diff --git a/src/platform/assets/components/MediaAssetCard.vue b/src/platform/assets/components/MediaAssetCard.vue index c2a734929ce..e6ef78ca159 100644 --- a/src/platform/assets/components/MediaAssetCard.vue +++ b/src/platform/assets/components/MediaAssetCard.vue @@ -24,7 +24,7 @@
{ 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(() => { diff --git a/src/platform/assets/components/MediaAssetContextMenu.test.ts b/src/platform/assets/components/MediaAssetContextMenu.test.ts index 4ffc4a9bdf1..36abafb11fb 100644 --- a/src/platform/assets/components/MediaAssetContextMenu.test.ts +++ b/src/platform/assets/components/MediaAssetContextMenu.test.ts @@ -8,6 +8,7 @@ import { defineComponent, nextTick, onMounted, ref } from 'vue' import { i18n } from '@/i18n' import MediaAssetContextMenu from '@/platform/assets/components/MediaAssetContextMenu.vue' +import type { MediaKind } from '@/platform/assets/schemas/mediaAssetSchema' import type { AssetItem } from '@/platform/assets/schemas/assetSchema' import type * as LoaderNodeUtil from '@/utils/loaderNodeUtil' @@ -106,7 +107,10 @@ interface MediaAssetContextMenuExposed { let capturedRef: MediaAssetContextMenuExposed | null = null -function mountComponent(targetAsset: AssetItem = asset) { +function mountComponent( + targetAsset: AssetItem = asset, + fileKind: MediaKind = 'image' +) { const onHide = vi.fn() const { container, unmount } = render( defineComponent({ @@ -116,10 +120,10 @@ function mountComponent(targetAsset: AssetItem = asset) { onMounted(() => { capturedRef = menuRef.value }) - return { menuRef, asset: targetAsset, onHide } + return { menuRef, asset: targetAsset, fileKind, onHide } }, template: - '' + '' }), { global: { @@ -202,6 +206,20 @@ describe('MediaAssetContextMenu', () => { unmount() }) + it('offers Inspect for an HDR asset', async () => { + const { container, unmount } = mountComponent( + { ...asset, name: 'sky.exr' }, + 'other' + ) + await showMenu(container) + + expect( + findMenuItem(i18n.global.t('mediaAsset.actions.inspect')) + ).toBeDefined() + + unmount() + }) + it('hides insert-as-node for text assets without a loader node', async () => { const { container, unmount } = mountComponent({ ...asset, diff --git a/src/platform/assets/components/MediaAssetContextMenu.vue b/src/platform/assets/components/MediaAssetContextMenu.vue index 25d7b1c2546..0f700d4f424 100644 --- a/src/platform/assets/components/MediaAssetContextMenu.vue +++ b/src/platform/assets/components/MediaAssetContextMenu.vue @@ -40,6 +40,7 @@ import { useDismissableOverlay } from '@/composables/useDismissableOverlay' import { isCloud } from '@/platform/distribution/types' import { supportsWorkflowMetadata } from '@/platform/workflow/utils/workflowExtractionUtil' import { isPreviewableMediaType } from '@/utils/formatUtil' +import { isHdrImageFilename } from '@/utils/hdrFormatUtil' import { detectNodeTypeFromFilename } from '@/utils/loaderNodeUtil' import { cn } from '@comfyorg/tailwind-utils' @@ -190,7 +191,7 @@ const contextMenuItems = computed(() => { // Individual mode: Show all menu options // Inspect - if (isPreviewableMediaType(fileKind)) { + if (isPreviewableMediaType(fileKind) || isHdrImageFilename(asset.name)) { items.push({ label: t('mediaAsset.actions.inspect'), icon: 'icon-[lucide--zoom-in]', diff --git a/src/platform/assets/components/NodeOutputsExportDialog.test.ts b/src/platform/assets/components/NodeOutputsExportDialog.test.ts index cef90df9127..8d955d6a71a 100644 --- a/src/platform/assets/components/NodeOutputsExportDialog.test.ts +++ b/src/platform/assets/components/NodeOutputsExportDialog.test.ts @@ -12,11 +12,13 @@ const items = [ { name: 'shot_003.exr', thumbnailUrl: '/api/view?filename=shot_003.exr' } ] -function renderDialog() { +function renderDialog( + dialogItems: { name: string; thumbnailUrl?: string }[] = 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 +79,17 @@ describe('NodeOutputsExportDialog', () => { ) }) + it('shows a placeholder for an output with no thumbnail', () => { + renderDialog([ + { name: 'shot_001.exr' }, + { name: 'shot_002.png', thumbnailUrl: '/api/view?filename=shot_002.png' } + ]) + + 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..e0c2f72b258 100644 --- a/src/platform/assets/components/NodeOutputsExportDialog.vue +++ b/src/platform/assets/components/NodeOutputsExportDialog.vue @@ -16,7 +16,7 @@