biondizzle/vllm
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
Harry Mellor
2025-10-12 17:51:31 +01:00
committed by GitHub
parent 9bb38130cb
commit 8fcaaf6a16
944 changed files with 9490 additions and 10121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vllm/transformers_utils/processor.py
View File

@@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
from functools import lru_cache
from typing import TYPE_CHECKING, Any, Optional, Union, cast
from typing import TYPE_CHECKING, Any, cast
from transformers import (
AutoFeatureExtractor,
@@ -45,7 +45,7 @@ class HashableList(list):
return hash(tuple(self))
def _get_processor_factory_fn(processor_cls: Union[type, tuple[type, ...]]):
def _get_processor_factory_fn(processor_cls: type | tuple[type, ...]):
if isinstance(processor_cls, tuple) or processor_cls == ProcessorMixin:
return AutoProcessor.from_pretrained
if hasattr(processor_cls, "from_pretrained"):
@@ -56,7 +56,7 @@ def _get_processor_factory_fn(processor_cls: Union[type, tuple[type, ...]]):
def _merge_mm_kwargs(
model_config: "ModelConfig",
processor_cls: Union[type, tuple[type, ...]],
processor_cls: type | tuple[type, ...],
/,
**kwargs,
):
@@ -86,9 +86,9 @@ def _merge_mm_kwargs(
def get_processor(
processor_name: str,
*args: Any,
revision: Optional[str] = None,
revision: str | None = None,
trust_remote_code: bool = False,
processor_cls: Union[type[_P], tuple[type[_P], ...]] = ProcessorMixin,
processor_cls: type[_P] | tuple[type[_P], ...] = ProcessorMixin,
**kwargs: Any,
) -> _P:
"""Load a processor for the given model name via HuggingFace."""
@@ -146,7 +146,7 @@ cached_get_processor = lru_cache(get_processor)
def cached_processor_from_config(
model_config: "ModelConfig",
processor_cls: Union[type[_P], tuple[type[_P], ...]] = ProcessorMixin,
processor_cls: type[_P] | tuple[type[_P], ...] = ProcessorMixin,
**kwargs: Any,
) -> _P:
return cached_get_processor(
@@ -161,7 +161,7 @@ def cached_processor_from_config(
def get_feature_extractor(
processor_name: str,
*args: Any,
revision: Optional[str] = None,
revision: str | None = None,
trust_remote_code: bool = False,
**kwargs: Any,
):
@@ -211,7 +211,7 @@ def cached_feature_extractor_from_config(
def get_image_processor(
processor_name: str,
*args: Any,
revision: Optional[str] = None,
revision: str | None = None,
trust_remote_code: bool = False,
**kwargs: Any,
):
@@ -261,9 +261,9 @@ def cached_image_processor_from_config(
def get_video_processor(
processor_name: str,
*args: Any,
revision: Optional[str] = None,
revision: str | None = None,
trust_remote_code: bool = False,
processor_cls_overrides: Optional[type[_V]] = None,
processor_cls_overrides: type[_V] | None = None,
**kwargs: Any,
):
"""Load a video processor for the given model name via HuggingFace."""
@@ -300,7 +300,7 @@ cached_get_video_processor = lru_cache(get_video_processor)
def cached_video_processor_from_config(
model_config: "ModelConfig",
processor_cls: Optional[type[_V]] = None,
processor_cls: type[_V] | None = None,
**kwargs: Any,
):
return cached_get_video_processor(