From fa0e8c34e874e47aa731bef79ac8ded5bacdc923 Mon Sep 17 00:00:00 2001 From: yolain Date: Thu, 18 Jul 2024 15:24:50 +0800 Subject: [PATCH] Fix sd3 clip load failed in latest comfyui revision --- py/libs/adv_encode.py | 9 ++++++--- py/libs/loader.py | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/py/libs/adv_encode.py b/py/libs/adv_encode.py index 66031fd..acbcce5 100644 --- a/py/libs/adv_encode.py +++ b/py/libs/adv_encode.py @@ -6,10 +6,13 @@ import itertools from comfy import model_management from comfy.sdxl_clip import SDXLClipModel, SDXLRefinerClipModel, SDXLClipG try: - from comfy.sd3_clip import SD3ClipModel, T5XXLModel + from comfy.text_encoders.sd3_clip import SD3ClipModel, T5XXLModel except: - SD3ClipModel, T5XXLModel = None, None - pass + try: + from comfy.sd3_clip import SD3ClipModel, T5XXLModel + except: + SD3ClipModel, T5XXLModel = None, None + pass from nodes import NODE_CLASS_MAPPINGS, ConditioningConcat, ConditioningZeroOut, ConditioningSetTimestepRange, ConditioningCombine def _grouper(n, iterable): diff --git a/py/libs/loader.py b/py/libs/loader.py index bd2b195..250e7ca 100644 --- a/py/libs/loader.py +++ b/py/libs/loader.py @@ -581,7 +581,10 @@ class easyLoader: return model def load_t5_from_sd3_clip(self, sd3_clip, padding): - from comfy.sd3_clip import SD3Tokenizer, SD3ClipModel + try: + from comfy.text_encoders.sd3_clip import SD3Tokenizer, SD3ClipModel + except: + from comfy.sd3_clip import SD3Tokenizer, SD3ClipModel import copy clip = sd3_clip.clone()