Upload chat_template.jinja

chat_template.jinja

@@ -10,24 +10,6 @@
 } %}
 {%- set end_of_turn = '[|endofturn|]\n' %}
 
-
-{%- macro available_tools(tools) %}
-    {{- "# Available Tools" }}
-    {{- "\nYou can use none, one, or multiple of the following tools by calling them as functions to help with the user’s query." }}
-    {{- "\nHere are the tools available to you in JSON format within <tool> and </tool> tags:\n" }}
-    {%- for tool in tools %}
-        {{- "<tool>" }}
-        {{- tool | tojson }}
-        {{- "</tool>\n" }}
-    {%- endfor %}
-
-    {{- "\nFor each function call you want to make, return a JSON object with function name and arguments within <tool_call> and </tool_call> tags, like:" }}
-    {{- "\n<tool_call>{\"name\": function_1_name, \"arguments\": {argument_1_name: argument_1_value, argument_2_name: argument_2_value}}</tool_call>" }}
-    {{- "\n<tool_call>{\"name\": function_2_name, \"arguments\": {...}}</tool_call>\n..." }}
-    {{- "\nNote that if no argument name is specified for a tool, you can just print the argument value directly, without the argument name or JSON formatting." }}
-{%- endmacro %}
-
-
 {%- set ns = namespace(last_query_index = messages|length - 1) %}
 {%- for message in messages %}
     {%- if message.role == "user" and message.content is string %}
@@ -38,32 +20,28 @@
 {%- for i in range(messages | length) %}
     {%- set msg = messages[i] %}
     {%- set role = msg.role %}
-    {% if role is not none and role.class is not none and not role in role_indicators %}
+    {%- if role not in role_indicators %}
         {{- raise_exception('Unknown role: ' ~ role) }}
     {%- endif %}
     
+    {%- set skip_ns = namespace(skip_standard = false) %}
     {%- if i == 0 %}
         {%- if role == 'system' %}
             {{- role_indicators['system'] }}
             {{- msg.content }}
-            {%- if tools is defined and tools %}
-                {{- "\n\n" }}{{- available_tools(tools) }}
-            {%- endif %}
-            {{- end_of_turn -}}
-            {%- continue %}
-        {%- elif tools is defined and tools %}
-            {{- role_indicators['system'] }}
-            {{- available_tools(tools) }}
             {{- end_of_turn -}}
+            {%- set skip_ns.skip_standard = true %}
         {%- endif %}
     {%- endif %}
 
     {%- if role == 'assistant' %}
         {{- role_indicators['assistant'] }}
 
-        {%- if msg.content %}
+        {%- if msg.content %}        
             {%- if "</think>" in msg.content %}
-                {%- set content = msg.content.split('</think>')[-1].strip() %}
+                {%- set content = msg.content.split('</think>') %}
+                {%- set content = content[-1] %}
+                {%- set content = content.strip() %}
                 {%- set reasoning_content = msg.content.split('</think>')[0].strip() %}
                 {%- if reasoning_content.startswith("<think>") %}
                     {%- set reasoning_content = reasoning_content[9:].strip() %}
@@ -105,7 +83,7 @@
                     {{- raise_exception('arguments or parameters are mandatory: ' ~ tool_call) }}
                 {%- endif %}
 
-                {{- "<tool_call>" }}{"name": "{{- tool_call.name }}", "arguments": {{ arguments | tojson }}}{{- "</tool_call>" }}
+                {{- "<tool_call>" }}{"name": "{{- tool_call.name }}", "arguments": {{ arguments | tojson(ensure_ascii=False) }}}{{- "</tool_call>" }}
 
                 {%- if not loop.last %}
                     {{- "\n" }}
@@ -119,8 +97,8 @@
         {%- if i == 0 or messages[i - 1].role != "tool" %}
             {{- role_indicators['tool'] }}
         {%- endif %}
-        {%- if msg.content is defined %}
-            {{- "<tool_result>" }}{"result": {{ msg.content | tojson }}}{{- "</tool_result>" }}
+        {%- if msg.content is defined %}            
+            {{- "<tool_result>" }}{"result": {{ msg.content | tojson(ensure_ascii=False) }}}{{- "</tool_result>" }}            
         {%- endif %}
         {%- if loop.last or messages[i + 1].role != "tool" %}
             {{- end_of_turn -}}
@@ -128,7 +106,7 @@
             {{- "\n" }}
         {%- endif %}
 
-    {%- else %}
+    {%- elif skip_ns.skip_standard == false %}
         {{- role_indicators[role] }}
         {{- msg.content }}
         {{- end_of_turn -}}