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

Convert pos object to array on parsing (#147)

Browse Source
This commit is contained in:
Chenlei Hu
2024-07-17 20:57:14 -04:00
committed by GitHub
parent 05d5896c82
commit 7619e9159b
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripts/defaultGraph.ts
View File

@@ -8,7 +8,7 @@ export const defaultGraph: ComfyWorkflowJSON = {
id: 7,
type: "CLIPTextEncode",
pos: [413, 389],
size: { 0: 425.27801513671875, 1: 180.6060791015625 },
size: [425.27801513671875, 180.6060791015625],
flags: {},
order: 3,
mode: 0,
@@ -28,7 +28,7 @@ export const defaultGraph: ComfyWorkflowJSON = {
id: 6,
type: "CLIPTextEncode",
pos: [415, 186],
size: { 0: 422.84503173828125, 1: 164.31304931640625 },
size: [422.84503173828125, 164.31304931640625],
flags: {},
order: 2,
mode: 0,
@@ -50,7 +50,7 @@ export const defaultGraph: ComfyWorkflowJSON = {
id: 5,
type: "EmptyLatentImage",
pos: [473, 609],
size: { 0: 315, 1: 106 },
size: [315, 106],
flags: {},
order: 1,
mode: 0,
@@ -62,7 +62,7 @@ export const defaultGraph: ComfyWorkflowJSON = {
id: 3,
type: "KSampler",
pos: [863, 186],
size: { 0: 315, 1: 262 },
size: [315, 262],
flags: {},
order: 4,
mode: 0,
@@ -80,7 +80,7 @@ export const defaultGraph: ComfyWorkflowJSON = {
id: 8,
type: "VAEDecode",
pos: [1209, 188],
size: { 0: 210, 1: 46 },
size: [210, 46],
flags: {},
order: 5,
mode: 0,
@@ -95,7 +95,7 @@ export const defaultGraph: ComfyWorkflowJSON = {
id: 9,
type: "SaveImage",
pos: [1451, 189],
size: { 0: 210, 1: 26 },
size: [210, 26],
flags: {},
order: 6,
mode: 0,
@@ -106,7 +106,7 @@ export const defaultGraph: ComfyWorkflowJSON = {
id: 4,
type: "CheckpointLoaderSimple",
pos: [26, 474],
size: { 0: 315, 1: 98 },
size: [315, 98],
flags: {},
order: 0,
mode: 0,

2
src/types/comfyWorkflow.ts
View File

@@ -45,7 +45,7 @@ const zProperties = z
.passthrough();
const zVector2 = z.union([
z.object({ 0: z.number(), 1: z.number() }),
z.object({ 0: z.number(), 1: z.number() }).transform((v) => [v[0], v[1]]),
z.tuple([z.number(), z.number()]),
]);

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

@@ -56,15 +56,18 @@ describe("parseComfyWorkflow", () => {
it("workflow.nodes.pos", async () => {
const workflow = JSON.parse(JSON.stringify(defaultGraph));
workflow.nodes[0].pos = [1, 2, 3];
await expect(parseComfyWorkflow(JSON.stringify(workflow))).rejects.toBeTruthy();
await expect(parseComfyWorkflow(JSON.stringify(workflow))).rejects.toThrow();
workflow.nodes[0].pos = [1, 2];
await expect(parseComfyWorkflow(JSON.stringify(workflow))).resolves.not.toThrow();
// Should automatically transform the legacy format object to array.
workflow.nodes[0].pos = {"0": 3, "1": 4};
await expect(parseComfyWorkflow(JSON.stringify(workflow))).resolves.not.toThrow();
let parsedWorkflow = await parseComfyWorkflow(JSON.stringify(workflow));
expect(parsedWorkflow.nodes[0].pos).toEqual([3, 4]);
workflow.nodes[0].pos = {0: 3, 1: 4};
await expect(parseComfyWorkflow(JSON.stringify(workflow))).resolves.not.toThrow();
parsedWorkflow = await parseComfyWorkflow(JSON.stringify(workflow));
expect(parsedWorkflow.nodes[0].pos).toEqual([3, 4]);
});
});