Compare commits

...

3 Commits

Author SHA1 Message Date
27cef60900 v0.13.3
Some checks failed
Default (tags) / security (push) Failing after 1s
Default (tags) / test (push) Failing after 1s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2026-01-20 03:55:09 +00:00
2b00e36b02 fix(): no changes detected 2026-01-20 03:55:09 +00:00
8eb3111e7e fix(ollama): preserve tool_calls in message history for native tool calling
When using native tool calling, the assistant's tool_calls must be saved in
message history. Without this, the model doesn't know it already called a
tool and may loop indefinitely calling the same tool.

This fix adds tool_calls forwarding in chatStreamResponse and chatWithOptions
history formatting.
2026-01-20 03:54:51 +00:00
4 changed files with 22 additions and 6 deletions

View File

@@ -1,5 +1,11 @@
# Changelog # Changelog
## 2026-01-20 - 0.13.3 - fix()
no changes detected
- No files changed in the provided diff.
- No version bump required.
## 2026-01-20 - 0.13.2 - fix(repo) ## 2026-01-20 - 0.13.2 - fix(repo)
no changes detected in diff; nothing to commit no changes detected in diff; nothing to commit

View File

@@ -1,6 +1,6 @@
{ {
"name": "@push.rocks/smartai", "name": "@push.rocks/smartai",
"version": "0.13.2", "version": "0.13.3",
"private": false, "private": false,
"description": "SmartAi is a versatile TypeScript library designed to facilitate integration and interaction with various AI models, offering functionalities for chat, audio generation, document processing, and vision tasks.", "description": "SmartAi is a versatile TypeScript library designed to facilitate integration and interaction with various AI models, offering functionalities for chat, audio generation, document processing, and vision tasks.",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",

View File

@@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@push.rocks/smartai', name: '@push.rocks/smartai',
version: '0.13.2', version: '0.13.3',
description: 'SmartAi is a versatile TypeScript library designed to facilitate integration and interaction with various AI models, offering functionalities for chat, audio generation, document processing, and vision tasks.' description: 'SmartAi is a versatile TypeScript library designed to facilitate integration and interaction with various AI models, offering functionalities for chat, audio generation, document processing, and vision tasks.'
} }

View File

@@ -345,9 +345,9 @@ export class OllamaProvider extends MultiModalModel {
const timeout = optionsArg.timeout || this.defaultTimeout; const timeout = optionsArg.timeout || this.defaultTimeout;
const modelOptions = { ...this.defaultOptions, ...optionsArg.options }; const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
// Format history messages with optional images and reasoning // Format history messages with optional images, reasoning, and tool_calls
const historyMessages = optionsArg.messageHistory.map((msg) => { const historyMessages = optionsArg.messageHistory.map((msg) => {
const formatted: { role: string; content: string; images?: string[]; reasoning?: string } = { const formatted: { role: string; content: string; images?: string[]; reasoning?: string; tool_calls?: any[] } = {
role: msg.role, role: msg.role,
content: msg.content, content: msg.content,
}; };
@@ -357,6 +357,11 @@ export class OllamaProvider extends MultiModalModel {
if (msg.reasoning) { if (msg.reasoning) {
formatted.reasoning = msg.reasoning; formatted.reasoning = msg.reasoning;
} }
// CRITICAL: Include tool_calls in history for native tool calling
// Without this, the model doesn't know it already called a tool and may call it again
if ((msg as any).tool_calls && Array.isArray((msg as any).tool_calls)) {
formatted.tool_calls = (msg as any).tool_calls;
}
return formatted; return formatted;
}); });
@@ -494,7 +499,7 @@ export class OllamaProvider extends MultiModalModel {
const timeout = optionsArg.timeout || this.defaultTimeout; const timeout = optionsArg.timeout || this.defaultTimeout;
const modelOptions = { ...this.defaultOptions, ...optionsArg.options }; const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
// Format history messages with optional images, reasoning, and tool role // Format history messages with optional images, reasoning, tool_calls, and tool role
const historyMessages = optionsArg.messageHistory.map((msg) => { const historyMessages = optionsArg.messageHistory.map((msg) => {
// Handle tool result messages // Handle tool result messages
if ((msg as any).role === 'tool') { if ((msg as any).role === 'tool') {
@@ -505,7 +510,7 @@ export class OllamaProvider extends MultiModalModel {
}; };
} }
const formatted: { role: string; content: string; images?: string[]; reasoning?: string } = { const formatted: { role: string; content: string; images?: string[]; reasoning?: string; tool_calls?: any[] } = {
role: msg.role, role: msg.role,
content: msg.content, content: msg.content,
}; };
@@ -515,6 +520,11 @@ export class OllamaProvider extends MultiModalModel {
if (msg.reasoning) { if (msg.reasoning) {
formatted.reasoning = msg.reasoning; formatted.reasoning = msg.reasoning;
} }
// CRITICAL: Include tool_calls in history for native tool calling
// Without this, the model doesn't know it already called a tool and may call it again
if ((msg as any).tool_calls && Array.isArray((msg as any).tool_calls)) {
formatted.tool_calls = (msg as any).tool_calls;
}
return formatted; return formatted;
}); });