298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-03-12 22:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

It's more logical for the StyleModelApply to append it directly.

Browse Source
This commit is contained in:
comfyanonymous 2023-03-06 01:48:18 -05:00
parent 7ec1dd25a2
commit 8515d96328
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nodes.py
View File

@ -425,33 +425,20 @@ class StyleModelLoader:
class StyleModelApply: class StyleModelApply:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": {"clip_vision_output": ("CLIP_VISION_OUTPUT", ), return {"required": {"conditioning": ("CONDITIONING", ),
"style_model": ("STYLE_MODEL", ) "style_model": ("STYLE_MODEL", ),
"clip_vision_output": ("CLIP_VISION_OUTPUT", ),
}} }}
RETURN_TYPES = ("CONDITIONING",) RETURN_TYPES = ("CONDITIONING",)
FUNCTION = "apply_stylemodel" FUNCTION = "apply_stylemodel"
CATEGORY = "conditioning/style_model" CATEGORY = "conditioning/style_model"
def apply_stylemodel(self, clip_vision_output, style_model): def apply_stylemodel(self, clip_vision_output, style_model, conditioning):
c = style_model.get_cond(clip_vision_output) cond = style_model.get_cond(clip_vision_output)
return ([[c, {}]], )
class ConditioningAppend:
@classmethod
def INPUT_TYPES(s):
return {"required": {"conditioning_to": ("CONDITIONING", ), "conditioning_from": ("CONDITIONING", )}}
RETURN_TYPES = ("CONDITIONING",)
FUNCTION = "append"
CATEGORY = "conditioning/style_model"
def append(self, conditioning_to, conditioning_from):
c = [] c = []
to_append = conditioning_from[0][0] for t in conditioning:
for t in conditioning_to: n = [torch.cat((t[0], cond), dim=1), t[1].copy()]
n = [torch.cat((t[0],to_append), dim=1), t[1].copy()]
c.append(n) c.append(n)
return (c, ) return (c, )
@ -952,8 +939,7 @@ NODE_CLASS_MAPPINGS = {
"LoraLoader": LoraLoader, "LoraLoader": LoraLoader,
"CLIPLoader": CLIPLoader, "CLIPLoader": CLIPLoader,
"CLIPVisionEncode": CLIPVisionEncode, "CLIPVisionEncode": CLIPVisionEncode,
"StyleModelApply":StyleModelApply, "StyleModelApply": StyleModelApply,
"ConditioningAppend":ConditioningAppend,
"ControlNetApply": ControlNetApply, "ControlNetApply": ControlNetApply,
"ControlNetLoader": ControlNetLoader, "ControlNetLoader": ControlNetLoader,
"DiffControlNetLoader": DiffControlNetLoader, "DiffControlNetLoader": DiffControlNetLoader,