Update chat_template.jinja (#1)

- Update chat_template.jinja (d7fb7756c7a84c7a09d0b4b1b4ce8202e4b89a8e)


Co-authored-by: Arman Rafiee <armand0e@users.noreply.huggingface.co>

chat_template.jinja

@@ -151,13 +151,14 @@
 {%- endmacro -%}
 
 {%- set ns = namespace(prev_message_type=None) -%}
-{%- set thinking_enabled = enable_thinking | default(true) -%}
 {%- set loop_messages = messages -%}
 {{ bos_token }}
-{%- if thinking_enabled or tools or messages[0]['role'] in ['system', 'developer'] -%}
+{#- Handle System/Tool Definitions Block -#}
+{%- if (enable_thinking | default(true)) or tools or messages[0]['role'] in ['system', 'developer'] -%}
     {{- '<|turn>system\n' -}}
 
-    {%- if thinking_enabled -%}
+    {#- Inject Thinking token at the very top of the FIRST system turn -#}
+    {%- if enable_thinking | default(true) -%}
         {{- '<|think|>' -}}
         {%- set ns.prev_message_type = 'think' -%}
     {%- endif -%}
@@ -179,15 +180,12 @@
     {{- '<turn|>\n' -}}
 {%- endif %}
 
+{#- Loop through messages -#}
 {%- for message in loop_messages -%}
     {%- set ns.prev_message_type = None -%}
     {%- set role = 'model' if message['role'] == 'assistant' else message['role'] -%}
         {{- '<|turn>' + role + '\n' }}
 
-            {%- if role == 'model' and not message['tool_responses'] and (message['reasoning_content'] | default('')) -%}
-                {{- '<|channel>thought\n' + (message['reasoning_content'] | trim) + '<channel|>' -}}
-            {%- endif -%}
-
             {%- if message['tool_calls'] -%}
                 {%- for tool_call in message['tool_calls'] -%}
                     {%- set function = tool_call['function'] -%}
@@ -208,6 +206,7 @@
             {%- endif -%}
 
             {%- if message['tool_responses'] -%}
+                {#- Tool Response handling -#}
                 {%- for tool_response in message['tool_responses'] -%}
                     {{- '<|tool_response>' -}}
                     {%- if tool_response['response'] is mapping -%}
@@ -252,7 +251,7 @@
                 {%- endfor -%}
             {%- endif -%}
 
-        {%- if not (message['tool_responses'] and not message['content'] and not (message['reasoning_content'] | default(''))) -%}
+        {%- if not (message['tool_responses'] and not message['content']) -%}
             {{- '<turn|>\n' -}}
         {%- endif -%}
 {%- endfor -%}
@@ -261,7 +260,7 @@
     {%- if ns.prev_message_type != 'tool_response' -%}
         {{- '<|turn>model\n' -}}
     {%- endif -%}
-    {%- if thinking_enabled -%}
-        {{- '<|channel>thought\n' -}}
+    {%- if not enable_thinking | default(true) -%}
+        {{- '<|channel>thought\n<channel|>' -}}
     {%- endif -%}
 {%- endif -%}