feat(ollama): Switch Ollama default withStructuredOutput method to js…

…onSchema (#7681)
langchain-ai · Feb 10, 2025 · 850819a · 850819a
1 parent 193d1e9
commit 850819a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/libs/langchain-ollama/src/chat_models.ts b/libs/langchain-ollama/src/chat_models.ts
@@ -841,8 +841,7 @@ export class ChatOllama
           parsed: RunOutput;
         }
       > {
-    // TODO: Make this method the default in a minor bump
-    if (config?.method === "jsonSchema") {
+    if (config?.method === undefined || config?.method === "jsonSchema") {
       const outputSchemaIsZod = isZodSchema(outputSchema);
       const jsonSchema = outputSchemaIsZod
         ? zodToJsonSchema(outputSchema)

diff --git a/libs/langchain-ollama/src/tests/chat_models_structured_output.int.test.ts b/libs/langchain-ollama/src/tests/chat_models_structured_output.int.test.ts
@@ -96,7 +96,6 @@ test("Ollama can call withStructuredOutput includeRaw JSON Schema", async () =>
   }).withStructuredOutput(weatherTool.schema, {
     name: weatherTool.name,
     includeRaw: true,
-    method: "jsonSchema",
   });
 
   const result = await model.invoke(messageHistory);
@@ -113,6 +112,7 @@ test("Ollama can call withStructuredOutput includeRaw with tool calling", async
   }).withStructuredOutput(weatherTool.schema, {
     name: weatherTool.name,
     includeRaw: true,
+    method: "functionCalling",
   });
 
   const result = await model.invoke(messageHistory);