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

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
Harry Mellor
2025-10-12 09:51:31 -07:00
committed by GitHub
parent 9bb38130cb
commit 8fcaaf6a16
944 changed files with 9490 additions and 10121 deletions
+21 -11
View File
@@ -7,10 +7,20 @@ from collections.abc import Mapping, Sequence
from dataclasses import dataclass
from functools import partial
from itertools import accumulate
from typing import TYPE_CHECKING, Any, Literal, Optional, TypedDict, Union, cast, final
from typing import (
TYPE_CHECKING,
Any,
Literal,
Optional,
TypeAlias,
TypedDict,
Union,
cast,
final,
)
import numpy as np
from typing_extensions import NotRequired, TypeAlias, TypeVar, deprecated
from typing_extensions import NotRequired, TypeVar, deprecated
from vllm.utils import LazyLoader, full_groupby, is_list_of
from vllm.utils.jsontree import json_map_leaves
@@ -85,7 +95,7 @@ which are treated as audio embeddings;
these are directly passed to the model without HF processing.
"""
ModalityData: TypeAlias = Union[_T, list[Optional[_T]], None]
ModalityData: TypeAlias = _T | list[_T | None] | None
"""
Either a single data item, or a list of data items. Can only be None if UUID
is provided.
@@ -117,7 +127,7 @@ The built-in modalities are defined by
[`MultiModalDataBuiltins`][vllm.multimodal.inputs.MultiModalDataBuiltins].
"""
MultiModalUUIDDict: TypeAlias = Mapping[str, Union[list[Optional[str]], str]]
MultiModalUUIDDict: TypeAlias = Mapping[str, list[str | None] | str]
"""
A dictionary containing user-provided UUIDs for items in each modality.
If a UUID for an item is not provided, its entry will be `None` and
@@ -412,7 +422,7 @@ class MultiModalFlatField(BaseMultiModalField):
[`MultiModalFieldConfig.flat_from_sizes`][vllm.multimodal.inputs.MultiModalFieldConfig.flat_from_sizes]
"""
slices: Union[Sequence[slice], Sequence[Sequence[slice]]]
slices: Sequence[slice] | Sequence[Sequence[slice]]
dim: int = 0
def build_elems(
@@ -524,7 +534,7 @@ class MultiModalFieldConfig:
@staticmethod
def flat(
modality: str,
slices: Union[Sequence[slice], Sequence[Sequence[slice]]],
slices: Sequence[slice] | Sequence[Sequence[slice]],
dim: int = 0,
):
"""
@@ -729,7 +739,7 @@ class MultiModalKwargsItem(UserDict[str, MultiModalFieldElem]):
_I = TypeVar(
"_I",
MultiModalKwargsItem,
Optional[MultiModalKwargsItem],
MultiModalKwargsItem | None,
default=MultiModalKwargsItem,
)
@@ -818,10 +828,10 @@ class MultiModalKwargsItems(UserDict[str, Sequence[_I]]):
)
MultiModalKwargsOptionalItems: TypeAlias = Union[
MultiModalKwargsItems[MultiModalKwargsItem],
MultiModalKwargsItems[Optional[MultiModalKwargsItem]],
]
MultiModalKwargsOptionalItems: TypeAlias = (
MultiModalKwargsItems[MultiModalKwargsItem]
| MultiModalKwargsItems[MultiModalKwargsItem | None]
)
class MultiModalKwargs(UserDict[str, NestedTensors]):