🛠️ revert chat template to the original one

README.md

@@ -14,10 +14,7 @@ base_model: Qwen/Qwen3.6-35B-A3B
 >
 > Please use [deepsweet/Qwen3.6-35B-A3B-MLX-oQ8](https://huggingface.co/deepsweet/Qwen3.6-35B-A3B-MLX-oQ8) if you have M3+ Apple Silicon.
 
-This model was converted to MLX format from [Qwen/Qwen3.6-35B-A3B](https://huggingface.co/Qwen/Qwen3.6-35B-A3B) using:
-
-- [oMLX v0.36.0](https://github.com/jundot/omlx/releases/tag/v0.3.6)
-- fully [fixed](https://huggingface.co/froggeric/Qwen3.5-35B-A3B-Uncensored-FernflowerAI-MLX-8bit/blob/main/chat_template.README.md) `chat_template.jinja` by [@froggeric](https://huggingface.co/froggeric)
+This model was converted to MLX format from [Qwen/Qwen3.6-35B-A3B](https://huggingface.co/Qwen/Qwen3.6-35B-A3B) using [oMLX v0.36.0].
 
 Settings:
 

chat_template.jinja

@@ -12,7 +12,7 @@
                 {%- if do_vision_count %}
                     {%- set image_count.value = image_count.value + 1 %}
                 {%- endif %}
-                {%- if add_vision_id is defined and add_vision_id %}
+                {%- if add_vision_id %}
                     {{- 'Picture ' ~ image_count.value ~ ': ' }}
                 {%- endif %}
                 {{- '<|vision_start|><|image_pad|><|vision_end|>' }}
@@ -23,7 +23,7 @@
                 {%- if do_vision_count %}
                     {%- set video_count.value = video_count.value + 1 %}
                 {%- endif %}
-                {%- if add_vision_id is defined and add_vision_id %}
+                {%- if add_vision_id %}
                     {{- 'Video ' ~ video_count.value ~ ': ' }}
                 {%- endif %}
                 {{- '<|vision_start|><|video_pad|><|vision_end|>' }}
@@ -39,10 +39,6 @@
         {{- raise_exception('Unexpected content type.') }}
     {%- endif %}
 {%- endmacro %}
-{%- set ns_flags = namespace(enable_thinking=true) %}
-{%- if enable_thinking is defined %}
-    {%- set ns_flags.enable_thinking = enable_thinking %}
-{%- endif %}
 {%- if not messages %}
     {{- raise_exception('No messages provided.') }}
 {%- endif %}
@@ -55,30 +51,16 @@
     {%- endfor %}
     {{- "\n</tools>" }}
     {{- '\n\nIf you choose to call a function ONLY reply in the following format with NO suffix:\n\n<tool_call>\n<function=example_function_name>\n<parameter=example_parameter_1>\nvalue_1\n</parameter>\n<parameter=example_parameter_2>\nThis is the value for the second parameter\nthat can span\nmultiple lines\n</parameter>\n</function>\n</tool_call>\n\n<IMPORTANT>\nReminder:\n- Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> XML tags\n- Required parameters MUST be specified\n- You may provide optional reasoning for your function call in natural language BEFORE the function call, but NOT after\n- If there is no function call available, answer the question like normal with your current knowledge and do not tell the user about function calls\n</IMPORTANT>' }}
-    {%- if messages[0].role == 'system' or messages[0].role == 'developer' %}
+    {%- if messages[0].role == 'system' %}
         {%- set content = render_content(messages[0].content, false, true)|trim %}
-        {%- if '<|think_off|>' in content %}
-            {%- set ns_flags.enable_thinking = false %}
-            {%- set content = content.replace('<|think_off|>', '').strip() %}
-        {%- elif '<|think_on|>' in content %}
-            {%- set ns_flags.enable_thinking = true %}
-            {%- set content = content.replace('<|think_on|>', '').strip() %}
-        {%- endif %}
         {%- if content %}
             {{- '\n\n' + content }}
         {%- endif %}
     {%- endif %}
     {{- '<|im_end|>\n' }}
 {%- else %}
-    {%- if messages[0].role == 'system' or messages[0].role == 'developer' %}
+    {%- if messages[0].role == 'system' %}
         {%- set content = render_content(messages[0].content, false, true)|trim %}
-        {%- if '<|think_off|>' in content %}
-            {%- set ns_flags.enable_thinking = false %}
-            {%- set content = content.replace('<|think_off|>', '').strip() %}
-        {%- elif '<|think_on|>' in content %}
-            {%- set ns_flags.enable_thinking = true %}
-            {%- set content = content.replace('<|think_on|>', '').strip() %}
-        {%- endif %}
         {{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}
     {%- endif %}
 {%- endif %}
@@ -98,14 +80,7 @@
 {%- endif %}
 {%- for message in messages %}
     {%- set content = render_content(message.content, true)|trim %}
-    {%- if '<|think_off|>' in content %}
-        {%- set ns_flags.enable_thinking = false %}
-        {%- set content = content.replace('<|think_off|>', '').strip() %}
-    {%- elif '<|think_on|>' in content %}
-        {%- set ns_flags.enable_thinking = true %}
-        {%- set content = content.replace('<|think_on|>', '').strip() %}
-    {%- endif %}
-    {%- if message.role == "system" or message.role == "developer" %}
+    {%- if message.role == "system" %}
         {%- if not loop.first %}
             {{- raise_exception('System message must be at the beginning.') }}
         {%- endif %}
@@ -122,7 +97,7 @@
             {%- endif %}
         {%- endif %}
         {%- set reasoning_content = reasoning_content|trim %}
-        {%- if loop.index0 > ns.last_query_index and reasoning_content %}
+        {%- if (preserve_thinking is defined and preserve_thinking is true) or (loop.index0 > ns.last_query_index) %}
             {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content + '\n</think>\n\n' + content }}
         {%- else %}
             {{- '<|im_start|>' + message.role + '\n' + content }}
@@ -141,21 +116,13 @@
                 {%- else %}
                     {{- '\n<tool_call>\n<function=' + tool_call.name + '>\n' }}
                 {%- endif %}
-                {%- if tool_call.arguments is defined and tool_call.arguments is mapping %}
-                    {%- if tool_call.arguments|length > 0 %}
-                        {%- for args_name in tool_call.arguments %}
-                            {%- set args_value = tool_call.arguments[args_name] %}
-                            {{- '<parameter=' + args_name + '>\n' }}
-                            {%- set args_value = args_value | tojson if args_value is mapping or (args_value is iterable and args_value is not string) else args_value | string %}
-                            {{- args_value }}
-                            {{- '\n</parameter>\n' }}
-                        {%- endfor %}
-                    {%- endif %}
-                {%- elif tool_call.arguments is defined and tool_call.arguments is string %}
-                    {%- if tool_call.arguments|trim|length > 0 %}
-                        {{- tool_call.arguments }}
-                        {{- '\n' }}
-                    {%- endif %}
+                {%- if tool_call.arguments is defined %}
+                    {%- for args_name, args_value in tool_call.arguments|items %}
+                        {{- '<parameter=' + args_name + '>\n' }}
+                        {%- set args_value = args_value | string if args_value is string else args_value | tojson | safe %}
+                        {{- args_value }}
+                        {{- '\n</parameter>\n' }}
+                    {%- endfor %}
                 {%- endif %}
                 {{- '</function>\n</tool_call>' }}
             {%- endfor %}
@@ -179,7 +146,7 @@
 {%- endfor %}
 {%- if add_generation_prompt %}
     {{- '<|im_start|>assistant\n' }}
-    {%- if ns_flags.enable_thinking is false %}
+    {%- if enable_thinking is defined and enable_thinking is false %}
         {{- '<think>\n\n</think>\n\n' }}
     {%- else %}
         {{- '<think>\n' }}