dearwolf/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI.git synced 2025-05-20 18:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Re-enable grammars

Browse source
This commit is contained in:
Ettore Di Giacinto 2025-05-16 18:25:26 +02:00
parent 73cb2f8fa5
commit 141ceaf581
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
backend/cpp/llama/grpc-server.cpp
View file

@ -344,23 +344,23 @@ struct server_task {
}
}
// TODO: add back json_schema and grammar support
// // process "json_schema" and "grammar"
// if (data.contains("json_schema") && !data.contains("grammar")) {
// try {
// auto schema = json_value(data, "json_schema", json::object());
// SRV_DBG("JSON schema: %s\n", schema.dump(2).c_str());
// params.sampling.grammar = json_schema_to_grammar(schema);
// SRV_DBG("Converted grammar: %s\n", params.sampling.grammar.c_str());
// } catch (const std::exception & e) {
// throw std::runtime_error(std::string("\"json_schema\": ") + e.what());
// }
// } else {
// params.sampling.grammar = json_value(data, "grammar", defaults.sampling.grammar);
// SRV_DBG("Grammar: %s\n", params.sampling.grammar.c_str());
// params.sampling.grammar_lazy = json_value(data, "grammar_lazy", defaults.sampling.grammar_lazy);
// SRV_DBG("Grammar lazy: %s\n", params.sampling.grammar_lazy ? "true" : "false");
// }
//TODO: add back json_schema and grammar support
// process "json_schema" and "grammar"
if (data.contains("json_schema") && !data.contains("grammar")) {
try {
auto schema = json_value(data, "json_schema", json::object());
SRV_DBG("JSON schema: %s\n", schema.dump(2).c_str());
params.sampling.grammar = json_schema_to_grammar(schema);
SRV_DBG("Converted grammar: %s\n", params.sampling.grammar.c_str());
} catch (const std::exception & e) {
throw std::runtime_error(std::string("\"json_schema\": ") + e.what());
}
} else {
params.sampling.grammar = json_value(data, "grammar", defaults.sampling.grammar);
SRV_DBG("Grammar: %s\n", params.sampling.grammar.c_str());
params.sampling.grammar_lazy = json_value(data, "grammar_lazy", defaults.sampling.grammar_lazy);
SRV_DBG("Grammar lazy: %s\n", params.sampling.grammar_lazy ? "true" : "false");
}
{
auto it = data.find("chat_format");