wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-07-10 00:17:16 +08:00
Code Issues Actions 37 Packages Projects Releases Wiki Activity

Merge 7605b998a4 into a3020f107e

Browse Source
This commit is contained in:
Silver 2026-07-07 15:25:17 +02:00 committed by GitHub
commit 90dfc7da3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
comfy/sd1_clip.py
View File

@ -540,6 +540,14 @@ class SDTokenizer:
self.disable_weights = disable_weights self.disable_weights = disable_weights
@property
def embedding_identifiers(self):
identifiers = [self.embedding_identifier]
for item in ["EMB:", "TE:"]:
if item not in identifiers:
identifiers.append(item)
return identifiers
def _try_get_embedding(self, embedding_name:str): def _try_get_embedding(self, embedding_name:str):
''' '''
Takes a potential embedding name and tries to retrieve it. Takes a potential embedding name and tries to retrieve it.
@ -591,16 +599,24 @@ class SDTokenizer:
tokens = [] tokens = []
for weighted_segment, weight in parsed_weights: for weighted_segment, weight in parsed_weights:
to_tokenize = unescape_important(weighted_segment) to_tokenize = unescape_important(weighted_segment)
split = re.split(r'(?<=\s){}'.format(re.escape(self.embedding_identifier)), to_tokenize) pattern = r'(?<=\s)({})'.format('|'.join(map(re.escape, self.embedding_identifiers)))
split = re.split(pattern, to_tokenize)
to_tokenize = [split[0]] to_tokenize = [split[0]]
for i in range(1, len(split)): for i in range(1, len(split), 2):
to_tokenize.append("{}{}".format(self.embedding_identifier, split[i])) if i + 1 < len(split):
to_tokenize.append("{}{}".format(split[i], split[i+1]))
to_tokenize = [x for x in to_tokenize if x != ""] to_tokenize = [x for x in to_tokenize if x != ""]
for word in to_tokenize: for word in to_tokenize:
# if we find an embedding, deal with the embedding # if we find an embedding, deal with the embedding
if word.startswith(self.embedding_identifier) and self.embedding_directory is not None: matched_id = None
embedding_name = word[len(self.embedding_identifier):].strip('\n') for identifier in self.embedding_identifiers:
if word.startswith(identifier):
matched_id = identifier
break
if matched_id is not None and self.embedding_directory is not None:
embedding_name = word[len(matched_id):].strip('\n')
embed, embedding_name, leftover = self._try_get_embedding(embedding_name) embed, embedding_name, leftover = self._try_get_embedding(embedding_name)
if embed is None: if embed is None:
logging.warning(f"warning, embedding:{embedding_name} does not exist, ignoring") logging.warning(f"warning, embedding:{embedding_name} does not exist, ignoring")