Skip to content

Add Qwen3 Chat Template Support #1001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sayanshaw24 merged 1 commit into from
Oct 10, 2025
Merged

Add Qwen3 Chat Template Support #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
137 changes: 72 additions & 65 deletions shared/api/minja.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1666,9 +1666,9 @@ namespace minja
{
public:
DEFINE_EXPRESION_ID();
std::shared_ptr<Expression> start, end;
SliceExpr(const Location &location, std::shared_ptr<Expression> &&s, std::shared_ptr<Expression> &&e)
: Expression(location), start(std::move(s)), end(std::move(e)) {}
std::shared_ptr<Expression> start, end, step;
SliceExpr(const Location &location, std::shared_ptr<Expression> &&s, std::shared_ptr<Expression> &&e, std::shared_ptr<Expression> && st = nullptr)
: Expression(location), start(std::move(s)), end(std::move(e)), step(std::move(st)) {}
Value do_evaluate(const std::shared_ptr<Context> &) const override
{
throw std::runtime_error("SliceExpr not implemented");
Expand All @@ -1692,25 +1692,37 @@ namespace minja
auto target_value = base->evaluate(context);
if (auto slice = expr_cast<SliceExpr *>(index.get()))
{
auto start = slice->start ? slice->start->evaluate(context).get<int64_t>() : 0;
auto end = slice->end ? slice->end->evaluate(context).get<int64_t>() : (int64_t)target_value.size();
auto len = target_value.size();
auto wrap = [len](int64_t i) -> int64_t {
if (i < 0) {
return i + len;
}
return i;
};
int64_t step = slice->step ? slice->step->evaluate(context).get<int64_t>() : 1;
if (!step) {
throw std::runtime_error("slice step cannot be zero");
}
int64_t start = slice->start ? wrap(slice->start->evaluate(context).get<int64_t>()) : (step < 0 ? len - 1 : 0);
int64_t end = slice->end ? wrap(slice->end->evaluate(context).get<int64_t>()) : (step < 0 ? -1 : len);
if (target_value.is_string())
{
std::string s = target_value.get<std::string>();
if (start < 0)
start = s.size() + start;
if (end < 0)
end = s.size() + end;
return s.substr(start, end - start);

std::string result;
if (start < end && step == 1) {
result = s.substr(start, end - start);
} else {
for (int64_t i = start; step > 0 ? i < end : i > end; i += step) {
result += s[i];
}
}
return result;
}
else if (target_value.is_array())
{
if (start < 0)
start = target_value.size() + start;
if (end < 0)
end = target_value.size() + end;
auto result = Value::array();
for (auto i = start; i < end; ++i)
for (int64_t i = start; step > 0 ? i < end : i > end; i += step)
{
result.push_back(target_value.at(i));
}
Expand Down Expand Up @@ -2161,6 +2173,12 @@ namespace minja
auto suffix = vargs.args[0].get<std::string>();
return suffix.length() <= str.length() && std::equal(suffix.rbegin(), suffix.rend(), str.rbegin());
}
else if (method->get_name() == "startswith")
{
vargs.expectArgs("startswith method", {1, 1}, {0, 0});
auto prefix = vargs.args[0].get<std::string>();
return prefix.length() <= str.length() && std::equal(prefix.begin(), prefix.end(), str.begin());
}
else if (method->get_name() == "title")
{
vargs.expectArgs("title method", {0, 0}, {0, 0});
Expand Down Expand Up @@ -2916,67 +2934,56 @@ namespace minja

auto value = parseValue();

while (it != end && consumeSpaces() && peekSymbols({"[", "."}))
{
if (!consumeToken("[").empty())
{
while (it != end && consumeSpaces() && peekSymbols({ "[", "." })) {
if (!consumeToken("[").empty()) {
std::shared_ptr<Expression> index;
if (!consumeToken(":").empty())
{
auto slice_end = parseExpression();
index = std::make_shared<SliceExpr>(slice_end->location, nullptr, std::move(slice_end));
auto slice_loc = get_location();
std::shared_ptr<Expression> start, end, step;
bool has_first_colon = false, has_second_colon = false;

if (!peekSymbols({ ":" })) {
start = parseExpression();
}
else
{
auto slice_start = parseExpression();
if (!consumeToken(":").empty())
{
consumeSpaces();
if (peekSymbols({"]"}))
{
index = std::make_shared<SliceExpr>(slice_start->location, std::move(slice_start), nullptr);
}
else
{
auto slice_end = parseExpression();
index = std::make_shared<SliceExpr>(slice_start->location, std::move(slice_start), std::move(slice_end));
}

if (!consumeToken(":").empty()) {
has_first_colon = true;
if (!peekSymbols({ ":", "]" })) {
end = parseExpression();
}
else
{
index = std::move(slice_start);
if (!consumeToken(":").empty()) {
has_second_colon = true;
if (!peekSymbols({ "]" })) {
step = parseExpression();
}
}
}
if (!index)
throw std::runtime_error("Empty index in subscript");
if (consumeToken("]").empty())
throw std::runtime_error("Expected closing bracket in subscript");

if ((has_first_colon || has_second_colon)) {
index = std::make_shared<SliceExpr>(slice_loc, std::move(start), std::move(end), std::move(step));
} else {
index = std::move(start);
}
if (!index) throw std::runtime_error("Empty index in subscript");
if (consumeToken("]").empty()) throw std::runtime_error("Expected closing bracket in subscript");

value = std::make_shared<SubscriptExpr>(value->location, std::move(value), std::move(index));
}
else if (!consumeToken(".").empty())
{
auto identifier = parseIdentifier();
if (!identifier)
throw std::runtime_error("Expected identifier in subscript");

consumeSpaces();
if (peekSymbols({"("}))
{
auto callParams = parseCallArgs();
value = std::make_shared<MethodCallExpr>(identifier->location, std::move(value), std::move(identifier), std::move(callParams));
}
else
{
auto key = std::make_shared<LiteralExpr>(identifier->location, Value(identifier->get_name()));
value = std::make_shared<SubscriptExpr>(identifier->location, std::move(value), std::move(key));
}
} else if (!consumeToken(".").empty()) {
auto identifier = parseIdentifier();
if (!identifier) throw std::runtime_error("Expected identifier in subscript");

consumeSpaces();
if (peekSymbols({ "(" })) {
auto callParams = parseCallArgs();
value = std::make_shared<MethodCallExpr>(identifier->location, std::move(value), std::move(identifier), std::move(callParams));
} else {
auto key = std::make_shared<LiteralExpr>(identifier->location, Value(identifier->get_name()));
value = std::make_shared<SubscriptExpr>(identifier->location, std::move(value), std::move(key));
}
}
consumeSpaces();
}

if (peekSymbols({"("}))
{
if (peekSymbols({ "(" })) {
auto location = get_location();
auto callParams = parseCallArgs();
value = std::make_shared<CallExpr>(location, std::move(value), std::move(callParams));
Expand Down
Loading