mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 14:30:41 +00:00
- Merge latest main to resolve conflicts
- Fix asset browser filtering: pass target input name (e.g.,
'ckpt_name') instead of PrimitiveNode's widget name ('value')
**Changes:**
- Add `inputNameForBrowser` param to `createAssetWidget`
- Pass `targetInputName` from `PrimitiveNode._createAssetWidget`
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-8596-fix-merge-main-and-pass-target-input-name-to-asset-browser-2fd6d73d36508112bb17cf5d3fe54687)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Subagent 5 <subagent@example.com>
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: guill <jacob.e.segal@gmail.com>
Co-authored-by: Jin Yi <jin12cc@gmail.com>
Co-authored-by: Alexander Brown <drjkl@comfy.org>
Co-authored-by: AustinMroz <austin@comfy.org>
Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com>
Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe>
Co-authored-by: Kelly Yang <124ykl@gmail.com>
Co-authored-by: sno <snomiao@gmail.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: Benjamin Lu <benjaminlu1107@gmail.com>
Co-authored-by: Terry Jia <terryjia88@gmail.com>
Co-authored-by: Luke Mino-Altherr <luke@comfy.org>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
127 lines
3.8 KiB
TypeScript
127 lines
3.8 KiB
TypeScript
import { readFileSync } from 'fs'
|
|
|
|
import type {
|
|
ComfyApiWorkflow,
|
|
ComfyWorkflowJSON
|
|
} from '../../../src/platform/workflow/validation/schemas/workflowSchema'
|
|
import type { WorkspaceStore } from '../../types/globals'
|
|
import type { ComfyPage } from '../ComfyPage'
|
|
|
|
type FolderStructure = {
|
|
[key: string]: FolderStructure | string
|
|
}
|
|
|
|
export class WorkflowHelper {
|
|
constructor(private readonly comfyPage: ComfyPage) {}
|
|
|
|
convertLeafToContent(structure: FolderStructure): FolderStructure {
|
|
const result: FolderStructure = {}
|
|
|
|
for (const [key, value] of Object.entries(structure)) {
|
|
if (typeof value === 'string') {
|
|
const filePath = this.comfyPage.assetPath(value)
|
|
result[key] = readFileSync(filePath, 'utf-8')
|
|
} else {
|
|
result[key] = this.convertLeafToContent(value)
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
async setupWorkflowsDirectory(structure: FolderStructure) {
|
|
const resp = await this.comfyPage.request.post(
|
|
`${this.comfyPage.url}/api/devtools/setup_folder_structure`,
|
|
{
|
|
data: {
|
|
tree_structure: this.convertLeafToContent(structure),
|
|
base_path: `user/${this.comfyPage.id}/workflows`
|
|
}
|
|
}
|
|
)
|
|
|
|
if (resp.status() !== 200) {
|
|
throw new Error(
|
|
`Failed to setup workflows directory: ${await resp.text()}`
|
|
)
|
|
}
|
|
|
|
await this.comfyPage.page.evaluate(async () => {
|
|
await (
|
|
window.app!.extensionManager as WorkspaceStore
|
|
).workflow.syncWorkflows()
|
|
})
|
|
|
|
// Wait for Vue to re-render the workflow list
|
|
await this.comfyPage.nextFrame()
|
|
}
|
|
|
|
async loadWorkflow(workflowName: string) {
|
|
await this.comfyPage.workflowUploadInput.setInputFiles(
|
|
this.comfyPage.assetPath(`${workflowName}.json`)
|
|
)
|
|
await this.comfyPage.nextFrame()
|
|
}
|
|
|
|
async deleteWorkflow(
|
|
workflowName: string,
|
|
whenMissing: 'ignoreMissing' | 'throwIfMissing' = 'ignoreMissing'
|
|
) {
|
|
// Open workflows tab
|
|
const { workflowsTab } = this.comfyPage.menu
|
|
await workflowsTab.open()
|
|
|
|
// Action to take if workflow missing
|
|
if (whenMissing === 'ignoreMissing') {
|
|
const workflows = await workflowsTab.getTopLevelSavedWorkflowNames()
|
|
if (!workflows.includes(workflowName)) return
|
|
}
|
|
|
|
// Delete workflow
|
|
await workflowsTab.getPersistedItem(workflowName).click({ button: 'right' })
|
|
await this.comfyPage.contextMenu.clickMenuItem('Delete')
|
|
await this.comfyPage.nextFrame()
|
|
await this.comfyPage.confirmDialog.delete.click()
|
|
|
|
// Clear toast & close tab
|
|
await this.comfyPage.toast.closeToasts(1)
|
|
await workflowsTab.close()
|
|
}
|
|
|
|
async getUndoQueueSize(): Promise<number | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow
|
|
return workflow?.changeTracker.undoQueue.length
|
|
})
|
|
}
|
|
|
|
async getRedoQueueSize(): Promise<number | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow
|
|
return workflow?.changeTracker.redoQueue.length
|
|
})
|
|
}
|
|
|
|
async isCurrentWorkflowModified(): Promise<boolean | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.isModified
|
|
})
|
|
}
|
|
|
|
async getExportedWorkflow(options: { api: true }): Promise<ComfyApiWorkflow>
|
|
async getExportedWorkflow(options?: {
|
|
api?: false
|
|
}): Promise<ComfyWorkflowJSON>
|
|
async getExportedWorkflow(options?: {
|
|
api?: boolean
|
|
}): Promise<ComfyWorkflowJSON | ComfyApiWorkflow> {
|
|
const api = options?.api ?? false
|
|
return this.comfyPage.page.evaluate(async (api) => {
|
|
return (await window.app!.graphToPrompt())[api ? 'output' : 'workflow']
|
|
}, api)
|
|
}
|
|
}
|