mirror of
https://github.com/huggingface/text-generation-inference.git
synced 2025-09-11 04:14:52 +00:00
fix: prefer apply_chat_template logic in HubTokenizerConfig struct
This commit is contained in:
parent
446b3b6af7
commit
adad67e3d0
@ -140,19 +140,9 @@ impl Infer {
|
||||
|
||||
/// Apply the chat template to the chat request
|
||||
#[instrument(skip_all)]
|
||||
|
||||
pub(crate) fn apply_chat_template(&self, chat: ChatRequest) -> Result<String, InferError> {
|
||||
let mut env = minijinja::Environment::new();
|
||||
let chat_template = self
|
||||
.tokenizer_config
|
||||
.chat_template
|
||||
.as_ref()
|
||||
.ok_or_else(|| {
|
||||
InferError::TemplateError(minijinja::ErrorKind::TemplateNotFound.into())
|
||||
})?;
|
||||
env.add_template("_", chat_template)?;
|
||||
env.get_template("_")?
|
||||
.render(chat)
|
||||
self.tokenizer_config
|
||||
.apply_chat_template(chat)
|
||||
.map_err(InferError::TemplateError)
|
||||
}
|
||||
|
||||
|
@ -26,6 +26,22 @@ pub struct HubTokenizerConfig {
|
||||
pub chat_template: Option<String>,
|
||||
}
|
||||
|
||||
impl HubTokenizerConfig {
|
||||
/// Apply the chat template to the chat request
|
||||
pub(crate) fn apply_chat_template(
|
||||
&self,
|
||||
chat: ChatRequest,
|
||||
) -> Result<String, minijinja::Error> {
|
||||
let mut env = minijinja::Environment::new();
|
||||
let chat_template = self
|
||||
.chat_template
|
||||
.as_ref()
|
||||
.ok_or(minijinja::ErrorKind::TemplateNotFound)?;
|
||||
env.add_template("_", chat_template)?;
|
||||
env.get_template("_")?.render(chat)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Serialize, ToSchema)]
|
||||
pub struct Info {
|
||||
/// Model info
|
||||
|
Loading…
Reference in New Issue
Block a user