openai: fix merge
This commit is contained in:
parent
3f5a25f566
commit
5ea637e42c
1 changed files with 1 additions and 1 deletions
|
@ -385,7 +385,7 @@ static json oaicompat_completion_params_parse(
|
||||||
|
|
||||||
std::string extra_system_message;
|
std::string extra_system_message;
|
||||||
// Apply chat template to the list of messages
|
// Apply chat template to the list of messages
|
||||||
llama_params["prompt"] = format_chat(model, chat_template, body.at("messages"));
|
llama_params["prompt"] = format_chat(model, chat_template, body.at("messages"), extra_system_message);
|
||||||
|
|
||||||
// Handle "stop" field
|
// Handle "stop" field
|
||||||
if (body.contains("stop") && body.at("stop").is_string()) {
|
if (body.contains("stop") && body.at("stop").is_string()) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue