neuro_llc/ComfyBox
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Subgraph ergonomic improvements & node def types

Browse Source
This commit is contained in:
space-nuko
2023-05-16 17:02:11 -05:00
parent 979f6eaeed
commit 0143b6430f
6 changed files with 115 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/nodes/ComfyBackendNode.ts
View File

@@ -5,6 +5,7 @@ import type { ComfyWidgetNode, ComfyExecutionResult } from "./ComfyWidgetNodes";
import { BuiltInSlotShape, BuiltInSlotType, type SerializedLGraphNode } from "@litegraph-ts/core";
import type IComfyInputSlot from "$lib/IComfyInputSlot";
import type { ComfyInputConfig } from "$lib/IComfyInputSlot";
import { iterateNodeDefOutputs, type ComfyNodeDef, iterateNodeDefInputs } from "$lib/ComfyNodeDef";
/*
* Base class for any node with configuration sent by the backend.
@@ -37,22 +38,19 @@ export class ComfyBackendNode extends ComfyGraphNode {
// comfy class -> input name -> input config
private static defaultInputConfigs: Record<string, Record<string, ComfyInputConfig>> = {}
private setup(nodeData: any) {
var inputs = nodeData["input"]["required"];
if (nodeData["input"]["optional"] != undefined) {
inputs = Object.assign({}, nodeData["input"]["required"], nodeData["input"]["optional"])
}
private setup(nodeDef: ComfyNodeDef) {
ComfyBackendNode.defaultInputConfigs[this.type] = {}
for (const inputName in inputs) {
for (const [inputName, inputData] of iterateNodeDefInputs(nodeDef)) {
const config: Partial<IComfyInputSlot> = {};
const inputData = inputs[inputName];
const type = inputData[0];
const [type, opts] = inputData;
if (inputData[1]?.forceInput) {
this.addInput(inputName, type);
if (opts?.forceInput) {
if (Array.isArray(type)) {
throw new Error(`Can't have forceInput set to true for an enum type! ${type}`)
}
this.addInput(inputName, type as string);
} else {
if (Array.isArray(type)) {
// Enums
@@ -73,11 +71,9 @@ export class ComfyBackendNode extends ComfyGraphNode {
ComfyBackendNode.defaultInputConfigs[this.type][inputName] = (config as IComfyInputSlot).config
}
for (const o in nodeData["output"]) {
const output = nodeData["output"][o];
const outputName = nodeData["output_name"][o] || output;
const outputShape = nodeData["output_is_list"][o] ? BuiltInSlotShape.GRID_SHAPE : BuiltInSlotShape.CIRCLE_SHAPE;
this.addOutput(outputName, output, { shape: outputShape });
for (const output of iterateNodeDefOutputs(nodeDef)) {
const outputShape = output.is_list ? BuiltInSlotShape.GRID_SHAPE : BuiltInSlotShape.CIRCLE_SHAPE;
this.addOutput(output.name, output.type, { shape: outputShape });
}
this.serialize_widgets = false;