Update chat_template.jinja

chat_template.jinja

@@ -1,32 +1,65 @@
-{%- set system_identity = "You are a helpful assistant created by Modotte." %}
+{%- set assistant_identity = "You are a helpful assistant created by Modotte." %}
 {%- set knowledge_cutoff = "2024-06" %}
 {%- set current_date = strftime_now("%Y-%m-%d") %}
 {%- set reasoning = reasoning_effort if reasoning_effort is defined else "no" %}
 
 <|start_of_role|>system<|end_of_role|><|start|>system<|message|>
-{{ system_identity }}
+{{ assistant_identity }}
 Knowledge cutoff: {{ knowledge_cutoff }}
 Current date: {{ current_date }}
 
 Reasoning: {{ reasoning }}<|end_of_text|>
+{%- 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 %}
+    {%- if ns.multi_step_tool and message.role == "user" and message.content is string and not(message.content.startswith('<tool_response>') and message.content.endswith('</tool_response>')) %}
+        {%- set ns.multi_step_tool = false %}
+        {%- set ns.last_query_index = index %}
+    {%- endif %}
+{%- endfor %}
 {%- for message in messages %}
-    {%- if message.role != 'system' %}
-        {%- set content = "" %}
-        {%- if message.content is string %}
-            {%- set content = message.content %}
-        {%- elif message.content is iterable %}
-            {%- for entry in message.content %}
-                {%- if entry.type == 'text' %}
-                    {%- if content != "" %}
-                        {%- set content = content + '\n' %}
-                    {%- endif %}
-                    {%- set content = content + entry.text %}
-                {%- endif %}
-            {%- endfor %}
+    {%- set content = message.content if message.content is string else '' %}
+    {%- if message.role == "user" or (message.role == "system" and not loop.first) %}
+<|start_of_role|>{{ message.role }}<|end_of_role|>{{ content }}<|end_of_text|>
+    {%- elif message.role == "assistant" %}
+        {%- set reasoning_content = '' %}
+        {%- if message.reasoning_content is string %}
+            {%- set reasoning_content = message.reasoning_content %}
+        {%- elif '</think>' in content %}
+            {%- set reasoning_content = content.split('</think>')[0].rstrip('\n').split('<think>')[-1].lstrip('\n') %}
+            {%- set content = content.split('</think>')[-1].lstrip('\n') %}
+        {%- endif %}
+        {%- if loop.index0 > ns.last_query_index %}
+            {%- if loop.last or (not loop.last and reasoning_content) %}
+<|start_of_role|>assistant<|end_of_role|><think>
+{{ reasoning_content.strip('\n') }}
+</think>
+
+{{ content.lstrip('\n') }}<|end_of_text|>
+            {%- else %}
+<|start_of_role|>assistant<|end_of_role|>{{ content }}<|end_of_text|>
+            {%- endif %}
+        {%- else %}
+<|start_of_role|>assistant<|end_of_role|>{{ content }}<|end_of_text|>
+        {%- endif %}
+    {%- elif message.role == "tool" %}
+        {%- if loop.first or (messages[loop.index0 - 1].role != "tool") %}
+<|start_of_role|>user<|end_of_role|>
+        {%- endif %}
+<tool_response>
+{{ content }}
+</tool_response>
+        {%- if loop.last or (messages[loop.index0 + 1].role != "tool") %}
+<|end_of_text|>
         {%- endif %}
-        {{ '<|start_of_role|>' + message.role + '<|end_of_role|>' + content + '<|end_of_text|>\n' }}
     {%- endif %}
 {%- endfor %}
 {%- if add_generation_prompt %}
 <|start_of_role|>assistant<|end_of_role|>
+    {%- if enable_thinking is defined and enable_thinking is false %}
+<think>
+
+</think>
+
+    {%- endif %}
 {%- endif %}