alphard/ComfyUI-Lora-Auto-Trigger-Words
1
0
Fork 0
mirror of https://github.com/idrirap/ComfyUI-Lora-Auto-Trigger-Words.git synced 2026-03-21 21:22:12 -03:00
Code Issues Packages Projects Releases Wiki Activity

fix: now can use the output lora_name as an input for override_lora_name

Browse Source
This commit is contained in:
Dijkstra
2024-04-09 18:11:46 +02:00
parent 96a69f7cbe
commit 2bd6769b78
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nodes_autotrigger.py
View File

@@ -56,7 +56,7 @@ class LoraLoaderVanilla:
model_lora, clip_lora = load_lora_for_models(model, clip, lora, strength_model, strength_clip) model_lora, clip_lora = load_lora_for_models(model, clip, lora, strength_model, strength_clip)
return (model_lora, clip_lora, civitai_tags_list, meta_tags_list, get_lora_name_from_lora_path(lora_name)) return (model_lora, clip_lora, civitai_tags_list, meta_tags_list, lora_name)
class LoraLoaderStackedVanilla: class LoraLoaderStackedVanilla:
@classmethod @classmethod
@@ -96,7 +96,7 @@ class LoraLoaderStackedVanilla:
if lora_stack is not None: if lora_stack is not None:
loras.extend(lora_stack) loras.extend(lora_stack)
return (civitai_tags_list, meta_tags_list, loras, get_lora_name_from_lora_path(lora_name)) return (civitai_tags_list, meta_tags_list, loras, lora_name)
class LoraLoaderAdvanced: class LoraLoaderAdvanced:
def __init__(self): def __init__(self):
@@ -162,10 +162,10 @@ class LoraLoaderAdvanced:
"subfolder": "lora_preview", "subfolder": "lora_preview",
"type": "temp" "type": "temp"
} }
return {"ui": {"images": [preview_output]}, "result": (model_lora, clip_lora, civitai_tags_list, meta_tags_list, get_lora_name_from_lora_path(lora_name["content"]))} return {"ui": {"images": [preview_output]}, "result": (model_lora, clip_lora, civitai_tags_list, meta_tags_list, lora_name["content"])}
return (model_lora, clip_lora, civitai_tags_list, meta_tags_list, get_lora_name_from_lora_path(lora_name["content"])) return (model_lora, clip_lora, civitai_tags_list, meta_tags_list, lora_name["content"])
class LoraLoaderStackedAdvanced: class LoraLoaderStackedAdvanced:
@classmethod @classmethod
@@ -218,9 +218,9 @@ class LoraLoaderStackedAdvanced:
"subfolder": "lora_preview", "subfolder": "lora_preview",
"type": "temp" "type": "temp"
} }
return {"ui": {"images": [preview_output]}, "result": (civitai_tags_list, meta_tags_list, loras, get_lora_name_from_lora_path(lora_name["content"]))} return {"ui": {"images": [preview_output]}, "result": (civitai_tags_list, meta_tags_list, loras, lora_name["content"])}
return {"result": (civitai_tags_list, meta_tags_list, loras, get_lora_name_from_lora_path(lora_name["content"]))} return {"result": (civitai_tags_list, meta_tags_list, loras, lora_name["content"])}
class LoraTagsOnly: class LoraTagsOnly:
@classmethod @classmethod

8
utils.py
View File

@@ -217,10 +217,8 @@ def parse_selector(selector, tags_list):
def append_lora_name_if_empty(tags_list, lora_path, enabled): def append_lora_name_if_empty(tags_list, lora_path, enabled):
if not enabled or len(tags_list) > 0: if not enabled or len(tags_list) > 0:
return tags_list return tags_list
tags_list.append(get_lora_name_from_lora_path(lora_path))
return tags_list
def get_lora_name_from_lora_path(lora_path):
filename = os.path.splitext(lora_path)[0] filename = os.path.splitext(lora_path)[0]
filename = os.path.basename(filename) filename = os.path.basename(filename)
return filename
tags_list.append(filename)
return tags_list