Skip to content

server: workaround new chat parser regression #20729

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

Open
jpohhhh wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

server: workaround new chat parser regression #20729

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
10 changes: 9 additions & 1 deletion tools/server/server-task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,15 @@ struct server_task_result_cmpl_final : server_task_result {

virtual void update(task_result_state & state) override {
is_updated = true;
oaicompat_msg = state.update_chat_msg(content, false, oaicompat_msg_diffs);
// common_chat_parse can throw std::runtime_error when the PEG
// parser fails to match the final output (is_partial=false).
// During streaming, the same text was parsed with is_partial=true
// and succeeded. Only this final parse can throw.
try {
oaicompat_msg = state.update_chat_msg(content, false, oaicompat_msg_diffs);
} catch (const std::exception & e) {
SRV_WRN("Final chat parse failed, using last partial result: %s\n", e.what());
}

oai_resp_id = state.oai_resp_id;
oai_resp_reasoning_id = state.oai_resp_reasoning_id;
Expand Down