Skip to content

server: observe resumable stream cancellation during first result wait (#27481) #27522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
loulanyue wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

server: observe resumable stream cancellation during first result wait (#27481) #27522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions tools/server/server-context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4298,10 +4298,13 @@ std::unique_ptr<server_res_generator> server_routes::handle_completions_impl(
// in streaming mode, the first error must be treated as non-stream response
// this is to match the OAI API behavior
// ref: https://github.com/ggml-org/llama.cpp/pull/16486#discussion_r2419657309
auto first_result = rd.next(req.should_stop);
auto first_should_stop = [res_this = res.get()]() {
return res_this->should_stop();
};
auto first_result = rd.next(first_should_stop);
if (first_result == nullptr) {
GGML_ASSERT(req.should_stop());
return res; // connection is closed
GGML_ASSERT(first_should_stop());
return res; // connection is closed or stream cancelled
}

if (first_result->is_error()) {
Expand Down
Loading