Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-02-10 01:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert legacy format node.widget_values (#149)

Browse Source
This commit is contained in:
Chenlei Hu
2024-07-17 22:05:16 -04:00
committed by GitHub
parent 7619e9159b
commit 24cdb6ad2d
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/types/comfyWorkflow.ts
View File

@@ -49,6 +49,15 @@ const zVector2 = z.union([
z.tuple([z.number(), z.number()]),
]);
const zWidgetValues = z.union([
z.array(z.any()),
z.record(z.any()).transform((v) =>
Object.keys(v)
.sort((a, b) => Number(a) - Number(b))
.map((key) => v[key])
),
]);
const zComfyNode = z
.object({
id: z.number(),
@@ -61,7 +70,7 @@ const zComfyNode = z
inputs: z.array(zNodeInput).optional(),
outputs: z.array(zNodeOutput).optional(),
properties: zProperties,
widgets_values: z.array(z.any()).optional(), // This could contain mixed types
widgets_values: zWidgetValues.optional(),
color: z.string().optional(),
bgcolor: z.string().optional(),
})

17
tests-ui/tests/comfyWorkflow.test.ts
View File

@@ -70,4 +70,21 @@ describe("parseComfyWorkflow", () => {
parsedWorkflow = await parseComfyWorkflow(JSON.stringify(workflow));
expect(parsedWorkflow.nodes[0].pos).toEqual([3, 4]);
});
it("workflow.nodes.widget_values", async () => {
const workflow = JSON.parse(JSON.stringify(defaultGraph));
workflow.nodes[0].widgets_values = ["foo", "bar"];
await expect(parseComfyWorkflow(JSON.stringify(workflow))).resolves.not.toThrow();
workflow.nodes[0].widgets_values = "foo";
await expect(parseComfyWorkflow(JSON.stringify(workflow))).rejects.toThrow();
workflow.nodes[0].widgets_values = undefined;
await expect(parseComfyWorkflow(JSON.stringify(workflow))).resolves.not.toThrow();
// Should automatically transform the legacy format object to array.
workflow.nodes[0].widgets_values = {0: "foo", 1: "bar"};
const parsedWorkflow = await parseComfyWorkflow(JSON.stringify(workflow));
expect(parsedWorkflow.nodes[0].widgets_values).toEqual(["foo", "bar"]);
});
});