mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-17 00:43:48 +08:00
clean up patch and following upstream
This commit is contained in:
parent
06b77605e5
commit
e61be509c4
@ -9,8 +9,8 @@ import folder_paths
|
|||||||
class UpscaleModelLoader:
|
class UpscaleModelLoader:
|
||||||
@classmethod
|
@classmethod
|
||||||
def INPUT_TYPES(s):
|
def INPUT_TYPES(s):
|
||||||
return {"required": { "model_name": (folder_paths.get_filename_list("upscale_models"), )},
|
return {"required": { "model_name": (folder_paths.get_filename_list("upscale_models"), ),
|
||||||
}
|
}}
|
||||||
RETURN_TYPES = ("UPSCALE_MODEL",)
|
RETURN_TYPES = ("UPSCALE_MODEL",)
|
||||||
FUNCTION = "load_model"
|
FUNCTION = "load_model"
|
||||||
|
|
||||||
|
|||||||
2
nodes.py
2
nodes.py
@ -770,7 +770,7 @@ class SaveImage:
|
|||||||
|
|
||||||
full_output_folder = os.path.join(self.output_dir, subfolder)
|
full_output_folder = os.path.join(self.output_dir, subfolder)
|
||||||
|
|
||||||
if os.path.commonpath((self.output_dir, os.path.realpath(full_output_folder))) != self.output_dir:
|
if os.path.commonpath((self.output_dir, os.path.abspath(full_output_folder))) != self.output_dir:
|
||||||
print("Saving image outside the output folder is not allowed.")
|
print("Saving image outside the output folder is not allowed.")
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
|
|||||||
@ -124,15 +124,6 @@ class ComfyApi extends EventTarget {
|
|||||||
return await resp.json();
|
return await resp.json();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads file list
|
|
||||||
* @returns An array of file list
|
|
||||||
*/
|
|
||||||
async getFiles(kind) {
|
|
||||||
const resp = await fetch("/getfiles/"+kind, { cache: "no-store" });
|
|
||||||
return await resp.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param {number} number The index at which to queue the prompt, passing -1 will insert the prompt at the front of the queue
|
* @param {number} number The index at which to queue the prompt, passing -1 will insert the prompt at the front of the queue
|
||||||
|
|||||||
@ -590,7 +590,7 @@ class ComfyApp {
|
|||||||
const nodeData = defs[nodeId];
|
const nodeData = defs[nodeId];
|
||||||
const node = Object.assign(
|
const node = Object.assign(
|
||||||
function ComfyNode() {
|
function ComfyNode() {
|
||||||
const inputs = Object.assign(nodeData["input"]["required"], nodeData["input"]["widget"]);
|
const inputs = nodeData["input"]["required"];
|
||||||
const config = { minWidth: 1, minHeight: 1 };
|
const config = { minWidth: 1, minHeight: 1 };
|
||||||
for (const inputName in inputs) {
|
for (const inputName in inputs) {
|
||||||
const inputData = inputs[inputName];
|
const inputData = inputs[inputName];
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user