Update chat_template.jinja

chat_template.jinja

@@ -1,19 +1,31 @@
 {%- if tools %}
-    {{- '<|im_start|>system\n' }}
-    {%- if messages[0].role == 'system' %}
-        {{- messages[0].content + '\n\n' }}
-    {%- endif %}
-    {{- "# Tools\n\nYou may call one or more functions to assist with the user query.\n\nYou are provided with function signatures within <tools></tools> XML tags:\n<tools>" }}
-    {%- for tool in tools %}
-        {{- "\n" }}
-        {{- tool | tojson }}
-    {%- endfor %}
-    {{- "\n</tools>\n\nFor each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:\n<tool_call>\n{\"name\": <function-name>, \"arguments\": <args-json-object>}\n</tool_call><|im_end|>\n" }}
+<|im_start|>system
+{%- if messages[0].role == 'system' %}
+{{ messages[0].content }}
+
+{%- endif %}
+# Tools
+
+You may call one or more functions to assist with the user query.
+
+You are provided with function signatures within <tools></tools> XML tags:
+<tools>
+{%- for tool in tools %}
+{{ tool | tojson }}
+{%- endfor %}
+</tools>
+
+For each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:
+<tool_call>
+{"name": <function-name>, "arguments": <args-json-object>}
+</tool_call><|im_end|>
 {%- else %}
     {%- if messages[0].role == 'system' %}
-        {{- '<|im_start|>system\n' + messages[0].content + '<|im_end|>\n' }}
+<|im_start|>system
+{{ messages[0].content }}<|im_end|>
     {%- endif %}
 {%- endif %}
+
 {%- set ns = namespace(multi_step_tool=true, last_query_index=messages|length - 1) %}
 {%- for message in messages[::-1] %}
     {%- set index = (messages|length - 1) - loop.index0 %}
@@ -22,14 +34,17 @@
         {%- set ns.last_query_index = index %}
     {%- endif %}
 {%- endfor %}
+
 {%- for message in messages %}
     {%- if message.content is string %}
         {%- set content = message.content %}
     {%- else %}
         {%- set content = '' %}
     {%- endif %}
+
     {%- if (message.role == "user") or (message.role == "system" and not loop.first) %}
-        {{- '<|im_start|>' + message.role + '\n' + content + '<|im_end|>' + '\n' }}
+<|im_start|>{{ message.role }}
+{{ content }}<|im_end|>
     {%- elif message.role == "assistant" %}
         {%- set reasoning_content = '' %}
         {%- if message.reasoning_content is string %}
@@ -40,50 +55,62 @@
                 {%- set content = content.split('</think>')[-1].lstrip('\n') %}
             {%- endif %}
         {%- endif %}
+
         {%- if loop.index0 > ns.last_query_index %}
             {%- if loop.last or (not loop.last and reasoning_content) %}
-                {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content.strip('\n') + '\n</think>\n\n' + content.lstrip('\n') }}
+<|im_start|>assistant
+<think>
+{{ reasoning_content.strip('\n') }}
+</think>
+
+{{ content.lstrip('\n') }}
             {%- else %}
-                {{- '<|im_start|>' + message.role + '\n' + content }}
+<|im_start|>assistant
+{{ content }}
             {%- endif %}
         {%- else %}
-            {{- '<|im_start|>' + message.role + '\n' + content }}
+<|im_start|>assistant
+{{ content }}
         {%- endif %}
+
         {%- if message.tool_calls %}
             {%- for tool_call in message.tool_calls %}
                 {%- if (loop.first and content) or (not loop.first) %}
-                    {{- '\n' }}
                 {%- endif %}
                 {%- if tool_call.function %}
                     {%- set tool_call = tool_call.function %}
                 {%- endif %}
-                {{- '<tool_call>\n{"name": "' }}
-                {{- tool_call.name }}
-                {{- '", "arguments": ' }}
-                {%- if tool_call.arguments is string %}
-                    {{- tool_call.arguments }}
-                {%- else %}
-                    {{- tool_call.arguments | tojson }}
-                {%- endif %}
-                {{- '}\n</tool_call>' }}
+<tool_call>
+{"name": "{{ tool_call.name }}", "arguments":
+{%- if tool_call.arguments is string %}
+{{ tool_call.arguments }}
+{%- else %}
+{{ tool_call.arguments | tojson }}
+{%- endif %}
+}
+</tool_call>
             {%- endfor %}
         {%- endif %}
-        {{- '<|im_end|>\n' }}
+<|im_end|>
     {%- elif message.role == "tool" %}
         {%- if loop.first or (messages[loop.index0 - 1].role != "tool") %}
-            {{- '<|im_start|>user' }}
+<|im_start|>user
         {%- endif %}
-        {{- '\n<tool_response>\n' }}
-        {{- content }}
-        {{- '\n</tool_response>' }}
+<tool_response>
+{{ content }}
+</tool_response>
         {%- if loop.last or (messages[loop.index0 + 1].role != "tool") %}
-            {{- '<|im_end|>\n' }}
+<|im_end|>
         {%- endif %}
     {%- endif %}
 {%- endfor %}
+
 {%- if add_generation_prompt %}
-    {{- '<|im_start|>assistant\n' }}
-    {%- if enable_thinking is defined and enable_thinking is false %}
-        {{- '<think>\n\n</think>\n\n' }}
+<|im_start|>assistant
+    {%- if true %}
+<think>
+
+</think>
+
     {%- endif %}
 {%- endif %}