diff --git a/tests/transformers_utils/processors/test_pixtral.py b/tests/transformers_utils/processors/test_pixtral.py new file mode 100644 index 0000000000..333308868e --- /dev/null +++ b/tests/transformers_utils/processors/test_pixtral.py @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: Apache-2.0 +# SPDX-FileCopyrightText: Copyright contributors to the vLLM project +import pytest +import transformers.image_utils +from PIL import Image + +from vllm.transformers_utils.processors.pixtral import MistralCommonImageProcessor + + +@pytest.fixture(scope="module") +def image_processor() -> MistralCommonImageProcessor: + return MistralCommonImageProcessor(mm_encoder=None) + + +def test_fetch_images_passes_through_decoded_image( + image_processor: MistralCommonImageProcessor, +): + image = Image.new("RGB", (4, 4)) + result = image_processor.fetch_images(image) + assert result is image + + +def test_fetch_images_recurses_over_list( + image_processor: MistralCommonImageProcessor, +): + a = Image.new("RGB", (4, 4)) + b = Image.new("RGB", (8, 8)) + result = image_processor.fetch_images([a, b]) + assert isinstance(result, list) + assert len(result) == 2 + assert result[0] is a + assert result[1] is b + + +def test_fetch_images_recurses_over_nested_list( + image_processor: MistralCommonImageProcessor, +): + a = Image.new("RGB", (4, 4)) + b = Image.new("RGB", (8, 8)) + result = image_processor.fetch_images([[a], [b]]) + assert result == [[a], [b]] + + +def test_fetch_images_str_delegates_to_load_image( + monkeypatch, image_processor: MistralCommonImageProcessor +): + sentinel = Image.new("RGB", (2, 2)) + received: dict[str, object] = {} + + def fake_load_image(path): + received["path"] = path + return sentinel + + monkeypatch.setattr(transformers.image_utils, "load_image", fake_load_image) + + result = image_processor.fetch_images("/tmp/fake.png") + assert result is sentinel + assert received["path"] == "/tmp/fake.png" + + +def test_fetch_images_rejects_unsupported_type( + image_processor: MistralCommonImageProcessor, +): + with pytest.raises(TypeError, match="only a single or a list"): + image_processor.fetch_images(42) diff --git a/vllm/transformers_utils/processors/pixtral.py b/vllm/transformers_utils/processors/pixtral.py index 67f0dd4b07..c03360a2a5 100644 --- a/vllm/transformers_utils/processors/pixtral.py +++ b/vllm/transformers_utils/processors/pixtral.py @@ -46,6 +46,22 @@ class MistralCommonImageProcessor: ncols, nrows = self.mm_encoder._image_to_num_tokens(image) return ncols * nrows, nrows, ncols + # Copied from Transformers (Apache-2.0): + # https://github.com/huggingface/transformers/blob/d20946079fd422335fbae3eeb98b7cd88334612f/src/transformers/image_processing_base.py#L473 + def fetch_images(self, image_url_or_urls): + from transformers.image_utils import is_valid_image, load_image + + if isinstance(image_url_or_urls, (list, tuple)): + return [self.fetch_images(x) for x in image_url_or_urls] + if isinstance(image_url_or_urls, str): + return load_image(image_url_or_urls) + if is_valid_image(image_url_or_urls): + return image_url_or_urls + raise TypeError( + "only a single or a list of entries is supported but got " + f"type={type(image_url_or_urls)}" + ) + class MistralCommonPixtralProcessor(ProcessorMixin): attributes = ["image_processor", "tokenizer"]