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
+3 -5
View File
@@ -13,8 +13,6 @@ Covers:
5) Multiple stop conditions
"""
from typing import Optional, Union
import pytest
from vllm import LLM, SamplingParams
@@ -33,9 +31,9 @@ class MinTokensTestCase:
name: str,
min_tokens: int,
max_tokens: int,
stop: Optional[Union[str, list[str]]] = None,
expected_min_len: Optional[int] = None,
expected_exact_len: Optional[int] = None,
stop: str | list[str] | None = None,
expected_min_len: int | None = None,
expected_exact_len: int | None = None,
):
self.name = name
self.min_tokens = min_tokens
+2 -4
View File
@@ -1,9 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
from __future__ import annotations
import random
from typing import Any, Union
from typing import Any
import pytest
import torch
@@ -34,7 +32,7 @@ def get_test_prompts(mm_enabled: bool):
for kind in random_prompt_type_choices:
word_choices = ["test", "temp", "hello", "where"]
word = random.choice(word_choices)
prompt: Union[str, list[dict[str, Any]]] = ""
prompt: str | list[dict[str, Any]] = ""
if kind == "repeat":
prompt = f"""
please repeat the word '{word}' 10 times.