Merge pull request #3685 from continuedev/dallin/toolsapalooza

Ollama tool support + tool bug fixes
continuedev · Jan 11, 2025 · ce56149 · ce56149
2 parents 4448c46 + 8293beb
commit ce56149
Show file tree

Hide file tree

Showing 14 changed files with 375 additions and 197 deletions.
diff --git a/core/index.d.ts b/core/index.d.ts
@@ -1066,7 +1066,6 @@ export interface ExperimentalConfig {
    * This is needed to crawl a large number of documentation sites that are dynamically rendered.
    */
   useChromiumForDocsCrawling?: boolean;
-  useTools?: boolean;
   modelContextProtocolServers?: MCPOptions[];
 }
 

diff --git a/core/llm/autodetect.ts b/core/llm/autodetect.ts
@@ -35,6 +35,7 @@ import {
   xWinCoderEditPrompt,
   zephyrEditPrompt,
 } from "./templates/edit.js";
+import { PROVIDER_TOOL_SUPPORT } from "./toolSupport.js";
 
 const PROVIDER_HANDLES_TEMPLATING: string[] = [
   "lmstudio",
@@ -87,11 +88,11 @@ const MODEL_SUPPORTS_IMAGES: string[] = [
 ];
 
 function modelSupportsTools(modelName: string, provider: string) {
-  return (
-    provider === "anthropic" &&
-    modelName.includes("claude") &&
-    (modelName.includes("3-5") || modelName.includes("3.5"))
-  );
+  const providerSupport = PROVIDER_TOOL_SUPPORT[provider];
+  if (!providerSupport) {
+    return false;
+  }
+  return providerSupport(modelName) ?? false;
 }
 
 function modelSupportsImages(

diff --git a/core/llm/constructMessages.ts b/core/llm/constructMessages.ts
@@ -71,20 +71,17 @@ function constructSystemPrompt(
   provider: string,
   useTools: boolean,
 ): string | null {
-  if (
-    useTools &&
-    CUSTOM_SYS_MSG_MODEL_FAMILIES.some((family) => model.includes(family))
-  ) {
-    return SYSTEM_MESSAGE + "\n\n" + TOOL_USE_RULES;
-  } else if (
-    CUSTOM_SYS_MSG_MODEL_FAMILIES.some((family) => model.includes(family))
-  ) {
-    return SYSTEM_MESSAGE;
-  } else if (useTools && modelSupportsTools(model, provider)) {
-    return TOOL_USE_RULES;
+  let systemMessage = "";
+  if (CUSTOM_SYS_MSG_MODEL_FAMILIES.some((family) => model.includes(family))) {
+    systemMessage = SYSTEM_MESSAGE;
   }
-
-  return null;
+  if (useTools && modelSupportsTools(model, provider)) {
+    if (systemMessage) {
+      systemMessage += "\n\n";
+    }
+    systemMessage += TOOL_USE_RULES;
+  }
+  return systemMessage || null;
 }
 
 const CANCELED_TOOL_CALL_MESSAGE =