update chat_template

chat_template.jinja

@@ -29,7 +29,10 @@
         {%- 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 + '\n' }}
+        {%- if message.name %}<name>{{ message.name }}</name>
+        {%- endif -%}
+        {{- '\n' + message.content | trim + '<|im_end|>\n' }}
     {%- elif message.role == "assistant" %}
         {%- set reasoning_content = '' %}
         {%- if message.reasoning_content is string %}
@@ -40,14 +43,18 @@
                 {%- set content = content.split('</think>')[-1].lstrip('\n') %}
             {%- endif %}
         {%- endif %}
+        {{- '<|im_start|>' + message.role + '\n' }}
+        {%- if message.name %}<name>{{ message.name }}</name>
+            {{- '\n' }}
+        {%- 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') }}
+                {{- '<think>\n' + reasoning_content.strip('\n') + '\n</think>\n\n' + content.lstrip('\n') }}
             {%- else %}
-                {{- '<|im_start|>' + message.role + '\n' + content }}
+                {{- content }}
             {%- endif %}
         {%- else %}
-            {{- '<|im_start|>' + message.role + '\n' + content }}
+            {{- content }}
         {%- endif %}
         {%- if message.tool_calls %}
             {%- for tool_call in message.tool_calls %}
@@ -82,8 +89,13 @@
     {%- endif %}
 {%- endfor %}
 {%- if add_generation_prompt %}
-    {{- '<|im_start|>assistant\n' }}
+    {{- '<|im_start|>user\n' }}
+    {%- if speak_as is defined and speak_as %}<name>{{ speak_as }}</name>
+    {%- endif -%}
+    {{- '\n' }}
     {%- if enable_thinking is defined and enable_thinking is false %}
         {{- '<think>\n\n</think>\n\n' }}
+    {%- elif enable_thinking is defined and enable_thinking is true %}
+        {{- '<think>' }}
     {%- endif %}
 {%- endif %}