The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Fix mistral 3 tokenizer code failing on latest transformers version and other breakage. (#12095)
comfyanonymous2129e7d27854
diff --git a/comfy/sd1_clip.py b/comfy/sd1_clip.pyindex c512ca5d0..d4f22120b 100644--- a/comfy/sd1_clip.py+++ b/comfy/sd1_clip.py@@ -466,7 +466,7 @@ def load_embed(embedding_name, embedding_directory, embedding_size, embed_key=Noreturn embed_outclass SDTokenizer:- def __init__(self, tokenizer_path=None, max_length=77, pad_with_end=True, embedding_directory=None, embedding_size=768, embedding_key='clip_l', tokenizer_class=CLIPTokenizer, has_start_token=True, has_end_token=True, pad_to_max_length=True, min_length=None, pad_token=None, end_token=None, min_padding=None, pad_left=False, disable_weights=False, tokenizer_data={}, tokenizer_args={}):+ def __init__(self, tokenizer_path=None, max_length=77, pad_with_end=True, embedding_directory=None, embedding_size=768, embedding_key='clip_l', tokenizer_class=CLIPTokenizer, has_start_token=True, has_end_token=True, pad_to_max_length=True, min_length=None, pad_token=None, end_token=None, start_token=None, min_padding=None, pad_left=False, disable_weights=False, tokenizer_data={}, tokenizer_args={}):if tokenizer_path is None:tokenizer_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "sd1_tokenizer")self.tokenizer = tokenizer_class.from_pretrained(tokenizer_path, **tokenizer_args)@@ -479,8 +479,15 @@ class SDTokenizer:empty = self.tokenizer('')["input_ids"]self.tokenizer_adds_end_token = has_end_tokenif has_start_token:- self.tokens_start = 1- self.start_token = empty[0]+ if len(empty) > 0:+ self.tokens_start = 1+ self.start_token = empty[0]+ else:+ self.tokens_start = 0+ self.start_token = start_token+ if start_token is None:+ logging.warning("WARNING: There's something wrong with your tokenizers.'")+if end_token is not None:self.end_token = end_tokenelse:@@ -488,7 +495,7 @@ class SDTokenizer:self.end_token = empty[1]else:self.tokens_start = 0- self.start_token = None+ self.start_token = start_tokenif end_token is not None:self.end_token = end_tokenelse:diff --git a/comfy/text_encoders/flux.py b/comfy/text_encoders/flux.pyindex 4075afca4..f67a5f805 100644--- a/comfy/text_encoders/flux.py+++ b/comfy/text_encoders/flux.py@@ -118,7 +118,7 @@ class MistralTokenizerClass:class Mistral3Tokenizer(sd1_clip.SDTokenizer):def __init__(self, embedding_directory=None, tokenizer_data={}):self.tekken_data = tokenizer_data.get("tekken_model", None)- super().__init__("", pad_with_end=False, embedding_size=5120, embedding_key='mistral3_24b', tokenizer_class=MistralTokenizerClass, has_end_token=False, pad_to_max_length=False, pad_token=11, max_length=99999999, min_length=1, pad_left=True, tokenizer_args=load_mistral_tokenizer(self.tekken_data), tokenizer_data=tokenizer_data)+ super().__init__("", pad_with_end=False, embedding_size=5120, embedding_key='mistral3_24b', tokenizer_class=MistralTokenizerClass, has_end_token=False, pad_to_max_length=False, pad_token=11, start_token=1, max_length=99999999, min_length=1, pad_left=True, tokenizer_args=load_mistral_tokenizer(self.tekken_data), tokenizer_data=tokenizer_data)def state_dict(self):return {"tekken_model": self.tekken_data}diff --git a/requirements.txt b/requirements.txtindex ec89dccd2..8d38c114b 100644--- a/requirements.txt+++ b/requirements.txt@@ -22,6 +22,7 @@ alembicSQLAlchemyav>=14.2.0comfy-kitchen>=0.2.7+requests#non essential dependencies:kornia>=0.7.1