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
+19 -19
View File
@@ -4,7 +4,7 @@
import warnings
from collections.abc import Sequence
from dataclasses import dataclass
from typing import Any, Optional, Union
from typing import Any
import torch
import torch.nn.functional as F
@@ -57,7 +57,7 @@ def check_outputs_equal(
#
# Assumes prompt logprobs were not requested.
TokensTextLogprobs = tuple[
list[int], str, Optional[Union[list[dict[int, float]], SampleLogprobs]]
list[int], str, list[dict[int, float]] | SampleLogprobs | None
]
# Allow for tokens to be represented as str's rather than IDs;
@@ -68,7 +68,7 @@ TokensTextLogprobs = tuple[
#
# Assumes prompt logprobs were not requested.
TextTextLogprobs = tuple[
list[str], str, Optional[Union[list[dict[str, float]], list[dict[str, Logprob]]]]
list[str], str, list[dict[str, float]] | list[dict[str, Logprob]] | None
]
# Representation of generated sequence as a tuple of
@@ -81,18 +81,18 @@ TextTextLogprobs = tuple[
TokensTextLogprobsPromptLogprobs = tuple[
list[int],
str,
Optional[Union[list[dict[int, float]], SampleLogprobs]],
Optional[Union[list[Optional[dict[int, float]]], PromptLogprobs]],
list[dict[int, float]] | SampleLogprobs | None,
list[dict[int, float] | None] | PromptLogprobs | None,
]
def check_logprobs_close(
*,
outputs_0_lst: Sequence[
Union[TokensTextLogprobs, TokensTextLogprobsPromptLogprobs, TextTextLogprobs]
TokensTextLogprobs | TokensTextLogprobsPromptLogprobs | TextTextLogprobs
],
outputs_1_lst: Sequence[
Union[TokensTextLogprobs, TokensTextLogprobsPromptLogprobs, TextTextLogprobs]
TokensTextLogprobs | TokensTextLogprobsPromptLogprobs | TextTextLogprobs
],
name_0: str,
name_1: str,
@@ -273,9 +273,9 @@ def build_model_context(
model_id: str,
runner: RunnerOption = "auto",
dtype: ModelDType = "auto",
model_config_kwargs: Optional[dict[str, Any]] = None,
mm_processor_kwargs: Optional[dict[str, Any]] = None,
limit_mm_per_prompt: Optional[dict[str, int]] = None,
model_config_kwargs: dict[str, Any] | None = None,
mm_processor_kwargs: dict[str, Any] | None = None,
limit_mm_per_prompt: dict[str, int] | None = None,
mm_processor_cache_gb: int = 0,
):
"""Creates an InputProcessingContext for a given model.
@@ -369,18 +369,18 @@ class ModelInfo:
name: str
architecture: str = ""
dtype: str = "auto"
max_model_len: Optional[int] = None
max_model_len: int | None = None
hf_dtype: str = "float32"
hf_overrides: Optional[dict[str, Any]] = None
hf_overrides: dict[str, Any] | None = None
default_pooling_type: str = ""
enable_test: bool = True
@dataclass
class EmbedModelInfo(ModelInfo):
mteb_score: Optional[float] = None
mteb_score: float | None = None
is_matryoshka: bool = False
matryoshka_dimensions: Optional[list[int]] = None
matryoshka_dimensions: list[int] | None = None
@dataclass
@@ -395,7 +395,7 @@ class LASTPoolingEmbedModelInfo(EmbedModelInfo):
@dataclass
class RerankModelInfo(ModelInfo):
mteb_score: Optional[float] = None
mteb_score: float | None = None
@dataclass
@@ -411,14 +411,14 @@ class LASTPoolingRerankModelInfo(RerankModelInfo):
@dataclass
class GenerateModelInfo(ModelInfo):
hf_dtype: str = "auto"
hf_ppl: Optional[float] = None
hf_ppl: float | None = None
def dummy_hf_overrides(
hf_config: PretrainedConfig,
*,
model_arch: str = "",
exist_overrides: Optional[dict[str, Any]] = None,
exist_overrides: dict[str, Any] | None = None,
use_original_num_layers: bool = False,
) -> PretrainedConfig:
"""
@@ -507,8 +507,8 @@ def dummy_hf_overrides(
def check_transformers_version(
model: str,
min_transformers_version: Optional[str] = None,
max_transformers_version: Optional[str] = None,
min_transformers_version: str | None = None,
max_transformers_version: str | None = None,
):
from .registry import _HfExamplesInfo