From 62cac2c43abb7c2d00be3b93581ab50ab1562a10 Mon Sep 17 00:00:00 2001 From: Xu Wenqing <121550081+Xu-Wenqing@users.noreply.github.com> Date: Fri, 30 May 2025 15:42:57 +0800 Subject: [PATCH] Update DeepSeek-R1-0528 function call chat template (#6765) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 许文卿 --- .../tool_chat_template_deepseekr1.jinja | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/examples/chat_template/tool_chat_template_deepseekr1.jinja b/examples/chat_template/tool_chat_template_deepseekr1.jinja index db9b378f4..bb86cbd9e 100644 --- a/examples/chat_template/tool_chat_template_deepseekr1.jinja +++ b/examples/chat_template/tool_chat_template_deepseekr1.jinja @@ -1,14 +1,14 @@ {% if not add_generation_prompt is defined %} {% set add_generation_prompt = false %} {% endif %} -{% set ns = namespace(is_first=false, is_tool=false, is_output_first=true, system_prompt='', is_first_sp=true) %} +{% set ns = namespace(is_first=false, is_tool=false, is_output_first=true, system_prompt='', is_first_sp=true, is_last_user=false) %} {%- for message in messages %} {%- if message['role'] == 'system' %} {%- if ns.is_first_sp %} {% set ns.system_prompt = ns.system_prompt + message['content'] %} {% set ns.is_first_sp = false %} {%- else %} - {% set ns.system_prompt = ns.system_prompt + '\\n\\n' + message['content'] %} + {% set ns.system_prompt = ns.system_prompt + '\n\n' + message['content'] %} {%- endif %} {%- endif %} {%- endfor %} @@ -30,51 +30,63 @@ {{ bos_token }} {{ ns.system_prompt }} {%- for message in messages %} + {% set content = message['content'] %} {%- if message['role'] == 'user' %} {%- set ns.is_tool = false -%} - {{'<｜User｜>' + message['content']}} + {%- set ns.is_first = false -%} + {%- set ns.is_last_user = true -%} + {{'<｜User｜>' + content + '<｜Assistant｜>'}} {%- endif %} - {%- if message['role'] == 'assistant' and 'tool_calls' in message %} + {%- if message['role'] == 'assistant' %} + {% if '' in content %} + {% set content = content.split('')[-1] %} + {% endif %} + {% endif %} + {%- if message['role'] == 'assistant' and message['tool_calls'] is defined and message['tool_calls'] is not none %} + {%- set ns.is_last_user = false -%} + {%- if ns.is_tool %} + {{'<｜tool▁outputs▁end｜>'}} + {%- endif %} + {%- set ns.is_first = false %} {%- set ns.is_tool = false -%} + {%- set ns.is_output_first = true %} {%- for tool in message['tool_calls'] %} {%- if not ns.is_first %} - {%- if message['content'] is none %} - {{'<｜Assistant｜><｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\\n' + '```json' + '\\n' + tool['function']['arguments'] + '\\n' + '```' + '<｜tool▁call▁end｜>'}} + {%- if content is none %} + {{'<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments'] + '\n' + '```' + '<｜tool▁call▁end｜>'}} {%- else %} - {{'<｜Assistant｜>' + message['content'] + '<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\\n' + '```json' + '\\n' + tool['function']['arguments'] + '\\n' + '```' + '<｜tool▁call▁end｜>'}} + {{content + '<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments'] + '\n' + '```' + '<｜tool▁call▁end｜>'}} {%- endif %} {%- set ns.is_first = true -%} {%- else %} - {{'\\n' + '<｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\\n' + '```json' + '\\n' + tool['function']['arguments'] + '\\n' + '```' + '<｜tool▁call▁end｜>'}} + {{'\n' + '<｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments'] + '\n' + '```' + '<｜tool▁call▁end｜>'}} {%- endif %} {%- endfor %} {{'<｜tool▁calls▁end｜><｜end▁of▁sentence｜>'}} {%- endif %} - {%- if message['role'] == 'assistant' and 'tool_calls' not in message %} + {%- if message['role'] == 'assistant' and (message['tool_calls'] is not defined or message['tool_calls'] is none)%} + {%- set ns.is_last_user = false -%} {%- if ns.is_tool %} - {{'<｜tool▁outputs▁end｜>' + message['content'] + '<｜end▁of▁sentence｜>'}} + {{'<｜tool▁outputs▁end｜>' + content + '<｜end▁of▁sentence｜>'}} {%- set ns.is_tool = false -%} {%- else %} - {% set content = message['content'] %} - {% if '' in content %} - {% set content = content.split('')[-1] %} - {% endif %} - {{'<｜Assistant｜>' + content + '<｜end▁of▁sentence｜>'}} + {{content + '<｜end▁of▁sentence｜>'}} {%- endif %} {%- endif %} {%- if message['role'] == 'tool' %} + {%- set ns.is_last_user = false -%} {%- set ns.is_tool = true -%} {%- if ns.is_output_first %} - {{'<｜tool▁outputs▁begin｜><｜tool▁output▁begin｜>' + message['content'] + '<｜tool▁output▁end｜>'}} + {{'<｜tool▁outputs▁begin｜><｜tool▁output▁begin｜>' + content + '<｜tool▁output▁end｜>'}} {%- set ns.is_output_first = false %} {%- else %} - {{'<｜tool▁output▁begin｜>' + message['content'] + '<｜tool▁output▁end｜>'}} + {{'\n<｜tool▁output▁begin｜>' + content + '<｜tool▁output▁end｜>'}} {%- endif %} {%- endif %} {%- endfor -%} {% if ns.is_tool %} {{'<｜tool▁outputs▁end｜>'}} {% endif %} -{% if add_generation_prompt and not ns.is_tool %} +{% if add_generation_prompt and not ns.is_last_user and not ns.is_tool %} {{'<｜Assistant｜>'}} {% endif %}