wip

juliendenize · juliendenize · commit e292f9b829cc · 2025-11-27T11:16:02.000+01:00
diff --git a/integrations/chat_templates/README.md b/integrations/chat_templates/README.md
diff --git a/integrations/chat_templates/__init__.py b/integrations/chat_templates/__init__.py
diff --git a/integrations/chat_templates/chat_templates.py b/integrations/chat_templates/chat_templates.py
diff --git a/integrations/chat_templates/templates/v1.jinja b/integrations/chat_templates/templates/v1.jinja
@@ -11,6 +11,7 @@
         {%- set system_message = messages[0]['content'] %}
     {%- else %}        
         {%- for block in messages[0]['content'] %}
+            {%- set system_message = '' %}
             {%- if block['type'] == 'text' %}
                 {% set system_message = system_message + block['text'] %}
             {%- else %}
@@ -29,7 +30,7 @@
 {%- for message in loop_messages %}
     {%- if message.role == 'user' or message.role == 'assistant' %}
         {%- if (message['role'] == 'user') != (ns.index % 2 == 0) %}
-            {{- raise_exception('After the optional system message, conversation roles must alternate user/assistant/user/assistant/...') }}
+            {{- raise_exception('After the optional system message, conversation roles must alternate user and assistant.') }}
         {%- endif %}
         {%- set ns.index = ns.index + 1 %}
     {%- endif %}
@@ -79,6 +80,6 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user and assistant roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user and assistant roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 {%- endfor %}
diff --git a/integrations/chat_templates/templates/v11.jinja b/integrations/chat_templates/templates/v11.jinja
@@ -127,7 +127,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
     {%- if message['role'] == 'user' %}
         {%- set ns.index = ns.index + 1 %}
diff --git a/integrations/chat_templates/templates/v11_audio.jinja b/integrations/chat_templates/templates/v11_audio.jinja
@@ -135,7 +135,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
     {%- if message['role'] == 'user' %}
         {%- set ns.index = ns.index + 1 %}
diff --git a/integrations/chat_templates/templates/v11_image.jinja b/integrations/chat_templates/templates/v11_image.jinja
@@ -133,7 +133,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
     {%- if message['role'] == 'user' %}
         {%- set ns.index = ns.index + 1 %}
diff --git a/integrations/chat_templates/templates/v13.jinja b/integrations/chat_templates/templates/v13.jinja
@@ -112,6 +112,6 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 {%- endfor %}
diff --git a/integrations/chat_templates/templates/v13_audio.jinja b/integrations/chat_templates/templates/v13_audio.jinja
@@ -117,6 +117,6 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 {%- endfor %}
diff --git a/integrations/chat_templates/templates/v13_image.jinja b/integrations/chat_templates/templates/v13_image.jinja
@@ -116,6 +116,6 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 {%- endfor %}
diff --git a/integrations/chat_templates/templates/v13_image_think.jinja b/integrations/chat_templates/templates/v13_image_think.jinja
@@ -121,6 +121,6 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 {%- endfor %}
diff --git a/integrations/chat_templates/templates/v13_think.jinja b/integrations/chat_templates/templates/v13_think.jinja
@@ -114,6 +114,6 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 {%- endfor %}
diff --git a/integrations/chat_templates/templates/v1_spm.jinja b/integrations/chat_templates/templates/v1_spm.jinja
@@ -11,6 +11,7 @@
         {%- set system_message = messages[0]['content'] %}
     {%- else %}        
         {%- for block in messages[0]['content'] %}
+            {%- set system_message = '' %}
             {%- if block['type'] == 'text' %}
                 {% set system_message = system_message + block['text'] %}
             {%- else %}
@@ -29,7 +30,7 @@
 {%- for message in loop_messages %}
     {%- if message.role == 'user' or message.role == 'assistant' %}
         {%- if (message['role'] == 'user') != (ns.index % 2 == 0) %}
-            {{- raise_exception('After the optional system message, conversation roles must alternate user/assistant/user/assistant/...') }}
+            {{- raise_exception('After the optional system message, conversation roles must alternate user and assistant.') }}
         {%- endif %}
         {%- set ns.index = ns.index + 1 %}
     {%- endif %}
@@ -82,6 +83,6 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user and assistant roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user and assistant roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 {%- endfor %}
diff --git a/integrations/chat_templates/templates/v2.jinja b/integrations/chat_templates/templates/v2.jinja
@@ -11,6 +11,7 @@
         {%- set system_message = messages[0]['content'] %}
     {%- else %}        
         {%- for block in messages[0]['content'] %}
+            {%- set system_message = '' %}
             {%- if block['type'] == 'text' %}
                 {% set system_message = system_message + block['text'] %}
             {%- else %}
@@ -37,7 +38,7 @@
 {%- for message in loop_messages %}
     {%- if message.role == 'user' or (message.role == 'assistant' and (message.tool_calls is not defined or message.tool_calls is none or message.tool_calls | length == 0)) %}
         {%- if (message['role'] == 'user') != (ns.index % 2 == 0) %}
-            {{- raise_exception('After the optional system message, conversation roles must alternate user/assistant/user/assistant/...') }}
+            {{- raise_exception('After the optional system message, conversation roles must alternate user and assistant roles except for tool calls and results.') }}
         {%- endif %}
         {%- set ns.index = ns.index + 1 %}
         {%- if message.role == 'user' %}
@@ -144,7 +145,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- elif message['role'] != 'tool' or ns.index > ns.max_idx_user %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 
     {%- if message['role'] == 'user' %}
diff --git a/integrations/chat_templates/templates/v2_spm.jinja b/integrations/chat_templates/templates/v2_spm.jinja
@@ -11,6 +11,7 @@
         {%- set system_message = messages[0]['content'] %}
     {%- else %}        
         {%- for block in messages[0]['content'] %}
+            {%- set system_message = '' %}
             {%- if block['type'] == 'text' %}
                 {% set system_message = system_message + block['text'] %}
             {%- else %}
@@ -37,7 +38,7 @@
 {%- for message in loop_messages %}
     {%- if message.role == 'user' or (message.role == 'assistant' and (message.tool_calls is not defined or message.tool_calls is none or message.tool_calls | length == 0)) %}
         {%- if (message['role'] == 'user') != (ns.index % 2 == 0) %}
-            {{- raise_exception('After the optional system message, conversation roles must alternate user/assistant/user/assistant/...') }}
+            {{- raise_exception('After the optional system message, conversation roles must alternate user and assistant roles except for tool calls and results.') }}
         {%- endif %}
         {%- set ns.index = ns.index + 1 %}
         {%- if message.role == 'user' %}
@@ -169,7 +170,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- elif message['role'] != 'tool' or ns.index > ns.max_idx_user %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 
     {%- if message['role'] == 'user' %}
diff --git a/integrations/chat_templates/templates/v3.jinja b/integrations/chat_templates/templates/v3.jinja
@@ -11,6 +11,7 @@
         {%- set system_message = messages[0]['content'] %}
     {%- else %}        
         {%- for block in messages[0]['content'] %}
+            {%- set system_message = '' %}
             {%- if block['type'] == 'text' %}
                 {% set system_message = system_message + block['text'] %}
             {%- else %}
@@ -149,7 +150,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- elif message['role'] != 'tool' or ns.index > ns.max_idx_user %}
-        {{- raise_exception('Only user, tool and assistant roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 
     {%- if message['role'] == 'user' %}
diff --git a/integrations/chat_templates/templates/v3_image.jinja b/integrations/chat_templates/templates/v3_image.jinja
@@ -11,6 +11,7 @@
         {%- set system_message = messages[0]['content'] %}
     {%- else %}        
         {%- for block in messages[0]['content'] %}
+            {%- set system_message = '' %}
             {%- if block['type'] == 'text' %}
                 {% set system_message = system_message + block['text'] %}
             {%- else %}
@@ -76,7 +77,7 @@
                 {%- elif block['type'] in ['image', 'image_url'] %}
                     {{- '[IMG]' }}
                 {%- else %}
-                    {{- raise_exception('Only text and image chunks are supported in user message content.') }}
+                    {{- raise_exception('Only text, image and image_url chunks are supported in user message content.') }}
                 {%- endif %}
             {%- endfor %}
         {%- else %}
@@ -156,7 +157,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- elif message['role'] != 'tool' or ns.index > ns.max_idx_user %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 
     {%- if message['role'] == 'user' %}
diff --git a/integrations/chat_templates/templates/v3_image_spm.jinja b/integrations/chat_templates/templates/v3_image_spm.jinja
@@ -11,6 +11,7 @@
         {%- set system_message = messages[0]['content'] %}
     {%- else %}        
         {%- for block in messages[0]['content'] %}
+            {%- set system_message = '' %}
             {%- if block['type'] == 'text' %}
                 {% set system_message = system_message + block['text'] %}
             {%- else %}
@@ -87,7 +88,7 @@
                     {{- '[IMG]' }}
                     {%- set ns.prev_img = true %}
                 {%- else %}
-                    {{- raise_exception('Only text and image chunks are supported in user message content.') }}
+                    {{- raise_exception('Only text, image and image_url chunks are supported in user message content.') }}
                 {%- endif %}
             {%- endfor %}
         {%- else %}
@@ -191,7 +192,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- elif message['role'] != 'tool' or ns.index > ns.max_idx_user %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 
     {%- if message['role'] == 'user' %}
diff --git a/integrations/chat_templates/templates/v3_spm.jinja b/integrations/chat_templates/templates/v3_spm.jinja
@@ -11,6 +11,7 @@
         {%- set system_message = messages[0]['content'] %}
     {%- else %}        
         {%- for block in messages[0]['content'] %}
+            {%- set system_message = '' %}
             {%- if block['type'] == 'text' %}
                 {% set system_message = system_message + block['text'] %}
             {%- else %}
@@ -173,7 +174,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- elif message['role'] != 'tool' or ns.index > ns.max_idx_user %}
-        {{- raise_exception('Only user, tool and assistant roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
 
     {%- if message['role'] == 'user' %}
diff --git a/integrations/chat_templates/templates/v7.jinja b/integrations/chat_templates/templates/v7.jinja
@@ -130,7 +130,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
     {%- if message['role'] == 'user' %}
         {%- set ns.index = ns.index + 1 %}
diff --git a/integrations/chat_templates/templates/v7_audio.jinja b/integrations/chat_templates/templates/v7_audio.jinja
@@ -139,7 +139,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
     {%- if message['role'] == 'user' %}
         {%- set ns.index = ns.index + 1 %}
diff --git a/integrations/chat_templates/templates/v7_image.jinja b/integrations/chat_templates/templates/v7_image.jinja
@@ -137,7 +137,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
     {%- if message['role'] == 'user' %}
         {%- set ns.index = ns.index + 1 %}
diff --git a/integrations/chat_templates/templates/v7_image_spm.jinja b/integrations/chat_templates/templates/v7_image_spm.jinja
@@ -167,7 +167,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
     {%- if message['role'] == 'user' %}
         {%- set ns.index = ns.index + 1 %}
diff --git a/integrations/chat_templates/templates/v7_spm.jinja b/integrations/chat_templates/templates/v7_spm.jinja
@@ -155,7 +155,7 @@
 
     {#- Raise exception for unsupported roles. #}
     {%- else %}
-        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role']) }}
+        {{- raise_exception('Only user, assistant and tool roles are supported, got ' + message['role'] + '.') }}
     {%- endif %}
     {%- if message['role'] == 'user' %}
         {%- set ns.index = ns.index + 1 %}
diff --git a/integrations/chat_templates/test_chat_templates.py b/integrations/chat_templates/test_chat_templates.py
