Distribute and run LLMs with a single file.
C++ cross-platformggufllama-cpplocal-ailocal-inferencelocal-llmopen-source-aisingle-file-executablespeech-to-text
Fixes CTRL+C bug in chat mode (#1009)
Davide Eynardef7094a8c841
diff --git a/llamafile/chatbot_api.cpp b/llamafile/chatbot_api.cppindex ebb4bf83..55af684e 100644--- a/llamafile/chatbot_api.cpp+++ b/llamafile/chatbot_api.cpp@@ -211,7 +211,12 @@ public:return true;});- if (!result) {+ if (stopped) {+ // User interrupted generation with Ctrl+C. We closed the connection+ // ourselves by returning false from the receiver, so httplib reports+ // Error::Canceled here; that is expected, not a failure. Any partial+ // response was already streamed and is returned below.+ } else if (!result) {err("error: HTTP request failed: %s", httplib::to_string(result.error()).c_str());} else if (result->status != 200) {err("error: server returned HTTP %d", result->status);diff --git a/llamafile/chatbot_repl.cpp b/llamafile/chatbot_repl.cppindex ac693404..6c676517 100644--- a/llamafile/chatbot_repl.cpp+++ b/llamafile/chatbot_repl.cpp@@ -174,17 +174,20 @@ void repl(ChatBackend &backend) {HighlightMarkdown markdown;ColorBleeder bleeder(is_base_model() ? (Highlight *)&txt : (Highlight *)&markdown);- // Save old signal handler and install ours- // NOTE: In combined mode, this overrides the server's SIGINT handler.- // Only install if we're NOT in API mode (no local model = API mode).+ // Save old signal handler and install ours. on_sigint only sets the+ // g_got_sigint flag, so a single Ctrl+C interrupts the current generation+ // and returns to the prompt; a second Ctrl+C (or Ctrl+D) at the prompt+ // exits via the !line path below.+ //+ // In combined mode (API backend) this deliberately overrides the server's+ // SIGINT handler, which would otherwise terminate the whole server on the+ // first Ctrl+C. The server is shut down instead when the REPL exits, via+ // the shutdown callback in api_main(). The old handler is restored below.struct sigaction sa, old_sa;- if (g_model) {- // Direct mode: install our own handler- sa.sa_handler = on_sigint;- sa.sa_flags = 0;- sigemptyset(&sa.sa_mask);- sigaction(SIGINT, &sa, &old_sa);- }+ sa.sa_handler = on_sigint;+ sa.sa_flags = 0;+ sigemptyset(&sa.sa_mask);+ sigaction(SIGINT, &sa, &old_sa);// run chatbotfor (;;) {@@ -322,9 +325,7 @@ void repl(ChatBackend &backend) {}// Restore original signal handler before cleanup- if (g_model) {- sigaction(SIGINT, &old_sa, nullptr);- }+ sigaction(SIGINT, &old_sa, nullptr);}} // namespace chatbot