Update chat_template.jinja

chat_template.jinja

@@ -23,14 +23,14 @@
   {%- set custom_instructions = system_message.replace("/no_think", "").replace("/think", "").rstrip() -%}
 {%- endif -%}
 
-{%- if "/system_override" in system_message -%}
+{%- if system_message is defined and "/system_override" in system_message -%}
   {{- custom_instructions.replace("/system_override", "").rstrip() -}}
   {{- "<|im_end|>\n" -}}
 {%- else -%}
   {{- "## Metadata\n\n" -}}
   {{- "Knowledge Cutoff Date: June 2025\n" -}}
   {%- set today = strftime_now("%d %B %Y") -%}
-  {{- "Today Date: " ~ today ~ "\n" -}}
+  {{- "Today Date: " + today + "\n" -}}
   {{- "Reasoning Mode: " + reasoning_mode + "\n\n" -}}
   
   {{- "## Custom Instructions\n\n" -}}
@@ -42,12 +42,15 @@
     {{- "You are a helpful AI assistant named SmolLM, trained by Hugging Face.\n\n" -}}
   {%- endif -%}
 
-  {%- if xml_tools or python_tools -%}
+  {%- if xml_tools or python_tools or tools -%}
     {{- "### Tools\n\n" -}}
-    {%- if xml_tools -%}
+    {%- if xml_tools or tools -%}
+      {%- if tools -%}
+        {%- set xml_tools = tools -%}
+      {%- endif -%}
       {%- set ns = namespace(xml_tool_string="You may call one or more functions to assist with the user query.\nYou are provided with function signatures within <tools></tools> XML tags:\n\n<tools>\n") -%}
       {%- for tool in xml_tools[:] -%} {# The slicing makes sure that xml_tools is a list #}
-        {%- set ns.xml_tool_string = ns.xml_tool_string ~ (tool | string) ~ "\n" -%}
+        {%- set ns.xml_tool_string = ns.xml_tool_string + (tool | tojson) + "\n" -%}
       {%- endfor -%}
       {%- set xml_tool_string = ns.xml_tool_string + "</tools>\n\nFor each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:\n<tool_call>\n{\"name\": <function-name>, \"arguments\": <args-json-object>}\n</tool_call>" -%}
       {{- xml_tool_string -}}
@@ -55,7 +58,7 @@
     {%- if python_tools -%}
       {%- set ns = namespace(python_tool_string="When you send a message containing Python code between '<code>' and '</code>' tags, it will be executed in a stateful Jupyter notebook environment, and you will then be given the output to continued reasoning in an agentic loop.\n\nYou can use the following tools in your python code like regular functions:\n<tools>\n") -%}
       {%- for tool in python_tools[:] -%} {# The slicing makes sure that python_tools is a list #}
-        {%- set ns.python_tool_string = ns.python_tool_string ~ (tool | string) ~ "\n" -%}
+        {%- set ns.python_tool_string = ns.python_tool_string + (tool | tojson) + "\n" -%}
       {%- endfor -%}
       {%- set python_tool_string = ns.python_tool_string + "</tools>\n\nThe state persists between code executions: so variables that you define in one step are still available thereafter." -%}
       {{- python_tool_string -}}
@@ -70,13 +73,11 @@
     {%- if message.role == "user" -%}
         {{ "<|im_start|>" + message.role + "\n"  + content + "<|im_end|>\n" }}
     {%- elif message.role == "assistant" -%}
-        {% generation %}
         {%- if reasoning_mode == "/think" -%}
             {{ "<|im_start|>assistant\n" + content.lstrip("\n") + "<|im_end|>\n" }}
         {%- else -%}
             {{ "<|im_start|>assistant\n" + "<think>\n\n</think>\n" + content.lstrip("\n") + "<|im_end|>\n" }}
         {%- endif -%}
-        {% endgeneration %}
     {%- elif message.role == "tool" -%}
     {{ "<|im_start|>" + "user\n"  + content + "<|im_end|>\n" }}
     {%- endif -%}