From ec4aeaf18aeab2784859d84501db125ca0183c66 Mon Sep 17 00:00:00 2001 From: ochafik Date: Tue, 28 Jan 2025 10:29:17 +0000 Subject: [PATCH] Revert "Allow tool use + streaming" This reverts commit 62717145f715d9e4b3f4f26a24eee94b850c5642. --- examples/server/utils.hpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/examples/server/utils.hpp b/examples/server/utils.hpp index e17c0c543..b6e4e1def 100644 --- a/examples/server/utils.hpp +++ b/examples/server/utils.hpp @@ -586,8 +586,15 @@ static json oaicompat_completion_params_parse( json llama_params; auto tools = json_value(body, "tools", json()); - if (tools.is_array() && !tools.empty() && !use_jinja) { - throw std::runtime_error("tools param requires --jinja flag"); + auto stream = json_value(body, "stream", false); + + if (tools.is_array() && !tools.empty()) { + if (stream) { + throw std::runtime_error("Cannot use tools with stream"); + } + if (!use_jinja) { + throw std::runtime_error("tools param requires --jinja flag"); + } } // Handle "stop" field