vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add missing try catch around jinja parsing to default to chatml

Browse source
This commit is contained in:
Olivier Chafik 2025-02-03 17:32:12 +00:00
parent aa98e59038
commit b2dd490926
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
common/common.cpp
View file

@ -1920,13 +1920,22 @@ common_chat_templates common_chat_templates_from_model(const struct llama_model
token_bos = get_token(llama_vocab_bos(vocab), "BOS", "bos_token"); token_bos = get_token(llama_vocab_bos(vocab), "BOS", "bos_token");
token_eos = get_token(llama_vocab_eos(vocab), "EOS", "eos_token"); token_eos = get_token(llama_vocab_eos(vocab), "EOS", "eos_token");
#endif #endif
return { try {
has_explicit_template, return {
std::make_unique<minja::chat_template>(default_template_src, token_bos, token_eos), has_explicit_template,
template_tool_use_src.empty() std::make_unique<minja::chat_template>(default_template_src, token_bos, token_eos),
? nullptr template_tool_use_src.empty()
: std::make_unique<minja::chat_template>(template_tool_use_src, token_bos, token_eos) ? nullptr
}; : std::make_unique<minja::chat_template>(template_tool_use_src, token_bos, token_eos),
};
} catch (const std::exception & e) {
LOG_ERR("%s: failed to parse chat template: %s\n", __func__, e.what());
return {
has_explicit_template,
std::make_unique<minja::chat_template>(CHATML_TEMPLATE_SRC, token_bos, token_eos),
nullptr,
};
}
} }
// //