chat : refactor API (#30210)
This commit is contained in:
1 parent
a518119d30
commit
8b54361025
41 files changed
+562
-736
No files matched your search
@@ -73,10 +73,10 @@ json task_params::to_json(bool only_metrics) const {
|
||||
{"stream", stream},
|
||||
{"n_probs", sampling.n_probs},
|
||||
{"min_keep", sampling.min_keep},
|
||||
{"chat_format", common_chat_format_name(chat_parser_params.format)},
|
||||
{"reasoning_format", common_reasoning_format_name(chat_parser_params.reasoning_format)},
|
||||
{"reasoning_in_content", chat_parser_params.reasoning_in_content},
|
||||
{"generation_prompt", chat_parser_params.generation_prompt.text},
|
||||
{"chat_format", common_chat_format_name(chat_format)},
|
||||
{"reasoning_format", common_reasoning_format_name(reasoning_format)},
|
||||
{"reasoning_in_content", stream && reasoning_format == COMMON_REASONING_FORMAT_DEEPSEEK_LEGACY},
|
||||
{"generation_prompt", sampling.generation_prompt},
|
||||
{"samplers", samplers},
|
||||
{"speculative.types", common_speculative_type_name_str(speculative.types)},
|
||||
{"timings_per_token", timings_per_token},
|
||||
@@ -132,10 +132,10 @@ json task_params::to_json(bool only_metrics) const {
|
||||
{"grammar_lazy", sampling.grammar_lazy},
|
||||
{"grammar_triggers", grammar_triggers},
|
||||
{"preserved_tokens", sampling.preserved_tokens},
|
||||
{"chat_format", common_chat_format_name(chat_parser_params.format)},
|
||||
{"reasoning_format", common_reasoning_format_name(chat_parser_params.reasoning_format)},
|
||||
{"reasoning_in_content", chat_parser_params.reasoning_in_content},
|
||||
{"generation_prompt", chat_parser_params.generation_prompt.text},
|
||||
{"chat_format", common_chat_format_name(chat_format)},
|
||||
{"reasoning_format", common_reasoning_format_name(reasoning_format)},
|
||||
{"reasoning_in_content", stream && reasoning_format == COMMON_REASONING_FORMAT_DEEPSEEK_LEGACY},
|
||||
{"generation_prompt", sampling.generation_prompt},
|
||||
{"samplers", samplers},
|
||||
{"speculative.types", common_speculative_type_name_str(speculative.types)},
|
||||
{"timings_per_token", timings_per_token},
|
||||
@@ -148,15 +148,12 @@ json task_params::to_json(bool only_metrics) const {
|
||||
//
|
||||
// task_result_state
|
||||
//
|
||||
task_result_state::task_result_state(const common_chat_parser_params & chat_parser_params)
|
||||
: chat_parser_params(chat_parser_params)
|
||||
task_result_state::task_result_state(common_chat_session session)
|
||||
: chat_session(std::move(session))
|
||||
, chat_msg(chat_session.msg())
|
||||
, oai_resp_id("resp_" + random_string())
|
||||
, oai_resp_reasoning_id("rs_" + random_string())
|
||||
, oai_resp_message_id("msg_" + random_string()) {
|
||||
if (chat_parser_params.is_continuation && !chat_parser_params.echo) {
|
||||
// initialize chat_msg to avoid emitting a delta containing the assistant prefill
|
||||
chat_msg = common_chat_parse(generated_input, true, chat_parser_params);
|
||||
}
|
||||
}
|
||||
|
||||
common_chat_msg task_result_state::update_chat_msg(
|
||||
@@ -164,13 +161,8 @@ common_chat_msg task_result_state::update_chat_msg(
|
||||
bool is_partial,
|
||||
std::vector<common_chat_msg_diff> & diffs,
|
||||
bool filter_tool_calls) {
|
||||
generated_input.append(added);
|
||||
auto msg_prv_copy = chat_msg;
|
||||
//SRV_DBG("Parsing chat message: %s\n", generated_input.text.c_str());
|
||||
auto new_msg = common_chat_parse(
|
||||
generated_input,
|
||||
is_partial,
|
||||
chat_parser_params);
|
||||
auto new_msg = is_partial ? chat_session.feed(added) : chat_session.finish(added);
|
||||
if (!new_msg.empty()) {
|
||||
new_msg.set_tool_call_ids(generated_tool_call_ids, gen_tool_call_id);
|
||||
chat_msg = new_msg;
|
||||
|
||||
Reference in new issue
Block a user