feat: skip tools when all disabled (#1205)

* feat: skip tools when all disabled * feat: ignore directly answer tool on check tools required
huggingface · May 30, 2024 · 38872ee · 38872ee
1 parent 3286583
commit 38872ee
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/lib/server/textGeneration/index.ts b/src/lib/server/textGeneration/index.ts
@@ -19,6 +19,8 @@ import { generate } from "./generate";
 import { mergeAsyncGenerators } from "$lib/utils/mergeAsyncGenerators";
 import type { TextGenerationContext } from "./types";
 import type { ToolResult } from "$lib/types/Tool";
+import { toolHasName } from "../tools/utils";
+import directlyAnswer from "../tools/directlyAnswer";
 
 export async function* textGeneration(ctx: TextGenerationContext) {
 	yield* mergeAsyncGenerators([
@@ -61,7 +63,8 @@ async function* textGenerationWithoutTitle(
 
 	if (model.tools && !conv.assistantId) {
 		const tools = pickTools(toolsPreference, Boolean(assistant));
-		toolResults = yield* runTools(ctx, tools, preprompt);
+		const toolCallsRequired = tools.some((tool) => !toolHasName(directlyAnswer.name, tool));
+		if (toolCallsRequired) toolResults = yield* runTools(ctx, tools, preprompt);
 	}
 
 	const processedMessages = await preprocessMessages(messages, webSearchResult, convId);