[Rust Frontend] [Refactor] Refine utility call interfaces (#44856)
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::Json;
|
||||
use axum::extract::rejection::QueryRejection;
|
||||
use axum::extract::{Query, State};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use vllm_engine_core_client::protocol::utility::PauseMode;
|
||||
|
||||
use crate::error::ApiError;
|
||||
use crate::state::AppState;
|
||||
@@ -10,8 +12,8 @@ use crate::utils::utility_call_error;
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub(crate) struct PauseParams {
|
||||
#[serde(default = "default_pause_mode")]
|
||||
mode: String,
|
||||
#[serde(default)]
|
||||
mode: PauseMode,
|
||||
#[serde(default = "default_clear_cache")]
|
||||
clear_cache: bool,
|
||||
}
|
||||
@@ -26,17 +28,14 @@ pub(crate) struct IsPausedResponse {
|
||||
is_paused: bool,
|
||||
}
|
||||
|
||||
/// Pause modes accepted by the engine (`PauseMode` in the Python frontend).
|
||||
const VALID_PAUSE_MODES: [&str; 3] = ["abort", "wait", "keep"];
|
||||
|
||||
fn default_pause_mode() -> String {
|
||||
"abort".to_string()
|
||||
}
|
||||
|
||||
const fn default_clear_cache() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
fn invalid_query(error: QueryRejection) -> ApiError {
|
||||
ApiError::invalid_request(error.body_text(), Some("mode"))
|
||||
}
|
||||
|
||||
// TODO: the Python frontend also accepts the deprecated
|
||||
// `wait_for_inflight_requests` flag (equivalent to `mode="wait"`); it is
|
||||
// intentionally omitted here in favor of the `mode` parameter.
|
||||
@@ -44,21 +43,13 @@ const fn default_clear_cache() -> bool {
|
||||
/// Pause the scheduler so generation can be halted (e.g. for weight updates).
|
||||
pub async fn pause(
|
||||
State(state): State<Arc<AppState>>,
|
||||
Query(params): Query<PauseParams>,
|
||||
params: Result<Query<PauseParams>, QueryRejection>,
|
||||
) -> Result<Json<StatusResponse>, ApiError> {
|
||||
if !VALID_PAUSE_MODES.contains(¶ms.mode.as_str()) {
|
||||
return Err(ApiError::invalid_request(
|
||||
format!(
|
||||
"Invalid pause mode '{}'; expected one of: abort, wait, keep",
|
||||
params.mode
|
||||
),
|
||||
Some("mode"),
|
||||
));
|
||||
}
|
||||
let Query(params) = params.map_err(invalid_query)?;
|
||||
|
||||
state
|
||||
.engine_core_client()
|
||||
.pause_scheduler(¶ms.mode, params.clear_cache)
|
||||
.pause_scheduler(params.mode, params.clear_cache)
|
||||
.await
|
||||
.map_err(|error| utility_call_error("pause", error))?;
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::Json;
|
||||
use axum::extract::rejection::QueryRejection;
|
||||
use axum::extract::{Query, State};
|
||||
use axum::http::StatusCode;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use vllm_engine_core_client::protocol::utility::PauseMode;
|
||||
|
||||
use crate::error::ApiError;
|
||||
use crate::state::AppState;
|
||||
@@ -18,8 +20,8 @@ pub(crate) struct IsSleepingResponse {
|
||||
pub(crate) struct SleepParams {
|
||||
#[serde(default = "default_sleep_level")]
|
||||
level: u32,
|
||||
#[serde(default = "default_sleep_mode")]
|
||||
mode: String,
|
||||
#[serde(default)]
|
||||
mode: PauseMode,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default, Deserialize)]
|
||||
@@ -32,18 +34,20 @@ const fn default_sleep_level() -> u32 {
|
||||
1
|
||||
}
|
||||
|
||||
fn default_sleep_mode() -> String {
|
||||
"abort".to_string()
|
||||
fn invalid_query(error: QueryRejection) -> ApiError {
|
||||
ApiError::invalid_request(error.body_text(), Some("mode"))
|
||||
}
|
||||
|
||||
/// Put the engine to sleep.
|
||||
pub async fn sleep(
|
||||
State(state): State<Arc<AppState>>,
|
||||
Query(params): Query<SleepParams>,
|
||||
params: Result<Query<SleepParams>, QueryRejection>,
|
||||
) -> Result<StatusCode, ApiError> {
|
||||
let Query(params) = params.map_err(invalid_query)?;
|
||||
|
||||
state
|
||||
.engine_core_client()
|
||||
.sleep(params.level, ¶ms.mode)
|
||||
.sleep(params.level, params.mode)
|
||||
.await
|
||||
.map_err(|error| utility_call_error("sleep", error))?;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user