Skip to content

GitLab

"vllm/executor/ray_distributed_executor.py" did not exist on "47b65a550866c7ffbd076ecb74106714838ce7da"
Unverified Commit 25159536 authored by sfbemerk's avatar sfbemerk Committed by GitHub
Browse files

Fix DeepSeek-R1-0528 chat template (#20717) 


Signed-off-by: default avatarBenjamin Merkel <benjamin.merkel@tngtech.com>
Co-authored-by: default avatarBenjamin Merkel <benjamin.merkel@tngtech.com>
parent 4bed1677
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
examples/tool_chat_template_deepseekr1.jinja
View file @ 25159536
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{% set ns.system_prompt = ns.system_prompt + '\n\n' + message['content'] %} {% set ns.system_prompt = ns.system_prompt + '\n\n' + message['content'] %}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor -%}
{#- Adapted from https://github.com/sgl-project/sglang/blob/main/examples/chat_template/tool_chat_template_deepseekr1.jinja #} {#- Adapted from https://github.com/sgl-project/sglang/blob/main/examples/chat_template/tool_chat_template_deepseekr1.jinja #}
{% if tools is defined and tools is not none %} {% if tools is defined and tools is not none %}
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
{% set ns.system_prompt = ns.system_prompt + '\n\n' + tool_ns.text %} {% set ns.system_prompt = ns.system_prompt + '\n\n' + tool_ns.text %}
{% endif %} {% endif %}
{{ bos_token }} {{- bos_token }}
{{ ns.system_prompt }} {{- ns.system_prompt }}
{%- for message in messages %} {%- for message in messages %}
{% set content = message['content'] %} {% set content = message['content'] %}
{%- if message['role'] == 'user' %} {%- if message['role'] == 'user' %}
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
{%- if message['role'] == 'assistant' and message['tool_calls'] is defined and message['tool_calls'] is not none %} {%- if message['role'] == 'assistant' and message['tool_calls'] is defined and message['tool_calls'] is not none %}
{%- set ns.is_last_user = false -%} {%- set ns.is_last_user = false -%}
{%- if ns.is_tool %} {%- if ns.is_tool %}
{{'<｜tool▁outputs▁end｜>'}} {{- '<｜tool▁outputs▁end｜>'}}
{%- endif %} {%- endif %}
{%- set ns.is_first = false %} {%- set ns.is_first = false %}
{%- set ns.is_tool = false -%} {%- set ns.is_tool = false -%}
...@@ -53,40 +53,40 @@ ...@@ -53,40 +53,40 @@
{%- for tool in message['tool_calls'] %} {%- for tool in message['tool_calls'] %}
{%- if not ns.is_first %} {%- if not ns.is_first %}
{%- if content is none %} {%- if content is none %}
{{'<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments']|tojson + '\n' + '```' + '<｜tool▁call▁end｜>'}} {{- '<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments']|tojson + '\n' + '```' + '<｜tool▁call▁end｜>'}}
{%- else %} {%- else %}
{{content + '<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments']|tojson + '\n' + '```' + '<｜tool▁call▁end｜>'}} {{- content + '<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments']|tojson + '\n' + '```' + '<｜tool▁call▁end｜>'}}
{%- endif %} {%- endif %}
{%- set ns.is_first = true -%} {%- set ns.is_first = true -%}
{%- else %} {%- else %}
{{'\n' + '<｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments']|tojson + '\n' + '```' + '<｜tool▁call▁end｜>'}} {{- '\n' + '<｜tool▁call▁begin｜>' + tool['type'] + '<｜tool▁sep｜>' + tool['function']['name'] + '\n' + '```json' + '\n' + tool['function']['arguments']|tojson + '\n' + '```' + '<｜tool▁call▁end｜>'}}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
{{'<｜tool▁calls▁end｜><｜end▁of▁sentence｜>'}} {{- '<｜tool▁calls▁end｜><｜end▁of▁sentence｜>'}}
{%- endif %} {%- endif %}
{%- if message['role'] == 'assistant' and (message['tool_calls'] is not defined or message['tool_calls'] is none)%} {%- if message['role'] == 'assistant' and (message['tool_calls'] is not defined or message['tool_calls'] is none)%}
{%- set ns.is_last_user = false -%} {%- set ns.is_last_user = false -%}
{%- if ns.is_tool %} {%- if ns.is_tool %}
{{'<｜tool▁outputs▁end｜>' + content + '<｜end▁of▁sentence｜>'}} {{- '<｜tool▁outputs▁end｜>' + content + '<｜end▁of▁sentence｜>'}}
{%- set ns.is_tool = false -%} {%- set ns.is_tool = false -%}
{%- else %} {%- else %}
{{content + '<｜end▁of▁sentence｜>'}} {{- content + '<｜end▁of▁sentence｜>'}}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- if message['role'] == 'tool' %} {%- if message['role'] == 'tool' %}
{%- set ns.is_last_user = false -%} {%- set ns.is_last_user = false -%}
{%- set ns.is_tool = true -%} {%- set ns.is_tool = true -%}
{%- if ns.is_output_first %} {%- if ns.is_output_first %}
{{'<｜tool▁outputs▁begin｜><｜tool▁output▁begin｜>' + content + '<｜tool▁output▁end｜>'}} {{- '<｜tool▁outputs▁begin｜><｜tool▁output▁begin｜>' + content + '<｜tool▁output▁end｜>'}}
{%- set ns.is_output_first = false %} {%- set ns.is_output_first = false %}
{%- else %} {%- else %}
{{'\n<｜tool▁output▁begin｜>' + content + '<｜tool▁output▁end｜>'}} {{- '\n<｜tool▁output▁begin｜>' + content + '<｜tool▁output▁end｜>'}}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- endfor -%} {%- endfor -%}
{% if ns.is_tool %} {% if ns.is_tool %}
{{'<｜tool▁outputs▁end｜>'}} {{- '<｜tool▁outputs▁end｜>'}}
{% endif %} {%- endif %}
{% if add_generation_prompt and not ns.is_last_user and not ns.is_tool %} {% if add_generation_prompt and not ns.is_last_user and not ns.is_tool %}
{{'<｜Assistant｜>'}} {{- '<｜Assistant｜>'}}
{% endif %} {%- endif %}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment