update to match mistral-common

chat_template.jinja

@@ -1,23 +1,14 @@
-{#- Default date variables. To improve UX pass the correct ones to the Jinja render. #}
-{%- if today is not defined %}
-    {%- set today = '29-04-2026' %}
-{%- endif %}
-{%- if yesterday is not defined %}
-    {%- set yesterday = '28-04-2026' %}
-{%- endif %}
-
 {#- Default system message if no system prompt is passed. #}
-{%- set default_system_message -%}
-You are Mistral Medium 3.5, a Large Language Model (LLM) created by Mistral AI, a French startup headquartered in Paris.
+{%- set default_system_message = 'You are Mistral Medium 3.5, a Large Language Model (LLM) created by Mistral AI, a French startup headquartered in Paris.
 You are an intelligent conversational assistant powering an AI assistant called Le Chat.
 Your knowledge base was last updated on Friday, November 1, 2024.
-The current date is {{ today }}.
+The current date is {today}.
 
 # GENERAL GUIDELINES
 
-- Accurately answer the user's question.
-- For uncertain information or when the user's request requires up-to-date or specific data, use the available tools to fetch the information.
-- Be very attentive to dates, always try to resolve dates (e.g. "yesterday" is {{ yesterday }}) and when asked about information at specific dates, discard information that is at another date.
+- Accurately answer the user\'s question.
+- For uncertain information or when the user\'s request requires up-to-date or specific data, use the available tools to fetch the information.
+- Be very attentive to dates, always try to resolve dates (e.g. "yesterday" is {yesterday}) and when asked about information at specific dates, discard information that is at another date.
 
 # WEB BROWSING INSTRUCTIONS
 
@@ -37,11 +28,10 @@ You may have access to tools that you can use to fetch information or perform ac
 2. When the request requires specific data that you do not have in your knowledge base.
 3. When the request involves actions that you cannot perform without tools.
 
-Always prioritize using tools to provide the most accurate and helpful response.
-{%- endset %}
+Always prioritize using tools to provide the most accurate and helpful response.' %}
 
 {#- Begin of sequence token. #}
-{{- '<s>' }}
+{{- bos_token }}
 
 
 {#- Handle system prompt if it exists. #}
@@ -66,6 +56,28 @@ Always prioritize using tools to provide the most accurate and helpful response.
 {%- endif %}
 {%- set model_settings = '[MODEL_SETTINGS]{"reasoning_effort": "' + reasoning_effort + '"}[/MODEL_SETTINGS]' %}
 
+{#- Macros #}
+{%- macro render_content(content, context_name, supported_types_desc, support_thinking, support_images) -%}
+    {%- if content is string -%}
+        {{- content -}}
+    {%- elif content -%}
+        {%- for block in content -%}
+            {%- if block['type'] == 'text' -%}
+                {{- block['text'] -}}
+            {%- elif support_thinking and block['type'] == 'thinking' -%}
+                {{- '[THINK]' + block['thinking'] -}}
+                {%- if block.get('closed', true) -%}{{- '[/THINK]' -}}{%- endif -%}
+            {%- elif support_images and block['type'] in ['image', 'image_url'] -%}
+                {{- '[IMG]' -}}
+            {%- else -%}
+                {{- raise_exception('Only ' + supported_types_desc + ' chunks are supported in ' + context_name + '.') -}}
+            {%- endif -%}
+        {%- endfor -%}
+    {%- else -%}
+        {{- raise_exception(context_name + ' must have non-empty content.') -}}
+    {%- endif -%}
+{%- endmacro -%}
+
 {#- Aggregate consecutive messages with the same role except system and tool. #}
 {#- A sentinel message is appended so the last group gets flushed inside the loop. #}
 {%- set ns_agg = namespace(messages=[], current_group=[], current_role=none) %}
@@ -79,6 +91,13 @@ Always prioritize using tools to provide the most accurate and helpful response.
                 {#- Convert reasoning / reasoning_content to a leading thinking chunk. #}
                 {%- set reasoning = msg.get('reasoning_content', msg.get('reasoning', none)) %}
                 {%- if reasoning is not none and reasoning != '' %}
+                    {%- if msg['content'] is not none and msg['content'] is not string %}
+                        {%- for block in msg['content'] %}
+                            {%- if block['type'] == 'thinking' %}
+                                {{- raise_exception('Message cannot have both thinking chunks in content and a top-level `reasoning` or `reasoning_content` field.') }}
+                            {%- endif %}
+                        {%- endfor %}
+                    {%- endif %}
                     {%- set think_chunk = {'type': 'thinking', 'thinking': reasoning} %}
                     {%- if msg['content'] is string and msg['content'] != '' %}
                         {%- set new_content = [think_chunk, {'type': 'text', 'text': msg['content']}] %}
@@ -96,10 +115,15 @@ Always prioritize using tools to provide the most accurate and helpful response.
                 {%- if msg['content'] is string %}
                     {%- set ns_c.text_parts = ns_c.text_parts + [msg['content']] %}
                 {%- elif msg['content'] is not none %}
+                    {%- set ns_msg = namespace(msg_text_parts=[]) %}
                     {%- for block in msg['content'] %}
                         {%- if block['type'] == 'text' %}
-                            {%- set ns_c.text_parts = ns_c.text_parts + [block['text']] %}
+                            {%- set ns_msg.msg_text_parts = ns_msg.msg_text_parts + [block['text']] %}
                         {%- else %}
+                            {%- if ns_msg.msg_text_parts | length > 0 %}
+                                {%- set ns_c.text_parts = ns_c.text_parts + [ns_msg.msg_text_parts | join('')] %}
+                                {%- set ns_msg.msg_text_parts = [] %}
+                            {%- endif %}
                             {%- if ns_c.text_parts | length > 0 %}
                                 {%- set ns_c.chunks = ns_c.chunks + [{'type': 'text', 'text': ns_c.text_parts | join('\n\n')}] %}
                                 {%- set ns_c.text_parts = [] %}
@@ -108,6 +132,9 @@ Always prioritize using tools to provide the most accurate and helpful response.
                             {%- set ns_c.has_non_text = true %}
                         {%- endif %}
                     {%- endfor %}
+                    {%- if ns_msg.msg_text_parts | length > 0 %}
+                        {%- set ns_c.text_parts = ns_c.text_parts + [ns_msg.msg_text_parts | join('')] %}
+                    {%- endif %}
                 {%- endif %}
                 {%- if msg['tool_calls'] is defined and msg['tool_calls'] is not none %}
                     {%- set ns_c.tool_calls = ns_c.tool_calls + msg['tool_calls'] | list %}
@@ -139,7 +166,7 @@ Always prioritize using tools to provide the most accurate and helpful response.
 
 {#- Validates message ordering. #}
 {%- set ns = namespace(available_tools_and_settings_emitted=false) %}
-{%- if loop_messages | length > 0 and loop_messages[0]['role'] != 'user' and loop_messages[0]['role'] != 'system' %}
+{%- if loop_messages | length > 0 and loop_messages[0]['role'] not in ['user', 'system'] %}
     {{- raise_exception('Conversation must start with a user or system message, got ' + loop_messages[0]['role'] + '.') }}
 {%- endif %}
 {%- set ns_order = namespace(previous_role=none) %}
@@ -147,19 +174,19 @@ Always prioritize using tools to provide the most accurate and helpful response.
     {%- set current_role = message['role'] %}
     {%- if ns_order.previous_role is not none %}
         {%- if ns_order.previous_role == 'system' %}
-            {%- if current_role != 'user' and current_role != 'assistant' and current_role != 'system' %}
+            {%- if current_role not in ['user', 'assistant', 'system'] %}
                 {{- raise_exception('Unexpected role \'' + current_role + '\' after role \'' + ns_order.previous_role + '\'') }}
             {%- endif %}
         {%- elif ns_order.previous_role == 'user' %}
-            {%- if current_role != 'assistant' and current_role != 'system' and current_role != 'user' %}
+            {%- if current_role not in ['assistant', 'system', 'user'] %}
                 {{- raise_exception('Unexpected role \'' + current_role + '\' after role \'' + ns_order.previous_role + '\'') }}
             {%- endif %}
         {%- elif ns_order.previous_role == 'assistant' %}
-            {%- if current_role != 'assistant' and current_role != 'user' and current_role != 'tool' %}
+            {%- if current_role not in ['assistant', 'user', 'tool'] %}
                 {{- raise_exception('Unexpected role \'' + current_role + '\' after role \'' + ns_order.previous_role + '\'') }}
             {%- endif %}
         {%- elif ns_order.previous_role == 'tool' %}
-            {%- if current_role != 'assistant' and current_role != 'tool' and current_role != 'user' %}
+            {%- if current_role not in ['assistant', 'tool', 'user'] %}
                 {{- raise_exception('Unexpected role \'' + current_role + '\' after role \'' + ns_order.previous_role + '\'') }}
             {%- endif %}
         {%- endif %}
@@ -176,28 +203,20 @@ Always prioritize using tools to provide the most accurate and helpful response.
             {{- model_settings }}
             {%- set ns.available_tools_and_settings_emitted = true %}
         {%- endif %}
-        {%- if message['content'] is string %}
-            {{- '[INST]' + message['content'] + '[/INST]' }}
-        {%- elif message['content'] | length > 0 %}
-            {{- '[INST]' }}
-            {%- if message['content'] | length == 2 %}
-                {%- set blocks = message['content'] | sort(attribute='type') %}
+        {%- if message['content'] is not string and message['content'] %}
+            {#- When content has exactly one image and one text block, put image first. #}
+            {%- if message['content'] | length == 2 and message['content'][0]['type'] == 'text' and message['content'][1]['type'] in ['image', 'image_url'] %}
+                {%- set blocks = [message['content'][1], message['content'][0]] %}
             {%- else %}
                 {%- set blocks = message['content'] %}
             {%- endif %}
-            {%- for block in blocks %}
-                {%- if block['type'] == 'text' %}
-                    {{- block['text'] }}
-                {%- elif block['type'] in ['image', 'image_url'] %}
-                    {{- '[IMG]' }}
-                {%- else %}
-                    {{- raise_exception('Only text, image and image_url chunks are supported in user message content.') }}
-                {%- endif %}
-            {%- endfor %}
-            {{- '[/INST]' }}
+            {%- set user_content = blocks %}
         {%- else %}
-            {{- raise_exception('User message must have a string or a list of chunks in content') }}
+            {%- set user_content = message['content'] %}
         {%- endif %}
+        {{- '[INST]' -}}
+        {{- render_content(user_content, 'user message content', supported_types_desc='text, image and image_url', support_thinking=false, support_images=true) -}}
+        {{- '[/INST]' }}
 
     {#- Assistant messages supports text and thinking content. #}
     {%- elif message['role'] == 'assistant' %}
@@ -205,19 +224,8 @@ Always prioritize using tools to provide the most accurate and helpful response.
             {{- raise_exception('Assistant message must have a string or a list of chunks in content or a list of tool calls.') }}
         {%- endif %}
 
-        {%- if message['content'] is string and message['content'] != '' %}
-            {{- message['content'] }}
-        {%- elif message['content'] | length > 0 %}
-            {%- for block in message['content'] %}
-                {%- if block['type'] == 'text' %}
-                    {{- block['text'] }}
-                {%- elif block['type'] == 'thinking' %}
-                    {{- '[THINK]' + block['thinking'] }}
-                    {%- if block.get('closed', true) %}{{- '[/THINK]' }}{%- endif %}
-                {%- else %}
-                    {{- raise_exception('Only text and thinking chunks are supported in assistant message contents.') }}
-                {%- endif %}
-            {%- endfor %}
+        {%- if message['content'] %}
+            {{- render_content(message['content'], 'assistant message contents', supported_types_desc='text and thinking', support_thinking=true, support_images=false) -}}
         {%- endif %}
 
         {%- if message['tool_calls'] is defined and message['tool_calls'] is not none and message['tool_calls']|length > 0 %}
@@ -234,26 +242,18 @@ Always prioritize using tools to provide the most accurate and helpful response.
             {%- endfor %}
         {%- endif %}
 
-        {{- '</s>' }}
+        {{- eos_token }}
 
-    {#- Tool messages only supports text content. #}
+    {#- Tool messages (multimodal). #}
     {%- elif message['role'] == 'tool' %}
-        {{- '[TOOL_RESULTS]' + message['content']|string + '[/TOOL_RESULTS]' }}
+        {{- '[TOOL_RESULTS]' -}}
+        {{- render_content(message['content'], 'tool message contents', supported_types_desc='text and image', support_images=true) -}}
+        {{- '[/TOOL_RESULTS]' }}
 
     {#- System messages. #}
     {%- elif message['role'] == 'system' %}
         {{- '[SYSTEM_PROMPT]' -}}
-        {%- if message['content'] is string %}
-            {{- message['content'] -}}
-        {%- else %}
-            {%- for block in message['content'] %}
-                {%- if block['type'] == 'text' %}
-                    {{- block['text'] }}
-                {%- else %}
-                    {{- raise_exception('Only text chunks are supported in system message contents.') }}
-                {%- endif %}
-            {%- endfor %}
-        {%- endif %}
+        {{- render_content(message['content'], 'system message contents', supported_types_desc='text', support_thinking=false, support_images=false) -}}
         {{- '[/SYSTEM_PROMPT]' -}}
 
     {#- Raise exception for unsupported roles. #}