Skip to content

Commit 21b10d9

Browse files
authored
Fix from_args_and_dict ProcessorMixin (#38296)
* fix-from-args-and-dict-processormixin * change used_kwargs to valid_kwargs * remove manual valid_kwargs * fix copies * fix modular aria
1 parent f844733 commit 21b10d9

37 files changed

+39
-181
lines changed

src/transformers/models/aria/modular_aria.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,6 @@ class AriaProcessor(ProcessorMixin):
936936
"""
937937

938938
attributes = ["image_processor", "tokenizer"]
939-
valid_kwargs = ["chat_template", "size_conversion"]
940939
image_processor_class = "AriaImageProcessor"
941940
tokenizer_class = "AutoTokenizer"
942941

src/transformers/models/aria/processing_aria.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ class AriaProcessor(ProcessorMixin):
6060
"""
6161

6262
attributes = ["image_processor", "tokenizer"]
63-
valid_kwargs = ["chat_template", "size_conversion"]
6463
image_processor_class = "AriaImageProcessor"
6564
tokenizer_class = "AutoTokenizer"
6665

src/transformers/models/aya_vision/processing_aya_vision.py

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,8 @@
1818
import numpy as np
1919

2020
from ...image_processing_utils import BatchFeature
21-
from ...image_utils import (
22-
ImageInput,
23-
make_flat_list_of_images,
24-
)
25-
from ...processing_utils import (
26-
ImagesKwargs,
27-
MultiModalData,
28-
ProcessingKwargs,
29-
ProcessorMixin,
30-
Unpack,
31-
)
21+
from ...image_utils import ImageInput, make_flat_list_of_images
22+
from ...processing_utils import ImagesKwargs, MultiModalData, ProcessingKwargs, ProcessorMixin, Unpack
3223
from ...tokenization_utils_base import PreTokenizedInput, TextInput
3324

3425

@@ -87,19 +78,6 @@ class AyaVisionProcessor(ProcessorMixin):
8778
"""
8879

8980
attributes = ["image_processor", "tokenizer"]
90-
valid_kwargs = [
91-
"chat_template",
92-
"image_token",
93-
"patch_size",
94-
"img_size",
95-
"downsample_factor",
96-
"start_of_img_token",
97-
"end_of_img_token",
98-
"img_patch_token",
99-
"img_line_break_token",
100-
"tile_token",
101-
"tile_global_token",
102-
]
10381
image_processor_class = "AutoImageProcessor"
10482
tokenizer_class = "AutoTokenizer"
10583

src/transformers/models/blip/processing_blip.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ class BlipProcessor(ProcessorMixin):
5555
"""
5656

5757
attributes = ["image_processor", "tokenizer"]
58-
valid_kwargs = []
5958
image_processor_class = ("BlipImageProcessor", "BlipImageProcessorFast")
6059
tokenizer_class = ("BertTokenizer", "BertTokenizerFast")
6160

src/transformers/models/blip_2/processing_blip_2.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@
2121
from ...image_processing_utils import BatchFeature
2222
from ...image_utils import ImageInput
2323
from ...processing_utils import ProcessingKwargs, ProcessorMixin, Unpack
24-
from ...tokenization_utils_base import (
25-
AddedToken,
26-
BatchEncoding,
27-
PreTokenizedInput,
28-
TextInput,
29-
)
24+
from ...tokenization_utils_base import AddedToken, BatchEncoding, PreTokenizedInput, TextInput
3025
from ...utils import logging
3126

3227

@@ -67,7 +62,6 @@ class Blip2Processor(ProcessorMixin):
6762
"""
6863

6964
attributes = ["image_processor", "tokenizer"]
70-
valid_kwargs = ["num_query_tokens"]
7165
image_processor_class = ("BlipImageProcessor", "BlipImageProcessorFast")
7266
tokenizer_class = "AutoTokenizer"
7367

src/transformers/models/chameleon/processing_chameleon.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ class ChameleonProcessor(ProcessorMixin):
7272

7373
attributes = ["image_processor", "tokenizer"]
7474
tokenizer_class = ("LlamaTokenizer", "LlamaTokenizerFast")
75-
valid_kwargs = ["image_seq_length", "image_token"]
7675
image_processor_class = "ChameleonImageProcessor"
7776

7877
def __init__(self, image_processor, tokenizer, image_seq_length: int = 1024, image_token: str = "<image>"):

src/transformers/models/colpali/processing_colpali.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ class ColPaliProcessor(ProcessorMixin):
9090
"""
9191

9292
attributes = ["image_processor", "tokenizer"]
93-
valid_kwargs = ["chat_template"]
9493
image_processor_class = ("SiglipImageProcessor", "SiglipImageProcessorFast")
9594
tokenizer_class = ("GemmaTokenizer", "GemmaTokenizerFast")
9695

src/transformers/models/csm/processing_csm.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@
3131
from ...audio_utils import AudioInput, make_list_of_audio
3232
from ...feature_extraction_utils import BatchFeature
3333
from ...processing_utils import AudioKwargs, ProcessingKwargs, ProcessorMixin, Unpack
34-
from ...tokenization_utils_base import (
35-
PreTokenizedInput,
36-
TextInput,
37-
)
34+
from ...tokenization_utils_base import PreTokenizedInput, TextInput
3835

3936

4037
class CsmAudioKwargs(AudioKwargs, total=False):
@@ -99,7 +96,6 @@ class CsmProcessor(ProcessorMixin):
9996
"""
10097

10198
attributes = ["feature_extractor", "tokenizer"]
102-
valid_kwargs = ["chat_template"]
10399
feature_extractor_class = "EncodecFeatureExtractor"
104100
tokenizer_class = "PreTrainedTokenizerFast"
105101

src/transformers/models/emu3/processing_emu3.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class Emu3Processor(ProcessorMixin):
7171
"""
7272

7373
attributes = ["image_processor", "tokenizer"]
74-
valid_kwargs = ["chat_template"]
7574
tokenizer_class = ("GPT2Tokenizer", "GPT2TokenizerFast")
7675
image_processor_class = "Emu3ImageProcessor"
7776

src/transformers/models/fuyu/processing_fuyu.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ class FuyuProcessor(ProcessorMixin):
350350
"""
351351

352352
attributes = ["image_processor", "tokenizer"]
353-
valid_kwargs = []
354353
image_processor_class = "FuyuImageProcessor"
355354
tokenizer_class = "AutoTokenizer"
356355

src/transformers/models/gemma3/processing_gemma3.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class Gemma3ProcessorKwargs(ProcessingKwargs, total=False):
5151

5252
class Gemma3Processor(ProcessorMixin):
5353
attributes = ["image_processor", "tokenizer"]
54-
valid_kwargs = ["chat_template", "image_seq_length"]
5554
image_processor_class = "AutoImageProcessor"
5655
tokenizer_class = "AutoTokenizer"
5756

src/transformers/models/got_ocr2/processing_got_ocr2.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ class GotOcr2Processor(ProcessorMixin):
9595
"""
9696

9797
attributes = ["image_processor", "tokenizer"]
98-
valid_kwargs = ["chat_template"]
9998
image_processor_class = "AutoImageProcessor"
10099
tokenizer_class = "PreTrainedTokenizerFast"
101100

src/transformers/models/granite_speech/processing_granite_speech.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131

3232
class GraniteSpeechProcessor(ProcessorMixin):
3333
attributes = ["audio_processor", "tokenizer"]
34-
valid_kwargs = ["audio_token"]
35-
3634
audio_processor_class = "GraniteSpeechFeatureExtractor"
3735
tokenizer_class = "AutoTokenizer"
3836

src/transformers/models/idefics/processing_idefics.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ class IdeficsProcessor(ProcessorMixin):
211211
"""
212212

213213
attributes = ["image_processor", "tokenizer"]
214-
valid_kwargs = ["image_size", "add_end_of_utterance_token"]
215214
image_processor_class = "IdeficsImageProcessor"
216215
tokenizer_class = "LlamaTokenizerFast"
217216

src/transformers/models/idefics2/processing_idefics2.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class Idefics2Processor(ProcessorMixin):
8585
"""
8686

8787
attributes = ["image_processor", "tokenizer"]
88-
valid_kwargs = ["image_seq_len", "chat_template"]
8988
image_processor_class = "Idefics2ImageProcessor"
9089
tokenizer_class = "AutoTokenizer"
9190

src/transformers/models/idefics3/processing_idefics3.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ class Idefics3Processor(ProcessorMixin):
133133
"""
134134

135135
attributes = ["image_processor", "tokenizer"]
136-
valid_kwargs = ["image_seq_len", "chat_template"]
137136
image_processor_class = "Idefics3ImageProcessor"
138137
tokenizer_class = "AutoTokenizer"
139138

src/transformers/models/instructblip/processing_instructblip.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@
2222
from ...image_processing_utils import BatchFeature
2323
from ...image_utils import ImageInput
2424
from ...processing_utils import ProcessingKwargs, ProcessorMixin, Unpack
25-
from ...tokenization_utils_base import (
26-
AddedToken,
27-
BatchEncoding,
28-
PreTokenizedInput,
29-
TextInput,
30-
)
25+
from ...tokenization_utils_base import AddedToken, BatchEncoding, PreTokenizedInput, TextInput
3126
from ...utils import logging
3227
from ..auto import AutoTokenizer
3328

@@ -72,7 +67,6 @@ class InstructBlipProcessor(ProcessorMixin):
7267
"""
7368

7469
attributes = ["image_processor", "tokenizer", "qformer_tokenizer"]
75-
valid_kwargs = ["num_query_tokens"]
7670
image_processor_class = ("BlipImageProcessor", "BlipImageProcessorFast")
7771
tokenizer_class = "AutoTokenizer"
7872
qformer_tokenizer_class = "AutoTokenizer"

src/transformers/models/instructblipvideo/processing_instructblipvideo.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class InstructBlipVideoProcessor(ProcessorMixin):
5757
"""
5858

5959
attributes = ["video_processor", "tokenizer", "qformer_tokenizer"]
60-
valid_kwargs = ["num_query_tokens"]
6160
video_processor_class = "AutoVideoProcessor"
6261
tokenizer_class = "AutoTokenizer"
6362
qformer_tokenizer_class = "AutoTokenizer"

src/transformers/models/internvl/processing_internvl.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,8 @@
1818
import numpy as np
1919

2020
from ...image_processing_utils import BatchFeature
21-
from ...image_utils import (
22-
ImageInput,
23-
concatenate_list,
24-
make_flat_list_of_images,
25-
)
26-
from ...processing_utils import (
27-
ImagesKwargs,
28-
MultiModalData,
29-
ProcessingKwargs,
30-
ProcessorMixin,
31-
Unpack,
32-
)
21+
from ...image_utils import ImageInput, concatenate_list, make_flat_list_of_images
22+
from ...processing_utils import ImagesKwargs, MultiModalData, ProcessingKwargs, ProcessorMixin, Unpack
3323
from ...tokenization_utils_base import PreTokenizedInput, TextInput
3424
from ...video_utils import VideoInput, VideoMetadata, load_video, make_batched_videos
3525

@@ -74,10 +64,6 @@ class InternVLProcessor(ProcessorMixin):
7464
"""
7565

7666
attributes = ["image_processor", "tokenizer", "video_processor"]
77-
valid_kwargs = [
78-
"chat_template",
79-
"image_seq_length",
80-
]
8167
image_processor_class = "AutoImageProcessor"
8268
video_processor_class = "AutoVideoProcessor"
8369
tokenizer_class = "AutoTokenizer"

src/transformers/models/janus/processing_janus.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
from ...feature_extraction_utils import BatchFeature
2222
from ...image_utils import ImageInput
2323
from ...processing_utils import ProcessingKwargs, ProcessorMixin, TextKwargs, Unpack
24-
from ...tokenization_utils_base import (
25-
PreTokenizedInput,
26-
TextInput,
27-
)
24+
from ...tokenization_utils_base import PreTokenizedInput, TextInput
2825
from ...utils import logging
2926

3027

@@ -68,7 +65,6 @@ class JanusProcessor(ProcessorMixin):
6865
"""
6966

7067
attributes = ["image_processor", "tokenizer"]
71-
valid_kwargs = ["chat_template", "use_default_system_prompt"]
7268
image_processor_class = "JanusImageProcessor"
7369
tokenizer_class = "LlamaTokenizerFast"
7470

src/transformers/models/kosmos2/processing_kosmos2.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ class Kosmos2Processor(ProcessorMixin):
8484
"""
8585

8686
attributes = ["image_processor", "tokenizer"]
87-
valid_kwargs = ["num_patch_index_tokens"]
8887
image_processor_class = ("CLIPImageProcessor", "CLIPImageProcessorFast")
8988
tokenizer_class = "AutoTokenizer"
9089

src/transformers/models/llama4/processing_llama4.py

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,11 @@
1616

1717
from typing import List, Optional, Union
1818

19-
from transformers.processing_utils import (
20-
ImagesKwargs,
21-
ProcessingKwargs,
22-
ProcessorMixin,
23-
Unpack,
24-
)
19+
from transformers.processing_utils import ImagesKwargs, ProcessingKwargs, ProcessorMixin, Unpack
2520
from transformers.tokenization_utils_base import PreTokenizedInput, TextInput
2621

2722
from ...image_processing_utils import BatchFeature
28-
from ...image_utils import (
29-
ImageInput,
30-
make_flat_list_of_images,
31-
)
23+
from ...image_utils import ImageInput, make_flat_list_of_images
3224

3325

3426
class Llama4ImagesKwargs(ImagesKwargs, total=False):
@@ -83,19 +75,6 @@ class Llama4Processor(ProcessorMixin):
8375
"""
8476

8577
attributes = ["image_processor", "tokenizer"]
86-
valid_kwargs = [
87-
"chat_template",
88-
"image_token",
89-
"patch_size",
90-
"img_size",
91-
"downsample_factor",
92-
"start_of_img_token",
93-
"end_of_img_token",
94-
"img_patch_token",
95-
"img_line_break_token",
96-
"tile_token",
97-
"tile_global_token",
98-
]
9978
image_processor_class = "AutoImageProcessor"
10079
tokenizer_class = "AutoTokenizer"
10180

src/transformers/models/llava/processing_llava.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,6 @@ class LlavaProcessor(ProcessorMixin):
7070
"""
7171

7272
attributes = ["image_processor", "tokenizer"]
73-
valid_kwargs = [
74-
"chat_template",
75-
"patch_size",
76-
"vision_feature_select_strategy",
77-
"image_token",
78-
"num_additional_image_tokens",
79-
]
8073
image_processor_class = "AutoImageProcessor"
8174
tokenizer_class = "AutoTokenizer"
8275

src/transformers/models/llava_next/processing_llava_next.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@ class LlavaNextProcessor(ProcessorMixin):
7676
"""
7777

7878
attributes = ["image_processor", "tokenizer"]
79-
valid_kwargs = [
80-
"chat_template",
81-
"patch_size",
82-
"vision_feature_select_strategy",
83-
"image_token",
84-
"num_additional_image_tokens",
85-
]
8679
image_processor_class = "AutoImageProcessor"
8780
tokenizer_class = "AutoTokenizer"
8881

src/transformers/models/llava_next_video/processing_llava_next_video.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ class LlavaNextVideoProcessor(ProcessorMixin):
7878
# video and image processor share same args, but have different processing logic
7979
# only image processor config is saved in the hub
8080
attributes = ["video_processor", "image_processor", "tokenizer"]
81-
valid_kwargs = [
82-
"chat_template",
83-
"patch_size",
84-
"vision_feature_select_strategy",
85-
"image_token",
86-
"video_token",
87-
"num_additional_image_tokens",
88-
]
8981
image_processor_class = ("LlavaNextImageProcessor", "LlavaNextImageProcessorFast")
9082
video_processor_class = "AutoVideoProcessor"
9183
tokenizer_class = ("LlamaTokenizer", "LlamaTokenizerFast")

src/transformers/models/llava_onevision/processing_llava_onevision.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,6 @@ class LlavaOnevisionProcessor(ProcessorMixin):
7575
"""
7676

7777
attributes = ["image_processor", "tokenizer", "video_processor"]
78-
valid_kwargs = [
79-
"chat_template",
80-
"num_image_tokens",
81-
"vision_feature_select_strategy",
82-
"image_token",
83-
"video_token",
84-
"vision_aspect_ratio",
85-
]
8678
image_processor_class = "AutoImageProcessor"
8779
tokenizer_class = "AutoTokenizer"
8880
video_processor_class = "AutoVideoProcessor"

src/transformers/models/mllama/processing_mllama.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
from ...feature_extraction_utils import BatchFeature
2323
from ...image_utils import ImageInput, make_nested_list_of_images
2424
from ...processing_utils import ImagesKwargs, ProcessingKwargs, ProcessorMixin, Unpack
25-
from ...tokenization_utils_base import (
26-
PreTokenizedInput,
27-
TextInput,
28-
)
25+
from ...tokenization_utils_base import PreTokenizedInput, TextInput
2926

3027

3128
class MllamaImagesKwargs(ImagesKwargs, total=False):
@@ -208,7 +205,6 @@ class MllamaProcessor(ProcessorMixin):
208205
"""
209206

210207
attributes = ["image_processor", "tokenizer"]
211-
valid_kwargs = ["chat_template"]
212208
image_processor_class = "MllamaImageProcessor"
213209
tokenizer_class = "PreTrainedTokenizerFast"
214210

0 commit comments

Comments
 (0)