feat: support ds v3.2 encoding and remove redundant char in ds v3.1 jinja template

Author: soaringk

rtp_llm/models/deepseek_v2.py

@@ -714,3 +714,4 @@ def get_weight_cls():
 register_model("deepseek-v3-mtp", DeepSeekV3Mtp, ["DeepseekV3ForCausalLMNextN"])
 register_model("kimi_k2", DeepSeekV2, [])
 register_model("deepseek_v31", DeepSeekV2, [])
+register_model("deepseek_v32", DeepSeekV2, [])  # DeepSeek-V3.2 uses same architecture as V3.1, with encoding script update

rtp_llm/openai/renderers/__init__.py

@@ -3,6 +3,7 @@
 from .chatglm4_renderer import ChatGlm4Renderer
 from .chatglm45_renderer import ChatGlm45Renderer
 from .deepseekv31_renderer import DeepseekV31Renderer
+from .deepseekv32_renderer import DeepseekV32Renderer
 from .internvl_renderer import InternVLRenderer
 from .kimik2_renderer import KimiK2Renderer
 from .llava_renderer import LlavaRenderer

rtp_llm/openai/renderers/deepseekv31_renderer.py

@@ -36,80 +36,78 @@
     {%- endif %}
   {%- endif %}
 {%- endfor %}
-
 {% if tools is defined and tools is not none %}
   {% set tool_ns = namespace(text='## Tools\nYou have access to the following tools:\n') %}
   {% for tool in tools %}
     {% set tool_ns.text = tool_ns.text + '\n### ' + tool.function.name + '\nDescription: ' + tool.function.description + '\n\nParameters: ' + (tool.function.parameters | tojson) + '\n' %}
   {% endfor %}
   {% set tool_ns.text = tool_ns.text + "\nIMPORTANT: ALWAYS adhere to this exact format for tool use:\n<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>tool_call_name<｜tool▁sep｜>tool_call_arguments<｜tool▁call▁end｜>{{additional_tool_calls}}<｜tool▁calls▁end｜>\n\nWhere:\n\n- `tool_call_name` must be an exact match to one of the available tools\n- `tool_call_arguments` must be valid JSON that strictly follows the tool's Parameters Schema\n- For multiple tool calls, chain them directly without separators or spaces\n" %}
-  {% set ns.system_prompt = ns.system_prompt + '\n\n' + tool_ns.text %}
+  {% set ns.system_prompt = (ns.system_prompt + '\n\n' if ns.system_prompt else '') + tool_ns.text %}
 {% endif %}
-
-{{ bos_token }}{{ ns.system_prompt }}
+{{- bos_token }}{{ ns.system_prompt }}
 {%- for message in messages %}
   {%- if message['role'] == 'user' %}
     {%- set ns.is_tool = false -%}
     {%- set ns.is_first = false -%}
     {%- set ns.is_last_user = true -%}
-    {{'<｜User｜>' + message['content']}}
+    {{- '<｜User｜>' + message['content'] -}}
   {%- endif %}
   {%- if message['role'] == 'assistant' and message['tool_calls'] is defined and message['tool_calls'] is not none %}
-    {%- if ns.is_last_user %}
-      {{'<｜Assistant｜></think>'}}
+    {%- if ns.is_last_user -%}
+      {{- '<｜Assistant｜></think>' -}}
     {%- endif %}
     {%- set ns.is_last_user = false -%}
     {%- set ns.is_first = false %}
     {%- set ns.is_tool = false -%}
     {%- for tool in message['tool_calls'] %}
       {%- if not ns.is_first %}
         {%- if message['content'] is none %}
-          {{'<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>'+ tool['function']['name'] + '<｜tool▁sep｜>' + tool['function']['arguments']|tojson + '<｜tool▁call▁end｜>'}}
+          {{- '<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>'+ tool['function']['name'] + '<｜tool▁sep｜>' + tool['function']['arguments']|tojson + '<｜tool▁call▁end｜>' -}}
         {%- else %}
-          {{message['content'] + '<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['function']['name'] + '<｜tool▁sep｜>' + tool['function']['arguments']|tojson + '<｜tool▁call▁end｜>'}}
+          {{- message['content'] + '<｜tool▁calls▁begin｜><｜tool▁call▁begin｜>' + tool['function']['name'] + '<｜tool▁sep｜>' + tool['function']['arguments']|tojson + '<｜tool▁call▁end｜>' -}}
         {%- endif %}
         {%- set ns.is_first = true -%}
       {%- else %}
-        {{'<｜tool▁call▁begin｜>'+ tool['function']['name'] + '<｜tool▁sep｜>' + tool['function']['arguments']|tojson + '<｜tool▁call▁end｜>'}}
+        {{- '<｜tool▁call▁begin｜>'+ tool['function']['name'] + '<｜tool▁sep｜>' + tool['function']['arguments']|tojson + '<｜tool▁call▁end｜>' -}}
       {%- endif %}
     {%- endfor %}
-    {{'<｜tool▁calls▁end｜><｜end▁of▁sentence｜>'}}
+    {{- '<｜tool▁calls▁end｜><｜end▁of▁sentence｜>' -}}
   {%- endif %}
   {%- if message['role'] == 'assistant' and (message['tool_calls'] is not defined or message['tool_calls'] is none) %}
-    {%- if ns.is_last_user %}
-      {{'<｜Assistant｜>'}}
-      {%- if message['prefix'] is defined and message['prefix'] and thinking %}
-        {{'<think>'}}
-      {%- else %}
-        {{'</think>'}}
+    {%- if ns.is_last_user -%}
+      {{- '<｜Assistant｜>' -}}
+      {%- if message['prefix'] is defined and message['prefix'] and thinking -%}
+        {{- '<think>' -}}
+      {%- else -%}
+        {{- '</think>' -}}
       {%- endif %}
     {%- endif %}
     {%- set ns.is_last_user = false -%}
     {%- if ns.is_tool %}
-      {{message['content'] + '<｜end▁of▁sentence｜>'}}
+      {{- message['content'] + '<｜end▁of▁sentence｜>' -}}
       {%- set ns.is_tool = false -%}
     {%- else %}
       {%- set content = message['content'] -%}
       {%- if '</think>' in content %}
         {%- set content = content.split('</think>', 1)[1] -%}
       {%- endif %}
-      {{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 -%}
-    {{'<｜tool▁output▁begin｜>' + message['content'] + '<｜tool▁output▁end｜>'}}
+    {{- '<｜tool▁output▁begin｜>' + message['content'] + '<｜tool▁output▁end｜>' -}}
   {%- endif %}
 {%- endfor -%}
-{%- if add_generation_prompt and ns.is_last_user and not ns.is_tool %}
-  {{'<｜Assistant｜>'}}
-  {%- if not thinking %}
-    {{'</think>'}}
-  {%- else %}
-    {{'<think>'}}
+{%- if add_generation_prompt and ns.is_last_user and not ns.is_tool -%}
+  {{- '<｜Assistant｜>' -}}
+  {%- if not thinking -%}
+    {{- '</think>' -}}
+  {%- else -%}
+    {{- '<think>' -}}
   {%- endif %}
-{% endif %}"""
+{%- endif %}"""
 
 
 class DeepseekV31Renderer(ReasoningToolBaseRenderer):