Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions tests/xllm_service/chat_template/jinja_chat_template_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,43 @@ TEST(JinjaChatTemplate, OpenChatModel) {
EXPECT_EQ(result.value(), expected);
}

TEST(JinjaChatTemplate, RendersGlm52StandardJinjaSyntax) {
const std::string template_str =
"{{ messages.0.role }}: {{ messages.0.content | capitalize }}";

nlohmann::ordered_json messages = {
{{"role", "user"}, {"content", "hello world"}}};

TokenizerArgs args;
args.chat_template(template_str);
args.bos_token("");
args.eos_token("");
JinjaChatTemplate template_(args);

auto result = template_.apply(messages);
ASSERT_TRUE(result.has_value());
EXPECT_EQ(result.value(), "user: Hello world");
}

TEST(JinjaChatTemplate, PreservesGlm52SyntaxLikeTextInStringLiterals) {
const std::string template_str =
"{{ 'release.2 | capitalize' }}|"
"{{ messages.0.content | capitalize }}";

nlohmann::ordered_json messages = {
{{"role", "user"}, {"content", "hello world"}}};

TokenizerArgs args;
args.chat_template(template_str);
args.bos_token("");
args.eos_token("");
JinjaChatTemplate template_(args);

auto result = template_.apply(messages);
ASSERT_TRUE(result.has_value());
EXPECT_EQ(result.value(), "release.2 | capitalize|Hello world");
}

TEST(JinjaChatTemplate, ApplyChatTemplateKwargs) {
const std::string template_str =
"{% if enable_thinking %}<think>{% endif %}"
Expand Down
120 changes: 119 additions & 1 deletion xllm_service/chat_template/jinja_chat_template.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ limitations under the License.
#include <glog/logging.h>
#include <unistd.h>

#include <cctype>
#include <optional>
#include <string>
#include <vector>
Expand Down Expand Up @@ -128,12 +129,129 @@ nlohmann::ordered_json with_thinking_fallback(
return fallback;
}

enum class JinjaBlock { kText, kExpression, kStatement, kComment };

bool is_numeric_member_prefix(char c) {
return std::isalpha(static_cast<unsigned char>(c)) || c == '_' || c == ')' ||
c == ']';
}

bool is_identifier_char(char c) {
return std::isalnum(static_cast<unsigned char>(c)) || c == '_';
}

std::string normalize_glm52_jinja_syntax(const std::string& tmpl) {
std::string normalized;
normalized.reserve(tmpl.size());

JinjaBlock block = JinjaBlock::kText;
char quote = '\0';
size_t i = 0;
while (i < tmpl.size()) {
if (block == JinjaBlock::kText && i + 1 < tmpl.size() && tmpl[i] == '{') {
if (tmpl[i + 1] == '{') {
block = JinjaBlock::kExpression;
} else if (tmpl[i + 1] == '%') {
block = JinjaBlock::kStatement;
} else if (tmpl[i + 1] == '#') {
block = JinjaBlock::kComment;
} else {
normalized.push_back(tmpl[i++]);
continue;
}
normalized.append(tmpl, i, 2);
i += 2;
continue;
}

if (block == JinjaBlock::kComment) {
if (i + 1 < tmpl.size() && tmpl[i] == '#' && tmpl[i + 1] == '}') {
normalized.append(tmpl, i, 2);
i += 2;
block = JinjaBlock::kText;
} else {
normalized.push_back(tmpl[i++]);
}
continue;
}

if (block == JinjaBlock::kExpression || block == JinjaBlock::kStatement) {
const char close = block == JinjaBlock::kExpression ? '}' : '%';
if (quote == '\0' && i + 1 < tmpl.size() && tmpl[i] == close &&
tmpl[i + 1] == '}') {
normalized.append(tmpl, i, 2);
i += 2;
block = JinjaBlock::kText;
continue;
}

if (quote != '\0') {
normalized.push_back(tmpl[i]);
if (tmpl[i] == '\\' && i + 1 < tmpl.size()) {
normalized.push_back(tmpl[i + 1]);
i += 2;
continue;
}
if (tmpl[i] == quote) {
quote = '\0';
}
++i;
continue;
}

if (tmpl[i] == '\'' || tmpl[i] == '"') {
quote = tmpl[i];
normalized.push_back(tmpl[i++]);
continue;
}

if (tmpl[i] == '.' && !normalized.empty() &&
is_numeric_member_prefix(normalized.back()) && i + 1 < tmpl.size() &&
std::isdigit(static_cast<unsigned char>(tmpl[i + 1]))) {
size_t end = i + 1;
while (end < tmpl.size() &&
std::isdigit(static_cast<unsigned char>(tmpl[end]))) {
++end;
}
normalized.push_back('[');
normalized.append(tmpl, i + 1, end - i - 1);
normalized.push_back(']');
i = end;
continue;
}

if (tmpl[i] == '|') {
size_t filter = i + 1;
while (filter < tmpl.size() &&
std::isspace(static_cast<unsigned char>(tmpl[filter]))) {
++filter;
}
constexpr char kCapitalize[] = "capitalize";
constexpr size_t kCapitalizeLength = sizeof(kCapitalize) - 1;
if (tmpl.compare(filter, kCapitalizeLength, kCapitalize) == 0 &&
(filter + kCapitalizeLength == tmpl.size() ||
!is_identifier_char(tmpl[filter + kCapitalizeLength]))) {
normalized.append(".capitalize()");
i = filter + kCapitalizeLength;
continue;
}
}
}

normalized.push_back(tmpl[i++]);
}

return normalized;
}

} // namespace

JinjaChatTemplate::JinjaChatTemplate(const TokenizerArgs& args) : args_(args) {
try {
template_ = std::make_unique<minja::chat_template>(
args_.chat_template(), args_.bos_token(), args_.eos_token());
normalize_glm52_jinja_syntax(args_.chat_template()),
args_.bos_token(),
args_.eos_token());
LOG(INFO) << "Jinja chat template init succeed.";

} catch (const std::exception& e) {
Expand Down