huggingface/text-generation-inference
5
0
Fork 0
mirror of https://github.com/huggingface/text-generation-inference.git synced 2025-06-19 15:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: adjust message types in tests

Browse Source
This commit is contained in:
drbh 2025-02-20 19:38:45 +00:00
parent 4fa8512d99
commit 3770344529
3 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
router/src/infer/chat_template.rs
View File

@ -123,7 +123,8 @@ mod tests {
use crate::infer::chat_template::{raise_exception, strftime_now};
use crate::infer::ChatTemplate;
use crate::{
ChatTemplateInputs, Message, MessageContent, TextMessage, TokenizerConfigToken, Tool,
ChatTemplateInputs, Message, MessageBody, MessageContent, TextMessage,
TokenizerConfigToken, Tool,
};
use chrono::Local;
use minijinja::Environment;
@ -1160,24 +1161,27 @@ TOOL CALL ID: 0
Message {
name: None,
role: "user".to_string(),
content: Some(MessageContent::SingleText(
body: MessageBody::Content {
content: MessageContent::SingleText(
"I'd like to show off how chat templating works!".to_string(),
)),
tool_calls: None,
),
},
},
Message {
name: None,
role: "assistant".to_string(),
content: Some(MessageContent::SingleText(
body: MessageBody::Content {
content: MessageContent::SingleText(
"Great! How can I help you today?".to_string(),
)),
tool_calls: None,
),
},
},
Message {
name: None,
role: "user".to_string(),
content: Some(MessageContent::SingleText("Just testing".to_string())),
tool_calls: None,
body: MessageBody::Content {
content: MessageContent::SingleText("Just testing".to_string()),
},
},
];
let tools_string = r#"[{"type": "function","function": {"name": "get_current_weather","description": "Get the current weather","parameters": {"type": "object","properties": {"location": {"type": "string","description": "The city and state, e.g. San Francisco, CA"},"format": {"type": "string","enum": ["celsius", "fahrenheit"],"description": "The temperature unit to use. Infer this from the users location."}},"required": ["location", "format"]}}}]"#.to_string();
@ -1201,19 +1205,21 @@ TOOL CALL ID: 0
Message {
name: None,
role: "system".to_string(),
content: Some(MessageContent::SingleText(
body: MessageBody::Content {
content: MessageContent::SingleText(
"Youre a helpful assistant! Answer the users question best you can."
.to_string(),
)),
tool_calls: None,
),
},
},
Message {
name: None,
role: "user".to_string(),
content: Some(MessageContent::SingleText(
body: MessageBody::Content {
content: MessageContent::SingleText(
"What is the weather like in Brooklyn, New York?".to_string(),
)),
tool_calls: None,
),
},
},
];
let tools_string = r#"[{"type": "function","function": {"name": "get_current_weather","description": "Get the current weather","parameters": {"type": "object","properties": {"location": {"type": "string","description": "The city and state, e.g. San Francisco, CA"},"format": {"type": "string","enum": ["celsius", "fahrenheit"],"description": "The temperature unit to use. Infer this from the users location."}},"required": ["location", "format"]}}}]"#.to_string();

28
router/src/lib.rs
View File

@ -1596,12 +1596,11 @@ mod tests {
assert_eq!(
request.messages[0],
Message {
role: "user".to_string(),
content: Some(MessageContent::SingleText(
"What is Deep Learning?".to_string()
)),
name: None,
tool_calls: None
role: "user".to_string(),
body: MessageBody::Content {
content: MessageContent::SingleText("What is Deep Learning?".to_string())
},
}
);
}
@ -1652,13 +1651,15 @@ mod tests {
assert_eq!(
request.messages[0],
Message {
name: None,
role: "user".to_string(),
content: Some(MessageContent::MultipleChunks(vec![
body: MessageBody::Content {
content: MessageContent::MultipleChunks(vec![
MessageChunk::Text { text: "Whats in this image?".to_string() },
MessageChunk::ImageUrl { image_url: Url { url: "https://huggingface.co/datasets/huggingface/documentation-images/resolve/main/transformers/rabbit.png".to_string() }},
])),
name: None,
tool_calls: None
]),
},
}
);
}
@ -1666,13 +1667,14 @@ mod tests {
#[test]
fn text_message_convert() {
let message = Message{
name: None,
role: "user".to_string(),
content: Some(MessageContent::MultipleChunks(vec![
body: MessageBody::Content {
content: MessageContent::MultipleChunks(vec![
MessageChunk::Text { text: "Whats in this image?".to_string() },
MessageChunk::ImageUrl { image_url: Url { url: "https://huggingface.co/datasets/huggingface/documentation-images/resolve/main/transformers/rabbit.png".to_string() } }
])),
name: None,
tool_calls: None
]),
}
};
let textmsg: TextMessage = message.into();
assert_eq!(textmsg.content, "Whats in this image?![](https://huggingface.co/datasets/huggingface/documentation-images/resolve/main/transformers/rabbit.png)");

13
router/src/vertex.rs
View File

@ -147,7 +147,7 @@ pub(crate) async fn vertex_compatibility(
#[cfg(test)]
mod tests {
use super::*;
use crate::{Message, MessageContent};
use crate::{Message, MessageBody, MessageContent};
#[test]
fn vertex_deserialization() {
@ -169,12 +169,13 @@ mod tests {
VertexRequest {
instances: vec![VertexInstance::Chat(ChatRequest {
messages: vec![Message {
role: "user".to_string(),
content: Some(MessageContent::SingleText(
"What's Deep Learning?".to_string()
)),
name: None,
..Default::default()
role: "user".to_string(),
body: MessageBody::Content {
content: MessageContent::SingleText(
"What's Deep Learning?".to_string()
)
},
},],
max_tokens: Some(128),
top_p: Some(0.95),