Skip to content

Commit ec344b5

Browse files
authored
Separate out kwargs in processor (#30193)
* Separate out kwargs in processor * Fix up
1 parent fc8eda3 commit ec344b5

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/transformers/models/clip/processing_clip.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,21 @@ def __call__(self, text=None, images=None, return_tensors=None, **kwargs):
9292
`None`).
9393
- **pixel_values** -- Pixel values to be fed to a model. Returned when `images` is not `None`.
9494
"""
95+
tokenizer_kwargs, image_processor_kwargs = {}, {}
96+
if kwargs:
97+
tokenizer_kwargs = {k: v for k, v in kwargs.items() if k not in self.image_processor._valid_processor_keys}
98+
image_processor_kwargs = {
99+
k: v for k, v in kwargs.items() if k in self.image_processor._valid_processor_keys
100+
}
95101

96102
if text is None and images is None:
97103
raise ValueError("You have to specify either text or images. Both cannot be none.")
98104

99105
if text is not None:
100-
encoding = self.tokenizer(text, return_tensors=return_tensors, **kwargs)
106+
encoding = self.tokenizer(text, return_tensors=return_tensors, **tokenizer_kwargs)
101107

102108
if images is not None:
103-
image_features = self.image_processor(images, return_tensors=return_tensors, **kwargs)
109+
image_features = self.image_processor(images, return_tensors=return_tensors, **image_processor_kwargs)
104110

105111
if text is not None and images is not None:
106112
encoding["pixel_values"] = image_features.pixel_values

0 commit comments

Comments
 (0)