[Misc] Support passing multiple request ids at once to AsyncLLM.abort() (#22944)
Signed-off-by: Nick Hill <nhill@redhat.com>
This commit is contained in:
@@ -998,7 +998,7 @@ class AsyncLLMEngine(EngineClient):
|
||||
await self.abort(request_id)
|
||||
raise
|
||||
|
||||
async def abort(self, request_id: str) -> None:
|
||||
async def abort(self, request_id: Union[str, Iterable[str]]) -> None:
|
||||
"""Abort a request.
|
||||
|
||||
Abort a submitted request. If the request is finished or not found,
|
||||
@@ -1007,6 +1007,9 @@ class AsyncLLMEngine(EngineClient):
|
||||
Args:
|
||||
request_id: The unique id of the request.
|
||||
"""
|
||||
if not isinstance(request_id, str):
|
||||
raise RuntimeError("Only single-request abort supported in"
|
||||
" deprecated V0")
|
||||
if not self.is_running:
|
||||
raise AsyncEngineDeadError(
|
||||
"Background loop is not running. If it was running, "
|
||||
|
||||
@@ -5,8 +5,8 @@ import asyncio
|
||||
import copy
|
||||
import pickle
|
||||
from contextlib import contextmanager, suppress
|
||||
from typing import (Any, AsyncGenerator, Dict, Iterator, List, Mapping,
|
||||
Optional, Union, cast)
|
||||
from typing import (Any, AsyncGenerator, Dict, Iterable, Iterator, List,
|
||||
Mapping, Optional, Union, cast)
|
||||
|
||||
import cloudpickle
|
||||
import psutil
|
||||
@@ -404,9 +404,13 @@ class MQLLMEngineClient(EngineClient):
|
||||
error_message="Unable to start RPC Server",
|
||||
socket=socket)
|
||||
|
||||
async def abort(self, request_id: str):
|
||||
async def abort(self, request_id: Union[str, Iterable[str]]):
|
||||
"""Send an ABORT_REQUEST signal to the RPC Server"""
|
||||
|
||||
if not isinstance(request_id, str):
|
||||
raise RuntimeError("Only single-request abort supported in"
|
||||
" deprecated V0")
|
||||
|
||||
with suppress(MQClientClosedError):
|
||||
await self._send_one_way_rpc_request(
|
||||
request=RPCAbortRequest(request_id), socket=self.input_socket)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
import asyncio
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import AsyncGenerator, Mapping, Optional
|
||||
from typing import AsyncGenerator, Iterable, Mapping, Optional, Union
|
||||
|
||||
from vllm.beam_search import BeamSearchSequence, create_sort_beams_key_function
|
||||
from vllm.config import DecodingConfig, ModelConfig, VllmConfig
|
||||
@@ -229,11 +229,12 @@ class EngineClient(ABC):
|
||||
...
|
||||
|
||||
@abstractmethod
|
||||
async def abort(self, request_id: str) -> None:
|
||||
async def abort(self, request_id: Union[str, Iterable[str]]) -> None:
|
||||
"""Abort a request.
|
||||
|
||||
Args:
|
||||
request_id: The unique id of the request.
|
||||
request_id: The unique id of the request,
|
||||
or an iterable of such ids.
|
||||
"""
|
||||
...
|
||||
|
||||
|
||||
Reference in New Issue
Block a user