Update chat_template.jinja

chat_template.jinja

@@ -1,66 +1,66 @@
-{%- set today_date = strftime_now("%Y-%m-%d") %}
 {%- set yesterday_day = strftime_now("%d") %}
 {%- set yesterday_month = strftime_now("%m") %}
 {%- set yesterday_year = strftime_now("%Y") %}
+{%- set today_date = yesterday_year + '-' + yesterday_month + '-' + yesterday_day %}
 {%- if yesterday_day == '01' %}
     {#- Jinja doesnt allow minus 1 date - Unsloth alternative #}
-	{%- if yesterday_month == '01' %}
-		{%- set yesterday_day = '31' %}
-	    {%- set yesterday_month = '12' %}
-	    {%- if yesterday_year == '2024' %}
-			{%- set yesterday_year = '2023' %}
-		{%- elif yesterday_year == '2025' %}
-			{%- set yesterday_year = '2024' %}
-		{%- elif yesterday_year == '2026' %}
-			{%- set yesterday_year = '2025' %}
-		{%- elif yesterday_year == '2027' %}
-			{%- set yesterday_year = '2026' %}
-		{%- elif yesterday_year == '2028' %}
-			{%- set yesterday_year = '2027' %}
-		{%- else %}
-			{{- raise_exception('Unsloth custom template does not support years > 2028') }}
-		{%- endif %}
-	{%- elif yesterday_month == '02' %}
-		{%- set yesterday_day = '31' %}
-	    {%- set yesterday_month = '01' %}
-	{%- elif yesterday_month == '03' %}
-	    {%- set yesterday_month = '02' %}
-	    {%- set yesterday_day = '28' %}
-	    {%- if yesterday_year == '2024' %}
-			{%- set yesterday_day = '29' %}
-		{%- elif yesterday_year == '2028' %}
-			{%- set yesterday_day = '29' %}
-		{%- else %}
-			{{- raise_exception('Unsloth custom template does not support years > 2028') }}
-		{%- endif %}
-	{%- elif yesterday_month == '04' %}
-		{%- set yesterday_day = '31' %}
-	    {%- set yesterday_month = '03' %}
-	{%- elif yesterday_month == '05' %}
-		{%- set yesterday_day = '30' %}
-	    {%- set yesterday_month = '04' %}
-	{%- elif yesterday_month == '06' %}
-	    {%- set yesterday_day = '31' %}
-	    {%- set yesterday_month = '05' %}
-	{%- elif yesterday_month == '07' %}
-	    {%- set yesterday_day = '30' %}
-	    {%- set yesterday_month = '06' %}
-	{%- elif yesterday_month == '08' %}
-	    {%- set yesterday_day = '31' %}
-	    {%- set yesterday_month = '07' %}
-	{%- elif yesterday_month == '09' %}
-	    {%- set yesterday_day = '31' %}
-	    {%- set yesterday_month = '08' %}
-	{%- elif yesterday_month == '10' %}
-	    {%- set yesterday_day = '30' %}
-	    {%- set yesterday_month = '09' %}
-	{%- elif yesterday_month == '11' %}
-	    {%- set yesterday_day = '31' %}
-	    {%- set yesterday_month = '10' %}
-	{%- elif yesterday_month == '12' %}
-	    {%- set yesterday_day = '30' %}
-	    {%- set yesterday_month = '11' %}
-	{%- endif %}
+    {%- if yesterday_month == '01' %}
+        {%- set yesterday_day = '31' %}
+        {%- set yesterday_month = '12' %}
+        {%- if yesterday_year == '2024' %}
+            {%- set yesterday_year = '2023' %}
+        {%- elif yesterday_year == '2025' %}
+            {%- set yesterday_year = '2024' %}
+        {%- elif yesterday_year == '2026' %}
+            {%- set yesterday_year = '2025' %}
+        {%- elif yesterday_year == '2027' %}
+            {%- set yesterday_year = '2026' %}
+        {%- elif yesterday_year == '2028' %}
+            {%- set yesterday_year = '2027' %}
+        {%- else %}
+            {{- raise_exception('Unsloth custom template does not support years > 2028') }}
+        {%- endif %}
+    {%- elif yesterday_month == '02' %}
+        {%- set yesterday_day = '31' %}
+        {%- set yesterday_month = '01' %}
+    {%- elif yesterday_month == '03' %}
+        {%- set yesterday_month = '02' %}
+        {%- set yesterday_day = '28' %}
+        {%- if yesterday_year == '2024' %}
+            {%- set yesterday_day = '29' %}
+        {%- elif yesterday_year == '2028' %}
+            {%- set yesterday_day = '29' %}
+        {%- else %}
+            {{- raise_exception('Unsloth custom template does not support years > 2028') }}
+        {%- endif %}
+    {%- elif yesterday_month == '04' %}
+        {%- set yesterday_day = '31' %}
+        {%- set yesterday_month = '03' %}
+    {%- elif yesterday_month == '05' %}
+        {%- set yesterday_day = '30' %}
+        {%- set yesterday_month = '04' %}
+    {%- elif yesterday_month == '06' %}
+        {%- set yesterday_day = '31' %}
+        {%- set yesterday_month = '05' %}
+    {%- elif yesterday_month == '07' %}
+        {%- set yesterday_day = '30' %}
+        {%- set yesterday_month = '06' %}
+    {%- elif yesterday_month == '08' %}
+        {%- set yesterday_day = '31' %}
+        {%- set yesterday_month = '07' %}
+    {%- elif yesterday_month == '09' %}
+        {%- set yesterday_day = '31' %}
+        {%- set yesterday_month = '08' %}
+    {%- elif yesterday_month == '10' %}
+        {%- set yesterday_day = '30' %}
+        {%- set yesterday_month = '09' %}
+    {%- elif yesterday_month == '11' %}
+        {%- set yesterday_day = '31' %}
+        {%- set yesterday_month = '10' %}
+    {%- elif yesterday_month == '12' %}
+        {%- set yesterday_day = '30' %}
+        {%- set yesterday_month = '11' %}
+    {%- endif %}
 {%- elif yesterday_day == '02' %}
     {%- set yesterday_day = '01' %}
 {%- elif yesterday_day == '03' %}
@@ -141,15 +141,66 @@
 {%- endif %}
 {{- '[SYSTEM_PROMPT]' + system_message + '[/SYSTEM_PROMPT]' }}
 
+
+{#- Tool description appended ONLY to last user message. Edits made by Unsloth #}
+{#- Tool description appended also if last message is tool. Edits made by Unsloth #}
+{%- set tools_description = "" %}
+{%- set has_tools = false %}
+{#- Cannot use set append_tools_index = loop.index0 since temporary variable - must use namespace #}
+{%- set ns = namespace(append_tools_index=0, append_tools=false) %}
+
+{%- if tools is defined and tools is not none and tools|length > 0 %}
+
+    {%- set has_tools = true %}
+    {%- set tools_description = "[AVAILABLE_TOOLS]" + (tools | tojson) + "[/AVAILABLE_TOOLS]" %}
+
+    {#- If User,Assistant,Tool,Tool we also need to append tools_description to  last assistant WITHOUT tool_calls defined. Edits made by Unsloth #}
+    {%- if (loop_messages|last)['role'] == 'tool' %}
+
+        {#- Find last assistant WITHOUT tool_calls defined #}
+        {%- set ns.append_tools = true %}
+        {%- for message in loop_messages %}
+            {%- if message['role'] == 'assistant' %}
+
+                {#- Cannot use set append_tools_index = loop.index0 since temporary variable - must use namespace #}
+
+                {%- if message['tool_calls'] is not defined or message['tool_calls'] is none %}
+                    {%- set ns.append_tools_index = loop.index0 %}
+                {%- endif %}
+
+            {%- endif %}
+        {%- endfor %}
+
+    {%- endif %}
+
+{%- endif %}
+
 {%- for message in loop_messages %}
     {%- if message['role'] == 'user' %}
+
+        {%- if has_tools and loop.last %}
+            {{- tools_description }}
+        {%- endif %}
+
+        {#- If directly called tools in first turn, prepend to user #}
+        {%- if ns.append_tools and ns.append_tools_index == 0 %}
+            {{- tools_description }}
+        {%- endif %}
+
         {%- if message['content'] is string %}
             {{- '[INST]' + message['content'] + '[/INST]' }}
         {%- else %}
             {{- '[INST]' }}
             {%- for block in message['content'] %}
                 {%- if block['type'] == 'text' %}
-                    {{- block['text'] }}
+
+                    {#- Original did not have content which is weird. Added by Un-sloth. #}
+                    {%- if block['text'] is defined %}
+                        {{- block['text'] }}
+                    {%- else %}
+                        {{- block['content'] }}
+                    {%- endif %}
+
                 {%- elif block['type'] in ['image', 'image_url'] %}
                     {{- '[IMG]' }}
                 {%- else %}
@@ -158,19 +209,62 @@
             {%- endfor %}
             {{- '[/INST]' }}
         {%- endif %}
+
     {%- elif message['role'] == 'system' %}
         {%- if message['content'] is string %}
             {{- '[SYSTEM_PROMPT]' + message['content'] + '[/SYSTEM_PROMPT]' }}
         {%- else %}
             {{- '[SYSTEM_PROMPT]' + message['content'][0]['text'] + '[/SYSTEM_PROMPT]' }}
         {%- endif %}
+
     {%- elif message['role'] == 'assistant' %}
         {%- if message['content'] is string %}
-            {{- message['content'] + eos_token }}
+            {{- message['content'] }}
         {%- else %}
-            {{- message['content'][0]['text'] + eos_token }}
+            {{- message['content'][0]['text'] }}
         {%- endif %}
+
+        {#- If User,Assistant,Tool,Tool we also need to append tools_description. Edits made by Unsloth #}
+
+        {%- if has_tools and (loop.index0 == ns.append_tools_index) %}
+            {{- eos_token }}
+            {{- tools_description }}
+        {%- endif %}
+
+        {%- if message['tool_calls'] is defined and message['tool_calls'] is not none %}
+            {%- for tool in message['tool_calls'] %}
+                {%- if tool['id'] is not defined %}
+                    {{- raise_exception('Tool ID must be provided!') }}
+                {%- endif %}
+                {%- set tool_call_id = tool['id'] %}
+                {%- if tool_call_id is not string or tool_call_id|length < 9 %}
+                    {{- raise_exception("Tool call IDs should be alphanumeric strings with length >= 9!") }}
+                {%- endif %}
+                {%- set arguments = tool['function']['arguments'] %}
+                {%- if arguments is not string %}
+                    {%- set arguments = arguments|tojson %}
+                {%- endif %}
+                {#- Must list tool calls AFTER assistant. Edits made by Un-sloth #}
+                {{- "[TOOL_CALLS]" + tool['function']['name'] + "[CALL_ID]" + tool_call_id + "[ARGS]" + arguments }}
+            {%- endfor %}
+        {%- endif %}
+
+        {#- Must not add EOS if added tools_description. Unsloth edits. #}
+        {%- if (loop.index0 != ns.append_tools_index) %}
+            {{- eos_token }}
+        {%- endif %}
+
+    {%- elif message['role'] == 'tool' %}
+        {%- if message['tool_call_id'] is not defined %}
+            {{- raise_exception('tool_call_id must be provided!') }}
+        {%- endif %}
+        {%- set tool_call_id = message['tool_call_id'] %}
+        {%- if tool_call_id is not string or tool_call_id|length < 9 %}
+            {{- raise_exception("Tool call IDs should be alphanumeric strings with length >= 9!") }}
+        {%- endif %}
+        {{- "[TOOL_RESULTS]" + tool_call_id + "[TOOL_CONTENT]" + message['content'] + "[/TOOL_RESULTS]" }}
+
     {%- else %}
-        {{- raise_exception('Only user, system and assistant roles are supported!') }}
+        {{- raise_exception('Only user, systemm assistant and tool roles are supported in the custom template made by Unsloth!') }}
     {%- endif %}
 {%- endfor %}