Skip to content

server: Allow continue in thinking (reasoning prefill) #22162

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
roj234 wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −8
Open

server: Allow continue in thinking (reasoning prefill) #22162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5362133
Allow thinking prefill
roj234 Apr 20, 2026
623ea9e
make </think> tag include \n
roj234 Apr 20, 2026
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
2 changes: 1 addition & 1 deletion common/chat-diff-analyzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ void analyze_reasoning::compare_reasoning_presence() {
return p.literal(reasoning_content) + p.space() + p.optional(p.tag("post", (p.marker() + p.space())) + p.rest());
});
auto parser_wrapped = build_tagged_peg_parser([&](common_peg_parser_builder &p) {
return p.tag("pre", p.marker() + p.space()) + p.literal(reasoning_content) + p.space() + p.tag("post", (p.marker() + p.space())) + p.rest();
return p.tag("pre", p.marker() + p.space()) + p.literal(reasoning_content) + p.tag("post", (p.space() + p.marker() + p.space())) + p.rest();
});
// try the more aggressive parse first, if it fails, fall back to the delimiter one
auto result = parser_wrapped.parse_anywhere_and_extract(comparison->output_B);
Expand Down
22 changes: 15 additions & 7 deletions tools/server/server-common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,13 +1068,6 @@ json oaicompat_chat_params_parse(
throw std::invalid_argument("Cannot have 2 or more assistant messages at the end of the list.");
}

/* TODO: test this properly */
inputs.reasoning_format = COMMON_REASONING_FORMAT_NONE;

if ( inputs.enable_thinking ) {
throw std::invalid_argument("Assistant response prefill is incompatible with enable_thinking.");
}

inputs.add_generation_prompt = true;
}
inputs.force_pure_content = opt.force_pure_content;
Expand All @@ -1084,11 +1077,26 @@ json oaicompat_chat_params_parse(

/* Append assistant prefilled message */
if (prefill_assistant_message) {
auto append_thinking_end = inputs.enable_thinking;
if ( append_thinking_end ) {
chat_params.prompt += last_message.reasoning_content;
}
std::string thinking_end = chat_params.thinking_end_tag;

if (!last_message.content_parts.empty()) {
for (auto & p : last_message.content_parts) {
if (p.text.length() > 0 && append_thinking_end) {
chat_params.prompt += thinking_end;
append_thinking_end = false;
}

chat_params.prompt += p.text;
}
} else {
if (last_message.content.length() > 0 && append_thinking_end) {
chat_params.prompt += thinking_end;
append_thinking_end = false;
}
chat_params.prompt += last_message.content;
}
}
Expand Down