nodes/Suzie1-ComfyUI_Comfyroll_CustomNodes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

version 1.74.1

Browse Source
This commit is contained in:
Suzie1
2024-01-19 19:58:51 +00:00
parent d6ff722ba8
commit ccc6adf685
5 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Patch_Notes.md
+3
View File
@@ -1,5 +1,8 @@
# 🧩 Comfyroll Studio - Patch Notes
## v1.74.1 Jan 19, 2024
- fixed CR Thumbnail Preview show_help
## v1.74 Jan 18, 2024
- changed CR Simple Image Compare to automatically resize the second image if the size is different
- added CR Aspect Ratio For Print
categories.py
+2 -2
View File
@@ -30,8 +30,8 @@ icons = {
"Comfyroll/Graphics/3D": "🧩 Comfyroll Studio/👾 Graphics/3D",
"Comfyroll/Graphics/Utilty": "🧩 Comfyroll Studio/👾 Graphics/🔧 Utility",
"Comfyroll/Workflow": "🧩 Comfyroll Studio/✨ Essential/Workflow",
"Comfyroll/Essential": "🧩 Comfyroll Studio/✨ Essential/📦 Core",
"Comfyroll/Legacy": "🧩 Comfyroll Studio/✨ Essential/💀 Legacy",
"Comfyroll/Essential/Core": "🧩 Comfyroll Studio/✨ Essential/📦 Core",
"Comfyroll/Essential/Legacy": "🧩 Comfyroll Studio/✨ Essential/💀 Legacy",
"Comfyroll/Animation/Camera": "🧩 Comfyroll Studio/🎥 Animation/🎦 Camera",
"Comfyroll/Animation/Utils": "🧩 Comfyroll Studio/🎥 Animation/🛠️ Utils",
"Comfyroll/Animation/Schedule": "🧩 Comfyroll Studio/🎥 Animation/📋 Schedule",
nodes/nodes_core.py
+13 -13
View File
@@ -51,12 +51,12 @@ class CR_ImageOutput:
RETURN_NAMES = ("trigger", )
FUNCTION = "save_images"
OUTPUT_NODE = True
CATEGORY = icons.get("Comfyroll/Essential")
CATEGORY = icons.get("Comfyroll/Essential/Core")
def save_images(self, images, file_format, prefix_presets, filename_prefix="CR",
trigger=False, output_type="Preview", prompt=None, extra_pnginfo=None):
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Essential-Nodes#cr-image-output"
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Core-Nodes#cr-image-output"
def map_filename(filename):
prefix_len = len(os.path.basename(filename_prefix))
@@ -152,7 +152,7 @@ class CR_ImageOutput:
})
counter += 1
return { "ui": { "images": results }, "result": (trigger,) }
return { "ui": { "images": results }, "result": (trigger, show_help,) }
#---------------------------------------------------------------------------------------------------------------------#
class CR_Seed:
@@ -165,11 +165,11 @@ class CR_Seed:
RETURN_NAMES = ("seed", "show_help", )
FUNCTION = "seedint"
OUTPUT_NODE = True
CATEGORY = icons.get("Comfyroll/Essential")
CATEGORY = icons.get("Comfyroll/Essential/Core")
@staticmethod
def seedint(seed):
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Essential-Nodes#cr-seed"
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Core-Nodes#cr-seed"
return (seed, show_help,)
#---------------------------------------------------------------------------------------------------------------------#
@@ -184,7 +184,7 @@ class CR_LatentBatchSize:
RETURN_TYPES = ("LATENT", )
FUNCTION = "batchsize"
CATEGORY = icons.get("Comfyroll/Essential")
CATEGORY = icons.get("Comfyroll/Essential/Core")
def batchsize(self, latent: tg.Sequence[tg.Mapping[tg.Text, torch.Tensor]], batch_size: int):
samples = latent['samples']
@@ -194,7 +194,7 @@ class CR_LatentBatchSize:
torch.clone(samples) for _ in range(batch_size - 1)
]
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Essential-Nodes#cr-latent-batch-size"
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Core-Nodes#cr-latent-batch-size"
return ({
'samples': torch.cat(sample_list),
@@ -210,10 +210,10 @@ class CR_PromptText:
RETURN_TYPES = ("STRING", "STRING", )
RETURN_NAMES = ("prompt", "show_help", )
FUNCTION = "get_value"
CATEGORY = icons.get("Comfyroll/Essential")
CATEGORY = icons.get("Comfyroll/Essential/Core")
def get_value(self, prompt):
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Essential-Nodes#cr-prompt-text"
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Core-Nodes#cr-prompt-text"
return (prompt, show_help, )
#---------------------------------------------------------------------------------------------------------------------#
@@ -235,7 +235,7 @@ class CR_ConditioningMixer:
RETURN_TYPES = ("CONDITIONING", "STRING", )
RETURN_NAMES = ("CONDITIONING", "show_help", )
FUNCTION = "conditioning"
CATEGORY = icons.get("Comfyroll/Essential")
CATEGORY = icons.get("Comfyroll/Essential/Core")
def conditioning(self, mix_method, conditioning_1, conditioning_2, average_strength):
@@ -243,7 +243,7 @@ class CR_ConditioningMixer:
conditioning_to = conditioning_2
conditioning_to_strength = average_strength
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Essential-Nodes#cr-conditioning-mixer"
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Core-Nodes#cr-conditioning-mixer"
if mix_method == "Combine":
return (conditioning_1 + conditioning_2, show_help, )
@@ -313,7 +313,7 @@ class CR_SelectModel:
RETURN_TYPES = ("MODEL", "CLIP", "VAE", "STRING", "STRING", )
RETURN_NAMES = ("MODEL", "CLIP", "VAE", "ckpt_name", "show_help", )
FUNCTION = "select_model"
CATEGORY = icons.get("Comfyroll/Essential")
CATEGORY = icons.get("Comfyroll/Essential/Core")
def select_model(self, ckpt_name1, ckpt_name2, ckpt_name3, ckpt_name4, ckpt_name5, select_model):
@@ -339,7 +339,7 @@ class CR_SelectModel:
model, clip, vae, clipvision = comfy.sd.load_checkpoint_guess_config(ckpt_path, output_vae=True, output_clip=True,
embedding_directory=folder_paths.get_folder_paths("embeddings"))
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Essential-Nodes#cr-select-model"
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Core-Nodes#cr-select-model"
return (model, clip, vae, model_name, show_help, )
nodes/nodes_graphics_template.py
+3 -3
View File
@@ -521,7 +521,7 @@ class CR_ThumbnailPreview:
def thumbnail(self, image, rescale_factor, max_columns):
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Other-Nodes#cr-thumbnail-preview"
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Template-Nodes#cr-thumbnail-preview"
result_images = []
outline_thickness = 1
@@ -551,7 +551,7 @@ class CR_ThumbnailPreview:
)
results.append({"source": "websocket", "content-type": "image/png", "type": "output"})
return {"ui": {"images": results}}
return {"ui": {"images": results}, "result": (show_help,) }
#---------------------------------------------------------------------------------------------------------------------
class CR_SeamlessChecker:
@@ -604,7 +604,7 @@ class CR_SeamlessChecker:
)
results.append({"source": "websocket", "content-type": "image/png", "type": "output"})
return {"ui": {"images": results}}
return {"ui": {"images": results}, "result": (show_help,) }
#---------------------------------------------------------------------------------------------------------------------#
# MAPPINGS
nodes/nodes_legacy.py
+4 -4
View File
@@ -22,7 +22,7 @@ class CR_ImageSize:
RETURN_TYPES = ("INT", "INT", "FLOAT", "STRING", )
RETURN_NAMES = ("Width", "Height", "upscale_factor", "show_help", )
FUNCTION = "ImageSize"
CATEGORY = icons.get("Comfyroll/Legacy")
CATEGORY = icons.get("Comfyroll/Essential/Legacy")
def ImageSize(self, width, height, upscale_factor):
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Legacy-Nodes#cr-image-size"
@@ -52,7 +52,7 @@ class CR_AspectRatio_SDXL:
#RETURN_NAMES = ("Width", "Height")
FUNCTION = "Aspect_Ratio"
CATEGORY = icons.get("Comfyroll/Legacy")
CATEGORY = icons.get("Comfyroll/Essential/Legacy")
def Aspect_Ratio(self, width, height, aspect_ratio, swap_dimensions, upscale_factor1, upscale_factor2, batch_size):
@@ -105,7 +105,7 @@ class CR_PromptMixer:
RETURN_NAMES = ("pos_g", "pos_l", "pos_r", "neg_g", "neg_l", "neg_r", )
FUNCTION = "mixer"
CATEGORY = icons.get("Comfyroll/Legacy")
CATEGORY = icons.get("Comfyroll/Essential/Legacy")
def mixer(self, prompt_positive, prompt_negative, style_positive, style_negative, preset):
@@ -164,7 +164,7 @@ class CR_SeedToInt:
RETURN_TYPES = ("INT", "STRING", )
RETURN_NAMES = ("INT", "show_help", )
FUNCTION = "seed_to_int"
CATEGORY = icons.get("Comfyroll/Legacy")
CATEGORY = icons.get("Comfyroll/Essential/Legacy")
def seed_to_int(self, seed):
show_help = "https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes/wiki/Conversion-Nodes#cr-seed-to-int"