298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-01-11 02:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

rework payload from server

Browse Source
This commit is contained in:
m957ymj75urz 2023-03-19 12:54:29 +01:00
parent 5fa514fa51
commit d1138e8ba0
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nodes.py
View File

@ -775,7 +775,7 @@ class KSamplerAdvanced:
class SaveImage: class SaveImage:
def __init__(self): def __init__(self):
self.output_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "output") self.output_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "output")
self.url_suffix = "" self.type = "output"
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
@ -822,7 +822,7 @@ class SaveImage:
if not os.path.exists(self.output_dir): if not os.path.exists(self.output_dir):
os.makedirs(self.output_dir) os.makedirs(self.output_dir)
paths = list() results = list()
for image in images: for image in images:
i = 255. * image.cpu().numpy() i = 255. * image.cpu().numpy()
img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8)) img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8))
@ -835,14 +835,19 @@ class SaveImage:
file = f"{filename}_{counter:05}_.png" file = f"{filename}_{counter:05}_.png"
img.save(os.path.join(full_output_folder, file), pnginfo=metadata, optimize=True) img.save(os.path.join(full_output_folder, file), pnginfo=metadata, optimize=True)
paths.append(os.path.join(subfolder, file + self.url_suffix)) results.append({
"filename": file,
"subfolder": subfolder,
"type": self.type
});
counter += 1 counter += 1
return { "ui": { "images": paths } }
return { "ui": { "images": results } }
class PreviewImage(SaveImage): class PreviewImage(SaveImage):
def __init__(self): def __init__(self):
self.output_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "temp") self.output_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "temp")
self.url_suffix = "&type=temp" self.type = "temp"
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):

4
server.py
View File

@ -111,7 +111,7 @@ class PromptServer():
@routes.get("/view") @routes.get("/view")
async def view_image(request): async def view_image(request):
if "file" in request.rel_url.query: if "filename" in request.rel_url.query:
type = request.rel_url.query.get("type", "output") type = request.rel_url.query.get("type", "output")
if type not in ["output", "input", "temp"]: if type not in ["output", "input", "temp"]:
return web.Response(status=400) return web.Response(status=400)
@ -123,7 +123,7 @@ class PromptServer():
return web.Response(status=403) return web.Response(status=403)
output_dir = full_output_dir output_dir = full_output_dir
file = request.rel_url.query["file"] file = request.rel_url.query["filename"]
file = os.path.basename(file) file = os.path.basename(file)
file = os.path.join(output_dir, file) file = os.path.join(output_dir, file)

5
web/scripts/app.js
View File

@ -110,10 +110,7 @@ class ComfyApp {
const img = new Image(); const img = new Image();
img.onload = () => r(img); img.onload = () => r(img);
img.onerror = () => r(null); img.onerror = () => r(null);
img.src = "/view?" + new URLSearchParams(src).toString();
var filename = src.replace(/^.*[\\\/]/, '');
var subfolder = src.replace(filename, '');
img.src = "/view?file=" + filename + "&subfolder=" + subfolder;
}); });
}) })
).then((imgs) => { ).then((imgs) => {

2
web/scripts/widgets.js
View File

@ -141,7 +141,7 @@ export const ComfyWidgets = {
node.imgs = [img]; node.imgs = [img];
app.graph.setDirtyCanvas(true); app.graph.setDirtyCanvas(true);
}; };
img.src = `/view/${name}?type=input`; img.src = `/view?filename=${name}&type=input`;
} }
// Add our own callback to the combo widget to render an image when it changes // Add our own callback to the combo widget to render an image when it changes