Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-04-30 11:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Reroute] Migrate floating link (#3260)

Browse Source
This commit is contained in:
Chenlei Hu
2025-03-27 22:13:16 -04:00
committed by GitHub
parent 25ce267b2e
commit 690326c374
8 changed files with 749 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests-ui/tests/utils/migration/migrateReroute.test.ts
View File

@@ -14,22 +14,24 @@ describe('migrateReroute', () => {
return JSON.parse(fileContent) as WorkflowJSON04
}
it.each(['branching.json', 'single_connected.json', 'floating.json'])(
'should correctly migrate %s',
(fileName) => {
// Load the legacy workflow
const legacyWorkflow = loadWorkflow(
`workflows/reroute/legacy/${fileName}`
)
it.each([
'branching.json',
'single_connected.json',
'floating.json',
'floating_branch.json'
])('should correctly migrate %s', (fileName) => {
// Load the legacy workflow
const legacyWorkflow = loadWorkflow(
`workflows/reroute/legacy/${fileName}`
)
// Migrate the workflow
const migratedWorkflow = migrateLegacyRerouteNodes(legacyWorkflow)
// Migrate the workflow
const migratedWorkflow = migrateLegacyRerouteNodes(legacyWorkflow)
// Compare with snapshot
expect(JSON.stringify(migratedWorkflow, null, 2)).toMatchFileSnapshot(
`workflows/reroute/native/${fileName}`
)
}
)
// Compare with snapshot
expect(JSON.stringify(migratedWorkflow, null, 2)).toMatchFileSnapshot(
`workflows/reroute/native/${fileName}`
)
})
})
})

253
tests-ui/tests/utils/migration/workflows/reroute/legacy/floating_branch.json Normal file
View File

@@ -0,0 +1,253 @@
{
"last_node_id": 36,
"last_link_id": 44,
"nodes": [
{
"id": 33,
"type": "Reroute",
"pos": [
492.768310546875,
274.761962890625
],
"size": [
75,
26
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [
{
"name": "",
"type": "*",
"link": 41
}
],
"outputs": [
{
"name": "",
"type": "VAE",
"links": [
40
]
}
],
"properties": {
"showOutputText": false,
"horizontal": false
}
},
{
"id": 32,
"type": "Reroute",
"pos": [
362.8304138183594,
275.12872314453125
],
"size": [
75,
26
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [
{
"name": "",
"type": "*",
"link": 39
}
],
"outputs": [
{
"name": "",
"type": "VAE",
"links": [
41,
42
]
}
],
"properties": {
"showOutputText": false,
"horizontal": false
}
},
{
"id": 4,
"type": "CheckpointLoaderSimple",
"pos": [
-0.6348835229873657,
238.0631866455078
],
"size": [
315,
98
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "MODEL",
"type": "MODEL",
"slot_index": 0,
"links": []
},
{
"name": "CLIP",
"type": "CLIP",
"slot_index": 1,
"links": []
},
{
"name": "VAE",
"type": "VAE",
"slot_index": 2,
"links": [
39
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "CheckpointLoaderSimple"
},
"widgets_values": [
"v1-5-pruned-emaonly.safetensors"
]
},
{
"id": 12,
"type": "VAEDecode",
"pos": [
611.6028442382812,
254.6018524169922
],
"size": [
210,
46
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [
{
"name": "samples",
"type": "LATENT",
"link": null
},
{
"name": "vae",
"type": "VAE",
"link": 40
}
],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": []
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "VAEDecode"
},
"widgets_values": []
},
{
"id": 34,
"type": "Reroute",
"pos": [
490.8152770996094,
364.4836730957031
],
"size": [
75,
26
],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [
{
"name": "",
"type": "*",
"link": 42
}
],
"outputs": [
{
"name": "",
"type": "VAE",
"links": null
}
],
"properties": {
"showOutputText": false,
"horizontal": false
}
}
],
"links": [
[
39,
4,
2,
32,
0,
"*"
],
[
40,
33,
0,
12,
1,
"VAE"
],
[
41,
32,
0,
33,
0,
"*"
],
[
42,
32,
0,
34,
0,
"*"
]
],
"floatingLinks": [
{
"id": 8,
"origin_id": 4,
"origin_slot": 2,
"target_id": -1,
"target_slot": -1,
"type": "*"
}
],
"groups": [],
"config": {},
"extra": {
"ds": {
"scale": 1.6672297511789418,
"offset": [
262.0504372113823,
124.35120995663942
]
},
"linkExtensions": []
},
"version": 0.4
}

8
tests-ui/tests/utils/migration/workflows/reroute/native/branching.json
View File

@@ -35,8 +35,8 @@
"type": "VAE",
"slot_index": 2,
"links": [
13,
21
21,
34
]
}
],
@@ -77,7 +77,7 @@
{
"name": "IMAGE",
"type": "IMAGE",
"links": null
"links": []
}
],
"properties": {
@@ -115,7 +115,7 @@
{
"name": "IMAGE",
"type": "IMAGE",
"links": null
"links": []
}
],
"properties": {

56
tests-ui/tests/utils/migration/workflows/reroute/native/floating.json
View File

@@ -34,10 +34,7 @@
"name": "VAE",
"type": "VAE",
"slot_index": 2,
"links": [
13,
31
]
"links": []
}
],
"properties": {
@@ -72,14 +69,14 @@
{
"name": "vae",
"type": "VAE",
"link": 21
"link": null
}
],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": null
"links": []
}
],
"properties": {
@@ -101,8 +98,51 @@
200.06933385457722
]
},
"reroutes": [],
"reroutes": [
{
"id": 1,
"pos": [
547.5,
293
],
"linkIds": [],
"floating": {
"slotType": "input"
}
},
{
"id": 2,
"pos": [
438.99267578125,
291.96600341796875
],
"linkIds": [],
"floating": {
"slotType": "output"
}
}
],
"linkExtensions": []
},
"version": 0.4
"version": 0.4,
"floatingLinks": [
{
"id": 7,
"origin_id": -1,
"origin_slot": -1,
"target_id": 12,
"target_slot": 1,
"type": "VAE",
"parentId": 1
},
{
"id": 8,
"origin_id": 4,
"origin_slot": 2,
"target_id": -1,
"target_slot": -1,
"type": "*",
"parentId": 2
}
]
}

166
tests-ui/tests/utils/migration/workflows/reroute/native/floating_branch.json Normal file
View File

@@ -0,0 +1,166 @@
{
"last_node_id": 36,
"last_link_id": 44,
"nodes": [
{
"id": 4,
"type": "CheckpointLoaderSimple",
"pos": [
-0.6348835229873657,
238.0631866455078
],
"size": [
315,
98
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "MODEL",
"type": "MODEL",
"slot_index": 0,
"links": []
},
{
"name": "CLIP",
"type": "CLIP",
"slot_index": 1,
"links": []
},
{
"name": "VAE",
"type": "VAE",
"slot_index": 2,
"links": [
40
]
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "CheckpointLoaderSimple"
},
"widgets_values": [
"v1-5-pruned-emaonly.safetensors"
]
},
{
"id": 12,
"type": "VAEDecode",
"pos": [
611.6028442382812,
254.6018524169922
],
"size": [
210,
46
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [
{
"name": "samples",
"type": "LATENT",
"link": null
},
{
"name": "vae",
"type": "VAE",
"link": 40
}
],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"links": []
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "VAEDecode"
},
"widgets_values": []
}
],
"links": [
[
40,
4,
2,
12,
1,
"VAE"
]
],
"floatingLinks": [
{
"id": 4,
"origin_id": 4,
"origin_slot": 2,
"target_id": -1,
"target_slot": -1,
"type": "*",
"parentId": 3
}
],
"groups": [],
"config": {},
"extra": {
"ds": {
"scale": 1.6672297511789418,
"offset": [
262.0504372113823,
124.35120995663942
]
},
"linkExtensions": [
{
"id": 40,
"parentId": 1
}
],
"reroutes": [
{
"id": 1,
"pos": [
530.268310546875,
287.761962890625
],
"linkIds": [
40
],
"parentId": 2
},
{
"id": 2,
"pos": [
400.3304138183594,
288.12872314453125
],
"linkIds": [
40
]
},
{
"id": 3,
"pos": [
528.3152770996094,
377.4836730957031
],
"linkIds": [],
"parentId": 2,
"floating": {
"slotType": "output"
}
}
]
},
"version": 0.4
}

2
tests-ui/tests/utils/migration/workflows/reroute/native/single_connected.json
View File

@@ -76,7 +76,7 @@
{
"name": "IMAGE",
"type": "IMAGE",
"links": null
"links": []
}
],
"properties": {