From 7a8104fbd26326f4d4c618a027942e62efc8f1bb Mon Sep 17 00:00:00 2001 From: anon Date: Tue, 30 May 2023 23:11:32 -0300 Subject: [PATCH 1/2] add missing quote when printing stopping strings --- examples/server/server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index 3d9cd5ca11809..8d07f39d7480d 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -668,7 +668,7 @@ bool parse_options_completion(json body, llama_server_context& llama, Response & std::string tmp_stop = std::accumulate(llama.params.antiprompt.begin(), llama.params.antiprompt.end(), std::string{}, [](std::string a, std::string b) { - return a + (a != "" ? ", \"" : "") + b + "\""; + return a + (a != "" ? ", \"" : "\"") + b + "\""; }); fprintf(stderr, From 3a079d5cc895620de11bf64c1448b189dbaa0954 Mon Sep 17 00:00:00 2001 From: anon Date: Tue, 30 May 2023 23:12:00 -0300 Subject: [PATCH 2/2] stop generating when the stream is closed --- examples/server/server.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index 8d07f39d7480d..ad46f56e9e58d 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -860,7 +860,12 @@ int main(int argc, char **argv) data.dump(llama.json_indent, ' ', false, json::error_handler_t::replace) + "\n\n"; - sink.write(str.data(), str.size()); + if (!sink.write(str.data(), str.size())) { + if (llama.verbose) { + fprintf(stderr, "stream closed\n"); + } + return false; + } } sink.done();