From 2ff7d494d7d1cdf1e3ec70dfc223d70a11359002 Mon Sep 17 00:00:00 2001 From: Hapse Date: Sun, 27 Oct 2024 12:30:22 +0100 Subject: [PATCH 1/5] added lora stack toggle check --- py/defs/ext/easyuse_nodes.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/py/defs/ext/easyuse_nodes.py b/py/defs/ext/easyuse_nodes.py index 3f7874d..68fd944 100644 --- a/py/defs/ext/easyuse_nodes.py +++ b/py/defs/ext/easyuse_nodes.py @@ -4,7 +4,12 @@ from ..formatters import calc_model_hash, calc_lora_hash, convert_skip_clip import re def get_lora_model_name_stack(node_id, obj, prompt, extra_data, outputs, input_data): - return get_lora_data_stack(input_data, "lora_\d_name") + toggled_on = input_data[0]["toggle"][0] + + if toggled_on: + return get_lora_data_stack(input_data, "lora_\d_name") + else: + return [] def get_lora_model_hash_stack(node_id, obj, prompt, extra_data, outputs, input_data): From 242f700190809c2ded31a916baf32950d340321d Mon Sep 17 00:00:00 2001 From: NLJ Date: Sat, 4 Jan 2025 00:52:31 +0100 Subject: [PATCH 2/5] added easy preSampling --- py/defs/ext/easyuse_nodes.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/py/defs/ext/easyuse_nodes.py b/py/defs/ext/easyuse_nodes.py index 68fd944..3ef1b8d 100644 --- a/py/defs/ext/easyuse_nodes.py +++ b/py/defs/ext/easyuse_nodes.py @@ -52,6 +52,8 @@ SAMPLERS = { "positive": "positive", "negative": "negative", }, + "easy preSampling": { + }, } @@ -89,6 +91,13 @@ CAPTURE_FIELD_LIST = { MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, MetaField.SCHEDULER: {"field_name": "scheduler"}, }, + "easy preSampling": { + MetaField.SEED: {"field_name": "seed"}, + MetaField.STEPS: {"field_name": "steps"}, + MetaField.CFG: {"field_name": "cfg"}, + MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, + MetaField.SCHEDULER: {"field_name": "scheduler"}, + }, "easy loraStack": { MetaField.LORA_MODEL_NAME: {"selector": get_lora_model_name_stack}, MetaField.LORA_MODEL_HASH: {"selector": get_lora_model_hash_stack}, From ca91c8765c8069f018f2c36b6a281ad154797dbc Mon Sep 17 00:00:00 2001 From: NLJ Date: Thu, 27 Feb 2025 15:13:40 +0100 Subject: [PATCH 3/5] added presamplers --- py/defs/ext/easyuse_nodes.py | 74 ++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/py/defs/ext/easyuse_nodes.py b/py/defs/ext/easyuse_nodes.py index 3ef1b8d..aab5bfd 100644 --- a/py/defs/ext/easyuse_nodes.py +++ b/py/defs/ext/easyuse_nodes.py @@ -53,10 +53,35 @@ SAMPLERS = { "negative": "negative", }, "easy preSampling": { + }, + "easy preSamplingAdvanced": { + + }, + "easy preSamplingCascade": { + + }, + "easy preSamplingCustom": { + + }, + "easy preSamplingDynamicCFG": { + + }, + "easy preSamplingLayerDiffusion": { + + }, + "easy preSamplingNoiseIn": { + + }, + "easy preSamplingSdTurbo": { + + } } + + + CAPTURE_FIELD_LIST = { "easy fullLoader": { MetaField.MODEL_NAME: {"field_name": "ckpt_name"}, @@ -98,6 +123,55 @@ CAPTURE_FIELD_LIST = { MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, MetaField.SCHEDULER: {"field_name": "scheduler"}, }, + "easy preSamplingAdvanced": { + MetaField.SEED: {"field_name": "seed"}, + MetaField.STEPS: {"field_name": "steps"}, + MetaField.CFG: {"field_name": "cfg"}, + MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, + MetaField.SCHEDULER: {"field_name": "scheduler"}, + }, + "easy preSamplingCascade": { + MetaField.SEED: {"field_name": "seed"}, + MetaField.STEPS: {"field_name": "steps"}, + MetaField.CFG: {"field_name": "cfg"}, + MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, + MetaField.SCHEDULER: {"field_name": "scheduler"}, + }, + "easy preSamplingCustom": { + MetaField.SEED: {"field_name": "seed"}, + MetaField.STEPS: {"field_name": "steps"}, + MetaField.CFG: {"field_name": "cfg"}, + MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, + MetaField.SCHEDULER: {"field_name": "scheduler"}, + }, + "easy preSamplingDynamicCFG": { + MetaField.SEED: {"field_name": "seed"}, + MetaField.STEPS: {"field_name": "steps"}, + MetaField.CFG: {"field_name": "cfg"}, + MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, + MetaField.SCHEDULER: {"field_name": "scheduler"}, + }, + "easy preSamplingLayerDiffusion": { + MetaField.SEED: {"field_name": "seed"}, + MetaField.STEPS: {"field_name": "steps"}, + MetaField.CFG: {"field_name": "cfg"}, + MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, + MetaField.SCHEDULER: {"field_name": "scheduler"}, + }, + "easy preSamplingNoiseIn": { + MetaField.SEED: {"field_name": "seed"}, + MetaField.STEPS: {"field_name": "steps"}, + MetaField.CFG: {"field_name": "cfg"}, + MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, + MetaField.SCHEDULER: {"field_name": "scheduler"}, + }, + "easy preSamplingSdTurbo": { + MetaField.SEED: {"field_name": "seed"}, + MetaField.STEPS: {"field_name": "steps"}, + MetaField.CFG: {"field_name": "cfg"}, + MetaField.SAMPLER_NAME: {"field_name": "sampler_name"}, + MetaField.SCHEDULER: {"field_name": "scheduler"}, + }, "easy loraStack": { MetaField.LORA_MODEL_NAME: {"selector": get_lora_model_name_stack}, MetaField.LORA_MODEL_HASH: {"selector": get_lora_model_hash_stack}, From af2ffca6f295ec3b5c1edd0c09cc5b81ad0e4901 Mon Sep 17 00:00:00 2001 From: NLJ Date: Mon, 17 Mar 2025 23:08:04 +0100 Subject: [PATCH 4/5] add option to remove workflow in png --- py/nodes/node.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/py/nodes/node.py b/py/nodes/node.py index a00489a..e8c998d 100644 --- a/py/nodes/node.py +++ b/py/nodes/node.py @@ -53,6 +53,7 @@ class SaveImageWithMetaData(BaseNode): "add_counter_to_filename": ("BOOLEAN", {"default": True}), "civitai_sampler": ("BOOLEAN", {"default": False}), "extra_metadata": ("EXTRA_METADATA", {}), + "save_workflow_image": ("BOOLEAN", {"default": True}), }, "hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"}, } @@ -79,6 +80,7 @@ class SaveImageWithMetaData(BaseNode): extra_metadata={}, prompt=None, extra_pnginfo=None, + save_workflow_image=True, ): pnginfo_dict_src = self.gen_pnginfo( sampler_selection_method, sampler_selection_node_id, civitai_sampler @@ -109,7 +111,9 @@ class SaveImageWithMetaData(BaseNode): if extra_pnginfo is not None: for x in extra_pnginfo: metadata.add_text(x, json.dumps(extra_pnginfo[x])) - + if save_workflow_image == False: + metadata.add_text("workflow", "") + filename_prefix = self.format_filename(filename_prefix, pnginfo_dict) output_path = os.path.join(self.output_dir, filename_prefix) if not os.path.exists(os.path.dirname(output_path)): From 068cd3473140f02f8b85420e508d9d85c3586d54 Mon Sep 17 00:00:00 2001 From: NLJ Date: Mon, 17 Mar 2025 23:17:49 +0100 Subject: [PATCH 5/5] potato potato --- py/nodes/node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/nodes/node.py b/py/nodes/node.py index e8c998d..ae25116 100644 --- a/py/nodes/node.py +++ b/py/nodes/node.py @@ -106,7 +106,7 @@ class SaveImageWithMetaData(BaseNode): parameters = Capture.gen_parameters_str(pnginfo_dict) if pnginfo_dict: metadata.add_text("parameters", parameters) - if prompt is not None: + if prompt is not None and save_workflow_image: metadata.add_text("prompt", json.dumps(prompt)) if extra_pnginfo is not None: for x in extra_pnginfo: