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

minja: add str.title()

Browse source
This commit is contained in:
ochafik 2024-09-26 19:03:59 +01:00
parent 296331bba3
commit 50685f837f
2 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
common/minja.hpp
View file

@ -100,7 +100,7 @@ private:
} }
out << string_quote; out << string_quote;
} }
void dump(std::ostringstream & out, int indent = -1, int level = 0, char string_quote = '\'') const { void dump(std::ostringstream & out, int indent = -1, int level = 0, bool to_json = false) const {
auto print_indent = [&](int level) { auto print_indent = [&](int level) {
if (indent > 0) { if (indent > 0) {
out << "\n"; out << "\n";
@ -113,13 +113,15 @@ private:
else print_indent(level + 1); else print_indent(level + 1);
}; };
auto string_quote = to_json ? '"' : '\'';
if (is_null()) out << "null"; if (is_null()) out << "null";
else if (array_) { else if (array_) {
out << "["; out << "[";
print_indent(level + 1); print_indent(level + 1);
for (size_t i = 0; i < array_->size(); ++i) { for (size_t i = 0; i < array_->size(); ++i) {
if (i) print_sub_sep(); if (i) print_sub_sep();
(*array_)[i].dump(out, indent, level + 1, string_quote); (*array_)[i].dump(out, indent, level + 1, to_json);
} }
print_indent(level); print_indent(level);
out << "]"; out << "]";
@ -134,15 +136,15 @@ private:
out << string_quote << it->first.dump() << string_quote; out << string_quote << it->first.dump() << string_quote;
} }
out << ": "; out << ": ";
it->second.dump(out, indent, level + 1, string_quote); it->second.dump(out, indent, level + 1, to_json);
} }
print_indent(level); print_indent(level);
out << "}"; out << "}";
} else if (callable_) { } else if (callable_) {
throw std::runtime_error("Cannot dump callable to JSON"); throw std::runtime_error("Cannot dump callable to JSON");
} else if (is_boolean()) { } else if (is_boolean() && !to_json) {
out << (this->to_bool() ? "True" : "False"); out << (this->to_bool() ? "True" : "False");
} else if (is_string()) { } else if (is_string() && !to_json) {
dump_string(primitive_, out, string_quote); dump_string(primitive_, out, string_quote);
} else { } else {
out << primitive_.dump(); out << primitive_.dump();
@ -378,7 +380,7 @@ public:
std::string dump(int indent=-1, bool to_json=false) const { std::string dump(int indent=-1, bool to_json=false) const {
std::ostringstream out; std::ostringstream out;
dump(out, indent, 0, to_json ? '"' : '\''); dump(out, indent, 0, to_json);
return out.str(); return out.str();
} }
@ -1231,14 +1233,22 @@ public:
return callable.call(context, vargs); return callable.call(context, vargs);
} }
} else if (obj.is_string()) { } else if (obj.is_string()) {
auto str = obj.get<std::string>();
if (method->get_name() == "strip") { if (method->get_name() == "strip") {
args.expectArgs("strip method", {0, 0}, {0, 0}); args.expectArgs("strip method", {0, 0}, {0, 0});
return Value(strip(obj.get<std::string>())); return Value(strip(str));
} else if (method->get_name() == "endswith") { } else if (method->get_name() == "endswith") {
args.expectArgs("endswith method", {1, 1}, {0, 0}); args.expectArgs("endswith method", {1, 1}, {0, 0});
auto str = obj.get<std::string>();
auto suffix = args.args[0]->evaluate(context).get<std::string>(); auto suffix = args.args[0]->evaluate(context).get<std::string>();
return suffix.length() <= str.length() && std::equal(suffix.rbegin(), suffix.rend(), str.rbegin()); return suffix.length() <= str.length() && std::equal(suffix.rbegin(), suffix.rend(), str.rbegin());
} else if (method->get_name() == "title") {
args.expectArgs("title method", {0, 0}, {0, 0});
auto res = str;
for (size_t i = 0, n = res.size(); i < n; ++i) {
if (i == 0 || std::isspace(res[i - 1])) res[i] = std::toupper(res[i]);
else res[i] = std::tolower(res[i]);
}
return res;
} }
} }
throw std::runtime_error("Unknown method: " + method->get_name()); throw std::runtime_error("Unknown method: " + method->get_name());
@ -2240,7 +2250,12 @@ inline std::shared_ptr<Context> Context::builtins() {
auto items = Value::array(); auto items = Value::array();
if (args.contains("object")) { if (args.contains("object")) {
auto & obj = args.at("object"); auto & obj = args.at("object");
if (!obj.is_null()) { if (obj.is_string()) {
auto json_obj = json::parse(obj.get<std::string>());
for (const auto & kv : json_obj.items()) {
items.push_back(Value::array({kv.key(), kv.value()}));
}
} else if (!obj.is_null()) {
for (auto & key : obj.keys()) { for (auto & key : obj.keys()) {
items.push_back(Value::array({key, obj.at(key)})); items.push_back(Value::array({key, obj.at(key)}));
} }

1
tests/test-minja.cpp
View file

@ -149,6 +149,7 @@ static void test_error_contains(const std::string & template_str, const json & b
} }
static void test_template_features() { static void test_template_features() {
test_render(R"({{ 'foo bar'.title() }})", {}, {}, "Foo Bar");
test_render(R"({{ 1 | safe }})", {}, {}, "1"); test_render(R"({{ 1 | safe }})", {}, {}, "1");
test_render(R"({{ 'abc'.endswith('bc') }},{{ ''.endswith('a') }})", {}, {}, "True,False"); test_render(R"({{ 'abc'.endswith('bc') }},{{ ''.endswith('a') }})", {}, {}, "True,False");
test_render(R"({{ none | selectattr("foo", "equalto", "bar") | list }})", {}, {}, "[]"); test_render(R"({{ none | selectattr("foo", "equalto", "bar") | list }})", {}, {}, "[]");