Skip to content

Commit 99cb6be

Browse files
committed
server : remove "tokens" from the OAI endpoint
ggml-ci
1 parent 5bf29af commit 99cb6be

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

examples/server/server.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,6 @@ struct server_task_result_cmpl_final : server_task_result {
547547
{"index", 0},
548548
{"message", json {
549549
{"content", content},
550-
{"tokens", tokens},
551550
{"role", "assistant"}
552551
}
553552
}}});
@@ -688,9 +687,8 @@ struct server_task_result_cmpl_partial : server_task_result {
688687
json second_ret = json{
689688
{"choices", json::array({json{{"finish_reason", nullptr},
690689
{"index", 0},
691-
{"delta", json{
692-
{"content", content},
693-
{"tokens", tokens}}}
690+
{"delta", json {
691+
{"content", content}}}
694692
}})},
695693
{"created", t},
696694
{"id", oaicompat_cmpl_id},
@@ -704,9 +702,8 @@ struct server_task_result_cmpl_partial : server_task_result {
704702
{"finish_reason", nullptr},
705703
{"index", 0},
706704
{"delta",
707-
json{
705+
json {
708706
{"content", content},
709-
{"tokens", tokens}
710707
}},
711708
}});
712709
}

examples/server/tests/unit/test_completion.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ def test_completion_stream(prompt: str, n_predict: int, re_content: str, n_promp
6262
assert data["generation_settings"]["seed"] == server.seed
6363
assert match_regex(re_content, content)
6464
else:
65-
assert len(res.body["tokens"]) > 0
66-
assert all(type(tok) == int for tok in res.body["tokens"])
65+
assert len(data["tokens"]) > 0
66+
assert all(type(tok) == int for tok in data["tokens"])
6767
content += data["content"]
6868

6969

0 commit comments

Comments
 (0)