mirror of
https://github.com/idrirap/ComfyUI-Lora-Auto-Trigger-Words.git
synced 2026-03-21 21:22:12 -03:00
chore: CLIP is not optional in the LoraLoaderVanilla and LoraLoaderAdvanced
This commit is contained in:
@@ -14,7 +14,6 @@ class LoraLoaderVanilla:
|
|||||||
return {
|
return {
|
||||||
"required": {
|
"required": {
|
||||||
"model": ("MODEL",),
|
"model": ("MODEL",),
|
||||||
"clip": ("CLIP", ),
|
|
||||||
"lora_name": (LORA_LIST, ),
|
"lora_name": (LORA_LIST, ),
|
||||||
"strength_model": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01}),
|
"strength_model": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01}),
|
||||||
"strength_clip": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01}),
|
"strength_clip": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01}),
|
||||||
@@ -22,6 +21,7 @@ class LoraLoaderVanilla:
|
|||||||
"append_loraname_if_empty": ("BOOLEAN", {"default": False}),
|
"append_loraname_if_empty": ("BOOLEAN", {"default": False}),
|
||||||
},
|
},
|
||||||
"optional": {
|
"optional": {
|
||||||
|
"clip": ("CLIP", ),
|
||||||
"override_lora_name":("STRING", {"forceInput": True}),
|
"override_lora_name":("STRING", {"forceInput": True}),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -31,7 +31,7 @@ class LoraLoaderVanilla:
|
|||||||
FUNCTION = "load_lora"
|
FUNCTION = "load_lora"
|
||||||
CATEGORY = "autotrigger"
|
CATEGORY = "autotrigger"
|
||||||
|
|
||||||
def load_lora(self, model, clip, lora_name, strength_model, strength_clip, force_fetch, append_loraname_if_empty, override_lora_name=""):
|
def load_lora(self, model, lora_name, strength_model, strength_clip, force_fetch, append_loraname_if_empty, clip=None, override_lora_name=""):
|
||||||
if override_lora_name != "":
|
if override_lora_name != "":
|
||||||
lora_name = override_lora_name
|
lora_name = override_lora_name
|
||||||
meta_tags_list = sort_tags_by_frequency(get_metadata(lora_name, "loras"))
|
meta_tags_list = sort_tags_by_frequency(get_metadata(lora_name, "loras"))
|
||||||
@@ -109,7 +109,6 @@ class LoraLoaderAdvanced:
|
|||||||
return {
|
return {
|
||||||
"required": {
|
"required": {
|
||||||
"model": ("MODEL",),
|
"model": ("MODEL",),
|
||||||
"clip": ("CLIP", ),
|
|
||||||
"lora_name": (LORA_LIST, ),
|
"lora_name": (LORA_LIST, ),
|
||||||
"strength_model": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01}),
|
"strength_model": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01}),
|
||||||
"strength_clip": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01}),
|
"strength_clip": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01}),
|
||||||
@@ -118,6 +117,7 @@ class LoraLoaderAdvanced:
|
|||||||
"append_loraname_if_empty": ("BOOLEAN", {"default": False}),
|
"append_loraname_if_empty": ("BOOLEAN", {"default": False}),
|
||||||
},
|
},
|
||||||
"optional": {
|
"optional": {
|
||||||
|
"clip": ("CLIP", ),
|
||||||
"override_lora_name":("STRING", {"forceInput": True}),
|
"override_lora_name":("STRING", {"forceInput": True}),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,7 +127,7 @@ class LoraLoaderAdvanced:
|
|||||||
FUNCTION = "load_lora"
|
FUNCTION = "load_lora"
|
||||||
CATEGORY = "autotrigger"
|
CATEGORY = "autotrigger"
|
||||||
|
|
||||||
def load_lora(self, model, clip, lora_name, strength_model, strength_clip, force_fetch, enable_preview, append_loraname_if_empty, override_lora_name=""):
|
def load_lora(self, model, lora_name, strength_model, strength_clip, force_fetch, enable_preview, append_loraname_if_empty, clip=None, override_lora_name=""):
|
||||||
if override_lora_name != "":
|
if override_lora_name != "":
|
||||||
has_preview, prev = get_preview_path(override_lora_name, "loras")
|
has_preview, prev = get_preview_path(override_lora_name, "loras")
|
||||||
prev = f"loras/{prev}" if has_preview else None
|
prev = f"loras/{prev}" if has_preview else None
|
||||||
@@ -253,7 +253,6 @@ class LoraTagsOnly:
|
|||||||
|
|
||||||
return (civitai_tags_list, meta_tags_list)
|
return (civitai_tags_list, meta_tags_list)
|
||||||
|
|
||||||
|
|
||||||
# A dictionary that contains all nodes you want to export with their names
|
# A dictionary that contains all nodes you want to export with their names
|
||||||
# NOTE: names should be globally unique
|
# NOTE: names should be globally unique
|
||||||
NODE_CLASS_MAPPINGS = {
|
NODE_CLASS_MAPPINGS = {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "comfyui-lora-auto-trigger-words"
|
name = "comfyui-lora-auto-trigger-words"
|
||||||
description = "The aim of these custom nodes is to get an easy access to the tags used to trigger a lora / lycoris. Extract the tags from civitai or from the safetensors metadatas when available."
|
description = "The aim of these custom nodes is to get an easy access to the tags used to trigger a lora / lycoris. Extract the tags from civitai or from the safetensors metadatas when available."
|
||||||
version = "1.0.2"
|
version = "1.0.3"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
|
|||||||
Reference in New Issue
Block a user