Better Llava1.5 Chat Format

Author: JamePeng

llama_cpp/llama_chat_format.py

@@ -2796,36 +2796,35 @@ class Llava15ChatHandler:
 
     CHAT_FORMAT = (
         "{% for message in messages %}"
-        "{% if message.role == 'system' %}"
-        "{{ message.content }}"
-        "{% endif %}"
-        "{% if message.role == 'user' %}"
-        "{% if message.content is string %}"
-        "\nUSER: {{ message.content }}"
-        "{% endif %}"
-        "{% if message.content is iterable %}"
-        "\nUSER: "
-        "{% for content in message.content %}"
-        "{% if content.type == 'image_url' and content.image_url is string %}"
-        "{{ content.image_url }}"
-        "{% endif %}"
-        "{% if content.type == 'image_url' and content.image_url is mapping %}"
-        "{{ content.image_url.url }}"
-        "{% endif %}"
-        "{% endfor %}"
-        "{% for content in message.content %}"
-        "{% if content.type == 'text' %}"
-        "{{ content.text }}"
-        "{% endif %}"
-        "{% endfor %}"
-        "{% endif %}"
-        "{% endif %}"
-        "{% if message.role == 'assistant' and message.content is not none %}"
-        "\nASSISTANT: {{ message.content }}"
-        "{% endif %}"
+            "{% if message.role == 'system' %}"
+                "{{ message.content }}"
+            "{% endif %}"
+
+            "{% if message.role == 'user' %}"
+                "{% if message.content is string %}"
+                    "\nUSER: {{ message.content }}"
+                "{% elif message.content is iterable %}"
+                    "\nUSER: "
+                    "{% for content in message.content %}"
+                        "{% if content.type == 'image_url' %}"
+                            "{{ content.image_url if content.image_url is string else content.image_url.url }}"
+                        "{% endif %}"
+                    "{% endfor %}"
+                    "{% for content in message.content %}"
+                        "{% if content.type == 'text' %}"
+                            "{{ content.text }}"
+                        "{% endif %}"
+                    "{% endfor %}"
+                "{% endif %}"
+            "{% endif %}"
+
+            "{% if message.role == 'assistant' and message.content is not none %}"
+                "\nASSISTANT: {{ message.content }}"
+            "{% endif %}"
         "{% endfor %}"
+
         "{% if add_generation_prompt %}"
-        "\nASSISTANT: "
+            "\nASSISTANT: "
         "{% endif %}"
     )