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,7 +3,7 @@
import random
from collections.abc import Callable
from typing import NamedTuple, Optional, Union
from typing import NamedTuple, TypeAlias
import numpy as np
import pytest
@@ -48,7 +48,7 @@ REQS_PER_LOGITPROC = 50
STR_NO_LOGITPROC = "none"
# LogitsProcessor subclass or "none"
LogitprocType = Union[type[LogitsProcessor], str]
LogitprocType: TypeAlias = type[LogitsProcessor] | str
class LogitsProcsRequestParams:
@@ -435,7 +435,7 @@ class LogitsprocTestHelpers(NamedTuple):
"""Supports setting up and validating logitsprocs unit tests."""
eval_fxn: Callable
gen_request_fxn: Optional[Callable] = None
gen_request_fxn: Callable | None = None
logitsprocs_test_mapping = {
@@ -471,7 +471,7 @@ def _generate_fake_step_update(
workload_params: list[LogitsProcsRequestParams],
wdx: int,
batch_update_builder: BatchUpdateBuilder,
) -> tuple[Optional[BatchUpdate], int, int]:
) -> tuple[BatchUpdate | None, int, int]:
batch_size = len(persistent_batch)
workload_size = len(workload_params)
workload_reqs_remaining = workload_size - wdx
@@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
import random
import sys
from typing import Any, Union
from typing import Any
import pytest
@@ -159,7 +159,7 @@ def test_custom_logitsprocs(monkeypatch, logitproc_source: CustomLogitprocSource
_run_test({}, logitproc_loaded=True)
return
kwargs: dict[str, list[Union[str, type[LogitsProcessor]]]] = {}
kwargs: dict[str, list[str | type[LogitsProcessor]]] = {}
if logitproc_source == CustomLogitprocSource.LOGITPROC_SOURCE_FQCN:
# Scenario: load logitproc based on fully-qualified class name (FQCN)
# Inject dummy module which defines logitproc
@@ -4,7 +4,7 @@
import os
import random
import sys
from typing import Any, Optional
from typing import Any
import openai
import pytest
@@ -25,7 +25,7 @@ from tests.v1.logits_processors.utils import entry_points as fake_entry_points
def _server_with_logitproc_entrypoint(
env_dict: Optional[dict[str, str]],
env_dict: dict[str, str] | None,
model: str,
vllm_serve_args: list[str],
) -> None:
@@ -48,7 +48,7 @@ def _server_with_logitproc_entrypoint(
def _server_with_logitproc_module(
env_dict: Optional[dict[str, str]],
env_dict: dict[str, str] | None,
model: str,
vllm_serve_args: list[str],
) -> None:
+4 -4
View File
@@ -3,7 +3,7 @@
import types
from enum import Enum, auto
from typing import Any, Optional
from typing import Any
import torch
@@ -61,7 +61,7 @@ class DummyLogitsProcessor(LogitsProcessor):
"""Never impacts greedy sampling"""
return False
def update_state(self, batch_update: Optional[BatchUpdate]):
def update_state(self, batch_update: BatchUpdate | None):
process_dict_updates(
self.req_info,
batch_update,
@@ -145,7 +145,7 @@ class WrappedPerReqLogitsProcessor(AdapterLogitsProcessor):
def new_req_logits_processor(
self,
params: SamplingParams,
) -> Optional[RequestLogitsProcessor]:
) -> RequestLogitsProcessor | None:
"""This method returns a new request-level logits processor, customized
to the `target_token` value associated with a particular request.
@@ -159,7 +159,7 @@ class WrappedPerReqLogitsProcessor(AdapterLogitsProcessor):
Returns:
`Callable` request logits processor, or None
"""
target_token: Optional[Any] = params.extra_args and params.extra_args.get(
target_token: Any | None = params.extra_args and params.extra_args.get(
"target_token"
)
if target_token is None: