summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorAlexey Parfenov <zxed@alkatrazstudio.net>2024-02-05 08:10:22 +0000
committerGitHub <noreply@github.com>2024-02-05 10:10:22 +0200
commita2d60c9158435ae9a6f14632f07f1acf7a3becef (patch)
tree1466e6a9bfc6ddc1810e0580eb404aa54de537e4 /examples
parente6f81775323f6f4e4a30abf022a6028fa86b79ac (diff)
server : allow to get default generation settings for completion (#5307)
Diffstat (limited to 'examples')
-rw-r--r--examples/server/README.md16
-rw-r--r--examples/server/server.cpp7
2 files changed, 21 insertions, 2 deletions
diff --git a/examples/server/README.md b/examples/server/README.md
index fe934dab..d8e7c313 100644
--- a/examples/server/README.md
+++ b/examples/server/README.md
@@ -264,7 +264,21 @@ Notice that each `probs` is an array of length `n_probs`.
It also accepts all the options of `/completion` except `stream` and `prompt`.
-- **GET** `/props`: Return the required assistant name and anti-prompt to generate the prompt in case you have specified a system prompt for all slots.
+- **GET** `/props`: Return current server settings.
+
+### Result JSON
+
+```json
+{
+ "assistant_name": "",
+ "user_name": "",
+ "default_generation_settings": { ... }
+}
+```
+
+- `assistant_name` - the required assistant name to generate the prompt in case you have specified a system prompt for all slots.
+- `user_name` - the required anti-prompt to generate the prompt in case you have specified a system prompt for all slots.
+- `default_generation_settings` - the default generation settings for the `/completion` endpoint, has the same fields as the `generation_settings` response object from the `/completion` endpoint.
- **POST** `/v1/chat/completions`: OpenAI-compatible Chat Completions API. Given a ChatML-formatted json description in `messages`, it returns the predicted completion. Both synchronous and streaming mode are supported, so scripted and interactive applications work fine. While no strong claims of compatibility with OpenAI API spec is being made, in our experience it suffices to support many apps. Only ChatML-tuned models, such as Dolphin, OpenOrca, OpenHermes, OpenChat-3.5, etc can be used with this endpoint. Compared to `api_like_OAI.py` this API implementation does not require a wrapper to be served.
diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index a9f8cb36..8000fee5 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -334,6 +334,7 @@ struct llama_server_context
// slots / clients
std::vector<llama_client_slot> slots;
+ json default_generation_settings_for_props;
llama_server_queue queue_tasks;
llama_server_response queue_results;
@@ -430,6 +431,9 @@ struct llama_server_context
slots.push_back(slot);
}
+ default_generation_settings_for_props = get_formated_generation(slots.front());
+ default_generation_settings_for_props["seed"] = -1;
+
batch = llama_batch_init(n_ctx, 0, params.n_parallel);
// empty system prompt
@@ -2614,7 +2618,8 @@ int main(int argc, char **argv)
res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin"));
json data = {
{ "user_name", llama.name_user.c_str() },
- { "assistant_name", llama.name_assistant.c_str() }
+ { "assistant_name", llama.name_assistant.c_str() },
+ { "default_generation_settings", llama.default_generation_settings_for_props }
};
res.set_content(data.dump(), "application/json; charset=utf-8");
});