Skip to content
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

Jump to bottom

Server: Fix system_prompt handling #7153

Merged
merged 1 commit into from
May 11, 2024
Merged

Server: Fix system_prompt handling #7153

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
20 changes: 7 additions & 13 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,9 +651,6 @@ struct server_context {
std::string system_prompt;
std::vector<llama_token> system_tokens;

std::string name_user; // this should be the antiprompt
std::string name_assistant;

// slots / clients
std::vector<server_slot> slots;
json default_generation_settings_for_props;
Expand Down Expand Up @@ -1098,15 +1095,11 @@ struct server_context {
system_need_update = false;
}

void system_prompt_set(const json & sys_props) {
system_prompt = sys_props.value("prompt", "");
name_user = sys_props.value("anti_prompt", "");
name_assistant = sys_props.value("assistant_name", "");
bool system_prompt_set(const std::string & sys_prompt) {
system_prompt = sys_prompt;

LOG_VERBOSE("system prompt process", {
{"system_prompt", system_prompt},
{"name_user", name_user},
{"name_assistant", name_assistant},
});

// release all slots
Expand All @@ -1115,6 +1108,7 @@ struct server_context {
}

system_need_update = true;
return true;
}

bool process_token(completion_token_output & result, server_slot & slot) {
Expand Down Expand Up @@ -1534,7 +1528,8 @@ struct server_context {
}

if (task.data.contains("system_prompt")) {
system_prompt_set(task.data.at("system_prompt"));
std::string sys_prompt = json_value(task.data, "system_prompt", std::string());
system_prompt_set(sys_prompt);

for (server_slot & slot : slots) {
slot.n_past = 0;
Expand Down Expand Up @@ -2918,7 +2913,7 @@ int main(int argc, char ** argv) {
server_params_parse(argc, argv, sparams, params);

if (!sparams.system_prompt.empty()) {
ctx_server.system_prompt_set(json::parse(sparams.system_prompt));
ctx_server.system_prompt_set(sparams.system_prompt);
}

if (params.model_alias == "unknown") {
Expand Down Expand Up @@ -3407,8 +3402,7 @@ int main(int argc, char ** argv) {
const auto handle_props = [&ctx_server](const httplib::Request & req, httplib::Response & res) {
res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin"));
json data = {
{ "user_name", ctx_server.name_user.c_str() },
{ "assistant_name", ctx_server.name_assistant.c_str() },
{ "system_prompt", ctx_server.system_prompt.c_str() },
{ "default_generation_settings", ctx_server.default_generation_settings_for_props },
{ "total_slots", ctx_server.params.n_parallel }
};
Expand Down
Loading