Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/transformers/processing_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1305,6 +1305,13 @@ class MyProcessingKwargs(ProcessingKwargs, CommonKwargs, TextKwargs, ImagesKwarg
# pass defaults to output dictionary
output_kwargs.update(default_kwargs)

# For `common_kwargs` just update all modality-specific kwargs with same key/values
common_kwargs = ModelProcessorKwargs._defaults.get("common_kwargs", {})
common_kwargs.update(kwargs.get("common_kwargs", {}))
if common_kwargs:
for kwarg in output_kwargs.values():
kwarg.update(common_kwargs)

# update modality kwargs with passed kwargs
non_modality_kwargs = set(kwargs) - set(output_kwargs)
for modality, output_kwarg in output_kwargs.items():
Expand Down Expand Up @@ -1354,13 +1361,6 @@ class MyProcessingKwargs(ProcessingKwargs, CommonKwargs, TextKwargs, ImagesKwarg
f"Keyword argument `{key}` is not a valid argument for this processor and will be ignored."
)

# For `common_kwargs` just update all modality-specific kwargs with same key/values
common_kwargs = kwargs.get("common_kwargs", {})
common_kwargs.update(ModelProcessorKwargs._defaults.get("common_kwargs", {}))
if common_kwargs:
for kwarg in output_kwargs.values():
kwarg.update(common_kwargs)

return output_kwargs

@classmethod
Expand Down