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
+23 -23
View File
@@ -14,11 +14,11 @@ import subprocess
import sys
import tempfile
from abc import ABC, abstractmethod
from collections.abc import Set
from collections.abc import Callable, Set
from dataclasses import asdict, dataclass, field
from functools import lru_cache
from pathlib import Path
from typing import Callable, Optional, TypeVar, Union
from typing import TypeVar
import torch.nn as nn
import transformers
@@ -654,7 +654,7 @@ class _LazyRegisteredModel(_BaseRegisteredModel):
def _try_load_model_cls(
model_arch: str,
model: _BaseRegisteredModel,
) -> Optional[type[nn.Module]]:
) -> type[nn.Module] | None:
from vllm.platforms import current_platform
current_platform.verify_model_arch(model_arch)
@@ -669,7 +669,7 @@ def _try_load_model_cls(
def _try_inspect_model_cls(
model_arch: str,
model: _BaseRegisteredModel,
) -> Optional[_ModelInfo]:
) -> _ModelInfo | None:
try:
return model.inspect_model_cls()
except Exception:
@@ -688,7 +688,7 @@ class _ModelRegistry:
def register_model(
self,
model_arch: str,
model_cls: Union[type[nn.Module], str],
model_cls: type[nn.Module] | str,
) -> None:
"""
Register an external model to be used in vLLM.
@@ -756,13 +756,13 @@ class _ModelRegistry:
f"Supported architectures: {all_supported_archs}"
)
def _try_load_model_cls(self, model_arch: str) -> Optional[type[nn.Module]]:
def _try_load_model_cls(self, model_arch: str) -> type[nn.Module] | None:
if model_arch not in self.models:
return None
return _try_load_model_cls(model_arch, self.models[model_arch])
def _try_inspect_model_cls(self, model_arch: str) -> Optional[_ModelInfo]:
def _try_inspect_model_cls(self, model_arch: str) -> _ModelInfo | None:
if model_arch not in self.models:
return None
@@ -772,7 +772,7 @@ class _ModelRegistry:
self,
architecture: str,
model_config: ModelConfig,
) -> Optional[str]:
) -> str | None:
if architecture in _TRANSFORMERS_BACKEND_MODELS:
return architecture
@@ -862,7 +862,7 @@ class _ModelRegistry:
def inspect_model_cls(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> tuple[_ModelInfo, str]:
if isinstance(architectures, str):
@@ -914,7 +914,7 @@ class _ModelRegistry:
def resolve_model_cls(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> tuple[type[nn.Module], str]:
if isinstance(architectures, str):
@@ -968,7 +968,7 @@ class _ModelRegistry:
def is_text_generation_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -976,7 +976,7 @@ class _ModelRegistry:
def is_pooling_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -984,7 +984,7 @@ class _ModelRegistry:
def is_cross_encoder_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -992,7 +992,7 @@ class _ModelRegistry:
def is_multimodal_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1000,7 +1000,7 @@ class _ModelRegistry:
def is_multimodal_raw_input_only_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1008,7 +1008,7 @@ class _ModelRegistry:
def is_pp_supported_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1016,7 +1016,7 @@ class _ModelRegistry:
def model_has_inner_state(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1024,7 +1024,7 @@ class _ModelRegistry:
def is_attention_free_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1032,7 +1032,7 @@ class _ModelRegistry:
def is_hybrid_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1040,7 +1040,7 @@ class _ModelRegistry:
def is_noops_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1048,7 +1048,7 @@ class _ModelRegistry:
def is_transcription_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1056,7 +1056,7 @@ class _ModelRegistry:
def is_transcription_only_model(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)
@@ -1064,7 +1064,7 @@ class _ModelRegistry:
def is_v1_compatible(
self,
architectures: Union[str, list[str]],
architectures: str | list[str],
model_config: ModelConfig,
) -> bool:
model_cls, _ = self.inspect_model_cls(architectures, model_config)