From 99cb6be1d3d473a537e23e1fec9f075240106e94 Mon Sep 17 00:00:00 2001
From: Georgi Gerganov <ggerganov@gmail.com>
Date: Wed, 18 Dec 2024 10:16:46 +0200
Subject: [PATCH] server : remove "tokens" from the OAI endpoint

ggml-ci
---
 examples/server/server.cpp                    | 9 +++------
 examples/server/tests/unit/test_completion.py | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index 4675ac593..87ce65a79 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -547,7 +547,6 @@ struct server_task_result_cmpl_final : server_task_result {
             {"index", 0},
             {"message", json {
                 {"content", content},
-                {"tokens",  tokens},
                 {"role",    "assistant"}
             }
         }}});
@@ -688,9 +687,8 @@ struct server_task_result_cmpl_partial : server_task_result {
                 json second_ret = json{
                             {"choices", json::array({json{{"finish_reason", nullptr},
                                                             {"index", 0},
-                                                            {"delta", json{
-                                                            {"content", content},
-                                                            {"tokens",  tokens}}}
+                                                            {"delta", json {
+                                                            {"content", content}}}
                                                             }})},
                             {"created", t},
                             {"id", oaicompat_cmpl_id},
@@ -704,9 +702,8 @@ struct server_task_result_cmpl_partial : server_task_result {
                 {"finish_reason", nullptr},
                 {"index", 0},
                 {"delta",
-                json{
+                json {
                     {"content", content},
-                    {"tokens",  tokens}
                 }},
             }});
         }
diff --git a/examples/server/tests/unit/test_completion.py b/examples/server/tests/unit/test_completion.py
index 135cd6d0c..36aee57dd 100644
--- a/examples/server/tests/unit/test_completion.py
+++ b/examples/server/tests/unit/test_completion.py
@@ -62,8 +62,8 @@ def test_completion_stream(prompt: str, n_predict: int, re_content: str, n_promp
             assert data["generation_settings"]["seed"] == server.seed
             assert match_regex(re_content, content)
         else:
-            assert len(res.body["tokens"]) > 0
-            assert all(type(tok) == int for tok in res.body["tokens"])
+            assert len(data["tokens"]) > 0
+            assert all(type(tok) == int for tok in data["tokens"])
             content += data["content"]