From 364a262bce9a2f1bfaf8dd1cfff447feafc43aa3 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Tue, 10 Nov 2026 19:43:37 +0100 Subject: [PATCH 01/14] style(perf-test): cards for the Performance Tests steps, results and logs Build, workflow and measurement settings each sit in a card with an uppercase label, and Results and Logs become cards too, as in the New UI proposal's Performance Tests page. The run count fields are narrower so they fit their card. Co-Authored-By: Claude Opus 5.5 --- .../src/views/PerformanceTestView.vue | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/renderer/src/views/PerformanceTestView.vue b/src/renderer/src/views/PerformanceTestView.vue index 80114953b..1a2d72a0d 100644 --- a/src/renderer/src/views/PerformanceTestView.vue +++ b/src/renderer/src/views/PerformanceTestView.vue @@ -662,12 +662,12 @@ watch(performanceTestLogs, async () => { :title="t('performanceTest.title')" :description="t('performanceTest.description')" /> -
+

{{ t('performanceTest.selectInstance') }}

@@ -704,7 +704,7 @@ watch(performanceTestLogs, async () => {

{{ t('performanceTest.chooseWorkflow') }}

{{ t('performanceTest.measurementSettings') }}

{
{
{
-
+
{ />
{
{
{{ performanceTestLogs || t('performanceTest.logsPlaceholder') }} From fa24c7664151a03d62b38b7c134157b116cee1e2 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Tue, 10 Nov 2026 22:30:44 +0100 Subject: [PATCH 02/14] style(perf-test): one setup panel, Run in the header, console-style logs Replace the three step cards with a single setup panel split into columns, move Run (and Stop, shown while a test is active) into the page header, leave Results on the page with a proper empty state, and render Logs as a console panel. BrandedPageHeader gains an optional actions slot. Co-Authored-By: Claude Opus 5.5 --- .../src/components/BrandedPageHeader.vue | 6 + .../src/views/PerformanceTestView.vue | 257 ++++++++++-------- 2 files changed, 152 insertions(+), 111 deletions(-) diff --git a/src/renderer/src/components/BrandedPageHeader.vue b/src/renderer/src/components/BrandedPageHeader.vue index 2a3fc7045..df8a730d8 100644 --- a/src/renderer/src/components/BrandedPageHeader.vue +++ b/src/renderer/src/components/BrandedPageHeader.vue @@ -15,5 +15,11 @@ defineProps<{ {{ description }}

+
+ +
diff --git a/src/renderer/src/views/PerformanceTestView.vue b/src/renderer/src/views/PerformanceTestView.vue index 1a2d72a0d..b009cb410 100644 --- a/src/renderer/src/views/PerformanceTestView.vue +++ b/src/renderer/src/views/PerformanceTestView.vue @@ -2,7 +2,17 @@ import Input from '@comfyorg/design-system/input/Input' import { computed, nextTick, onUnmounted, ref, toRef, useTemplateRef, watch } from 'vue' import { useI18n } from 'vue-i18n' -import { FolderOpen, ImageDown, Trash2 } from 'lucide-vue-next' +import { + FileJson, + FolderOpen, + Gauge, + ImageDown, + LayoutTemplate, + Play, + Square, + SquareTerminal, + Trash2 +} from 'lucide-vue-next' import Button from '@comfyorg/design-system/button/Button' import BrandBackground from '../components/BrandBackground.vue' import BrandedPageHeader from '../components/BrandedPageHeader.vue' @@ -656,41 +666,61 @@ watch(performanceTestLogs, async () => { class="performance-test__layout @container relative h-full min-h-0 w-full overflow-x-hidden overflow-y-auto" >
-
+ > + + +
-
-

{{ t('performanceTest.selectInstance') }}

-
- +
+

+ {{ t('performanceTest.selectInstance') }} +

+
+ {{ t('performanceTest.workspaceLabel') }}
-
- +
+ {{ t('performanceTest.instanceLabel') }} -
+
{
-
-

{{ t('performanceTest.chooseWorkflow') }}

+
+

+ {{ t('performanceTest.chooseWorkflow') }} +

{{ t('performanceTest.orImportApiWorkflow') }}
- + +
-
-

{{ t('performanceTest.measurementSettings') }}

+
+

+ {{ t('performanceTest.measurementSettings') }} +

- - - -
- + + + + +
+ +
-
-
- - - - -
- +
+ + + + +
+ +
-
- - -
{ />
{
-

- {{ t('performanceTest.resultsPlaceholder') }} -

+
+
-
+
From a98280b53645ddf760c63308adc4c366092e48d0 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 11 Nov 2026 18:05:54 +0100 Subject: [PATCH 14/14] style(perf-test): setup as filter buttons, results in one card Build and Workflow use the shared filter dropdown trigger, the workflow actions move into its menu, Run sits at the end of the setup row, and the results, run label and system information share one card. Co-Authored-By: Claude Opus 5.5 --- locales/en.json | 15 +- locales/zh.json | 15 +- src/renderer/src/panel/PanelApp.test.ts | 214 +++-- .../src/views/PerformanceTestView.vue | 882 ++++++++++-------- 4 files changed, 634 insertions(+), 492 deletions(-) diff --git a/locales/en.json b/locales/en.json index 335ed74af..3792ddc46 100644 --- a/locales/en.json +++ b/locales/en.json @@ -1610,7 +1610,7 @@ "measuredRunsHint": "Runs timed after the warm-up runs. Their durations are used to calculate the results.", "logsPlaceholder": "Build logs will appear here.", "results": "Results", - "resultsPlaceholder": "Performance test results will appear here.", + "resultsPlaceholder": "Choose a workflow and press Run. Results stay here until the next run.", "workflowFileName": "Workflow file", "fastestRun": "Fastest run", "slowestRun": "Slowest run", @@ -1619,7 +1619,6 @@ "measuredRunCount": "Measured runs", "failedRunCount": "Failed runs", "runProgress": "Progress", - "runProgressCount": "{completed} of {total} runs completed", "runDurationChart": "Run duration aggregates", "device": "Compute device", "vram": "VRAM", @@ -1640,7 +1639,17 @@ "launchFailed": "Failed to start the build.", "submittingRuns": "Submitting {warmupCount} warm-up runs and {count} measured runs...", "completedRuns": "Finished {count} measured runs ({failed} failed). Final response saved to {path}", - "submitFailed": "Failed to submit the performance test workflow." + "submitFailed": "Failed to submit the performance test workflow.", + "chooseWorkflowPlaceholder": "Choose a workflow", + "resultContextOn": "on", + "runNumber": "Run {current} of {total}", + "resultsEmptyTitle": "No results yet", + "medianSummary": "Median run · {count} measured · {failed} failed", + "legendMedian": "Median", + "legendAverage": "Average", + "legendRange": "fastest to slowest", + "runPhaseWarmup": "warm-up run", + "runPhaseMeasured": "measured run {current} of {total}" }, "benchmarks": { "title": "Benchmarks", diff --git a/locales/zh.json b/locales/zh.json index 047979731..6d8840601 100644 --- a/locales/zh.json +++ b/locales/zh.json @@ -1610,7 +1610,7 @@ "measuredRunsHint": "在预热运行之后计时的运行。其耗时将用于计算结果。", "logsPlaceholder": "构建日志将显示在此处。", "results": "结果", - "resultsPlaceholder": "性能测试结果将显示在此处。", + "resultsPlaceholder": "选择工作流并点击运行。结果会保留到下一次运行。", "workflowFileName": "工作流文件", "fastestRun": "最快运行", "slowestRun": "最慢运行", @@ -1619,7 +1619,6 @@ "measuredRunCount": "测量运行数", "failedRunCount": "失败运行数", "runProgress": "进度", - "runProgressCount": "已完成 {completed}/{total} 次运行", "runDurationChart": "运行时长汇总", "device": "计算设备", "vram": "显存", @@ -1640,7 +1639,17 @@ "launchFailed": "无法启动构建。", "submittingRuns": "正在提交 {warmupCount} 次预热运行和 {count} 次测量运行...", "completedRuns": "已完成 {count} 次测量运行({failed} 次失败)。最终响应已保存到 {path}", - "submitFailed": "无法提交基准工作流。" + "submitFailed": "无法提交基准工作流。", + "chooseWorkflowPlaceholder": "选择工作流", + "resultContextOn": "于", + "runNumber": "第 {current} / {total} 次运行", + "resultsEmptyTitle": "暂无结果", + "medianSummary": "中位运行 · {count} 次测量 · {failed} 次失败", + "legendMedian": "中位数", + "legendAverage": "平均值", + "legendRange": "最快到最慢", + "runPhaseWarmup": "预热运行", + "runPhaseMeasured": "第 {current} / {total} 次测量运行" }, "benchmarks": { "title": "性能比较", diff --git a/src/renderer/src/panel/PanelApp.test.ts b/src/renderer/src/panel/PanelApp.test.ts index 44e8d2d63..21a102f8b 100644 --- a/src/renderer/src/panel/PanelApp.test.ts +++ b/src/renderer/src/panel/PanelApp.test.ts @@ -484,6 +484,51 @@ function dataTransferWith(file: File): DataTransfer { return dataTransfer } +async function openWorkflowMenu(wrapper: ReturnType) { + const trigger = wrapper.get('.performance-test__workflow-trigger') + ;(trigger.element as HTMLButtonElement).focus() + await trigger.trigger('keydown', { key: 'ArrowDown' }) + await flushPromises() +} + +async function waitForBuildMenuFocusReturn() { + await vi.waitFor(() => + expect(document.activeElement).toBe( + document.querySelector('.performance-test__instance-select button') + ) + ) +} + +function workflowMenuItem(selector: string): HTMLElement | null { + return document.body.querySelector(`[role="menu"] ${selector}`) +} + +async function chooseWorkflowItem(wrapper: ReturnType, selector: string) { + await openWorkflowMenu(wrapper) + const item = workflowMenuItem(selector) + expect(item).not.toBeNull() + item!.click() + await flushPromises() + await settleWorkflowMenu(wrapper) +} + +async function settleWorkflowMenu(wrapper: ReturnType) { + const trigger = wrapper.get('.performance-test__workflow-trigger').element + await vi.waitFor(() => + expect( + document.activeElement === trigger || document.querySelector('[role="dialog"]') !== null + ).toBe(true) + ) +} + +async function closeWorkflowMenu(wrapper: ReturnType) { + document.activeElement?.dispatchEvent( + new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }) + ) + await flushPromises() + await settleWorkflowMenu(wrapper) +} + function mountPanel() { return mount(PanelApp, { attachTo: document.body, @@ -803,39 +848,34 @@ describe('PanelApp', () => { expect(measuredRunsInput.element).toHaveProperty('value', '5') const logsToggle = wrapper.get('.performance-test__logs-section button') expect(logsToggle.text()).toBe('Logs') - expect(logsToggle.attributes('aria-expanded')).toBe('true') - const resultsToggle = wrapper.get('.performance-test__results-section button') - expect(resultsToggle.text()).toBe('Results') - expect(resultsToggle.attributes('aria-expanded')).toBe('true') + expect(logsToggle.attributes('aria-expanded')).toBe('false') + expect(wrapper.get('.performance-test__logs-summary').text()).toBe( + 'Build logs will appear here.' + ) + expect(wrapper.get('.performance-test__results-section h2').text()).toBe('Results') expect( wrapper.findAll('.performance-test__content > section').map((section) => section.classes()[0]) ).toEqual(['performance-test__results-section', 'performance-test__logs-section']) expect(wrapper.find('.performance-test__system-section').exists()).toBe(false) - expect(wrapper.get('.performance-test__results').text()).toContain( - 'Performance test results will appear here.' - ) - await resultsToggle.trigger('click') - expect(resultsToggle.attributes('aria-expanded')).toBe('false') - expect(wrapper.get('.performance-test__results').attributes('style')).toContain('display: none') - await resultsToggle.trigger('click') - expect(wrapper.get('.branded-page-header .performance-test__run').exists()).toBe(true) - expect(wrapper.find('.performance-test__drop-zone').text()).toContain( - 'Import API workflowor drop the .json' + expect(wrapper.get('.performance-test__results').text()).toContain('No results yet') + expect(wrapper.get('.performance-test__setup .performance-test__run').exists()).toBe(true) + expect(wrapper.get('.performance-test__workflow-trigger').text()).toBe( + 'WorkflowChoose a workflow' ) expect(wrapper.find('.performance-test__run').text()).toBe('Run') + expect(wrapper.get('.performance-test__logs').attributes('style')).toContain('display: none') + await logsToggle.trigger('click') + expect(logsToggle.attributes('aria-expanded')).toBe('true') expect(wrapper.find('.performance-test__logs').text()).toBe('Build logs will appear here.') expect(wrapper.get('.performance-test__logs').classes()).toContain('scroll-visible') await logsToggle.trigger('click') - expect(logsToggle.attributes('aria-expanded')).toBe('false') - expect(wrapper.get('.performance-test__logs').attributes('style')).toContain('display: none') - await logsToggle.trigger('click') const instanceSelect = wrapper.get('.performance-test__instance-select button') expect(instanceSelect.attributes()).toMatchObject({ 'aria-haspopup': 'menu', 'aria-label': 'Select a build', 'aria-expanded': 'false' }) - expect(instanceSelect.text()).toBe('Select a build') + expect(instanceSelect.text()).toBe('BuildSelect a build') await instanceSelect.trigger('keydown', { key: 'ArrowDown' }) await flushPromises() expect( @@ -855,7 +895,8 @@ describe('PanelApp', () => { new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }) ) await flushPromises() - expect(instanceSelect.text()).toBe('Workspace Install') + await waitForBuildMenuFocusReturn() + expect(instanceSelect.text()).toBe('BuildWorkspace Install') const api = ( window as unknown as { @@ -875,14 +916,16 @@ describe('PanelApp', () => { } } ).api - await wrapper.get('.performance-test__drop-content').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__drop-content') await flushPromises() expect(api.importPerformanceTestWorkflow).toHaveBeenCalledWith(undefined) expect(wrapper.get('.performance-test__workflow-file').text()).toContain('cat-workflow.json') - expect(wrapper.get('.performance-test__workflow-file').text()).toContain( + expect(wrapper.get('.performance-test__workflow-trigger').attributes('title')).toBe( 'C:\\ComfyUI\\performance-tests\\20260907225500\\cat-workflow.json' ) - expect(wrapper.get('.performance-test__drop-zone').text()).not.toContain('Import API workflow') + expect(wrapper.get('.performance-test__workflow-trigger').text()).not.toContain( + 'Choose a workflow' + ) api.importPerformanceTestWorkflow.mockResolvedValueOnce({ ok: true, @@ -895,7 +938,7 @@ describe('PanelApp', () => { await flushPromises() expect(api.getPathForFile).toHaveBeenCalledWith(droppedFile) expect(api.importPerformanceTestWorkflow).toHaveBeenLastCalledWith('C:\\incoming\\dropped.json') - expect(wrapper.get('.performance-test__workflow-file').text()).toContain( + expect(wrapper.get('.performance-test__workflow-trigger').attributes('title')).toBe( 'C:\\ComfyUI\\performance-tests\\20260907225600\\cat-workflow.json' ) @@ -984,7 +1027,9 @@ describe('PanelApp', () => { telemetryEvents.some((event) => event.actionName === 'comfy.desktop.performance_test.stopped') ).toBe(false) const results = wrapper.get('.performance-test__results').text() - expect(wrapper.get('.performance-test__result-workflow').text()).toBe('cat-workflow.json') + expect(wrapper.get('.performance-test__run-label').text()).toBe( + 'cat-workflow.json on Workspace Install' + ) expect(results).toContain('Fastest run') expect(results).toContain('1.250 s') expect(results).toContain('Slowest run') @@ -993,33 +1038,20 @@ describe('PanelApp', () => { expect(results).not.toContain('prompt-7') expect(results).toContain('Average run') expect(results).toContain('2.000 s') - expect(results).toContain('Median run') expect(results).toContain('1.875 s') - expect(results).toContain('Measured runs') - expect(results).toContain('5') - expect(results).toContain('Failed runs') - expect(results).toContain('0') + expect(results).toContain('Median run · 5 measured · 0 failed') expect(wrapper.get('.performance-test__summary').findAll(':scope > *')).toHaveLength(2) expect( wrapper .get('.performance-test__timing-list') .findAll('dt') .map((label) => label.text()) - ).toEqual([ - 'Fastest run', - 'Average run', - 'Median run', - 'Slowest run', - 'Measured runs', - 'Failed runs' - ]) + ).toEqual(['Fastest run', 'Average run', 'Slowest run']) expect(wrapper.get('.performance-test__aggregate-chart').attributes('aria-label')).toBe( 'Run duration aggregates' ) - expect(wrapper.get('.performance-test__aggregate-chart').text()).toContain('1.250 s – 2.750 s') - expect(wrapper.findAll('.performance-test__aggregate-track')).toHaveLength(1) const systemSection = wrapper.get('.performance-test__system-section') - expect(systemSection.get('h2').text()).toBe('System information') + expect(systemSection.get('h3').text()).toBe('System information') const system = systemSection.get('.performance-test__system').text() expect(system).toContain('NVIDIA GeForce RTX 4090') expect(system).not.toContain('Top-level fallback should not be displayed') @@ -1105,7 +1137,7 @@ describe('PanelApp', () => { }) ) const runActionCalls = api.runAction.mock.calls.length - await wrapper.get('.performance-test__delete-workflow').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__delete-workflow') expect(wrapper.get('.performance-test__run').attributes('disabled')).toBe('') await wrapper.get('.performance-test__run').trigger('click') expect(api.runAction).toHaveBeenCalledTimes(runActionCalls) @@ -1119,7 +1151,7 @@ describe('PanelApp', () => { 'C:\\ComfyUI\\performance-tests\\20260907225600\\cat-workflow.json' ) expect(wrapper.find('.performance-test__workflow-file').exists()).toBe(false) - expect(wrapper.get('.performance-test__drop-zone').text()).toContain('Import API workflow') + expect(wrapper.get('.performance-test__workflow-trigger').text()).toContain('Choose a workflow') expect(wrapper.get('.performance-test__workflow-error').text()).toBe( 'This workflow belongs to a completed test and was kept with its results.' ) @@ -1127,7 +1159,7 @@ describe('PanelApp', () => { useDashboardScopeStore().selectWorkspace(PERSONAL_WORKSPACE_ID) await flushPromises() - expect(instanceSelect.text()).toBe('Select a build') + expect(instanceSelect.text()).toBe('BuildSelect a build') await instanceSelect.trigger('keydown', { key: 'ArrowDown' }) await flushPromises() expect( @@ -1139,6 +1171,7 @@ describe('PanelApp', () => { new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }) ) await flushPromises() + await waitForBuildMenuFocusReturn() }) it('opens the new-install takeover above the chooser body when show-new-install fires', async () => { @@ -1392,11 +1425,12 @@ describe('PanelApp', () => { new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }) ) await flushPromises() + await waitForBuildMenuFocusReturn() return { wrapper, api } } async function chooseExampleWorkflow(wrapper: ReturnType): Promise { - await wrapper.get('.performance-test__example-workflow').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__example-workflow') await flushPromises() ;( document.querySelector('[data-testid="performance-test-use-example"]') as HTMLButtonElement @@ -1451,7 +1485,7 @@ describe('PanelApp', () => { it('prepares an example workflow and blocks the run until its models are downloaded', async () => { const { wrapper, api } = await mountWithInstance() - await wrapper.get('.performance-test__example-workflow').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__example-workflow') await flushPromises() expect(api.getPerformanceTestExampleWorkflows).toHaveBeenCalledWith('workspace-install') expect(document.querySelector('[role="dialog"]')?.textContent).toContain('Z-Image Int8') @@ -1467,25 +1501,29 @@ describe('PanelApp', () => { 'workspace-install', 'image_z_image_int8' ) - const workflow = wrapper.get('.performance-test__workflow-file') - expect(workflow.text()).toContain('Z-Image Int8: Text to Image') - expect(workflow.text()).toContain(downloading.message) - expect(workflow.get('[role="progressbar"]').attributes('aria-valuenow')).toBe('40') - expect(wrapper.get('.performance-test__delete-workflow').attributes('aria-label')).toBe( + expect(wrapper.get('.performance-test__workflow-file').text()).toContain( + 'Z-Image Int8: Text to Image' + ) + const status = wrapper.get('.performance-test__status') + expect(status.text()).toContain(downloading.message) + expect(status.get('[role="progressbar"]').attributes('aria-valuenow')).toBe('40') + await openWorkflowMenu(wrapper) + expect(workflowMenuItem('.performance-test__delete-workflow')?.textContent).toContain( 'Cancel download' ) + await closeWorkflowMenu(wrapper) expect(wrapper.get('.performance-test__run').attributes('disabled')).toBeDefined() await emitExampleDownload({ ...downloading, percent: 80 }) expect( - wrapper - .get('.performance-test__workflow-file [role="progressbar"]') - .attributes('aria-valuenow') + wrapper.get('.performance-test__status [role="progressbar"]').attributes('aria-valuenow') ).toBe('80') await emitExampleDownload({ status: 'done', percent: 100, message: 'Template models ready' }) expect(wrapper.get('.performance-test__run').attributes('disabled')).toBeUndefined() - expect(wrapper.get('.performance-test__workflow-file').text()).toContain(EXAMPLE_PATH) + expect(wrapper.get('.performance-test__workflow-trigger').attributes('title')).toBe( + EXAMPLE_PATH + ) expect(wrapper.find('[role="progressbar"]').exists()).toBe(false) }) @@ -1516,7 +1554,7 @@ describe('PanelApp', () => { download: { status: 'done', percent: 100, message: 'Template models ready' } }) await chooseExampleWorkflow(wrapper) - await wrapper.get('.performance-test__drop-content').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__drop-content') await flushPromises() expect(wrapper.get('.performance-test__workflow-file').text()).toContain('cat-workflow.json') const telemetryEvents = captureTelemetry() @@ -1539,7 +1577,7 @@ describe('PanelApp', () => { 'C:\\ComfyUI\\performance-tests\\20260907220000\\image_z_image_int8.json' ) - expect(wrapper.get('.performance-test__workflow-file').text()).toContain(downloading.message) + expect(wrapper.get('.performance-test__status').text()).toContain(downloading.message) expect(wrapper.get('.performance-test__run').attributes('disabled')).toBeDefined() }) @@ -1603,7 +1641,7 @@ describe('PanelApp', () => { } ]) const importedPath = 'C:\\ComfyUI\\performance-tests\\20260907225500\\cat-workflow.json' - await wrapper.get('.performance-test__drop-content').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__drop-content') await flushPromises() let resolvePrepare!: (result: unknown) => void api.preparePerformanceTestExampleWorkflow.mockImplementationOnce( @@ -1621,13 +1659,16 @@ describe('PanelApp', () => { .find((option) => option.textContent?.includes('Other Install'))! .dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })) await flushPromises() + await waitForBuildMenuFocusReturn() resolvePrepare({ ok: true, filePath: EXAMPLE_PATH, download: downloading }) await flushPromises() expect(api.deletePerformanceTestWorkflow).toHaveBeenCalledWith(EXAMPLE_PATH) expect(api.deletePerformanceTestWorkflow).not.toHaveBeenCalledWith(importedPath) - expect(wrapper.get('.performance-test__workflow-file').text()).toContain(importedPath) + expect(wrapper.get('.performance-test__workflow-trigger').attributes('title')).toBe( + importedPath + ) }) it('removes an example prepared for another instance once a launching test releases it', async () => { @@ -1666,6 +1707,7 @@ describe('PanelApp', () => { .find((option) => option.textContent?.includes('Other Install'))! .dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })) await flushPromises() + await waitForBuildMenuFocusReturn() expect(api.deletePerformanceTestWorkflow).not.toHaveBeenCalled() resolveLaunch({ ok: false, message: 'Launch failed' }) @@ -1704,6 +1746,7 @@ describe('PanelApp', () => { .find((option) => option.textContent?.includes('Other Install'))! .dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })) await flushPromises() + await waitForBuildMenuFocusReturn() expect(api.deletePerformanceTestWorkflow).toHaveBeenCalledWith(EXAMPLE_PATH) expect(wrapper.get('.performance-test__workflow-file').exists()).toBe(true) @@ -1712,7 +1755,7 @@ describe('PanelApp', () => { it('explains that example workflows need an installed instance', async () => { const { wrapper, api } = await mountWithInstance('installing') - await wrapper.get('.performance-test__example-workflow').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__example-workflow') await flushPromises() expect(api.getPerformanceTestExampleWorkflows).not.toHaveBeenCalled() @@ -1741,7 +1784,7 @@ describe('PanelApp', () => { const { wrapper, api } = await mountWithInstance() await chooseExampleWorkflow(wrapper) - await wrapper.get('.performance-test__delete-workflow').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__delete-workflow') await flushPromises() expect(api.deletePerformanceTestWorkflow).toHaveBeenCalledWith(EXAMPLE_PATH) @@ -1781,7 +1824,7 @@ describe('PanelApp', () => { diskSpace: { free: 1_000_000_000, total: 1_000_000_000_000 } }) - await wrapper.get('.performance-test__example-workflow').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__example-workflow') await flushPromises() expect(document.querySelector('.performance-test__example-disk-error')).not.toBeNull() @@ -1797,7 +1840,7 @@ describe('PanelApp', () => { const onLine = vi.spyOn(navigator, 'onLine', 'get').mockReturnValue(false) try { - await wrapper.get('.performance-test__example-workflow').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__example-workflow') await flushPromises() expect(api.getPerformanceTestExampleWorkflows).not.toHaveBeenCalled() expect(wrapper.get('.performance-test__workflow-error').text()).toBe(offlineMessage) @@ -1866,7 +1909,7 @@ describe('PanelApp', () => { const wrapper = mountPanel() await flushPromises() - await wrapper.get('.performance-test__drop-content').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__drop-content') await wrapper .get('.performance-test__instance-select button') .trigger('keydown', { key: 'ArrowDown' }) @@ -1875,6 +1918,7 @@ describe('PanelApp', () => { new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }) ) await flushPromises() + await waitForBuildMenuFocusReturn() const runButton = wrapper.get('.performance-test__run') expect(runButton.attributes('disabled')).toBeUndefined() @@ -1885,7 +1929,7 @@ describe('PanelApp', () => { resolveImport = resolve }) ) - await wrapper.get('.performance-test__drop-content').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__drop-content') expect(runButton.attributes('disabled')).toBe('') await runButton.trigger('click') expect(api.runAction).not.toHaveBeenCalled() @@ -1900,15 +1944,15 @@ describe('PanelApp', () => { await flushPromises() const workflowImportCalls = api.importPerformanceTestWorkflow.mock.calls.length - expect(wrapper.get('.performance-test__drop-content').attributes('disabled')).toBe('') - await wrapper.get('.performance-test__drop-content').trigger('click') + expect(wrapper.get('.performance-test__workflow-trigger').attributes('disabled')).toBe('') + await openWorkflowMenu(wrapper) + expect(workflowMenuItem('.performance-test__drop-content')).toBeNull() await wrapper.get('.performance-test__drop-zone').trigger('drop', { dataTransfer: dataTransferWith( new File(['{}'], 'replacement.json', { type: 'application/json' }) ) }) expect(api.importPerformanceTestWorkflow).toHaveBeenCalledTimes(workflowImportCalls) - expect(wrapper.find('.performance-test__delete-workflow').exists()).toBe(false) expect(api.deletePerformanceTestWorkflow).not.toHaveBeenCalled() expect(api.stopComfyUI).not.toHaveBeenCalledWith('workspace-install') expect(api.runAction).toHaveBeenCalledWith('workspace-install', 'launch', { @@ -1920,8 +1964,7 @@ describe('PanelApp', () => { resolveLaunch({ ok: true }) await flushPromises() expect(api.runPerformanceTestWorkflow).toHaveBeenCalled() - expect(wrapper.get('.performance-test__drop-content').attributes('disabled')).toBe('') - expect(wrapper.find('.performance-test__delete-workflow').exists()).toBe(false) + expect(wrapper.get('.performance-test__workflow-trigger').attributes('disabled')).toBe('') resolveSubmission({ ok: true, @@ -1933,7 +1976,9 @@ describe('PanelApp', () => { resultPath: 'C:\\ComfyUI\\performance-tests\\20260907225600\\jobs.json' }) await flushPromises() - expect(wrapper.find('.performance-test__delete-workflow').exists()).toBe(true) + await openWorkflowMenu(wrapper) + expect(workflowMenuItem('.performance-test__delete-workflow')).not.toBeNull() + await closeWorkflowMenu(wrapper) }) it('restarts an already-running performance test session before running', async () => { @@ -1972,7 +2017,7 @@ describe('PanelApp', () => { const wrapper = mountPanel() await flushPromises() - await wrapper.get('.performance-test__drop-content').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__drop-content') await wrapper .get('.performance-test__instance-select button') .trigger('keydown', { key: 'ArrowDown' }) @@ -1981,6 +2026,7 @@ describe('PanelApp', () => { new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }) ) await flushPromises() + await waitForBuildMenuFocusReturn() const runButton = wrapper.get('.performance-test__run') expect(runButton.attributes('disabled')).toBeUndefined() @@ -2035,7 +2081,7 @@ describe('PanelApp', () => { const wrapper = mountPanel() await flushPromises() - await wrapper.get('.performance-test__drop-content').trigger('click') + await chooseWorkflowItem(wrapper, '.performance-test__drop-content') await wrapper .get('.performance-test__instance-select button') .trigger('keydown', { key: 'ArrowDown' }) @@ -2044,11 +2090,12 @@ describe('PanelApp', () => { new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }) ) await flushPromises() + await waitForBuildMenuFocusReturn() const telemetryEvents = captureTelemetry() await wrapper.get('.performance-test__run').trigger('click') await flushPromises() expect(wrapper.find('.performance-test__run').exists()).toBe(false) - expect(wrapper.get('.branded-page-header .performance-test__stop').text()).toBe('Stop') + expect(wrapper.get('.performance-test__setup .performance-test__stop').text()).toBe('Stop') mockState.performanceTestProgressCallbacks.forEach((callback) => callback({ sessionId: 'different-session', completedRuns: 5, totalRuns: 6 }) @@ -2061,12 +2108,12 @@ describe('PanelApp', () => { }) ) await flushPromises() - expect(wrapper.get('.performance-test__progress').text()).toContain('Progress') - expect(wrapper.get('.performance-test__progress').text()).toContain('2 of 6 runs completed') - const progressBar = wrapper.get('[role="progressbar"]') + expect(wrapper.get('.performance-test__progress').text()).toContain('Run 3 of 6') + expect(wrapper.get('.performance-test__progress').text()).toContain('measured run 2 of 5') + const progressBar = wrapper.get('.performance-test__progress-track') expect(progressBar.attributes('aria-valuenow')).toBe('2') expect(progressBar.attributes('aria-valuemax')).toBe('6') - expect(progressBar.get('i').attributes('style')).toContain('width: 33%') + expect(progressBar.findAll('i')).toHaveLength(6) const exitedCallback = api.onComfyExited.mock.calls[0]![0] as (data: { installationId: string @@ -2123,15 +2170,18 @@ describe('PanelApp', () => { resultPath: 'C:\\ComfyUI\\performance-tests\\late-result\\jobs.json' }) await flushPromises() - expect(wrapper.get('.performance-test__drop-content').attributes('disabled')).toBe('') - expect(wrapper.find('.performance-test__delete-workflow').exists()).toBe(false) + expect(wrapper.get('.performance-test__workflow-trigger').attributes('disabled')).toBe('') resolveStop() await flushPromises() expect(wrapper.find('.performance-test__stop').exists()).toBe(false) - expect(wrapper.find('.branded-page-header .performance-test__run').exists()).toBe(true) - expect(wrapper.get('.performance-test__drop-content').attributes('disabled')).toBeUndefined() - expect(wrapper.find('.performance-test__delete-workflow').exists()).toBe(true) + expect(wrapper.find('.performance-test__setup .performance-test__run').exists()).toBe(true) + expect( + wrapper.get('.performance-test__workflow-trigger').attributes('disabled') + ).toBeUndefined() + await openWorkflowMenu(wrapper) + expect(workflowMenuItem('.performance-test__delete-workflow')).not.toBeNull() + await closeWorkflowMenu(wrapper) expect( telemetryEvents.some( (event) => event.actionName === 'comfy.desktop.performance_test.completed' diff --git a/src/renderer/src/views/PerformanceTestView.vue b/src/renderer/src/views/PerformanceTestView.vue index 256a8e3ef..a1ec0e71b 100644 --- a/src/renderer/src/views/PerformanceTestView.vue +++ b/src/renderer/src/views/PerformanceTestView.vue @@ -5,17 +5,20 @@ import { useI18n } from 'vue-i18n' import { Check, ChevronDown, - FileJson, + CircleAlert, FolderOpen, ImageDown, + LayoutGrid, Play, Square, - Upload, - X + Trash2, + Upload } from 'lucide-vue-next' import Button from '@comfyorg/design-system/button/Button' import Menu from '@comfyorg/design-system/menu/Menu' +import MenuItem from '@comfyorg/design-system/menu/MenuItem' import MenuRadioItem from '@comfyorg/design-system/menu/MenuRadioItem' +import MenuSeparator from '@comfyorg/design-system/menu/MenuSeparator' import { DropdownMenuRadioGroup } from 'reka-ui' import BrandBackground from '../components/BrandBackground.vue' import BrandedPageHeader from '../components/BrandedPageHeader.vue' @@ -41,12 +44,14 @@ import { import { emitTelemetryAction } from '../lib/telemetry' import { performanceTestSessionKey } from '../../../shared/performanceTestSession' -const cardClass = 'flex w-full min-w-0 flex-none flex-col' -const titleClass = - 'mt-1 mb-1 flex min-h-8 items-center gap-2 text-[11px] leading-[1.4] font-semibold tracking-[0.04em] text-subtle-foreground uppercase' const toggleClass = 'self-center text-[11px] font-semibold tracking-[0.04em] text-subtle-foreground uppercase hover:text-foreground [&_.collapsible-section-toggle__chevron]:size-3.5' -const factClass = 'grid min-h-10 grid-cols-[112px_minmax(0,1fr)] items-center gap-3' +const filterClass = 'gap-1.5 px-3 text-[13px]/5' +const numberInputClass = + 'w-9 flex-none [&_input]:h-6 [&_input]:w-full [&_input]:rounded-md [&_input]:border-0 [&_input]:bg-transparent [&_input]:p-0 [&_input]:text-center [&_input]:text-[13px] [&_input]:text-foreground [&_input]:tabular-nums [&_input]:shadow-none [&_input]:[appearance:textfield] [&_input]:focus-visible:ring-0 [&_input::-webkit-inner-spin-button]:appearance-none [&_input::-webkit-outer-spin-button]:appearance-none' +const runButtonClass = 'ml-auto min-w-20 gap-1.5 px-3 text-[13px]/5' +const actionClass = 'h-[30px] gap-1.5 rounded-lg px-2 text-[12.5px]/5 font-normal' +const summaryClass = 'ml-3 min-w-0 truncate text-[13px] font-normal tracking-normal normal-case' interface PerformanceTestRunTelemetry { readonly installationId: string @@ -125,8 +130,8 @@ const { }) const isExportingResults = ref(false) const exportResultsError = ref(null) -const logsExpanded = ref(true) -const resultsExpanded = ref(true) +const logsExpanded = ref(false) +const systemExpanded = ref(false) const warmupRuns = ref('1') const measuredRuns = ref('5') const logInstallationId = ref(null) @@ -157,52 +162,85 @@ const computeDeviceNames = computed(() => .flatMap((device) => (device.deviceName ? [device.deviceName] : [])) .join(', ') ) -const statTiles = computed(() => { - const summary = performanceTestResult.value?.resultsSummary - const statistics = performanceTestResult.value?.statistics - if (!summary) return [] - const timings = statistics - ? [ - { - label: t('performanceTest.fastestRun'), - value: formatDuration(statistics.fastest.durationSeconds) - }, - { - label: t('performanceTest.averageRunDuration'), - value: formatDuration(statistics.averageDurationSeconds) - }, - { - label: t('performanceTest.medianRunDuration'), - value: formatDuration(statistics.medianDurationSeconds) - }, - { - label: t('performanceTest.slowestRun'), - value: formatDuration(statistics.slowest.durationSeconds) - } - ] - : [] - return [ - ...timings, - { label: t('performanceTest.measuredRunCount'), value: String(summary.measuredJobCount) }, - { label: t('performanceTest.failedRunCount'), value: String(summary.failedRunCount) } - ] -}) -const durationRange = computed(() => { +const numberLine = computed(() => { const statistics = performanceTestResult.value?.statistics if (!statistics) return null const fastest = statistics.fastest.durationSeconds const slowest = statistics.slowest.durationSeconds - const pad = Math.max(0.05, (slowest - fastest) * 0.5) - const low = fastest - pad - const span = slowest + pad - low - const position = (value: number): number => ((value - low) / span) * 100 + const span = slowest - fastest + const position = (value: number): number => (span > 0 ? ((value - fastest) / span) * 100 : 50) + const average = position(statistics.averageDurationSeconds) return { - left: `${position(fastest)}%`, - width: `${position(slowest) - position(fastest)}%`, - average: `${position(statistics.averageDurationSeconds)}%`, - label: `${formatDuration(fastest)} – ${formatDuration(slowest)}` + fastest: formatDuration(fastest), + slowest: formatDuration(slowest), + average: formatDuration(statistics.averageDurationSeconds), + median: formatDuration(statistics.medianDurationSeconds), + medianAt: `${position(statistics.medianDurationSeconds)}%`, + averageAt: `${average}%`, + averageLabelAt: `${Math.min(88, Math.max(12, average))}%` } }) +const systemSummary = computed(() => { + const hardware = performanceTestResult.value?.hardware + const systemInfo = performanceTestResult.value?.systemInfo + return [ + computeDeviceNames.value, + hardware?.vramMb != null ? `${formatMemory(hardware.vramMb)} ${t('performanceTest.vram')}` : '', + systemInfo ? formatOperatingSystem(systemInfo) : '', + hardware?.pytorchVersion ? `PyTorch ${hardware.pytorchVersion}` : '' + ] + .filter(Boolean) + .join(' · ') +}) +const lastLogLine = computed( + () => + performanceTestLogs.value + .split('\n') + .map((line) => line.trim()) + .filter(Boolean) + .pop() ?? '' +) +interface PerformanceTestRunLabel { + readonly workflow: string + readonly build: string + readonly warmups: number +} +const runLabel = ref(null) +const runSettings = computed(() => [ + { + id: 'performance-test-warmup-runs', + label: t('performanceTest.warmupRuns'), + hint: t('performanceTest.warmupRunsHint'), + min: '0', + max: '5', + value: warmupRuns.value, + update: (value: string | number | undefined) => (warmupRuns.value = String(value ?? '')), + commit: correctWarmupRuns + }, + { + id: 'performance-test-measured-runs', + label: t('performanceTest.measuredRuns'), + hint: t('performanceTest.measuredRunsHint'), + min: '1', + max: '100', + value: measuredRuns.value, + update: (value: string | number | undefined) => (measuredRuns.value = String(value ?? '')), + commit: correctMeasuredRuns + } +]) +const runPhase = computed(() => { + const warmups = runLabel.value?.warmups ?? 0 + const current = Math.min(completedProgressRuns.value + 1, totalProgressRuns.value) + return current <= warmups + ? t('performanceTest.runPhaseWarmup') + : t('performanceTest.runPhaseMeasured', { + current: current - warmups, + total: totalProgressRuns.value - warmups + }) +}) +const hasWorkflow = computed(() => + Boolean(workflowFilePath.value || pendingExampleWorkflowLabel.value) +) const workflowLabel = computed( () => pendingExampleWorkflowLabel.value ?? @@ -376,6 +414,12 @@ async function runPerformanceTest(): Promise { }) isLaunching.value = true performanceTestResult.value = null + runLabel.value = { + workflow: workflowLabel.value, + build: selectedInstance.value?.label ?? '', + warmups + } + logsExpanded.value = true progressSessionId.value = sessionId completedProgressRuns.value = 0 totalProgressRuns.value = warmups + runs @@ -417,6 +461,7 @@ async function runPerformanceTest(): Promise { ) if (submission.ok) { performanceTestResult.value = submission + logsExpanded.value = false if (activeRunTelemetry === runTelemetry) { activeRunTelemetry = null const summary = submission.resultsSummary @@ -691,41 +736,12 @@ watch(performanceTestLogs, async () => {
- - - -
-
-
-

{{ t('performanceTest.selectInstance') }}

-
+ +
+
+
+

{{ t('performanceTest.selectInstance') }}

+
{ >