From 4a6eb1a94ef54cf6a57c6325a13d73295626dd8c Mon Sep 17 00:00:00 2001 From: John Mai Date: Thu, 19 Sep 2024 23:42:42 +0800 Subject: [PATCH] :bug: Fix evaluateUnaryExpression Unknown argument type: UndefinedValue --- Sources/Runtime.swift | 6 +----- Tests/ChatTemplateTests.swift | 11 ++++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Sources/Runtime.swift b/Sources/Runtime.swift index 7aec010..8eb84f6 100644 --- a/Sources/Runtime.swift +++ b/Sources/Runtime.swift @@ -557,11 +557,7 @@ struct Interpreter { switch node.operation.value { case "not": - if let argument = argument as? BooleanValue { - return BooleanValue(value: !argument.value) - } - - throw JinjaError.syntaxError("Unknown argument type: \(type(of:node.argument))") + return BooleanValue(value: !argument.bool()) default: throw JinjaError.syntaxError("Unknown operator: \(node.operation.value)") } diff --git a/Tests/ChatTemplateTests.swift b/Tests/ChatTemplateTests.swift index 8c75d70..4b9ab6b 100644 --- a/Tests/ChatTemplateTests.swift +++ b/Tests/ChatTemplateTests.swift @@ -216,13 +216,22 @@ final class ChatTemplateTests: XCTestCase { target: "user\nHello, how are you?\nmodel\nI\'m doing great. How can I help you today?\nuser\nI\'d like to show off how chat templating works!\n" ), + // Qwen/Qwen2.5-0.5B-Instruct + Test( + chatTemplate: + "{%- if tools %}\n {{- '<|im_start|>system\\n' }}\n {%- if messages[0]['role'] == 'system' %}\n {{- messages[0]['content'] }}\n {%- else %}\n {{- 'You are Qwen, created by Alibaba Cloud. You are a helpful assistant.' }}\n {%- endif %}\n {{- \"\\n\\n# Tools\\n\\nYou may call one or more functions to assist with the user query.\\n\\nYou are provided with function signatures within XML tags:\\n\" }}\n {%- for tool in tools %}\n {{- \"\\n\" }}\n {{- tool | tojson }}\n {%- endfor %}\n {{- \"\\n\\n\\nFor each function call, return a json object with function name and arguments within XML tags:\\n\\n{\\\"name\\\": , \\\"arguments\\\": }\\n<|im_end|>\\n\" }}\n{%- else %}\n {%- if messages[0]['role'] == 'system' %}\n {{- '<|im_start|>system\\n' + messages[0]['content'] + '<|im_end|>\\n' }}\n {%- else %}\n {{- '<|im_start|>system\\nYou are Qwen, created by Alibaba Cloud. You are a helpful assistant.<|im_end|>\\n' }}\n {%- endif %}\n{%- endif %}\n{%- for message in messages %}\n {%- if (message.role == \"user\") or (message.role == \"system\" and not loop.first) or (message.role == \"assistant\" and not message.tool_calls) %}\n {{- '<|im_start|>' + message.role + '\\n' + message.content + '<|im_end|>' + '\\n' }}\n {%- elif message.role == \"assistant\" %}\n {{- '<|im_start|>' + message.role }}\n {%- if message.content %}\n {{- '\\n' + message.content }}\n {%- endif %}\n {%- for tool_call in message.tool_calls %}\n {%- if tool_call.function is defined %}\n {%- set tool_call = tool_call.function %}\n {%- endif %}\n {{- '\\n\\n{\"name\": \"' }}\n {{- tool_call.name }}\n {{- '\", \"arguments\": ' }}\n {{- tool_call.arguments | tojson }}\n {{- '}\\n' }}\n {%- endfor %}\n {{- '<|im_end|>\\n' }}\n {%- elif message.role == \"tool\" %}\n {%- if (loop.index0 == 0) or (messages[loop.index0 - 1].role != \"tool\") %}\n {{- '<|im_start|>user' }}\n {%- endif %}\n {{- '\\n\\n' }}\n {{- message.content }}\n {{- '\\n' }}\n {%- if loop.last or (messages[loop.index0 + 1].role != \"tool\") %}\n {{- '<|im_end|>\\n' }}\n {%- endif %}\n {%- endif %}\n{%- endfor %}\n{%- if add_generation_prompt %}\n {{- '<|im_start|>assistant\\n' }}\n{%- endif %}\n", + data: [ + "messages": messages + ], + target: + "<|im_start|>system\nYou are Qwen, created by Alibaba Cloud. You are a helpful assistant.<|im_end|>\n<|im_start|>user\nHello, how are you?<|im_end|>\n<|im_start|>assistant\nI\'m doing great. How can I help you today?<|im_end|>\n<|im_start|>user\nI\'d like to show off how chat templating works!<|im_end|>\n" + ), ] func testDefaultTemplates() throws { for test in defaultTemplates { let template = try Template(test.chatTemplate) let result = try template.render(test.data) - XCTAssertEqual(result.debugDescription, test.target.debugDescription) } }