From 2a1a6f6326403032602897d9f48552f182c08be6 Mon Sep 17 00:00:00 2001
From: Georgi Gerganov <ggerganov@gmail.com>
Date: Wed, 18 Dec 2024 14:10:59 +0200
Subject: [PATCH] server : fix rebase artifacts

---
 examples/server/server.cpp                   | 4 ++--
 examples/server/tests/unit/test_embedding.py | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index 57db582d7..5ed4e8d27 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -687,6 +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}}}
                                                             }})},
                             {"created", t},
                             {"id", oaicompat_cmpl_id},
@@ -702,7 +704,6 @@ struct server_task_result_cmpl_partial : server_task_result {
                 {"delta",
                 json {
                     {"content", content},
-                    {"tokens",  tokens}
                 }},
             }});
         }
@@ -1016,7 +1017,6 @@ struct server_slot {
         n_prompt_tokens    = 0;
         last_nl_pos        = 0;
         generated_text     = "";
-        generated_tokens   = {};
         has_new_line       = false;
         truncated          = false;
         stop               = STOP_TYPE_NONE;
diff --git a/examples/server/tests/unit/test_embedding.py b/examples/server/tests/unit/test_embedding.py
index af6d14853..e32d74582 100644
--- a/examples/server/tests/unit/test_embedding.py
+++ b/examples/server/tests/unit/test_embedding.py
@@ -92,10 +92,6 @@ def test_embedding_pooling_none():
     for x in res.body[0]['embedding']:
         assert abs(sum([x ** 2 for x in x]) - 1) > EPSILON
 
-    # make sure embedding vector is not normalized
-    for x in res.body[0]['embedding']:
-        assert abs(sum([x ** 2 for x in x]) - 1) > EPSILON
-
 
 def test_embedding_pooling_none_oai():
     global server