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
+7 -6
View File
@@ -1,8 +1,9 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
from collections.abc import Callable
from concurrent.futures import Future
from typing import Any, Callable, Optional, Union
from typing import Any
import torch
import torch.distributed as dist
@@ -91,10 +92,10 @@ class Executor(ExecutorBase):
def collective_rpc(
self,
method: Union[str, Callable],
timeout: Optional[float] = None,
method: str | Callable,
timeout: float | None = None,
args: tuple = (),
kwargs: Optional[dict] = None,
kwargs: dict | None = None,
non_block: bool = False,
) -> list[Any]:
raise NotImplementedError
@@ -103,7 +104,7 @@ class Executor(ExecutorBase):
self,
scheduler_output: SchedulerOutput,
non_block: bool = False,
) -> Union[ModelRunnerOutput, Future[ModelRunnerOutput]]:
) -> ModelRunnerOutput | Future[ModelRunnerOutput]:
output = self.collective_rpc(
"execute_model", args=(scheduler_output,), non_block=non_block
)
@@ -112,7 +113,7 @@ class Executor(ExecutorBase):
def execute_dummy_batch(self) -> None:
self.collective_rpc("execute_dummy_batch")
def take_draft_token_ids(self) -> Optional[DraftTokenIds]:
def take_draft_token_ids(self) -> DraftTokenIds | None:
output = self.collective_rpc("take_draft_token_ids")
return output[0]