alphard/efficiency-nodes-comfyui
1
0
Fork 0
mirror of https://github.com/jags111/efficiency-nodes-comfyui.git synced 2026-03-21 21:22:13 -03:00
Code Issues Packages Projects Releases Wiki Activity

Mini-Patch

Browse Source
This commit is contained in:
TSC
2023-04-18 18:50:40 -05:00
committed by GitHub
parent 3ae297dcd8
commit de0641cd99
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
efficiency_nodes.py
View File

@@ -40,7 +40,7 @@ def pil2tensor(image: Image.Image) -> torch.Tensor:
# TSC Efficient Loader # TSC Efficient Loader
# Track what objects have already been loaded into memory (*only for instances of this node) # Track what objects have already been loaded into memory
loaded_objects = { loaded_objects = {
"ckpt": [], # (ckpt_name, location) "ckpt": [], # (ckpt_name, location)
"clip": [], # (ckpt_name, location) "clip": [], # (ckpt_name, location)
@@ -183,7 +183,7 @@ class TSC_KSampler:
"denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}), "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
"preview_image": (["Disabled", "Enabled"],), "preview_image": (["Disabled", "Enabled"],),
}, },
"optional": { "optional_vae": ("VAE",), #change to vae "optional": { "optional_vae": ("VAE",),
"script": ("SCRIPT",),}, "script": ("SCRIPT",),},
"hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"}, "hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
} }
@@ -301,7 +301,7 @@ class TSC_KSampler:
# Enable vae decode on next Hold # Enable vae decode on next Hold
last_helds["vae_decode"][my_unique_id] = True last_helds["vae_decode"][my_unique_id] = True
return {"ui": {"images": list()}, return {"ui": {"images": list()},
"result": (model, positive, negative, {"samples": latent}, vae, TSC_KSampler.empty_image,)} "result": (model, positive, negative, {"samples": latent}, vae, last_images,)}
else: else:
# Decode images and store # Decode images and store
images = vae.decode(latent).cpu() images = vae.decode(latent).cpu()
@@ -326,7 +326,7 @@ class TSC_KSampler:
# If not in preview mode, return the results in the specified format # If not in preview mode, return the results in the specified format
if preview_image == "Disabled": if preview_image == "Disabled":
return {"ui": {"images": list()}, return {"ui": {"images": list()},
"result": (model, positive, negative, last_latent, vae, TSC_KSampler.empty_image,)} "result": (model, positive, negative, last_latent, vae, last_images,)}
# if preview_image == "Enabled": # if preview_image == "Enabled":
else: else:
@@ -354,11 +354,6 @@ class TSC_KSampler:
"result": (model, positive, negative, {"samples": latent}, vae, images,)} "result": (model, positive, negative, {"samples": latent}, vae, images,)}
elif sampler_state == "Script": elif sampler_state == "Script":
# If not in preview mode, return the results in the specified format
if preview_image == "Disabled":
print('\033[31mKSampler(Efficient)[{}] Error:\033[0m Preview must be enabled to use Script mode.'.format(my_unique_id))
return {"ui": {"images": list()},
"result": (model, positive, negative, last_latent, vae, TSC_KSampler.empty_image,)}
# If no script input connected, set X_type and Y_type to "Nothing" # If no script input connected, set X_type and Y_type to "Nothing"
if script is None: if script is None:
@@ -369,9 +364,9 @@ class TSC_KSampler:
X_type, X_value, Y_type, Y_value, grid_spacing, latent_id = script X_type, X_value, Y_type, Y_value, grid_spacing, latent_id = script
if (X_type == "Nothing" and Y_type == "Nothing"): if (X_type == "Nothing" and Y_type == "Nothing"):
print('\033[31mKSampler(Efficient)[{}] Error:\033[0m No valid script input detected'.format(my_unique_id)) print('\033[31mKSampler(Efficient)[{}] Error:\033[0m No valid script entry detected'.format(my_unique_id))
return {"ui": {"images": list()}, return {"ui": {"images": list()},
"result": (model, positive, negative, last_latent, vae, TSC_KSampler.empty_image,)} "result": (model, positive, negative, last_latent, vae, last_images,)}
# Extract the 'samples' tensor from the dictionary # Extract the 'samples' tensor from the dictionary
latent_image_tensor = latent_image['samples'] latent_image_tensor = latent_image['samples']
@@ -706,8 +701,12 @@ class TSC_KSampler:
results = preview_images(images, filename_prefix) results = preview_images(images, filename_prefix)
last_helds["results"][my_unique_id] = results last_helds["results"][my_unique_id] = results
# Output image results to ui and node outputs # If not in preview mode, return the results in the specified format
return {"ui": {"images": results}, "result": (model, positive, negative, {"samples": latent_new}, vae, images,)} if preview_image == "Disabled":
return {"ui": {"images": list()}, "result": (model, positive, negative, last_latent, vae, images,)}
else:
# Output image results to ui and node outputs
return {"ui": {"images": results}, "result": (model, positive, negative, {"samples": latent_new}, vae, images,)}
# TSC XY Plot # TSC XY Plot