[Rust Frontend] Resolve unified and split parser selections consistently (#56018)
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
This commit is contained in:
@@ -23,8 +23,8 @@ use serde_json::Value;
|
||||
use serde_with::{DefaultOnNull, OneOrMany, serde_as};
|
||||
use thiserror_ext::AsReport as _;
|
||||
use uuid::Uuid;
|
||||
use vllm_chat::GenerationConfigMode;
|
||||
use vllm_chat::multimodal::MmLimitPerPrompt;
|
||||
use vllm_chat::{GenerationConfigMode, ReasoningParserFactory};
|
||||
use vllm_engine_core_client::TransportMode;
|
||||
use vllm_managed_engine::ManagedEngineConfig;
|
||||
use vllm_managed_engine::cli::{ManagedEngineArgs, repartition_managed_engine_args};
|
||||
@@ -756,13 +756,7 @@ impl ServeArgs {
|
||||
}
|
||||
|
||||
fn effective_engine_reasoning_parser(selection: &ParserSelection, model: &str) -> Option<String> {
|
||||
match selection {
|
||||
ParserSelection::Auto => ReasoningParserFactory::global()
|
||||
.resolve_name_for_model(model)
|
||||
.map(str::to_string),
|
||||
ParserSelection::None => None,
|
||||
ParserSelection::Explicit(name) => Some(name.clone()),
|
||||
}
|
||||
selection.resolve_reasoning_name(model).map(str::to_owned)
|
||||
}
|
||||
|
||||
/// Allocate fresh IPC endpoints for one managed frontend instance.
|
||||
|
||||
@@ -413,6 +413,21 @@ fn serve_args_resolve_auto_reasoning_parser_for_managed_engine() {
|
||||
.assert_debug_eq(&config.python_args);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn serve_args_resolve_unified_reasoning_parser_for_managed_engine() {
|
||||
let cli = Cli::try_parse_from(["vllm-rs", "serve", "moonshotai/Kimi-K3"]).unwrap();
|
||||
let Command::Serve(args) = cli.command else {
|
||||
panic!("expected serve args");
|
||||
};
|
||||
expect![[r#"
|
||||
[
|
||||
"--reasoning-parser",
|
||||
"kimi_k3",
|
||||
]
|
||||
"#]]
|
||||
.assert_debug_eq(&args.to_managed_engine_config(5555).python_args);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn serve_args_forward_explicit_reasoning_parser_to_managed_engine() {
|
||||
let cli = Cli::try_parse_from([
|
||||
|
||||
Reference in New Issue
Block a user