[DON'T MERGE] compare GLM-5.1 and GLM-5 chat_template

chat_template.jinja

@@ -1,17 +1,5 @@
 [gMASK]<sop>
 {%- if tools -%}
-{%- macro tool_to_json(tool) -%}
-    {%- set ns_tool = namespace(first=true) -%}
-    {{ '{' -}}
-    {%- for k, v in tool.items() -%}
-        {%- if k != 'defer_loading' and k != 'strict' -%}
-            {%- if not ns_tool.first -%}{{- ', ' -}}{%- endif -%}
-            {%- set ns_tool.first = false -%}
-            "{{ k }}": {{ v | tojson(ensure_ascii=False) }}
-        {%- endif -%}
-    {%- endfor -%}
-    {{- '}' -}}
-{%- endmacro -%}
 <|system|>
 # Tools
 
@@ -20,12 +8,7 @@ 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 %}
-{%- if 'function' in tool -%}
-    {%- set tool = tool['function'] -%}
-{%- endif -%}
-{% if tool.defer_loading is not defined or not tool.defer_loading %}
-{{ tool_to_json(tool) }}
-{% endif %}
+{{ tool | tojson(ensure_ascii=False) }}
 {% endfor %}
 </tools>
 
@@ -46,34 +29,28 @@ For each function call, output the function name and arguments within the follow
         {{- content }}
     {%- endif -%}
 {%- endmacro -%}
-{%- set ns = namespace(last_user_index=-1, thinking_indices='') -%}
+{%- set ns = namespace(last_user_index=-1) %}
 {%- for m in messages %}
     {%- if m.role == 'user' %}
-        {%- set ns.last_user_index = loop.index0 -%}
-    {%- elif m.role == 'assistant' %}
-        {%- if m.reasoning_content is string %}
-            {%- set ns.thinking_indices = ns.thinking_indices ~ ',' ~ ns.last_user_index ~ ',' -%}
-        {%- endif %}
+        {% set ns.last_user_index = loop.index0 -%}
     {%- endif %}
 {%- endfor %}
-{%- set ns.has_thinking = false -%}
-{%- for m in messages -%}
-{%- if m.role == 'user' -%}<|user|>{{ visible_text(m.content) }}{% set ns.has_thinking = (',' ~ loop.index0 ~ ',') in ns.thinking_indices -%}
+{% for m in messages %}
+{%- if m.role == 'user' -%}<|user|>{{ visible_text(m.content) }}
 {%- elif m.role == 'assistant' -%}
 <|assistant|>
+{%- set reasoning_content = '' %}
 {%- set content = visible_text(m.content) %}
 {%- if m.reasoning_content is string %}
     {%- set reasoning_content = m.reasoning_content %}
-{%- elif '</think>' in content %}
-    {%- set reasoning_content = content.split('</think>')[0].split('<think>')[-1] %}
-    {%- set content = content.split('</think>')[-1] %}
-{%- elif loop.index0 > ns.last_user_index and not (enable_thinking is defined and not enable_thinking) %}
-    {%- set reasoning_content = '' %}
-{%- elif loop.index0 < ns.last_user_index and ns.has_thinking %}
-    {%- set reasoning_content = '' %}
+{%- else %}
+    {%- if '</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 %}
 {%- endif %}
-{%- if ((clear_thinking is defined and not clear_thinking) or loop.index0 > ns.last_user_index) and reasoning_content is defined -%}
-{{ '<think>' + reasoning_content +  '</think>'}}
+{%- if ((clear_thinking is defined and not clear_thinking) or loop.index0 > ns.last_user_index) and reasoning_content -%}
+{{ '<think>' + reasoning_content.strip() +  '</think>'}}
 {%- else -%}
 {{ '</think>' }}
 {%- endif -%}
@@ -89,24 +66,16 @@ For each function call, output the function name and arguments within the follow
 {% set _args = tc.arguments %}{% for k, v in _args.items() %}<arg_key>{{ k }}</arg_key><arg_value>{{ v | tojson(ensure_ascii=False) if v is not string else v }}</arg_value>{% endfor %}</tool_call>{% endfor %}
 {% endif %}
 {%- elif m.role == 'tool' -%}
+{%- if m.content is string -%}
 {%- if loop.first or (messages[loop.index0 - 1].role != "tool") %}
-    {{- '<|observation|>' -}}
+    {{- '<|observation|>' }}
 {%- endif %}
-{%- if m.content is string -%}
-    {{- '<tool_response>' + m.content + '</tool_response>' -}}
+{{- '<tool_response>' }}
+{{- m.content }}
+{{- '</tool_response>' }}
 {%- else -%}
-    {{- '<tool_response><tools>\n' -}}
-    {% for tr in m.content %}
-        {%- for tool in tools -%}
-            {%- if 'function' in tool -%}
-                {%- set tool = tool['function'] -%}
-            {%- endif -%}
-            {%- if tool.name == tr.name -%}
-                {{- tool_to_json(tool) + '\n' -}}
-            {%- endif -%}
-        {%- endfor -%}
-    {%- endfor -%}
-    {{- '</tools></tool_response>' -}}
+<|observation|>{% for tr in m.content %}
+<tool_response>{{ tr.output if tr.output is defined else tr }}</tool_response>{% endfor -%}
 {% endif -%}
 {%- elif m.role == 'system' -%}
 <|system|>{{ visible_text(m.content) }}