Skip to content

Commit 46415d7

Browse files
author
Olivier Chafik
committed
Fix lazy trigger handling
1 parent c2d836f commit 46415d7

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

examples/server/server.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,7 @@ struct server_task {
402402
{
403403
const auto grammar_trigger_words = data.find("grammar_trigger_words");
404404
if (grammar_trigger_words != data.end()) {
405-
auto words = to_string_vec(*grammar_trigger_words);
406-
for (const auto & word : params.sampling.grammar_trigger_words) {
405+
for (const auto & word : to_string_vec(*grammar_trigger_words)) {
407406
auto ids = common_tokenize(vocab, word, /* add_special= */ false, /* parse_special= */ true);
408407
if (ids.size() == 1) {
409408
params.sampling.grammar_trigger_tokens.push_back(ids[0]);

examples/server/tests/unit/test_chat_completion.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,12 @@ def test_completion_with_required_tool(template_name: str, n_predict: int, tool:
273273

274274

275275
@pytest.mark.parametrize("template_name,n_predict,tools,tool_choice", [
276-
("meetkai-functionary-medium-v3.1", 32, [], None),
277-
("meetkai-functionary-medium-v3.1", 32, [TEST_TOOL], None),
278-
("meetkai-functionary-medium-v3.1", 32, [PYTHON_TOOL], 'none'),
279-
("meetkai-functionary-medium-v3.2", 32, [], None),
280-
("meetkai-functionary-medium-v3.2", 32, [TEST_TOOL], None),
281-
("meetkai-functionary-medium-v3.2", 32, [PYTHON_TOOL], 'none'),
276+
("meetkai-functionary-medium-v3.1", 128, [], None),
277+
("meetkai-functionary-medium-v3.1", 128, [TEST_TOOL], None),
278+
("meetkai-functionary-medium-v3.1", 128, [PYTHON_TOOL], 'none'),
279+
("meetkai-functionary-medium-v3.2", 128, [], None),
280+
("meetkai-functionary-medium-v3.2", 128, [TEST_TOOL], None),
281+
("meetkai-functionary-medium-v3.2", 128, [PYTHON_TOOL], 'none'),
282282
("meta-llama-Meta-Llama-3.1-8B-Instruct", 128, [], None),
283283
("meta-llama-Meta-Llama-3.1-8B-Instruct", 128, [TEST_TOOL], None),
284284
("meta-llama-Meta-Llama-3.1-8B-Instruct", 128, [PYTHON_TOOL], 'none'),

0 commit comments

Comments
 (0)