Upload processor

chat_template.jinja

@@ -6,114 +6,46 @@
 {%- if messages[0]['role'] == 'system' %}
     {%- if messages[0]['content'] is string %}
         {%- set system_message = messages[0]['content'] %}
-        {%- set loop_messages = messages[1:] %}
     {%- else %}
         {%- set system_message = messages[0]['content'][0]['text'] %}
-        {%- set loop_messages = messages[1:] %}
     {%- endif %}
+    {%- set loop_messages = messages[1:] %}
 {%- else %}
     {%- set system_message = default_system_message %}
     {%- set loop_messages = messages %}
 {%- endif %}
-{%- if not tools is defined %}
-    {%- set tools = none %}
-{%- elif tools is not none %}
-    {%- set parallel_tool_prompt = "You are a helpful assistant that can call tools. If you call one or more tools, format them in a single JSON array or objects, where each object is a tool call, not as separate objects outside of an array or multiple arrays. Use the format [{\"name\": tool call name, \"arguments\": tool call arguments}, additional tool calls] if you call more than one tool. If you call tools, do not attempt to interpret them or otherwise provide a response until you receive a tool call result that you can interpret for the user." %}
-    {%- if system_message is defined %}
-        {%- set system_message = system_message + "\n\n" + parallel_tool_prompt %}
-    {%- else %}
-        {%- set system_message = parallel_tool_prompt %}
-    {%- endif %}
-{%- endif %}
 {{- '[SYSTEM_PROMPT]' + system_message + '[/SYSTEM_PROMPT]' }}
 
-{%- set user_messages = loop_messages | selectattr("role", "equalto", "user") | list %}
-
-{%- for message in loop_messages | rejectattr("role", "equalto", "tool") | rejectattr("role", "equalto", "tool_results") | selectattr("tool_calls", "undefined") %}
-    {%- if (message["role"] == "user") != (loop.index0 % 2 == 0) %}
-        {{- raise_exception("After the optional system message, conversation roles must alternate user/assistant/user/assistant/...") }}
-    {%- endif %}
-{%- endfor %}
-
 {%- for message in loop_messages %}
-    {%- if message["role"] == "user" %}
-        {%- if tools is not none and (message == user_messages[-1]) %}
-            {{- "[AVAILABLE_TOOLS] [" }}
-            {%- for tool in tools %}
-                {%- set tool = tool.function %}
-                {{- '{"type": "function", "function": {' }}
-                {%- for key, val in tool.items() if key != "return" %}
-                    {%- if val is string %}
-                        {{- '"' + key + '": "' + val + '"' }}
-                    {%- else %}
-                        {{- '"' + key + '": ' + val|tojson }}
-                    {%- endif %}
-                    {%- if not loop.last %}
-                        {{- ", " }}
-                    {%- endif %}
-                {%- endfor %}
-                {{- "}}" }}
-                {%- if not loop.last %}
-                    {{- ", " }}
+    {%- if message['role'] == 'user' %}
+        {%- if message['content'] is string %}
+            {{- '[INST]' + message['content'] + '[/INST]' }}
+        {%- else %}
+            {{- '[INST]' }}
+            {%- for block in message['content'] %}
+                {%- if block['type'] == 'text' %}
+                    {{- block['text'] }}
+                {%- elif block['type'] in ['image', 'image_url'] %}
+                    {{- '[IMG]' }}
                 {%- else %}
-                    {{- "]" }}
+                    {{- raise_exception('Only text and image blocks are supported in message content!') }}
                 {%- endif %}
             {%- endfor %}
-            {{- "[/AVAILABLE_TOOLS]" }}
+            {{- '[/INST]' }}
         {%- endif %}
+    {%- elif message['role'] == 'system' %}
         {%- if message['content'] is string %}
-        {{- '[INST]' + message['content'] + '[/INST]' }}
-        {%- else %}
-                {{- '[INST]' }}
-                {%- for block in message['content'] %}
-                        {%- if block['type'] == 'text' %}
-                                {{- block['text'] }}
-                        {%- elif block['type'] == 'image' or block['type'] == 'image_url' %}
-                                {{- '[IMG]' }}
-                            {%- else %}
-                                {{- raise_exception('Only text and image blocks are supported in message content!') }}
-                            {%- endif %}
-                    {%- endfor %}
-                {{- '[/INST]' }}
-            {%- endif %}
-    {%- elif message["role"] == "tool_calls" or message.tool_calls is defined %}
-        {%- if message.tool_calls is defined %}
-            {%- set tool_calls = message.tool_calls %}
+            {{- '[SYSTEM_PROMPT]' + message['content'] + '[/SYSTEM_PROMPT]' }}
         {%- else %}
-            {%- set tool_calls = message.content %}
+            {{- '[SYSTEM_PROMPT]' + message['content'][0]['text'] + '[/SYSTEM_PROMPT]' }}
         {%- endif %}
-        {{- "[TOOL_CALLS] [" }}
-        {%- for tool_call in tool_calls %}
-            {%- set out = tool_call.function|tojson %}
-            {{- out[:-1] }}
-            {%- if not tool_call.id is defined or tool_call.id|length < 9 %}
-                {{- raise_exception("Tool call IDs should be alphanumeric strings with length >= 9! (1)" + tool_call.id) }}
-            {%- endif %}
-            {{- ', "id": "' + tool_call.id[-9:] + '"}' }}
-            {%- if not loop.last %}
-                {{- ", " }}
-            {%- else %}
-                {{- "]" + eos_token }}
-            {%- endif %}
-        {%- endfor %}
     {%- elif message['role'] == 'assistant' %}
         {%- if message['content'] is string %}
             {{- message['content'] + eos_token }}
         {%- else %}
             {{- message['content'][0]['text'] + eos_token }}
         {%- endif %}
-    {%- elif message["role"] == "tool_results" or message["role"] == "tool" %}
-        {%- if message.content is defined and message.content.content is defined %}
-            {%- set content = message.content.content %}
-        {%- else %}
-            {%- set content = message.content %}
-        {%- endif %}
-        {{- '[TOOL_RESULTS] {"content": ' + content|string + ", " }}
-        {%- if not message.tool_call_id is defined or message.tool_call_id|length < 9 %}
-            {{- raise_exception("Tool call IDs should be alphanumeric strings with length >= 9! (2)" + message.tool_call_id) }}
-        {%- endif %}
-        {{- '"call_id": "' + message.tool_call_id[-9:] + '"}[/TOOL_RESULTS]' }}
     {%- else %}
-        {{- raise_exception("Only user and assistant roles are supported, with the exception of an initial optional system message!") }}
+        {{- raise_exception('Only user, system and assistant roles are supported!') }}
     {%- endif %}
 {%- endfor %}

special_tokens_map.json

@@ -20,8 +20,6 @@
     "[SYSTEM_PROMPT]",
     "[/SYSTEM_PROMPT]",
     "[TOOL_CONTENT]",
-    "<think>",
-    "</think>",
     "<SPECIAL_22>",
     "<SPECIAL_23>",
     "<SPECIAL_24>",

tokenizer.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d9afb2e9b1e51982044599ff85afe192f6ca1e402c0dc430240ff1b8fb7a0d2
-size 17078019
+oid sha256:24f2d27f4699b47d7e5dfa65648c204844bd17b9e81c30733e1cbd55e5385da7
+size 17078021

tokenizer_config.json

@@ -169,7 +169,7 @@
       "normalized": false,
       "rstrip": false,
       "single_word": false,
-      "special": true
+      "special": false
     },
     "21": {
       "content": "</think>",
@@ -177,7 +177,7 @@
       "normalized": false,
       "rstrip": false,
       "single_word": false,
-      "special": true
+      "special": false
     },
     "22": {
       "content": "<SPECIAL_22>",
@@ -8025,8 +8025,6 @@
     "[SYSTEM_PROMPT]",
     "[/SYSTEM_PROMPT]",
     "[TOOL_CONTENT]",
-    "<think>",
-    "</think>",
     "<SPECIAL_22>",
     "<SPECIAL_23>",
     "<SPECIAL_24>",