HF generation markers

chat_template.jinja

@@ -67,12 +67,12 @@
             {%- endif %}
             {%- if loop.index0 > ns.last_query_index %}
                 {%- if loop.last or (not loop.last and reasoning_content) %}
-                    {{- '<|im_start|>' + message.role + '\n<think>\n' + reasoning_content.strip('\n') + '\n</think>\n\n' + content.lstrip('\n') }}
+                    {{- '<|im_start|>' + message.role + '\n' }}{% generation %}{{- '<think>\n' + reasoning_content.strip('\n') + '\n</think>\n\n' + content.lstrip('\n') }}{% endgeneration %}
                 {%- else %}
-                    {{- '<|im_start|>' + message.role + '\n' + content }}
+                    {{- '<|im_start|>' + message.role + '\n' }}{% generation %}{{- content }}{% endgeneration %}
                 {%- endif %}
             {%- else %}
-                {{- '<|im_start|>' + message.role + '\n' + content }}
+                {{- '<|im_start|>' + message.role + '\n' }}{% generation %}{{- content }}{% endgeneration %}
             {%- endif %}
             {%- if message.tool_calls %}
                 {%- for tool_call in message.tool_calls %}
@@ -95,7 +95,13 @@
             {%- endif %}
             {{- '<|im_end|>\n' }}
         {%- else %}
-            {{- render_block_turns(message.role, message.content) }}
+            {%- for content in message.content -%}
+                {%- if content['type'] == 'image' or 'image' in content or 'image_url' in content -%}
+                    {{- '<|im_start|>' + message.role + '\n<image><|im_end|>\n' }}
+                {%- elif 'text' in content -%}
+                    {{- '<|im_start|>' + message.role + '\n' }}{% generation %}{{- content['text'] }}{% endgeneration %}{{- '<|im_end|>\n' }}
+                {%- endif -%}
+            {%- endfor %}
             {%- if message.tool_calls %}
                 {{- '<|im_start|>' + message.role + '\n' }}
                 {%- for tool_call in message.tool_calls %}