chore: CLIP is not optional in the LoraLoaderVanilla and LoraLoaderAdvanced

This commit is contained in:
Dijkstra
2024-10-31 19:49:13 +01:00
parent 6484968fbe
commit c85b302a61
2 changed files with 5 additions and 6 deletions

View File

@@ -14,7 +14,6 @@ class LoraLoaderVanilla:
return {
"required": {
"model": ("MODEL",),
"clip": ("CLIP", ),
"lora_name": (LORA_LIST, ),
"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}),
@@ -22,6 +21,7 @@ class LoraLoaderVanilla:
"append_loraname_if_empty": ("BOOLEAN", {"default": False}),
},
"optional": {
"clip": ("CLIP", ),
"override_lora_name":("STRING", {"forceInput": True}),
}
}
@@ -31,7 +31,7 @@ class LoraLoaderVanilla:
FUNCTION = "load_lora"
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 != "":
lora_name = override_lora_name
meta_tags_list = sort_tags_by_frequency(get_metadata(lora_name, "loras"))
@@ -109,7 +109,6 @@ class LoraLoaderAdvanced:
return {
"required": {
"model": ("MODEL",),
"clip": ("CLIP", ),
"lora_name": (LORA_LIST, ),
"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}),
@@ -118,6 +117,7 @@ class LoraLoaderAdvanced:
"append_loraname_if_empty": ("BOOLEAN", {"default": False}),
},
"optional": {
"clip": ("CLIP", ),
"override_lora_name":("STRING", {"forceInput": True}),
}
}
@@ -127,7 +127,7 @@ class LoraLoaderAdvanced:
FUNCTION = "load_lora"
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 != "":
has_preview, prev = get_preview_path(override_lora_name, "loras")
prev = f"loras/{prev}" if has_preview else None
@@ -253,7 +253,6 @@ class LoraTagsOnly:
return (civitai_tags_list, meta_tags_list)
# A dictionary that contains all nodes you want to export with their names
# NOTE: names should be globally unique
NODE_CLASS_MAPPINGS = {