Update chat_template.jinja

chat_template.jinja

@@ -1,34 +1,38 @@
-{{ bos_token }}
-{%- set loop_messages = messages -%}
-{%- for message in loop_messages -%}
-    {%- if message['role'] == 'system' -%}
-        {%- set role = 'user' -%}
-    {%- elif message['role'] == 'assistant' -%}
-        {%- set role = 'model' -%}
-    {%- else -%}
-        {%- set role = message['role'] -%}
-    {%- endif -%}
-    
-    {%- if (role == 'user') != (loop.index0 % 2 == 0) -%}
-        {{ raise_exception("Conversation roles must alternate user/assistant/user/assistant/...") }}
-    {%- endif -%}
-    
-    {{ '<start_of_turn>' + role + '\n' }}
-    {%- if message['content'] is string -%}
-        {{ message['content'] | trim }}
-    {%- elif message['content'] is iterable -%}
-        {%- for item in message['content'] -%}
-            {%- if item['type'] == 'image' -%}
-                {{ '<start_of_image>' }}
-            {%- elif item['type'] == 'text' -%}
-                {{ item['text'] | trim }}
-            {%- endif -%}
-        {%- endfor -%}
-    {%- else -%}
-        {{ raise_exception("Invalid content type") }}
-    {%- endif -%}
-    {{ '<end_of_turn>\n' }}
+{%- for m in messages -%}
+{%- if m.role == "system" -%}
+<start_of_turn>user
+{%- set c = m.content -%}
+{%- if c is string -%}
+{{ c }}
+{%- else -%}
+{%- for it in c -%}
+{%- if it.type == "image" -%}
+<start_of_image>
+{%- elif it.type == "text" -%}
+{{ it.text }}
+{%- endif -%}
+{%- endfor -%}
+{%- endif -%}
+<end_of_turn>
+{%- elif m.role == "user" -%}
+<start_of_turn>user
+{%- set c = m.content -%}
+{%- if c is string -%}
+{{ c }}
+{%- else -%}
+{%- for it in c -%}
+{%- if it.type == "image" -%}
+<start_of_image>
+{%- elif it.type == "text" -%}
+{{ it.text }}
+{%- endif -%}
 {%- endfor -%}
-{%- if add_generation_prompt -%}
-    {{'<start_of_turn>model\n'}}
 {%- endif -%}
+<end_of_turn>
+{%- elif m.role == "assistant" -%}
+<start_of_turn>model
+{{ m.content }}
+<end_of_turn>
+{%- endif -%}
+{%- endfor -%}
+<start_of_turn>model