-
-
{{ title }}
-
+
+
{{ title }}
+
{{ description }}
+
+
+
diff --git a/src/renderer/src/panel/PanelApp.test.ts b/src/renderer/src/panel/PanelApp.test.ts
index 78f824ec3..21a102f8b 100644
--- a/src/renderer/src/panel/PanelApp.test.ts
+++ b/src/renderer/src/panel/PanelApp.test.ts
@@ -124,13 +124,14 @@ vi.mock('../views/MigrateConfirmTakeover.vue', () => ({
methods: { open: vi.fn() }
}
}))
-import { mount, flushPromises, DOMWrapper } from '@vue/test-utils'
+import { mount, flushPromises } from '@vue/test-utils'
import { createPinia, setActivePinia } from 'pinia'
import PanelApp from './PanelApp.vue'
import { en } from '../lib/i18nMessages'
import { __resetLauncherPrefsForTest } from '../composables/useLauncherPrefs'
import { useOverlay } from '../composables/useOverlay'
import { useDashboardScopeStore } from '../stores/dashboardScopeStore'
+import { PERSONAL_WORKSPACE_ID } from '../../../shared/workspaces'
import { TELEMETRY_ACTION_EVENT_NAME, type TelemetryActionEventDetail } from '../lib/telemetry'
interface InstallationLike {
@@ -483,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,
@@ -629,9 +675,12 @@ describe('PanelApp', () => {
mockState.panelSwitchCallbacks.forEach((callback) => callback({ panel: 'performance-test' }))
await flushPromises()
- expect(
- wrapper.get('.performance-test__workspace-select .workspace-selector__name').text()
- ).toBe('Workspace Two')
+ expect(useDashboardScopeStore().selectedWorkspaceId).toBe('workspace-2')
+ await wrapper
+ .get('.performance-test__instance-select button')
+ .trigger('keydown', { key: 'ArrowDown' })
+ await flushPromises()
+ expect(document.querySelectorAll('.ui-select-option')).toHaveLength(1)
})
it('shows only installed Personal instances on Performance Test while signed out', async () => {
@@ -663,10 +712,6 @@ describe('PanelApp', () => {
await flushPromises()
expect(wrapper.find('.performance-test__content').exists()).toBe(true)
- expect(
- wrapper.get('.performance-test__workspace-select .workspace-selector__name').text()
- ).toBe('Personal')
-
await wrapper
.get('.performance-test__instance-select button')
.trigger('keydown', { key: 'ArrowDown' })
@@ -751,22 +796,14 @@ describe('PanelApp', () => {
expect(wrapper.find('[data-testid="performance-test"]').exists()).toBe(true)
expect(wrapper.get('.branded-page-header h1').text()).toBe('Performance Tests')
expect(wrapper.find('[data-testid="app-sidebar"]').exists()).toBe(true)
- expect(wrapper.findAll('.performance-test__selection-row')).toHaveLength(2)
- expect(
- wrapper.findAll('.performance-test__selection-label').map((label) => label.text())
- ).toEqual(['Workspace', 'Build'])
- expect(wrapper.findAll('.performance-test__selection-control button')).toHaveLength(2)
- expect(wrapper.find('.performance-test__workspace-select .ui-select-trigger').exists()).toBe(
- false
- )
- expect(
- wrapper.get('.performance-test__workspace-select .workspace-selector__name').text()
- ).toBe('Workspace One')
- expect(wrapper.find('.performance-test__columns').exists()).toBe(true)
- expect(wrapper.findAll('.performance-test__column')).toHaveLength(3)
- expect(
- wrapper.findAll('.performance-test__column h2').map((heading) => heading.text())
- ).toEqual(['1. Select a build', '2. Choose a workflow', '3. Set measurement settings'])
+ expect(wrapper.find('.performance-test__workspace-select').exists()).toBe(false)
+ expect(wrapper.find('.performance-test__setup').exists()).toBe(true)
+ expect(wrapper.findAll('.performance-test__step')).toHaveLength(3)
+ expect(wrapper.findAll('.performance-test__step h2').map((heading) => heading.text())).toEqual([
+ 'Build',
+ 'Workflow',
+ 'Runs'
+ ])
const settings = wrapper.findAll('.performance-test__setting')
expect(settings).toHaveLength(2)
expect(settings.map((setting) => setting.find('label').text())).toEqual([
@@ -811,40 +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.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('.performance-test__column:nth-child(3) .performance-test__run').exists()
- ).toBe(true)
- expect(wrapper.find('.performance-test__drop-zone').text()).toBe(
- 'Drop a workflow .json file in API format here, or click to browse'
+ expect(wrapper.find('.performance-test__system-section').exists()).toBe(false)
+ 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({
- role: 'combobox',
+ '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(
@@ -858,15 +889,14 @@ describe('PanelApp', () => {
)
).toEqual(['Standalone · 0.3.50', 'Standalone', 'Standalone'])
expect(wrapper.text()).not.toContain('Other Workspace Install')
- expect(wrapper.find('.branded-page-header__description').text()).toBe(
- 'Run performance tests against your ComfyUI builds.'
- )
+ expect(wrapper.find('.branded-page-header__description').exists()).toBe(false)
expect(wrapper.find('[data-testid="chooser-view"]').exists()).toBe(false)
;(document.querySelectorAll('.ui-select-option')[0] as HTMLElement).dispatchEvent(
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 {
@@ -886,15 +916,15 @@ 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(
- 'Drop a workflow .json file in API format here, or click to browse'
+ expect(wrapper.get('.performance-test__workflow-trigger').text()).not.toContain(
+ 'Choose a workflow'
)
api.importPerformanceTestWorkflow.mockResolvedValueOnce({
@@ -908,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'
)
@@ -997,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(results).toContain('Workflow filecat-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')
@@ -1006,55 +1038,37 @@ 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([
- 'Measured runs',
- 'Failed runs',
- 'Fastest run',
- 'Average run',
- 'Slowest run',
- 'Median run'
- ])
+ ).toEqual(['Fastest run', 'Average run', 'Slowest run'])
expect(wrapper.get('.performance-test__aggregate-chart').attributes('aria-label')).toBe(
'Run duration aggregates'
)
- expect(wrapper.findAll('.performance-test__aggregate-bar')).toHaveLength(4)
- expect(wrapper.findAll('.performance-test__results h3')).toHaveLength(1)
- expect(results).toContain('System information')
- expect(results).toContain('NVIDIA GeForce RTX 4090')
- expect(results).not.toContain('Top-level fallback should not be displayed')
- expect(wrapper.find('.performance-test__result-list--compact').exists()).toBe(true)
- expect(wrapper.findAll('.performance-test__system-group h4')).toHaveLength(0)
- const systemGroups = wrapper.findAll('.performance-test__system-group')
- expect(systemGroups[0]!.text()).toContain('NVIDIA GeForce RTX 4090')
- expect(systemGroups[0]!.text()).toContain('VRAM24.0 GB')
- expect(systemGroups[0]!.text()).toContain('RAM63.9 GB')
- expect(systemGroups[0]!.text()).toContain('PyTorch version2.10.0+cu130')
- expect(systemGroups[0]!.text()).toContain('xFormers version0.0.31')
- expect(systemGroups[1]!.text()).toContain('CPUAMD Ryzen 9 7950X')
- expect(systemGroups[1]!.text()).toContain('CPU cores32')
- expect(systemGroups[1]!.text()).toContain('Architecturex64')
- expect(systemGroups[1]!.text()).toContain('Operating systemMicrosoft Windows 11 Pro 10.0.26200')
- expect(results).not.toContain('GPU driver')
- expect(results).not.toContain('Device index')
- expect(results).not.toContain('Backend')
- expect(results).not.toContain('24576 MB')
- expect(results).not.toContain('65461 MB')
+ const systemSection = wrapper.get('.performance-test__system-section')
+ 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')
+ expect(system).toContain('VRAM24.0 GB')
+ expect(system).toContain('RAM63.9 GB')
+ expect(system).toContain('PyTorch version2.10.0+cu130')
+ expect(system).toContain('xFormers version0.0.31')
+ expect(system).toContain('CPUAMD Ryzen 9 7950X')
+ expect(system).toContain('CPU cores32')
+ expect(system).toContain('Architecturex64')
+ expect(system).toContain('Operating systemMicrosoft Windows 11 Pro 10.0.26200')
+ for (const hidden of ['GPU driver', 'Device index', 'Backend', '24576 MB', '65461 MB']) {
+ expect(results).not.toContain(hidden)
+ expect(system).not.toContain(hidden)
+ }
expect(
- wrapper
- .get('.performance-test__results')
- .element.lastElementChild?.classList.contains('performance-test__results-actions')
+ wrapper.get('.performance-test__results-head .performance-test__results-actions').exists()
).toBe(true)
const openResultsFolder = wrapper.get('.performance-test__open-results')
expect(openResultsFolder.text()).toBe('Open folder')
@@ -1111,7 +1125,7 @@ describe('PanelApp', () => {
})
await flushPromises()
expect(wrapper.get('.performance-test__logs').text()).toContain('ComfyUI is ready')
- expect(wrapper.get('.performance-test__stop').attributes('disabled')).toBe('')
+ expect(wrapper.find('.performance-test__stop').exists()).toBe(false)
expect(api.stopComfyUI).toHaveBeenCalledWith('performance-test:workspace-install')
expect(api.cancelOperation).toHaveBeenCalledWith('performance-test:workspace-install')
@@ -1123,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)
@@ -1137,21 +1151,15 @@ 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(
- 'Drop a workflow .json file in API format here, or click to browse'
- )
+ 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.'
)
- await wrapper.get('.performance-test__workspace-select button').trigger('click')
- await flushPromises()
- await new DOMWrapper(document.body)
- .get('[data-testid="devplatform-workspace-personal"]')
- .trigger('click')
+ 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(
@@ -1163,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 () => {
@@ -1416,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
@@ -1475,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')
@@ -1491,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)
})
@@ -1540,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()
@@ -1563,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()
})
@@ -1627,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(
@@ -1645,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 () => {
@@ -1690,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' })
@@ -1728,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)
@@ -1736,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()
@@ -1765,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)
@@ -1805,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()
@@ -1821,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)
@@ -1890,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' })
@@ -1899,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()
@@ -1909,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()
@@ -1924,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', {
@@ -1944,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,
@@ -1957,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 () => {
@@ -1996,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' })
@@ -2005,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()
@@ -2059,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' })
@@ -2068,10 +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.get('.performance-test__run').text()).toBe('Running...')
+ expect(wrapper.find('.performance-test__run').exists()).toBe(false)
+ expect(wrapper.get('.performance-test__setup .performance-test__stop').text()).toBe('Stop')
mockState.performanceTestProgressCallbacks.forEach((callback) =>
callback({ sessionId: 'different-session', completedRuns: 5, totalRuns: 6 })
@@ -2084,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
@@ -2118,6 +2142,7 @@ describe('PanelApp', () => {
await flushPromises()
expect(api.stopComfyUI).toHaveBeenCalledWith('performance-test:workspace-install')
expect(stopButton.attributes('disabled')).toBe('')
+ expect(stopButton.text()).toBe('Stopping...')
expect(
telemetryEvents.filter(
(event) => event.actionName === 'comfy.desktop.performance_test.stopped'
@@ -2145,13 +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.get('.performance-test__drop-content').attributes('disabled')).toBeUndefined()
- expect(wrapper.find('.performance-test__delete-workflow').exists()).toBe(true)
+ expect(wrapper.find('.performance-test__stop').exists()).toBe(false)
+ 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 80114953b..a1ec0e71b 100644
--- a/src/renderer/src/views/PerformanceTestView.vue
+++ b/src/renderer/src/views/PerformanceTestView.vue
@@ -2,15 +2,30 @@
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 {
+ Check,
+ ChevronDown,
+ CircleAlert,
+ FolderOpen,
+ ImageDown,
+ LayoutGrid,
+ Play,
+ Square,
+ 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'
import CollapsibleSectionToggle from '../components/CollapsibleSectionToggle.vue'
import InfoTooltip from '../components/InfoTooltip.vue'
import TemplatePickerStep from '../components/TemplatePickerStep.vue'
import BaseModal from '../components/ui/BaseModal.vue'
-import BaseSelect, { type BaseSelectOption } from '../components/ui/BaseSelect.vue'
import { usePerformanceTestExampleWorkflow } from '../composables/usePerformanceTestExampleWorkflow'
import { useWorkspaceInstallScope } from '../composables/useWorkspaceInstallScope'
import { useAuthStore } from '../stores/authStore'
@@ -28,12 +43,15 @@ import {
} from '../lib/performanceTestResultsSvg'
import { emitTelemetryAction } from '../lib/telemetry'
import { performanceTestSessionKey } from '../../../shared/performanceTestSession'
-import DevPlatformWorkspaceSelector from './devplatform/DevPlatformWorkspaceSelector.vue'
-const resultListClass =
- 'grid gap-x-6 m-0 [&>div]:min-w-0 [&_dt]:text-neutral-200 [&_dt]:[text-align:var(--perf-label-align,left)] [&_dd]:mt-[var(--perf-value-margin,4px)] [&_dd]:[overflow-wrap:anywhere] [&_dd]:[color:var(--perf-value-color,var(--text-primary))] [&_dd]:text-[length:var(--perf-value-size,24px)] [&_dd]:leading-[var(--perf-value-leading,1.25)] [&_dd]:[text-align:var(--perf-value-align,left)]'
-const compactResultListClass =
- 'grid-cols-1 gap-y-2 [--perf-value-margin:0px] [--perf-value-size:12px] [--perf-value-leading:1.3] [--perf-value-color:var(--text-muted)] [--perf-value-align:right] [--perf-label-align:left] [&>div]:flex [&>div]:items-baseline [&>div]:justify-between [&>div]:gap-2 [&>div]:pb-1 [&>div]:border-b [&>div]:border-solid [&>div]:border-[var(--chooser-surface-border)] [&_dt]:flex-none [&_dt]:text-[12px]'
+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 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
@@ -61,7 +79,7 @@ const performanceTestInstallations = computed(() =>
(authStore.isSignedIn || installation.status === 'installed')
)
)
-const instanceOptions = computed(() =>
+const instanceOptions = computed<{ value: string; label: string; description: string }[]>(() =>
performanceTestInstallations.value.map((installation) => ({
value: installation.id,
label: installation.name,
@@ -69,6 +87,9 @@ const instanceOptions = computed(() =>
}))
)
const selectedInstallationId = ref(null)
+const selectedInstance = computed(() =>
+ instanceOptions.value.find((option) => option.value === selectedInstallationId.value)
+)
const workflowFilePath = ref(null)
const workflowImportError = ref(null)
const isWorkflowDragging = ref(false)
@@ -109,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)
@@ -141,35 +162,85 @@ const computeDeviceNames = computed(() =>
.flatMap((device) => (device.deviceName ? [device.deviceName] : []))
.join(', ')
)
-const aggregateChart = computed(() => {
+const numberLine = computed(() => {
const statistics = performanceTestResult.value?.statistics
- if (!statistics) return []
-
- const aggregates = [
- {
- label: t('performanceTest.fastestRun'),
- value: statistics.fastest.durationSeconds
- },
- {
- label: t('performanceTest.slowestRun'),
- value: statistics.slowest.durationSeconds
- },
- {
- label: t('performanceTest.averageRunDuration'),
- value: statistics.averageDurationSeconds
- },
- {
- label: t('performanceTest.medianRunDuration'),
- value: statistics.medianDurationSeconds
- }
+ if (!statistics) return null
+ const fastest = statistics.fastest.durationSeconds
+ const slowest = statistics.slowest.durationSeconds
+ const span = slowest - fastest
+ const position = (value: number): number => (span > 0 ? ((value - fastest) / span) * 100 : 50)
+ const average = position(statistics.averageDurationSeconds)
+ return {
+ 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}` : ''
]
- const maximum = Math.max(...aggregates.map(({ value }) => value), 0)
-
- return aggregates.map((aggregate) => ({
- ...aggregate,
- width: maximum > 0 ? `${(aggregate.value / maximum) * 100}%` : '0%'
- }))
+ .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 ??
@@ -343,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
@@ -384,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
@@ -649,515 +727,560 @@ watch(performanceTestLogs, async () => {