Update Optional[x] -> x | None and Union[x, y] to x | y (#26633)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>

tests/models/multimodal/processing/test_common.py

@@ -2,7 +2,6 @@
 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project
 
 from functools import partial
-from typing import Optional, Union
 
 import numpy as np
 import pytest
@@ -247,7 +246,7 @@ MM_DATA_PATCHES = {
 def _test_processing_correctness_one(
     model_config: ModelConfig,
     tokenizer: AnyTokenizer,
-    prompt: Union[str, list[int]],
+    prompt: str | list[int],
     mm_data: MultiModalDataDict,
     baseline_processor: BaseMultiModalProcessor,
     cached_processor: BaseMultiModalProcessor,
@@ -441,7 +440,7 @@ def _assert_inputs_equal(
     a: MultiModalInputs,
     b: MultiModalInputs,
     *,
-    ignore_mm_keys: Optional[set[str]] = None,
+    ignore_mm_keys: set[str] | None = None,
     msg: str = "",
 ):
     if ignore_mm_keys is None:

tests/models/multimodal/processing/test_h2ovl.py

@@ -3,7 +3,6 @@
 """Tests for H2OVL's multimodal preprocessing kwargs."""
 
 from collections.abc import Mapping
-from typing import Optional
 
 import pytest
 from PIL import Image
@@ -149,7 +148,7 @@ def test_processor_override(
     size_factors: list[int],
     min_dynamic_patch: int,
     max_dynamic_patch: int,
-    dynamic_image_size: Optional[bool],
+    dynamic_image_size: bool | None,
     kwargs_on_init: bool,
 ):
     mm_processor_kwargs = {

tests/models/multimodal/processing/test_internvl.py

@@ -3,7 +3,6 @@
 """Tests for InternVL's multimodal preprocessing kwargs."""
 
 from collections.abc import Mapping
-from typing import Optional
 
 import pytest
 from PIL import Image
@@ -103,7 +102,7 @@ def test_processor_override(
     size_factors: list[int],
     min_dynamic_patch: int,
     max_dynamic_patch: int,
-    dynamic_image_size: Optional[bool],
+    dynamic_image_size: bool | None,
     kwargs_on_init: bool,
 ):
     mm_processor_kwargs = {

tests/models/multimodal/processing/test_nemotron_vl.py

@@ -3,7 +3,6 @@
 """Tests for Nemotron-Nano-VL's multimodal preprocessing kwargs."""
 
 from collections.abc import Mapping
-from typing import Optional
 
 import pytest
 from PIL import Image
@@ -105,7 +104,7 @@ def test_processor_override(
     size_factors: list[int],
     min_dynamic_patch: int,
     max_dynamic_patch: int,
-    dynamic_image_size: Optional[bool],
+    dynamic_image_size: bool | None,
     kwargs_on_init: bool,
 ):
     mm_processor_kwargs = {

tests/models/multimodal/processing/test_tensor_schema.py

@@ -4,7 +4,7 @@ import tempfile
 from collections.abc import Iterable
 from contextlib import contextmanager
 from functools import partial
-from typing import Any, Union
+from typing import Any, TypeAlias
 
 import numpy as np
 import pytest
@@ -55,15 +55,15 @@ REPO_ID_TO_SKIP = {
 }
 
 ImageInput = list[Image.Image]
-VideoInput = Union[
-    list[Image.Image], list[np.ndarray], list[tuple[np.ndarray, dict[str, Any]]]
-]
+VideoInput: TypeAlias = (
+    list[Image.Image] | list[np.ndarray] | list[tuple[np.ndarray, dict[str, Any]]]
+)
 AudioInput = list[tuple[np.ndarray, int]]
 
 
 def _resize_data(
-    _data: Union[Image.Image, np.ndarray], size_factor: float
-) -> Union[Image.Image, np.ndarray]:
+    _data: Image.Image | np.ndarray, size_factor: float
+) -> Image.Image | np.ndarray:
     assert size_factor <= 1, "Size factor must be less than 1"
     # Image input
     if isinstance(_data, Image.Image):
@@ -88,8 +88,8 @@ def _resize_data(
 
 
 def resize_mm_data(
-    data: Union[ImageInput, VideoInput, AudioInput], size_factors: tuple[float, ...]
-) -> Union[ImageInput, VideoInput, AudioInput]:
+    data: ImageInput | VideoInput | AudioInput, size_factors: tuple[float, ...]
+) -> ImageInput | VideoInput | AudioInput:
     size_factors = size_factors[: len(data)]
     if is_list_of(data, (Image.Image, np.ndarray, list)):
         return [_resize_data(d, s) for d, s in zip(data, size_factors)]