mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-24 06:35:10 +00:00
b2a1108340
Manual backport of #10856 to `core/1.43`. ## Conflicts resolved Two files had trivial conflicts from the same root cause — #10856 extracted the inline `cleanup_fake_model` block into a shared `cleanupFakeModel` helper in `browser_tests/tests/propertiesPanel/ErrorsTabHelper.ts`: - `browser_tests/tests/errorOverlay.spec.ts` - `browser_tests/tests/propertiesPanel/errorsTabMissingModels.spec.ts` `core/1.43` still carries the original inline `expect(cleanupOk).toBeTruthy()` form. main's version (post-#10967) uses an inline `expect.poll()` instead. #10856 replaces both with `await cleanupFakeModel(comfyPage)` calling the helper added by this same PR. Resolution: accepted the PR version (helper call) on both conflict sites. The helper itself is added as part of this backport, so no runtime behavior is lost. ## Verification - No residual conflict markers - Cherry-picked commit carries the entire #10856 squash (45 files, +3596/-209) ## Original PR summary See #10856 for full behavioral description, test plan, and screenshots. --- Fixes Comfy-Org/ComfyUI#13256 on core/1.43 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-11217-backport-core-1-43-fix-exclude-muted-bypassed-nodes-from-missing-asset-detection-10-3426d73d365081f0becbcf7d909f0021) by [Unito](https://www.unito.io) Co-authored-by: Christian Byrne <cbyrne@comfy.org>
142 lines
3.5 KiB
JSON
142 lines
3.5 KiB
JSON
{
|
|
"id": "test-missing-models-in-subgraph",
|
|
"revision": 0,
|
|
"last_node_id": 2,
|
|
"last_link_id": 0,
|
|
"nodes": [
|
|
{
|
|
"id": 1,
|
|
"type": "KSampler",
|
|
"pos": [100, 100],
|
|
"size": [270, 262],
|
|
"flags": {},
|
|
"order": 1,
|
|
"mode": 0,
|
|
"inputs": [
|
|
{ "name": "model", "type": "MODEL", "link": null },
|
|
{ "name": "positive", "type": "CONDITIONING", "link": null },
|
|
{ "name": "negative", "type": "CONDITIONING", "link": null },
|
|
{ "name": "latent_image", "type": "LATENT", "link": null }
|
|
],
|
|
"outputs": [{ "name": "LATENT", "type": "LATENT", "links": [] }],
|
|
"properties": {
|
|
"Node name for S&R": "KSampler"
|
|
},
|
|
"widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
|
|
},
|
|
{
|
|
"id": 2,
|
|
"type": "subgraph-with-missing-model",
|
|
"pos": [450, 100],
|
|
"size": [400, 200],
|
|
"flags": {},
|
|
"order": 0,
|
|
"mode": 0,
|
|
"inputs": [{ "name": "model", "type": "MODEL", "link": null }],
|
|
"outputs": [{ "name": "MODEL", "type": "MODEL", "links": null }],
|
|
"properties": {},
|
|
"widgets_values": []
|
|
}
|
|
],
|
|
"links": [],
|
|
"groups": [],
|
|
"definitions": {
|
|
"subgraphs": [
|
|
{
|
|
"id": "subgraph-with-missing-model",
|
|
"version": 1,
|
|
"state": {
|
|
"lastGroupId": 0,
|
|
"lastNodeId": 1,
|
|
"lastLinkId": 2,
|
|
"lastRerouteId": 0
|
|
},
|
|
"revision": 0,
|
|
"config": {},
|
|
"name": "Subgraph with Missing Model",
|
|
"inputNode": {
|
|
"id": -10,
|
|
"bounding": [100, 200, 120, 60]
|
|
},
|
|
"outputNode": {
|
|
"id": -20,
|
|
"bounding": [500, 200, 120, 60]
|
|
},
|
|
"inputs": [
|
|
{
|
|
"id": "input1-id",
|
|
"name": "model",
|
|
"type": "MODEL",
|
|
"linkIds": [1],
|
|
"pos": { "0": 150, "1": 220 }
|
|
}
|
|
],
|
|
"outputs": [
|
|
{
|
|
"id": "output1-id",
|
|
"name": "MODEL",
|
|
"type": "MODEL",
|
|
"linkIds": [2],
|
|
"pos": { "0": 520, "1": 220 }
|
|
}
|
|
],
|
|
"widgets": [],
|
|
"nodes": [
|
|
{
|
|
"id": 1,
|
|
"type": "CheckpointLoaderSimple",
|
|
"pos": [250, 180],
|
|
"size": [315, 98],
|
|
"flags": {},
|
|
"order": 0,
|
|
"mode": 0,
|
|
"inputs": [],
|
|
"outputs": [
|
|
{ "name": "MODEL", "type": "MODEL", "links": [2] },
|
|
{ "name": "CLIP", "type": "CLIP", "links": null },
|
|
{ "name": "VAE", "type": "VAE", "links": null }
|
|
],
|
|
"properties": {
|
|
"Node name for S&R": "CheckpointLoaderSimple"
|
|
},
|
|
"widgets_values": ["fake_model.safetensors"]
|
|
}
|
|
],
|
|
"links": [
|
|
{
|
|
"id": 1,
|
|
"origin_id": -10,
|
|
"origin_slot": 0,
|
|
"target_id": 1,
|
|
"target_slot": 0,
|
|
"type": "MODEL"
|
|
},
|
|
{
|
|
"id": 2,
|
|
"origin_id": 1,
|
|
"origin_slot": 0,
|
|
"target_id": -20,
|
|
"target_slot": 0,
|
|
"type": "MODEL"
|
|
}
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"config": {},
|
|
"extra": {
|
|
"ds": {
|
|
"scale": 1,
|
|
"offset": [0, 0]
|
|
}
|
|
},
|
|
"models": [
|
|
{
|
|
"name": "fake_model.safetensors",
|
|
"url": "http://localhost:8188/api/devtools/fake_model.safetensors",
|
|
"directory": "checkpoints"
|
|
}
|
|
],
|
|
"version": 0.4
|
|
}
|