up

themrzmaster · themrzmaster · commit 1ad8acb98151 · 2024-04-22T11:03:42.000-03:00
diff --git a/llama_cpp/llama_chat_format.py b/llama_cpp/llama_chat_format.py
@@ -2927,22 +2927,22 @@ def llama3_function_calling(
         '\n{ "arg1": "value1", "arg2": "value2" }'
         "\nWhen you have completed entering function calls, end your output with '</done>'."
         '\nStart your output with either "message:" or "functions.". Do not mix the two.'
-        '\n In any hypothesis you should output: message: function_name: arguments never do that'
-        "\nWhen you encounter a <tool_output> tag from a user message, it indicates the output from a previously executed function."
-        "Please present this output in an easy-to-understand format, as the user has not seen it directly.\n"
+        "\nAfter performing a function call, the user will send a response containing the return values of the function calls between <tool_output> tags."
+        "Always present this output back to the user, as the user has not seen it directly.\n"
         "Example: <tool_output> item: Cheeseburguer, price: 12 </tool_output> You should output: I found a Cheeseburguer that costs 12 dollars."
         "{% endif %}"
+        "<|eot_id|>\n"
         "{% for message in messages %}"
-        "{% if message.role == 'tool' %}"
+        "{% if message.role == 'tool'%}"
         "<|start_header_id|>user<|end_header_id|>\n\n"
-        "<tool_output>  {{ message.content | default('No response available') }} </tool_output>"
+        "Function output, bring it to me: <tool_output>  {{ message.content | default('No response available') }} </tool_output>"
         "<|eot_id|>\n"
         "{% elif message.role == 'assistant' and message.function_call is defined%}"
         "<|start_header_id|>{{ message.role }}<|end_header_id|>\n\n"
         "Function called: {{ message.function_call.name | default('No name') }}\n"
         "Function argument: {{ message.function_call.arguments | default('No arguments') }}"
         "<|eot_id|>\n"
-        "{% else %}"
+        "{% elif message.role != 'system' %}"
         "<|start_header_id|>{{ message.role }}<|end_header_id|>\n\n"
         "{{ message.content }}"
         "<|eot_id|>\n"
