From: Olivier Chafik <redacted>
Date: Mon, 10 Mar 2025 09:44:42 +0000 (+0000)
Subject: `sampler`: fixes trigger tokens + lazy grammars (fix typo cast from token to string... 
X-Git-Tag: upstream/0.0.5028~168
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=2b3a25c212f8c4d8a49cec23e03343a7719d51c9;p=pkg%2Fggml%2Fsources%2Fllama.cpp

`sampler`: fixes trigger tokens + lazy grammars (fix typo cast from token to string) (#12291)

* Fix typo in lazy grammar handling (fixes trigger tokens)

Co-authored-by: Georgi Gerganov <redacted>

---------

Co-authored-by: Georgi Gerganov <redacted>
---

diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index 8386f4ee..aec8b9ee 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -384,8 +384,9 @@ struct server_task {
                             SRV_DBG("Grammar trigger token: %d (`%s`)\n", token, word.c_str());
                             common_grammar_trigger trigger;
                             trigger.type = COMMON_GRAMMAR_TRIGGER_TYPE_TOKEN;
-                            trigger.value = (llama_token) token;
-                            params.sampling.grammar_triggers.push_back(trigger);
+                            trigger.value = word;
+                            trigger.token = token;
+                            params.sampling.grammar_triggers.push_back(std::move(trigger));
                         } else {
                             SRV_DBG("Grammar trigger word: `%s`\n", word.c_str());
                             params.sampling.grammar_triggers.push_back({COMMON_GRAMMAR_TRIGGER_TYPE_WORD, word});