Skip to content

Commit 5664c6a

Browse files
committed
Squashed commit of the following (ggml-org#16755):
commit 08cc2af Merge: e52c95c 69e9ff0 Author: Marcel de Vries <[email protected]> Date: Fri Oct 24 14:19:46 2025 +0200 Merge branch 'master' into qwen3-coder_tool_call_parser commit e52c95c Author: Marcel de Vries <[email protected]> Date: Mon Oct 13 05:10:25 2025 +0200 Fix crash when tool call doesn't start with <tool_call> commit 0563a5d Merge: d1fe943 ef07a40 Author: Marcel de Vries <[email protected]> Date: Thu Oct 2 20:18:42 2025 +0200 Merge branch 'master' into qwen3-coder_tool_call_parser commit d1fe943 Author: Marcel de Vries <[email protected]> Date: Thu Sep 18 17:47:48 2025 +0200 Sync bundled template with upstream See https://huggingface.co/Qwen/Qwen3-Coder-30B-A3B-Instruct/blob/main/chat_template.jinja commit 1ba0322 Merge: 2520059 4ca088b Author: Marcel de Vries <[email protected]> Date: Thu Sep 18 17:46:28 2025 +0200 Merge branch 'master' into qwen3-coder_tool_call_parser commit 2520059 Merge: 11f3dbd 550cf72 Author: Marcel de Vries <[email protected]> Date: Tue Sep 9 08:38:45 2025 +0200 Merge branch 'master' into qwen3-coder_tool_call_parser commit 11f3dbd Author: Marcel de Vries <[email protected]> Date: Sun Aug 31 11:34:02 2025 +0200 Fix merge oopsie commit f43719f Merge: ca51625 bbbf5ec Author: Marcel de Vries <[email protected]> Date: Sun Aug 31 11:27:54 2025 +0200 Merge branch 'master' into qwen3-coder_tool_call_parser commit ca51625 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 21:46:29 2025 +0700 Moved common_chat_parse_qwen3_coder_xml commit cff131c Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 21:39:30 2025 +0700 Qwen3-Coder XML: handle union schema types and sanitize unsupported branches; add tests - chat-parser: support schema.type as array (e.g. ["number","null"]) in convert_qwen3_param_value() - chat: resolve $refs; allow unions including "string" as freeform; sanitize empty {"not":{}} in anyOf/oneOf before add_schema - tests: add Qwen3-Coder regression ensuring grammar builds with unions and ignores {"not":{}} commit 9a2cca8 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 21:26:34 2025 +0700 removed test commit a7f2105 Merge: 9b512e4 e33da80 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 20:42:49 2025 +0700 Merge branch 'qwen3-coder_tool_call_parser' of https://github.com/bold84/llama.cpp into qwen3-coder_tool_call_parser commit e33da80 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 20:37:20 2025 +0700 Update common/chat.cpp Co-authored-by: Marcel de Vries <[email protected]> commit ccad78f Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 20:37:09 2025 +0700 Update common/chat.cpp Co-authored-by: Marcel de Vries <[email protected]> commit 9b512e4 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 20:36:58 2025 +0700 revert commit 6e1fb00 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 19:18:33 2025 +0700 Fix for test commit dc6c4f2 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 17:03:57 2025 +0700 Update common/chat.cpp Co-authored-by: Kashyap Jois <[email protected]> commit b5e3747 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 17:03:40 2025 +0700 Update common/chat.cpp Co-authored-by: Kashyap Jois <[email protected]> commit 89daf6b Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 13:39:20 2025 +0700 Fix C++ compilation error in tests/test-chat.cpp Add missing closing brace to terminate test_template_output_parsers() function. This resolves compilation errors that prevented successful build of the test-chat target. commit dda43af Merge: 5c7c5dd 2de36f5 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 11:25:57 2025 +0600 Merge pull request ggml-org#1 from bold84/qwen3-coder_tool_call_parser_edit Fix grammar, hide tool_call from output commit 2de36f5 Author: Marcel de Vries <[email protected]> Date: Sun Aug 24 07:15:06 2025 +0200 Fix grammar, hide tool_call from output commit 5c7c5dd Merge: c920daf 710dfc4 Author: Benjamin Oldenburg <[email protected]> Date: Sun Aug 24 11:07:11 2025 +0600 Merge branch 'master' into qwen3-coder_tool_call_parser commit c920daf Author: Benjamin Oldenburg <[email protected]> Date: Sat Aug 2 02:13:06 2025 +0700 reset template commit 90dd63a Author: Benjamin Oldenburg <[email protected]> Date: Sat Aug 2 02:02:35 2025 +0700 qwen3-coder tool call parser
1 parent a5c07dc commit 5664c6a

File tree

6 files changed

+1615
-0
lines changed

6 files changed

+1615
-0
lines changed

0 commit comments

Comments
 (0)