diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 3c75e01dc5..092a798431 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2402,9 +2402,9 @@ dependencies = [ [[package]] name = "minijinja" -version = "2.18.0" +version = "2.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "328251e58ad8e415be6198888fc207502727dc77945806421ab34f35bf012e7d" +checksum = "ef84a52be188a1d4124bd717903fdde96ca4705f2b56adfe2d91fcc57fcb6987" dependencies = [ "indexmap 2.13.0", "memo-map", @@ -2414,9 +2414,9 @@ dependencies = [ [[package]] name = "minijinja-contrib" -version = "2.18.0" +version = "2.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6302e47d2b51f9fc978268ff7f5a014de5caa2ad48440309fd10ee711480d7" +checksum = "fd6e279dc925840c2d9ebc1e9f85410611d01292561297463ba3e516c3ad94dd" dependencies = [ "minijinja", "serde", @@ -5520,7 +5520,6 @@ dependencies = [ "expect-test", "futures", "half", - "indexmap 2.13.0", "itertools 0.14.0", "llm-multimodal", "minijinja", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 09f55cf07c..405d6775bc 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -61,8 +61,8 @@ itertools = "0.14.0" libc = "0.2.177" llm-multimodal = { git = "https://github.com/smg-project/llm-multimodal", rev = "15adba5e025d8636ba4a334fb379b1371f6196a1", default-features = false, features = ["native-tls"] } mimalloc = "0.1.52" -minijinja = { version = "2.0", features = ["unstable_machinery", "json", "builtins", "loader", "loop_controls", "preserve_order"] } -minijinja-contrib = { version = "2.0", features = ["pycompat"] } +minijinja = { version = "2.22", features = ["unstable_machinery", "json", "builtins", "loader", "loop_controls", "preserve_order"] } +minijinja-contrib = { version = "2.22", features = ["pycompat"] } native-tls-vendored = { package = "native-tls", version = "0.2.18", features = ["vendored"] } ndarray = { version = "0.17", features = ["serde"] } openai-harmony = { package = "oss-harmony", git = "https://github.com/oss-harmony/harmony", tag = "v0.0.11", default-features = false } diff --git a/rust/src/chat/Cargo.toml b/rust/src/chat/Cargo.toml index 7bc66dd598..f7526b75d9 100644 --- a/rust/src/chat/Cargo.toml +++ b/rust/src/chat/Cargo.toml @@ -10,7 +10,6 @@ asynk-strim-attr.workspace = true easy-ext.workspace = true futures.workspace = true half.workspace = true -indexmap.workspace = true itertools.workspace = true llm-multimodal.workspace = true minijinja.workspace = true diff --git a/rust/src/chat/src/renderer/hf/mod.rs b/rust/src/chat/src/renderer/hf/mod.rs index cfbc3f924a..901447dc27 100644 --- a/rust/src/chat/src/renderer/hf/mod.rs +++ b/rust/src/chat/src/renderer/hf/mod.rs @@ -16,7 +16,6 @@ use self::format::{ ChatTemplateContentFormat, ChatTemplateContentFormatOption as ContentFormatOption, }; use self::template::{CompiledChatTemplate, TemplateContext}; -use self::value::{TemplateValue, to_template_value}; use super::{ChatRenderer, RenderedPrompt, effective_template_kwargs}; use crate::error::Result; use crate::request::{ChatContent, ChatContentPart, ChatMessage, ChatRequest}; @@ -28,7 +27,6 @@ mod error; mod format; mod template; mod tojson; -mod value; pub use template::{load_chat_template, resolve_chat_template}; @@ -277,7 +275,7 @@ struct TemplateToolCall { #[derive(Debug, Serialize)] struct TemplateToolFunction { name: String, - arguments: TemplateValue, + arguments: JsonValue, } #[derive(Debug, Serialize)] @@ -291,7 +289,7 @@ pub(super) struct TemplateTool { struct TemplateToolDefinition { name: String, description: Option, - parameters: TemplateValue, + parameters: JsonValue, strict: Option, } @@ -384,8 +382,6 @@ fn to_template_tool_calls( error.as_report() )) })?; - let arguments = to_template_value(arguments); - tool_calls.push(TemplateToolCall { id: tool_call.id.clone(), r#type: "function", @@ -564,7 +560,7 @@ fn to_template_tools(tools: &[ChatTool]) -> Vec { function: TemplateToolDefinition { name: tool.name.clone(), description: tool.description.clone(), - parameters: to_template_value(tool.parameters.clone()), + parameters: tool.parameters.clone(), strict: tool.strict, }, }) @@ -1008,7 +1004,7 @@ mod tests { .apply_chat_template(&request) .unwrap(); - assert_eq!(rendered.prompt, Prompt::Text("|true".to_string())); + assert_eq!(rendered.prompt, Prompt::Text("|True".to_string())); } #[test] @@ -1093,7 +1089,7 @@ mod tests { let rendered = renderer.render(&request).unwrap().prompt; - assert_eq!(rendered, Prompt::Text("true|x".to_string())); + assert_eq!(rendered, Prompt::Text("True|x".to_string())); } #[test] @@ -1146,7 +1142,7 @@ mod tests { let rendered = renderer.render(&request).unwrap(); - assert_eq!(rendered.prompt, Prompt::Text("none|true".to_string())); + assert_eq!(rendered.prompt, Prompt::Text("none|True".to_string())); assert_eq!( rendered.effective_template_kwargs.get("reasoning_effort"), Some(&Value::String("none".to_string())) diff --git a/rust/src/chat/src/renderer/hf/value.rs b/rust/src/chat/src/renderer/hf/value.rs deleted file mode 100644 index 574e4a4592..0000000000 --- a/rust/src/chat/src/renderer/hf/value.rs +++ /dev/null @@ -1,80 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// SPDX-FileCopyrightText: Copyright contributors to the vLLM project - -use std::sync::Arc; - -use indexmap::IndexMap; -use minijinja::value::{Enumerator, Object, ObjectExt, ObjectRepr}; -use minijinja::{Error as TemplateError, ErrorKind as TemplateErrorKind, State}; -use serde::Serialize; -use serde_json::Value as JsonValue; - -/// A wrapper around `minijinja::Value` that can be constructed with `to_template_value` and used -/// as a value in the chat template. -#[derive(Debug, Serialize)] -#[serde(transparent)] -pub(super) struct TemplateValue(minijinja::Value); - -pub(super) fn to_template_value(value: JsonValue) -> TemplateValue { - TemplateValue(match value { - JsonValue::Array(values) => values - .into_iter() - .map(to_template_value) - .map(|value| value.0) - .collect::(), - JsonValue::Object(values) => minijinja::Value::from_object(TemplateMap( - values - .into_iter() - .map(|(key, value)| (key, to_template_value(value).0)) - .collect(), - )), - // For primitive values, directly convert them to `minijinja::Value` using `from_serialize`. - value => minijinja::Value::from_serialize(value), - }) -} - -/// A custom map type that always returns `UnknownMethod` for method calls, so that pycompat can -/// always handle dict methods through the unknown-method callback. -/// -/// Use `IndexMap` to preserve the original key order when iterating. -/// -/// MiniJinja's default map can resolve a same-named field before Python dict methods. HF templates -/// commonly call `dict.items()`, which would fail if the map had an `items` field. -/// See issue: https://github.com/mitsuhiko/minijinja/issues/903 -#[derive(Debug)] -struct TemplateMap(IndexMap); - -impl Object for TemplateMap { - fn repr(self: &Arc) -> ObjectRepr { - ObjectRepr::Map - } - - fn get_value(self: &Arc, key: &minijinja::Value) -> Option { - self.0.get(key.as_str()?).cloned() - } - - fn get_value_by_str(self: &Arc, key: &str) -> Option { - self.0.get(key).cloned() - } - - fn enumerate(self: &Arc) -> Enumerator { - self.mapped_rev_enumerator(|this| { - Box::new(this.0.keys().map(|key| minijinja::Value::from(key.as_str()))) - }) - } - - fn enumerator_len(self: &Arc) -> Option { - Some(self.0.len()) - } - - fn call_method( - self: &Arc, - _state: &State<'_, '_>, - _method: &str, - _args: &[minijinja::Value], - ) -> std::result::Result { - // Always return `UnknownMethod` for method calls, - // so that pycompat can handle dict methods through the unknown-method callback. - Err(TemplateError::from(TemplateErrorKind::UnknownMethod)) - } -}