Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Core] Expose API endpoint /is_sleeping #14312

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions vllm/engine/async_llm_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,9 @@ async def sleep(self, level: int = 1) -> None:
async def wake_up(self) -> None:
self.engine.wake_up()

async def is_sleeping(self) -> bool:
return self.engine.is_sleeping()

async def add_lora(self, lora_request: LoRARequest) -> None:
self.engine.add_lora(lora_request)

Expand Down
3 changes: 3 additions & 0 deletions vllm/engine/llm_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -1914,6 +1914,9 @@ def wake_up(self) -> None:
"Sleep mode is not enabled in the model config")
self.model_executor.wake_up()

def is_sleeping(self) -> bool:
return self.model_executor.is_sleeping

def check_health(self) -> None:
if self.tokenizer:
self.tokenizer.check_health()
Expand Down
16 changes: 14 additions & 2 deletions vllm/engine/multiprocessing/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,18 @@ class RPCWakeUpRequest(Enum):
WAKE_UP = 1


@dataclass
class RPCIsSleepingRequest:
# Set the default value of request_id to a new UUID
request_id: str = field(default_factory=lambda: str(uuid.uuid4()))


@dataclass
class RPCIsSleepingResponse:
request_id: str
is_sleeping: bool


@dataclass
class RPCLoadAdapterRequest:
lora_request: LoRARequest
Expand All @@ -151,10 +163,10 @@ class RPCAdapterLoadedResponse:
RPC_REQUEST_T = Union[RPCProcessRequest, RPCAbortRequest, RPCStartupRequest,
RPCUProfileRequest, RPCLoadAdapterRequest,
RPCResetPrefixCacheRequest, RPCSleepRequest,
RPCWakeUpRequest]
RPCWakeUpRequest, RPCIsSleepingRequest]

REQUEST_OUTPUTS_T = Union[List[RequestOutput], RPCAdapterLoadedResponse,
RPCError]
RPCIsSleepingResponse, RPCError]


def ENGINE_DEAD_ERROR(
Expand Down
27 changes: 25 additions & 2 deletions vllm/engine/multiprocessing/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
IPC_OUTPUT_EXT, RPC_REQUEST_T,
VLLM_RPC_SUCCESS_STR, RPCAbortRequest,
RPCAdapterLoadedResponse, RPCError,
RPCIsSleepingRequest,
RPCIsSleepingResponse,
RPCLoadAdapterRequest,
RPCProcessRequest,
RPCResetPrefixCacheRequest,
Expand Down Expand Up @@ -247,7 +249,9 @@ async def run_output_handler_loop(self):
if queue is not None:
queue.put_nowait(exception)
# Put each output into the appropriate queue.
elif isinstance(request_outputs, RPCAdapterLoadedResponse):
elif isinstance(
request_outputs,
(RPCAdapterLoadedResponse, RPCIsSleepingResponse)):
self._add_output(request_outputs)
else:
for request_output in request_outputs:
Expand All @@ -257,7 +261,8 @@ async def run_output_handler_loop(self):
logger.debug("Shutting down MQLLMEngineClient output handler.")

def _add_output(self, request_output: Union[RequestOutput,
RPCAdapterLoadedResponse]):
RPCAdapterLoadedResponse,
RPCIsSleepingResponse]):
queue = self.output_queues.get(request_output.request_id)
if queue is not None:
queue.put_nowait(request_output)
Expand Down Expand Up @@ -697,6 +702,24 @@ async def wake_up(self) -> None:
return await self._send_one_way_rpc_request(
request=RPCWakeUpRequest.WAKE_UP, socket=self.input_socket)

async def is_sleeping(self) -> bool:
"""Check whether the engine is sleeping"""
request = RPCIsSleepingRequest()

queue: asyncio.Queue[Union[BaseException,
RPCIsSleepingResponse]] = asyncio.Queue()
self.output_queues[request.request_id] = queue

request_bytes = pickle.dumps(request)
await self.input_socket.send_multipart((request_bytes, ), copy=False)

request_output = await queue.get()
self.output_queues.pop(request.request_id)

if isinstance(request_output, BaseException):
raise request_output
return request_output.is_sleeping

async def add_lora(self, lora_request: LoRARequest) -> None:
"""Load a new LoRA adapter into the engine for future requests."""
# Uses the same I/O as generate requests
Expand Down
13 changes: 13 additions & 0 deletions vllm/engine/multiprocessing/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
IPC_OUTPUT_EXT, REQUEST_OUTPUTS_T,
VLLM_RPC_SUCCESS_STR, RPCAbortRequest,
RPCAdapterLoadedResponse, RPCError,
RPCIsSleepingRequest,
RPCIsSleepingResponse,
RPCLoadAdapterRequest,
RPCProcessRequest,
RPCResetPrefixCacheRequest,
Expand Down Expand Up @@ -256,6 +258,8 @@ def handle_new_input(self):
self.sleep(request.value)
elif isinstance(request, RPCWakeUpRequest):
self.wake_up()
elif isinstance(request, RPCIsSleepingRequest):
self._handle_is_sleeping_request(request)
else:
raise ValueError("Unknown RPCRequest Type: "
f"{type(request)}")
Expand Down Expand Up @@ -320,6 +324,12 @@ def _handle_load_adapter_request(self, request: RPCLoadAdapterRequest):
self._send_outputs(
RPCAdapterLoadedResponse(request_id=request.request_id))

def _handle_is_sleeping_request(self, request: RPCIsSleepingRequest):
is_sleeping = self.is_sleeping()
self._send_outputs(
RPCIsSleepingResponse(request_id=request.request_id,
is_sleeping=is_sleeping))

def _health_check(self):
# Send unhealthy if engine has already errored
if self._errored_with is not None:
Expand Down Expand Up @@ -389,6 +399,9 @@ def sleep(self, level: int = 1) -> None:
def wake_up(self) -> None:
self.engine.wake_up()

def is_sleeping(self) -> bool:
return self.engine.is_sleeping()


def signal_handler(*_) -> None:
raise KeyboardInterrupt("MQLLMEngine terminated")
Expand Down
5 changes: 5 additions & 0 deletions vllm/engine/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,11 @@ async def wake_up(self) -> None:
"""Wake up the engine"""
...

@abstractmethod
async def is_sleeping(self) -> bool:
"""Check whether the engine is sleeping"""
...

@abstractmethod
async def add_lora(self, lora_request: LoRARequest) -> None:
"""Load a new LoRA adapter into the engine for future requests."""
Expand Down
6 changes: 6 additions & 0 deletions vllm/entrypoints/openai/api_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,12 @@ async def wake_up(raw_request: Request):
# is sent but does not finish yet when we return a response.
return Response(status_code=200)

@router.get("/is_sleeping")
async def is_sleeping(raw_request: Request):
logger.info("check whether the engine is sleeping")
is_sleeping = await engine_client(raw_request).is_sleeping()
return JSONResponse(content={"is_sleeping": is_sleeping})


@router.post("/invocations", dependencies=[Depends(validate_json_request)])
async def invocations(raw_request: Request):
Expand Down
3 changes: 3 additions & 0 deletions vllm/v1/engine/async_llm.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,9 @@ async def sleep(self, level: int = 1) -> None:
async def wake_up(self) -> None:
await self.engine_core.wake_up_async()

async def is_sleeping(self) -> bool:
return await self.engine_core.is_sleeping_async()

async def add_lora(self, lora_request: LoRARequest) -> bool:
"""Load a new LoRA adapter into the engine for future requests."""
return await self.engine_core.add_lora_async(lora_request)
Expand Down
3 changes: 3 additions & 0 deletions vllm/v1/engine/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ def sleep(self, level: int = 1):
def wake_up(self):
self.model_executor.wake_up()

def is_sleeping(self) -> bool:
return self.model_executor.is_sleeping

def execute_dummy_batch(self):
self.model_executor.collective_rpc("execute_dummy_batch")

Expand Down
15 changes: 15 additions & 0 deletions vllm/v1/engine/core_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ def sleep(self, level: int = 1) -> None:
def wake_up(self) -> None:
raise NotImplementedError

def is_sleeping(self) -> bool:
raise NotImplementedError

def execute_dummy_batch(self) -> None:
raise NotImplementedError

Expand Down Expand Up @@ -127,6 +130,9 @@ async def sleep_async(self, level: int = 1) -> None:
async def wake_up_async(self) -> None:
raise NotImplementedError

async def is_sleeping_async(self) -> bool:
raise NotImplementedError

async def abort_requests_async(self, request_ids: list[str]) -> None:
raise NotImplementedError

Expand Down Expand Up @@ -181,6 +187,9 @@ def sleep(self, level: int = 1) -> None:
def wake_up(self) -> None:
self.engine_core.wake_up()

def is_sleeping(self) -> bool:
return self.engine_core.is_sleeping()

def execute_dummy_batch(self) -> None:
self.engine_core.execute_dummy_batch()

Expand Down Expand Up @@ -425,6 +434,9 @@ def sleep(self, level: int = 1) -> None:
def wake_up(self) -> None:
self._call_utility("wake_up")

def is_sleeping(self) -> bool:
return self._call_utility("is_sleeping")

def execute_dummy_batch(self) -> None:
self._call_utility("execute_dummy_batch")

Expand Down Expand Up @@ -515,6 +527,9 @@ async def sleep_async(self, level: int = 1) -> None:
async def wake_up_async(self) -> None:
await self._call_utility_async("wake_up")

async def is_sleeping_async(self) -> bool:
return await self._call_utility_async("is_sleeping")

async def execute_dummy_batch_async(self) -> None:
await self._call_utility_async("execute_dummy_batch")

Expand Down
3 changes: 3 additions & 0 deletions vllm/v1/engine/llm_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ def sleep(self, level: int = 1):
def wake_up(self):
self.engine_core.wake_up()

def is_sleeping(self) -> bool:
return self.engine_core.is_sleeping()

def get_tokenizer_group(
self,
group_type: type[_G] = BaseTokenizerGroup,
Expand Down