@push.rocks/smartai 0.13.0 → 0.13.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.smartai.d.ts +2 -11
- package/dist_ts/classes.smartai.js +1 -1
- package/dist_ts/provider.ollama.d.ts +34 -0
- package/dist_ts/provider.ollama.js +87 -21
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.smartai.ts +2 -11
- package/ts/provider.ollama.ts +134 -20
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartai',
|
|
6
|
-
version: '0.13.
|
|
6
|
+
version: '0.13.2',
|
|
7
7
|
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.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxxQkFBcUI7SUFDM0IsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGtOQUFrTjtDQUNoTyxDQUFBIn0=
|
|
@@ -2,7 +2,7 @@ import { Conversation } from './classes.conversation.js';
|
|
|
2
2
|
import { AnthropicProvider } from './provider.anthropic.js';
|
|
3
3
|
import { ElevenLabsProvider } from './provider.elevenlabs.js';
|
|
4
4
|
import { MistralProvider } from './provider.mistral.js';
|
|
5
|
-
import { OllamaProvider } from './provider.ollama.js';
|
|
5
|
+
import { OllamaProvider, type IOllamaModelOptions } from './provider.ollama.js';
|
|
6
6
|
import { OpenAiProvider } from './provider.openai.js';
|
|
7
7
|
import { PerplexityProvider } from './provider.perplexity.js';
|
|
8
8
|
import { ExoProvider } from './provider.exo.js';
|
|
@@ -29,16 +29,7 @@ export interface ISmartAiOptions {
|
|
|
29
29
|
baseUrl?: string;
|
|
30
30
|
model?: string;
|
|
31
31
|
visionModel?: string;
|
|
32
|
-
defaultOptions?:
|
|
33
|
-
num_ctx?: number;
|
|
34
|
-
temperature?: number;
|
|
35
|
-
top_k?: number;
|
|
36
|
-
top_p?: number;
|
|
37
|
-
repeat_penalty?: number;
|
|
38
|
-
num_predict?: number;
|
|
39
|
-
stop?: string[];
|
|
40
|
-
seed?: number;
|
|
41
|
-
};
|
|
32
|
+
defaultOptions?: IOllamaModelOptions;
|
|
42
33
|
defaultTimeout?: number;
|
|
43
34
|
};
|
|
44
35
|
elevenlabs?: {
|
|
@@ -136,4 +136,4 @@ export class SmartAi {
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zbWFydGFpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2xhc3Nlcy5zbWFydGFpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxFQUFFLGNBQWMsRUFBNEIsTUFBTSxzQkFBc0IsQ0FBQztBQUNoRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFtQ2hELE1BQU0sT0FBTyxPQUFPO0lBYWxCLFlBQVksVUFBMkI7UUFDckMsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUM7SUFDNUIsQ0FBQztJQUVNLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUM3QixJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksY0FBYyxDQUFDO2dCQUN2QyxXQUFXLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXO2FBQ3RDLENBQUMsQ0FBQztZQUNILE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNwQyxDQUFDO1FB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
|
|
@@ -13,6 +13,37 @@ export interface IOllamaModelOptions {
|
|
|
13
13
|
num_predict?: number;
|
|
14
14
|
stop?: string[];
|
|
15
15
|
seed?: number;
|
|
16
|
+
think?: boolean;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* JSON Schema tool definition for Ollama native tool calling
|
|
20
|
+
* @see https://docs.ollama.com/capabilities/tool-calling
|
|
21
|
+
*/
|
|
22
|
+
export interface IOllamaTool {
|
|
23
|
+
type: 'function';
|
|
24
|
+
function: {
|
|
25
|
+
name: string;
|
|
26
|
+
description: string;
|
|
27
|
+
parameters: {
|
|
28
|
+
type: 'object';
|
|
29
|
+
properties: Record<string, {
|
|
30
|
+
type: string;
|
|
31
|
+
description?: string;
|
|
32
|
+
enum?: string[];
|
|
33
|
+
}>;
|
|
34
|
+
required?: string[];
|
|
35
|
+
};
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Tool call returned by model in native tool calling mode
|
|
40
|
+
*/
|
|
41
|
+
export interface IOllamaToolCall {
|
|
42
|
+
function: {
|
|
43
|
+
name: string;
|
|
44
|
+
arguments: Record<string, unknown>;
|
|
45
|
+
index?: number;
|
|
46
|
+
};
|
|
16
47
|
}
|
|
17
48
|
export interface IOllamaProviderOptions {
|
|
18
49
|
baseUrl?: string;
|
|
@@ -28,6 +59,7 @@ export interface IOllamaChatOptions extends ChatOptions {
|
|
|
28
59
|
options?: IOllamaModelOptions;
|
|
29
60
|
timeout?: number;
|
|
30
61
|
model?: string;
|
|
62
|
+
tools?: IOllamaTool[];
|
|
31
63
|
}
|
|
32
64
|
/**
|
|
33
65
|
* Chunk emitted during streaming
|
|
@@ -35,6 +67,7 @@ export interface IOllamaChatOptions extends ChatOptions {
|
|
|
35
67
|
export interface IOllamaStreamChunk {
|
|
36
68
|
content: string;
|
|
37
69
|
thinking?: string;
|
|
70
|
+
toolCalls?: IOllamaToolCall[];
|
|
38
71
|
done: boolean;
|
|
39
72
|
stats?: {
|
|
40
73
|
totalDuration?: number;
|
|
@@ -46,6 +79,7 @@ export interface IOllamaStreamChunk {
|
|
|
46
79
|
*/
|
|
47
80
|
export interface IOllamaChatResponse extends ChatResponse {
|
|
48
81
|
thinking?: string;
|
|
82
|
+
toolCalls?: IOllamaToolCall[];
|
|
49
83
|
stats?: {
|
|
50
84
|
totalDuration?: number;
|
|
51
85
|
evalCount?: number;
|
|
@@ -146,18 +146,24 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
146
146
|
...historyMessages,
|
|
147
147
|
userMessage,
|
|
148
148
|
];
|
|
149
|
+
// Build request body - include think parameter if set
|
|
150
|
+
const requestBody = {
|
|
151
|
+
model: this.model,
|
|
152
|
+
messages: messages,
|
|
153
|
+
stream: false,
|
|
154
|
+
options: this.defaultOptions,
|
|
155
|
+
};
|
|
156
|
+
// Add think parameter for reasoning models (GPT-OSS, QwQ, etc.)
|
|
157
|
+
if (this.defaultOptions.think !== undefined) {
|
|
158
|
+
requestBody.think = this.defaultOptions.think;
|
|
159
|
+
}
|
|
149
160
|
// Make API call to Ollama with defaultOptions and timeout
|
|
150
161
|
const response = await fetch(`${this.baseUrl}/api/chat`, {
|
|
151
162
|
method: 'POST',
|
|
152
163
|
headers: {
|
|
153
164
|
'Content-Type': 'application/json',
|
|
154
165
|
},
|
|
155
|
-
body: JSON.stringify(
|
|
156
|
-
model: this.model,
|
|
157
|
-
messages: messages,
|
|
158
|
-
stream: false,
|
|
159
|
-
options: this.defaultOptions,
|
|
160
|
-
}),
|
|
166
|
+
body: JSON.stringify(requestBody),
|
|
161
167
|
signal: AbortSignal.timeout(this.defaultTimeout),
|
|
162
168
|
});
|
|
163
169
|
if (!response.ok) {
|
|
@@ -230,15 +236,25 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
230
236
|
...historyMessages,
|
|
231
237
|
userMessage,
|
|
232
238
|
];
|
|
239
|
+
// Build request body with optional tools and think parameters
|
|
240
|
+
const requestBody = {
|
|
241
|
+
model,
|
|
242
|
+
messages,
|
|
243
|
+
stream: true,
|
|
244
|
+
options: modelOptions,
|
|
245
|
+
};
|
|
246
|
+
// Add think parameter for reasoning models (GPT-OSS, QwQ, etc.)
|
|
247
|
+
if (modelOptions.think !== undefined) {
|
|
248
|
+
requestBody.think = modelOptions.think;
|
|
249
|
+
}
|
|
250
|
+
// Add tools for native function calling
|
|
251
|
+
if (optionsArg.tools && optionsArg.tools.length > 0) {
|
|
252
|
+
requestBody.tools = optionsArg.tools;
|
|
253
|
+
}
|
|
233
254
|
const response = await fetch(`${this.baseUrl}/api/chat`, {
|
|
234
255
|
method: 'POST',
|
|
235
256
|
headers: { 'Content-Type': 'application/json' },
|
|
236
|
-
body: JSON.stringify(
|
|
237
|
-
model,
|
|
238
|
-
messages,
|
|
239
|
-
stream: true,
|
|
240
|
-
options: modelOptions,
|
|
241
|
-
}),
|
|
257
|
+
body: JSON.stringify(requestBody),
|
|
242
258
|
signal: AbortSignal.timeout(timeout),
|
|
243
259
|
});
|
|
244
260
|
if (!response.ok) {
|
|
@@ -262,9 +278,23 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
262
278
|
continue;
|
|
263
279
|
try {
|
|
264
280
|
const json = JSON.parse(line);
|
|
281
|
+
// Parse tool_calls from response
|
|
282
|
+
let toolCalls;
|
|
283
|
+
if (json.message?.tool_calls && Array.isArray(json.message.tool_calls)) {
|
|
284
|
+
toolCalls = json.message.tool_calls.map((tc) => ({
|
|
285
|
+
function: {
|
|
286
|
+
name: tc.function?.name || '',
|
|
287
|
+
arguments: typeof tc.function?.arguments === 'string'
|
|
288
|
+
? JSON.parse(tc.function.arguments)
|
|
289
|
+
: tc.function?.arguments || {},
|
|
290
|
+
index: tc.index,
|
|
291
|
+
},
|
|
292
|
+
}));
|
|
293
|
+
}
|
|
265
294
|
yield {
|
|
266
295
|
content: json.message?.content || '',
|
|
267
296
|
thinking: json.message?.thinking,
|
|
297
|
+
toolCalls,
|
|
268
298
|
done: json.done || false,
|
|
269
299
|
stats: json.done ? {
|
|
270
300
|
totalDuration: json.total_duration,
|
|
@@ -289,12 +319,15 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
289
319
|
const stream = await this.chatStreamResponse(optionsArg);
|
|
290
320
|
let content = '';
|
|
291
321
|
let thinking = '';
|
|
322
|
+
let toolCalls = [];
|
|
292
323
|
let stats;
|
|
293
324
|
for await (const chunk of stream) {
|
|
294
325
|
if (chunk.content)
|
|
295
326
|
content += chunk.content;
|
|
296
327
|
if (chunk.thinking)
|
|
297
328
|
thinking += chunk.thinking;
|
|
329
|
+
if (chunk.toolCalls)
|
|
330
|
+
toolCalls = toolCalls.concat(chunk.toolCalls);
|
|
298
331
|
if (chunk.stats)
|
|
299
332
|
stats = chunk.stats;
|
|
300
333
|
if (onChunk)
|
|
@@ -304,6 +337,7 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
304
337
|
role: 'assistant',
|
|
305
338
|
message: content,
|
|
306
339
|
thinking: thinking || undefined,
|
|
340
|
+
toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
|
|
307
341
|
stats,
|
|
308
342
|
};
|
|
309
343
|
}
|
|
@@ -314,8 +348,16 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
314
348
|
const model = optionsArg.model || this.model;
|
|
315
349
|
const timeout = optionsArg.timeout || this.defaultTimeout;
|
|
316
350
|
const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
|
|
317
|
-
// Format history messages with optional images and
|
|
351
|
+
// Format history messages with optional images, reasoning, and tool role
|
|
318
352
|
const historyMessages = optionsArg.messageHistory.map((msg) => {
|
|
353
|
+
// Handle tool result messages
|
|
354
|
+
if (msg.role === 'tool') {
|
|
355
|
+
return {
|
|
356
|
+
role: 'tool',
|
|
357
|
+
content: msg.content,
|
|
358
|
+
tool_name: msg.toolName,
|
|
359
|
+
};
|
|
360
|
+
}
|
|
319
361
|
const formatted = {
|
|
320
362
|
role: msg.role,
|
|
321
363
|
content: msg.content,
|
|
@@ -341,25 +383,49 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
341
383
|
...historyMessages,
|
|
342
384
|
userMessage,
|
|
343
385
|
];
|
|
386
|
+
// Build request body with optional tools and think parameters
|
|
387
|
+
const requestBody = {
|
|
388
|
+
model,
|
|
389
|
+
messages,
|
|
390
|
+
stream: false,
|
|
391
|
+
options: modelOptions,
|
|
392
|
+
};
|
|
393
|
+
// Add think parameter for reasoning models (GPT-OSS, QwQ, etc.)
|
|
394
|
+
if (modelOptions.think !== undefined) {
|
|
395
|
+
requestBody.think = modelOptions.think;
|
|
396
|
+
}
|
|
397
|
+
// Add tools for native function calling
|
|
398
|
+
if (optionsArg.tools && optionsArg.tools.length > 0) {
|
|
399
|
+
requestBody.tools = optionsArg.tools;
|
|
400
|
+
}
|
|
344
401
|
const response = await fetch(`${this.baseUrl}/api/chat`, {
|
|
345
402
|
method: 'POST',
|
|
346
403
|
headers: { 'Content-Type': 'application/json' },
|
|
347
|
-
body: JSON.stringify(
|
|
348
|
-
model,
|
|
349
|
-
messages,
|
|
350
|
-
stream: false,
|
|
351
|
-
options: modelOptions,
|
|
352
|
-
}),
|
|
404
|
+
body: JSON.stringify(requestBody),
|
|
353
405
|
signal: AbortSignal.timeout(timeout),
|
|
354
406
|
});
|
|
355
407
|
if (!response.ok) {
|
|
356
408
|
throw new Error(`Ollama API error: ${response.statusText}`);
|
|
357
409
|
}
|
|
358
410
|
const result = await response.json();
|
|
411
|
+
// Parse tool_calls from response
|
|
412
|
+
let toolCalls;
|
|
413
|
+
if (result.message?.tool_calls && Array.isArray(result.message.tool_calls)) {
|
|
414
|
+
toolCalls = result.message.tool_calls.map((tc) => ({
|
|
415
|
+
function: {
|
|
416
|
+
name: tc.function?.name || '',
|
|
417
|
+
arguments: typeof tc.function?.arguments === 'string'
|
|
418
|
+
? JSON.parse(tc.function.arguments)
|
|
419
|
+
: tc.function?.arguments || {},
|
|
420
|
+
index: tc.index,
|
|
421
|
+
},
|
|
422
|
+
}));
|
|
423
|
+
}
|
|
359
424
|
return {
|
|
360
425
|
role: 'assistant',
|
|
361
|
-
message: result.message.content,
|
|
426
|
+
message: result.message.content || '',
|
|
362
427
|
thinking: result.message.thinking,
|
|
428
|
+
toolCalls,
|
|
363
429
|
stats: {
|
|
364
430
|
totalDuration: result.total_duration,
|
|
365
431
|
evalCount: result.eval_count,
|
|
@@ -450,4 +516,4 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
450
516
|
throw new Error('Image editing is not supported by Ollama. Please use OpenAI provider for image editing.');
|
|
451
517
|
}
|
|
452
518
|
}
|
|
453
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provider.ollama.js","sourceRoot":"","sources":["../ts/provider.ollama.ts"],"names":[],"mappings":"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"}
|
|
519
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provider.ollama.js","sourceRoot":"","sources":["../ts/provider.ollama.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartai",
|
|
3
|
-
"version": "0.13.
|
|
3
|
+
"version": "0.13.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"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.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartai',
|
|
6
|
-
version: '0.13.
|
|
6
|
+
version: '0.13.2',
|
|
7
7
|
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.'
|
|
8
8
|
}
|
package/ts/classes.smartai.ts
CHANGED
|
@@ -3,7 +3,7 @@ import * as plugins from './plugins.js';
|
|
|
3
3
|
import { AnthropicProvider } from './provider.anthropic.js';
|
|
4
4
|
import { ElevenLabsProvider } from './provider.elevenlabs.js';
|
|
5
5
|
import { MistralProvider } from './provider.mistral.js';
|
|
6
|
-
import { OllamaProvider } from './provider.ollama.js';
|
|
6
|
+
import { OllamaProvider, type IOllamaModelOptions } from './provider.ollama.js';
|
|
7
7
|
import { OpenAiProvider } from './provider.openai.js';
|
|
8
8
|
import { PerplexityProvider } from './provider.perplexity.js';
|
|
9
9
|
import { ExoProvider } from './provider.exo.js';
|
|
@@ -32,16 +32,7 @@ export interface ISmartAiOptions {
|
|
|
32
32
|
baseUrl?: string;
|
|
33
33
|
model?: string;
|
|
34
34
|
visionModel?: string;
|
|
35
|
-
defaultOptions?:
|
|
36
|
-
num_ctx?: number;
|
|
37
|
-
temperature?: number;
|
|
38
|
-
top_k?: number;
|
|
39
|
-
top_p?: number;
|
|
40
|
-
repeat_penalty?: number;
|
|
41
|
-
num_predict?: number;
|
|
42
|
-
stop?: string[];
|
|
43
|
-
seed?: number;
|
|
44
|
-
};
|
|
35
|
+
defaultOptions?: IOllamaModelOptions;
|
|
45
36
|
defaultTimeout?: number;
|
|
46
37
|
};
|
|
47
38
|
elevenlabs?: {
|
package/ts/provider.ollama.ts
CHANGED
|
@@ -26,6 +26,39 @@ export interface IOllamaModelOptions {
|
|
|
26
26
|
num_predict?: number; // Max tokens to predict
|
|
27
27
|
stop?: string[]; // Stop sequences
|
|
28
28
|
seed?: number; // Random seed for reproducibility
|
|
29
|
+
think?: boolean; // Enable thinking/reasoning mode (for GPT-OSS, QwQ, etc.)
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* JSON Schema tool definition for Ollama native tool calling
|
|
34
|
+
* @see https://docs.ollama.com/capabilities/tool-calling
|
|
35
|
+
*/
|
|
36
|
+
export interface IOllamaTool {
|
|
37
|
+
type: 'function';
|
|
38
|
+
function: {
|
|
39
|
+
name: string;
|
|
40
|
+
description: string;
|
|
41
|
+
parameters: {
|
|
42
|
+
type: 'object';
|
|
43
|
+
properties: Record<string, {
|
|
44
|
+
type: string;
|
|
45
|
+
description?: string;
|
|
46
|
+
enum?: string[];
|
|
47
|
+
}>;
|
|
48
|
+
required?: string[];
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Tool call returned by model in native tool calling mode
|
|
55
|
+
*/
|
|
56
|
+
export interface IOllamaToolCall {
|
|
57
|
+
function: {
|
|
58
|
+
name: string;
|
|
59
|
+
arguments: Record<string, unknown>;
|
|
60
|
+
index?: number;
|
|
61
|
+
};
|
|
29
62
|
}
|
|
30
63
|
|
|
31
64
|
export interface IOllamaProviderOptions {
|
|
@@ -43,6 +76,7 @@ export interface IOllamaChatOptions extends ChatOptions {
|
|
|
43
76
|
options?: IOllamaModelOptions; // Per-request model options
|
|
44
77
|
timeout?: number; // Per-request timeout in ms
|
|
45
78
|
model?: string; // Per-request model override
|
|
79
|
+
tools?: IOllamaTool[]; // Available tools for native function calling
|
|
46
80
|
// images is inherited from ChatOptions
|
|
47
81
|
}
|
|
48
82
|
|
|
@@ -52,6 +86,7 @@ export interface IOllamaChatOptions extends ChatOptions {
|
|
|
52
86
|
export interface IOllamaStreamChunk {
|
|
53
87
|
content: string;
|
|
54
88
|
thinking?: string; // For models with extended thinking
|
|
89
|
+
toolCalls?: IOllamaToolCall[]; // Tool calls in streaming mode
|
|
55
90
|
done: boolean;
|
|
56
91
|
stats?: {
|
|
57
92
|
totalDuration?: number;
|
|
@@ -64,6 +99,7 @@ export interface IOllamaStreamChunk {
|
|
|
64
99
|
*/
|
|
65
100
|
export interface IOllamaChatResponse extends ChatResponse {
|
|
66
101
|
thinking?: string;
|
|
102
|
+
toolCalls?: IOllamaToolCall[]; // Tool calls from model (native tool calling)
|
|
67
103
|
stats?: {
|
|
68
104
|
totalDuration?: number;
|
|
69
105
|
evalCount?: number;
|
|
@@ -233,18 +269,26 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
233
269
|
userMessage,
|
|
234
270
|
];
|
|
235
271
|
|
|
272
|
+
// Build request body - include think parameter if set
|
|
273
|
+
const requestBody: Record<string, unknown> = {
|
|
274
|
+
model: this.model,
|
|
275
|
+
messages: messages,
|
|
276
|
+
stream: false,
|
|
277
|
+
options: this.defaultOptions,
|
|
278
|
+
};
|
|
279
|
+
|
|
280
|
+
// Add think parameter for reasoning models (GPT-OSS, QwQ, etc.)
|
|
281
|
+
if (this.defaultOptions.think !== undefined) {
|
|
282
|
+
requestBody.think = this.defaultOptions.think;
|
|
283
|
+
}
|
|
284
|
+
|
|
236
285
|
// Make API call to Ollama with defaultOptions and timeout
|
|
237
286
|
const response = await fetch(`${this.baseUrl}/api/chat`, {
|
|
238
287
|
method: 'POST',
|
|
239
288
|
headers: {
|
|
240
289
|
'Content-Type': 'application/json',
|
|
241
290
|
},
|
|
242
|
-
body: JSON.stringify(
|
|
243
|
-
model: this.model,
|
|
244
|
-
messages: messages,
|
|
245
|
-
stream: false,
|
|
246
|
-
options: this.defaultOptions,
|
|
247
|
-
}),
|
|
291
|
+
body: JSON.stringify(requestBody),
|
|
248
292
|
signal: AbortSignal.timeout(this.defaultTimeout),
|
|
249
293
|
});
|
|
250
294
|
|
|
@@ -331,15 +375,28 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
331
375
|
userMessage,
|
|
332
376
|
];
|
|
333
377
|
|
|
378
|
+
// Build request body with optional tools and think parameters
|
|
379
|
+
const requestBody: Record<string, unknown> = {
|
|
380
|
+
model,
|
|
381
|
+
messages,
|
|
382
|
+
stream: true,
|
|
383
|
+
options: modelOptions,
|
|
384
|
+
};
|
|
385
|
+
|
|
386
|
+
// Add think parameter for reasoning models (GPT-OSS, QwQ, etc.)
|
|
387
|
+
if (modelOptions.think !== undefined) {
|
|
388
|
+
requestBody.think = modelOptions.think;
|
|
389
|
+
}
|
|
390
|
+
|
|
391
|
+
// Add tools for native function calling
|
|
392
|
+
if (optionsArg.tools && optionsArg.tools.length > 0) {
|
|
393
|
+
requestBody.tools = optionsArg.tools;
|
|
394
|
+
}
|
|
395
|
+
|
|
334
396
|
const response = await fetch(`${this.baseUrl}/api/chat`, {
|
|
335
397
|
method: 'POST',
|
|
336
398
|
headers: { 'Content-Type': 'application/json' },
|
|
337
|
-
body: JSON.stringify(
|
|
338
|
-
model,
|
|
339
|
-
messages,
|
|
340
|
-
stream: true,
|
|
341
|
-
options: modelOptions,
|
|
342
|
-
}),
|
|
399
|
+
body: JSON.stringify(requestBody),
|
|
343
400
|
signal: AbortSignal.timeout(timeout),
|
|
344
401
|
});
|
|
345
402
|
|
|
@@ -364,9 +421,25 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
364
421
|
if (!line.trim()) continue;
|
|
365
422
|
try {
|
|
366
423
|
const json = JSON.parse(line);
|
|
424
|
+
|
|
425
|
+
// Parse tool_calls from response
|
|
426
|
+
let toolCalls: IOllamaToolCall[] | undefined;
|
|
427
|
+
if (json.message?.tool_calls && Array.isArray(json.message.tool_calls)) {
|
|
428
|
+
toolCalls = json.message.tool_calls.map((tc: any) => ({
|
|
429
|
+
function: {
|
|
430
|
+
name: tc.function?.name || '',
|
|
431
|
+
arguments: typeof tc.function?.arguments === 'string'
|
|
432
|
+
? JSON.parse(tc.function.arguments)
|
|
433
|
+
: tc.function?.arguments || {},
|
|
434
|
+
index: tc.index,
|
|
435
|
+
},
|
|
436
|
+
}));
|
|
437
|
+
}
|
|
438
|
+
|
|
367
439
|
yield {
|
|
368
440
|
content: json.message?.content || '',
|
|
369
441
|
thinking: json.message?.thinking,
|
|
442
|
+
toolCalls,
|
|
370
443
|
done: json.done || false,
|
|
371
444
|
stats: json.done ? {
|
|
372
445
|
totalDuration: json.total_duration,
|
|
@@ -393,11 +466,13 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
393
466
|
const stream = await this.chatStreamResponse(optionsArg);
|
|
394
467
|
let content = '';
|
|
395
468
|
let thinking = '';
|
|
469
|
+
let toolCalls: IOllamaToolCall[] = [];
|
|
396
470
|
let stats: IOllamaChatResponse['stats'];
|
|
397
471
|
|
|
398
472
|
for await (const chunk of stream) {
|
|
399
473
|
if (chunk.content) content += chunk.content;
|
|
400
474
|
if (chunk.thinking) thinking += chunk.thinking;
|
|
475
|
+
if (chunk.toolCalls) toolCalls = toolCalls.concat(chunk.toolCalls);
|
|
401
476
|
if (chunk.stats) stats = chunk.stats;
|
|
402
477
|
if (onChunk) onChunk(chunk);
|
|
403
478
|
}
|
|
@@ -406,6 +481,7 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
406
481
|
role: 'assistant' as const,
|
|
407
482
|
message: content,
|
|
408
483
|
thinking: thinking || undefined,
|
|
484
|
+
toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
|
|
409
485
|
stats,
|
|
410
486
|
};
|
|
411
487
|
}
|
|
@@ -418,8 +494,17 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
418
494
|
const timeout = optionsArg.timeout || this.defaultTimeout;
|
|
419
495
|
const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
|
|
420
496
|
|
|
421
|
-
// Format history messages with optional images and
|
|
497
|
+
// Format history messages with optional images, reasoning, and tool role
|
|
422
498
|
const historyMessages = optionsArg.messageHistory.map((msg) => {
|
|
499
|
+
// Handle tool result messages
|
|
500
|
+
if ((msg as any).role === 'tool') {
|
|
501
|
+
return {
|
|
502
|
+
role: 'tool',
|
|
503
|
+
content: msg.content,
|
|
504
|
+
tool_name: (msg as any).toolName,
|
|
505
|
+
};
|
|
506
|
+
}
|
|
507
|
+
|
|
423
508
|
const formatted: { role: string; content: string; images?: string[]; reasoning?: string } = {
|
|
424
509
|
role: msg.role,
|
|
425
510
|
content: msg.content,
|
|
@@ -448,15 +533,28 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
448
533
|
userMessage,
|
|
449
534
|
];
|
|
450
535
|
|
|
536
|
+
// Build request body with optional tools and think parameters
|
|
537
|
+
const requestBody: Record<string, unknown> = {
|
|
538
|
+
model,
|
|
539
|
+
messages,
|
|
540
|
+
stream: false,
|
|
541
|
+
options: modelOptions,
|
|
542
|
+
};
|
|
543
|
+
|
|
544
|
+
// Add think parameter for reasoning models (GPT-OSS, QwQ, etc.)
|
|
545
|
+
if (modelOptions.think !== undefined) {
|
|
546
|
+
requestBody.think = modelOptions.think;
|
|
547
|
+
}
|
|
548
|
+
|
|
549
|
+
// Add tools for native function calling
|
|
550
|
+
if (optionsArg.tools && optionsArg.tools.length > 0) {
|
|
551
|
+
requestBody.tools = optionsArg.tools;
|
|
552
|
+
}
|
|
553
|
+
|
|
451
554
|
const response = await fetch(`${this.baseUrl}/api/chat`, {
|
|
452
555
|
method: 'POST',
|
|
453
556
|
headers: { 'Content-Type': 'application/json' },
|
|
454
|
-
body: JSON.stringify(
|
|
455
|
-
model,
|
|
456
|
-
messages,
|
|
457
|
-
stream: false,
|
|
458
|
-
options: modelOptions,
|
|
459
|
-
}),
|
|
557
|
+
body: JSON.stringify(requestBody),
|
|
460
558
|
signal: AbortSignal.timeout(timeout),
|
|
461
559
|
});
|
|
462
560
|
|
|
@@ -465,10 +563,26 @@ export class OllamaProvider extends MultiModalModel {
|
|
|
465
563
|
}
|
|
466
564
|
|
|
467
565
|
const result = await response.json();
|
|
566
|
+
|
|
567
|
+
// Parse tool_calls from response
|
|
568
|
+
let toolCalls: IOllamaToolCall[] | undefined;
|
|
569
|
+
if (result.message?.tool_calls && Array.isArray(result.message.tool_calls)) {
|
|
570
|
+
toolCalls = result.message.tool_calls.map((tc: any) => ({
|
|
571
|
+
function: {
|
|
572
|
+
name: tc.function?.name || '',
|
|
573
|
+
arguments: typeof tc.function?.arguments === 'string'
|
|
574
|
+
? JSON.parse(tc.function.arguments)
|
|
575
|
+
: tc.function?.arguments || {},
|
|
576
|
+
index: tc.index,
|
|
577
|
+
},
|
|
578
|
+
}));
|
|
579
|
+
}
|
|
580
|
+
|
|
468
581
|
return {
|
|
469
582
|
role: 'assistant' as const,
|
|
470
|
-
message: result.message.content,
|
|
583
|
+
message: result.message.content || '',
|
|
471
584
|
thinking: result.message.thinking,
|
|
585
|
+
toolCalls,
|
|
472
586
|
stats: {
|
|
473
587
|
totalDuration: result.total_duration,
|
|
474
588
|
evalCount: result.eval_count,
|