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

JSON: [key] -> .at(key), assert() -> GGML_ASSERT (#7143)

Browse source
This commit is contained in:
Johannes Gäßler 2024-05-08 21:53:08 +02:00 • committed by GitHub
parent 9da243b36a
commit c12452c7ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 56 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/server/utils.hpp
View file

@ -3,6 +3,8 @@
#include "llama.h"
#include "common.h"
// Change JSON_ASSERT from assert() to GGML_ASSERT:
#define JSON_ASSERT GGML_ASSERT
#include "json.hpp"
#include <string>
@ -373,11 +375,11 @@ static json oaicompat_completion_params_parse(
llama_params["top_p"] = json_value(body, "top_p", 1.0);
// Apply chat template to the list of messages
llama_params["prompt"] = format_chat(model, chat_template, body["messages"]);
llama_params["prompt"] = format_chat(model, chat_template, body.at("messages"));
// Handle "stop" field
if (body.contains("stop") && body["stop"].is_string()) {
llama_params["stop"] = json::array({body["stop"].get<std::string>()});
if (body.contains("stop") && body.at("stop").is_string()) {
llama_params["stop"] = json::array({body.at("stop").get<std::string>()});
} else {
llama_params["stop"] = json_value(body, "stop", json::array());
}