happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 907e7be410 into 2ba9adc093

This commit is contained in:
matteo 2026-02-16 15:55:30 +02:00 committed by GitHub
parent 2ba9adc093 907e7be410
commit 2571720a44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/server/server-context.cpp
View File

@ -77,6 +77,7 @@ struct server_slot {
size_t last_nl_pos = 0;
std::string generated_text;
std::string debug_generated_text;
llama_tokens generated_tokens;
// idx of draft tokens in the main batch
@ -425,7 +426,7 @@ struct server_slot {
if (!only_metrics) {
res["prompt"] = ptask->tokens.detokenize(ctx, true);
res["generated"] = generated_text;
res["generated"] = generated_text.empty()?debug_generated_text:generated_text;
}
}
@ -1442,6 +1443,10 @@ private:
res->id_slot = slot.id;
res->index = slot.task->index;
// keep copy of last generated text for debugging purposes
slot.debug_generated_text = slot.generated_text;
// in stream mode, content and tokens are already in last partial chunk
if (slot.task->params.stream) {
res->content = "";