Update chat_template.jinja (#13)

- Update chat_template.jinja (bef067fc89c029dc5429655ed48b830183177f04)
- Update chat_template.jinja (26bb21ffbfe2d9527e007758ddddb3700955d2af)


Co-authored-by: Joshua <Xenova@users.noreply.huggingface.co>

chat_template.jinja

@@ -1,14 +1,25 @@
 {{- bos_token -}}
 {%- set system_prompt = "" -%}
+{%- set ns = namespace(system_prompt="") -%}
 {%- if messages[0]["role"] == "system" -%}
-	{%- set system_prompt = messages[0]["content"] -%}
+	{%- set ns.system_prompt = messages[0]["content"] -%}
 	{%- set messages = messages[1:] -%}
 {%- endif -%}
 {%- if tools -%}
-	{%- set system_prompt = system_prompt + ("\n" if system_prompt else "") + "List of tools: <|tool_list_start|>" + tools | tojson + "<|tool_list_end|>" -%}
+	{%- set ns.system_prompt = ns.system_prompt + ("\n" if ns.system_prompt else "") + "List of tools: <|tool_list_start|>[" -%}
+	{%- for tool in tools -%}
+		{%- if tool is not string -%}
+            {%- set tool = tool | tojson -%}
+		{%- endif -%}
+		{%- set ns.system_prompt = ns.system_prompt + tool -%}
+        {%- if not loop.last -%}
+            {%- set ns.system_prompt = ns.system_prompt + ", " -%}
+        {%- endif -%}
+	{%- endfor -%}
+	{%- set ns.system_prompt = ns.system_prompt + "]<|tool_list_end|>" -%}
 {%- endif -%}
-{%- if system_prompt -%}
-	{{- "<|im_start|>system\n" + system_prompt + "<|im_end|>\n" -}}
+{%- if ns.system_prompt -%}
+	{{- "<|im_start|>system\n" + ns.system_prompt + "<|im_end|>\n" -}}
 {%- endif -%}
 {%- for message in messages -%}
 	{{- "<|im_start|>" + message["role"] + "\n" -}}