Skip to content

Commit 3845ec9

Browse files
VoidIsVoidGimling
authored andcommitted
server: add data: [DONE] to /chat/completions stream response
1 parent 7820364 commit 3845ec9

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

examples/server/server.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2986,6 +2986,8 @@ int main(int argc, char ** argv) {
29862986
}, [&](json error_data) {
29872987
server_sent_event(sink, "error", error_data);
29882988
});
2989+
static const std::string ev_done = "data: [DONE]\n\n";
2990+
sink.write(ev_done.data(), ev_done.size());
29892991
sink.done();
29902992
return true;
29912993
};

examples/server/tests/features/steps/steps.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,8 @@ async def oai_chat_completions(user_prompt,
10201020
event_data = line.split(': ', 1)
10211021
assert event_data[0] == 'data', f'Bad event code received: ```{event_data}```'
10221022
chunk_raw = event_data[1]
1023+
if chunk_raw == '[DONE]':
1024+
continue
10231025

10241026
chunk = json.loads(chunk_raw)
10251027
assert len(chunk['choices']) == 1, f"no choices provided, line ```{line}```"
@@ -1322,14 +1324,16 @@ def start_server_background(context):
13221324
if 'LLAMA_SERVER_BIN_PATH' in os.environ:
13231325
context.server_path = os.environ['LLAMA_SERVER_BIN_PATH']
13241326
server_listen_addr = context.server_fqdn
1327+
# server_listen_addr = "127.0.0.1"
13251328
server_args = [
13261329
'--host', server_listen_addr,
13271330
'--port', context.server_port,
13281331
]
1332+
13291333
if context.model_file:
13301334
server_args.extend(['--model', context.model_file])
1331-
if context.model_url:
1332-
server_args.extend(['--model-url', context.model_url])
1335+
# if context.model_url:
1336+
# server_args.extend(['--model-url', context.model_url])
13331337
if context.model_hf_repo:
13341338
server_args.extend(['--hf-repo', context.model_hf_repo])
13351339
if context.model_hf_file:

0 commit comments

Comments
 (0)