From afb9cb07f0a4976efcda2d27334840bbcbd223f5 Mon Sep 17 00:00:00 2001 From: joe Date: Fri, 11 Oct 2024 17:41:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0load=20default=20json?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/shellagent.js | 29 ++- web/shellagent_default.json | 459 ++++++++++++++++++++++++++++++++++++ 2 files changed, 481 insertions(+), 7 deletions(-) create mode 100644 web/shellagent_default.json diff --git a/web/shellagent.js b/web/shellagent.js index e78bf5f..670f8b6 100644 --- a/web/shellagent.js +++ b/web/shellagent.js @@ -1,10 +1,11 @@ -import { app } from "../../scripts/app.js"; +import { app } from "../scripts/app.js"; + app.registerExtension({ name: "Shellagent.extension", async setup() { - window.parent.postMessage({ - type: 'loaded' - }, '*'); + window.parent.postMessage({ + type: 'loaded' + }, '*'); window.addEventListener('message', (event) => { if (event.data.type === 'save') { app.graphToPrompt().then(data => { @@ -15,9 +16,23 @@ app.registerExtension({ }, "*"); }); } - if (event.data.type === 'load') { - app.loadGraphData(event.data.data, true, false); - } + if (event.data.type === 'load') { + app.loadGraphData(event.data.data, true, false); + } + if (event.data.type === 'load_default') { + // 使用FileReader读取JSON文件 + fetch('extensions/ComfyUI-ShellAgent-Plugin/shellagent_default.json') + .then(response => response.blob()) + .then(blob => { + const reader = new FileReader(); + reader.onload = function(e) { + const json = JSON.parse(e.target.result); + app.loadGraphData(json, true, false); + }; + reader.readAsText(blob); + }) + .catch(error => console.error('加载默认JSON文件时出错:', error)); + } }); }, }); \ No newline at end of file diff --git a/web/shellagent_default.json b/web/shellagent_default.json new file mode 100644 index 0000000..69907b5 --- /dev/null +++ b/web/shellagent_default.json @@ -0,0 +1,459 @@ +{ + "last_node_id": 14, + "last_link_id": 17, + "nodes": [ + { + "id": 7, + "type": "CLIPTextEncode", + "pos": { + "0": 413, + "1": 389 + }, + "size": { + "0": 425.27801513671875, + "1": 180.6060791015625 + }, + "flags": {}, + "order": 3, + "mode": 0, + "inputs": [ + { + "name": "clip", + "type": "CLIP", + "link": 15 + } + ], + "outputs": [ + { + "name": "CONDITIONING", + "type": "CONDITIONING", + "links": [ + 6 + ], + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "CLIPTextEncode" + }, + "widgets_values": [ + "watermark, text\n" + ] + }, + { + "id": 6, + "type": "CLIPTextEncode", + "pos": { + "0": 415, + "1": 186 + }, + "size": { + "0": 422.84503173828125, + "1": 164.31304931640625 + }, + "flags": {}, + "order": 2, + "mode": 0, + "inputs": [ + { + "name": "clip", + "type": "CLIP", + "link": 14 + } + ], + "outputs": [ + { + "name": "CONDITIONING", + "type": "CONDITIONING", + "links": [ + 4 + ], + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "CLIPTextEncode" + }, + "widgets_values": [ + "photograph of victorian woman with wings, sky clouds, meadow grass\n" + ] + }, + { + "id": 8, + "type": "VAEDecode", + "pos": { + "0": 1209, + "1": 188 + }, + "size": { + "0": 210, + "1": 46 + }, + "flags": {}, + "order": 6, + "mode": 0, + "inputs": [ + { + "name": "samples", + "type": "LATENT", + "link": 7 + }, + { + "name": "vae", + "type": "VAE", + "link": 17 + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 9 + ], + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "VAEDecode" + }, + "widgets_values": [] + }, + { + "id": 9, + "type": "SaveImage", + "pos": { + "0": 1451, + "1": 189 + }, + "size": { + "0": 210, + "1": 58 + }, + "flags": {}, + "order": 7, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 9 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "SaveImage" + }, + "widgets_values": [ + "ComfyUI" + ] + }, + { + "id": 10, + "type": "LoadImage", + "pos": { + "0": 215.97996520996094, + "1": 703.6800537109375 + }, + "size": { + "0": 315, + "1": 314.0000305175781 + }, + "flags": {}, + "order": 0, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 10 + ], + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "example.png", + "image" + ] + }, + { + "id": 12, + "type": "VAEEncode", + "pos": { + "0": 614.97998046875, + "1": 707.6800537109375 + }, + "size": { + "0": 210, + "1": 46 + }, + "flags": {}, + "order": 4, + "mode": 0, + "inputs": [ + { + "name": "pixels", + "type": "IMAGE", + "link": 10 + }, + { + "name": "vae", + "type": "VAE", + "link": 16 + } + ], + "outputs": [ + { + "name": "LATENT", + "type": "LATENT", + "links": [ + 11 + ], + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "VAEEncode" + }, + "widgets_values": [] + }, + { + "id": 3, + "type": "KSampler", + "pos": { + "0": 863, + "1": 186 + }, + "size": { + "0": 315, + "1": 262 + }, + "flags": {}, + "order": 5, + "mode": 0, + "inputs": [ + { + "name": "model", + "type": "MODEL", + "link": 13 + }, + { + "name": "positive", + "type": "CONDITIONING", + "link": 4 + }, + { + "name": "negative", + "type": "CONDITIONING", + "link": 6 + }, + { + "name": "latent_image", + "type": "LATENT", + "link": 11 + } + ], + "outputs": [ + { + "name": "LATENT", + "type": "LATENT", + "links": [ + 7 + ], + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "KSampler" + }, + "widgets_values": [ + 280823642470253, + "randomize", + 20, + 8, + "dpmpp_2m", + "normal", + 0.8700000000000001 + ] + }, + { + "id": 14, + "type": "CheckpointLoaderSimple", + "pos": { + "0": 19, + "1": 433 + }, + "size": { + "0": 315, + "1": 98 + }, + "flags": {}, + "order": 1, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "MODEL", + "type": "MODEL", + "links": [ + 13 + ], + "slot_index": 0, + "shape": 3 + }, + { + "name": "CLIP", + "type": "CLIP", + "links": [ + 14, + 15 + ], + "slot_index": 1, + "shape": 3 + }, + { + "name": "VAE", + "type": "VAE", + "links": [ + 16, + 17 + ], + "slot_index": 2, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "CheckpointLoaderSimple" + }, + "widgets_values": [ + "v1-5-pruned-emaonly.ckpt" + ] + } + ], + "links": [ + [ + 4, + 6, + 0, + 3, + 1, + "CONDITIONING" + ], + [ + 6, + 7, + 0, + 3, + 2, + "CONDITIONING" + ], + [ + 7, + 3, + 0, + 8, + 0, + "LATENT" + ], + [ + 9, + 8, + 0, + 9, + 0, + "IMAGE" + ], + [ + 10, + 10, + 0, + 12, + 0, + "IMAGE" + ], + [ + 11, + 12, + 0, + 3, + 3, + "LATENT" + ], + [ + 13, + 14, + 0, + 3, + 0, + "MODEL" + ], + [ + 14, + 14, + 1, + 6, + 0, + "CLIP" + ], + [ + 15, + 14, + 1, + 7, + 0, + "CLIP" + ], + [ + 16, + 14, + 2, + 12, + 1, + "VAE" + ], + [ + 17, + 14, + 2, + 8, + 1, + "VAE" + ] + ], + "groups": [ + { + "title": "Loading images", + "bounding": [ + 150, + 630, + 726, + 171 + ], + "color": "#3f789e", + "font_size": 24, + "flags": {} + } + ], + "config": {}, + "extra": { + "ds": { + "scale": 0.8264462809917361, + "offset": [ + 247.8974125987761, + -5.429250683976626 + ] + } + }, + "version": 0.4 + } \ No newline at end of file