@push.rocks/smartai 0.12.1 → 0.13.1

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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartai',
6
- version: '0.12.1',
6
+ version: '0.13.1',
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=
@@ -7,6 +7,8 @@ export interface ChatMessage {
7
7
  content: string;
8
8
  /** Base64-encoded images for vision-capable models */
9
9
  images?: string[];
10
+ /** Chain-of-thought reasoning for GPT-OSS models (e.g., Ollama) */
11
+ reasoning?: string;
10
12
  }
11
13
  /**
12
14
  * Options for chat interactions
@@ -31,6 +33,8 @@ export interface StreamingChatOptions extends ChatOptions {
31
33
  export interface ChatResponse {
32
34
  role: 'assistant';
33
35
  message: string;
36
+ /** Chain-of-thought reasoning from reasoning models */
37
+ reasoning?: string;
34
38
  }
35
39
  /**
36
40
  * Options for research interactions
@@ -40,4 +40,4 @@ export class MultiModalModel {
40
40
  }
41
41
  }
42
42
  }
43
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJzdHJhY3QuY2xhc3Nlcy5tdWx0aW1vZGFsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvYWJzdHJhY3QuY2xhc3Nlcy5tdWx0aW1vZGFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBc0h4Qzs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLGVBQWU7SUFBckM7UUFDRTs7O1dBR0c7UUFDTyxxQkFBZ0IsR0FBcUMsSUFBSSxDQUFDO0lBNEd0RSxDQUFDO0lBMUdDOzs7T0FHRztJQUNPLEtBQUssQ0FBQyxtQkFBbUI7UUFDakMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1lBQzNCLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDeEQsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDdEMsQ0FBQztJQUNILENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsS0FBSztRQUNoQixrRUFBa0U7UUFDbEUsMkVBQTJFO0lBQzdFLENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLElBQUksSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7WUFDMUIsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbkMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQztRQUMvQixDQUFDO0lBQ0gsQ0FBQztDQTZFRiJ9
43
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJzdHJhY3QuY2xhc3Nlcy5tdWx0aW1vZGFsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvYWJzdHJhY3QuY2xhc3Nlcy5tdWx0aW1vZGFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBMEh4Qzs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLGVBQWU7SUFBckM7UUFDRTs7O1dBR0c7UUFDTyxxQkFBZ0IsR0FBcUMsSUFBSSxDQUFDO0lBNEd0RSxDQUFDO0lBMUdDOzs7T0FHRztJQUNPLEtBQUssQ0FBQyxtQkFBbUI7UUFDakMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1lBQzNCLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDeEQsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDdEMsQ0FBQztJQUNILENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsS0FBSztRQUNoQixrRUFBa0U7UUFDbEUsMkVBQTJFO0lBQzdFLENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLElBQUksSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7WUFDMUIsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbkMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQztRQUMvQixDQUFDO0lBQ0gsQ0FBQztDQTZFRiJ9
@@ -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;
@@ -128,6 +128,9 @@ export class OllamaProvider extends MultiModalModel {
128
128
  if (msg.images && msg.images.length > 0) {
129
129
  formatted.images = msg.images;
130
130
  }
131
+ if (msg.reasoning) {
132
+ formatted.reasoning = msg.reasoning;
133
+ }
131
134
  return formatted;
132
135
  });
133
136
  // Build user message with optional images
@@ -143,18 +146,24 @@ export class OllamaProvider extends MultiModalModel {
143
146
  ...historyMessages,
144
147
  userMessage,
145
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
+ }
146
160
  // Make API call to Ollama with defaultOptions and timeout
147
161
  const response = await fetch(`${this.baseUrl}/api/chat`, {
148
162
  method: 'POST',
149
163
  headers: {
150
164
  'Content-Type': 'application/json',
151
165
  },
152
- body: JSON.stringify({
153
- model: this.model,
154
- messages: messages,
155
- stream: false,
156
- options: this.defaultOptions,
157
- }),
166
+ body: JSON.stringify(requestBody),
158
167
  signal: AbortSignal.timeout(this.defaultTimeout),
159
168
  });
160
169
  if (!response.ok) {
@@ -164,6 +173,7 @@ export class OllamaProvider extends MultiModalModel {
164
173
  return {
165
174
  role: 'assistant',
166
175
  message: result.message.content,
176
+ reasoning: result.message.thinking || result.message.reasoning,
167
177
  };
168
178
  }
169
179
  /**
@@ -189,6 +199,7 @@ export class OllamaProvider extends MultiModalModel {
189
199
  return {
190
200
  role: 'assistant',
191
201
  message: response.message,
202
+ reasoning: response.thinking,
192
203
  };
193
204
  }
194
205
  /**
@@ -198,7 +209,7 @@ export class OllamaProvider extends MultiModalModel {
198
209
  const model = optionsArg.model || this.model;
199
210
  const timeout = optionsArg.timeout || this.defaultTimeout;
200
211
  const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
201
- // Format history messages with optional images
212
+ // Format history messages with optional images and reasoning
202
213
  const historyMessages = optionsArg.messageHistory.map((msg) => {
203
214
  const formatted = {
204
215
  role: msg.role,
@@ -207,6 +218,9 @@ export class OllamaProvider extends MultiModalModel {
207
218
  if (msg.images && msg.images.length > 0) {
208
219
  formatted.images = msg.images;
209
220
  }
221
+ if (msg.reasoning) {
222
+ formatted.reasoning = msg.reasoning;
223
+ }
210
224
  return formatted;
211
225
  });
212
226
  // Build user message with optional images
@@ -222,15 +236,25 @@ export class OllamaProvider extends MultiModalModel {
222
236
  ...historyMessages,
223
237
  userMessage,
224
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
+ }
225
254
  const response = await fetch(`${this.baseUrl}/api/chat`, {
226
255
  method: 'POST',
227
256
  headers: { 'Content-Type': 'application/json' },
228
- body: JSON.stringify({
229
- model,
230
- messages,
231
- stream: true,
232
- options: modelOptions,
233
- }),
257
+ body: JSON.stringify(requestBody),
234
258
  signal: AbortSignal.timeout(timeout),
235
259
  });
236
260
  if (!response.ok) {
@@ -254,9 +278,23 @@ export class OllamaProvider extends MultiModalModel {
254
278
  continue;
255
279
  try {
256
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
+ }
257
294
  yield {
258
295
  content: json.message?.content || '',
259
296
  thinking: json.message?.thinking,
297
+ toolCalls,
260
298
  done: json.done || false,
261
299
  stats: json.done ? {
262
300
  totalDuration: json.total_duration,
@@ -281,12 +319,15 @@ export class OllamaProvider extends MultiModalModel {
281
319
  const stream = await this.chatStreamResponse(optionsArg);
282
320
  let content = '';
283
321
  let thinking = '';
322
+ let toolCalls = [];
284
323
  let stats;
285
324
  for await (const chunk of stream) {
286
325
  if (chunk.content)
287
326
  content += chunk.content;
288
327
  if (chunk.thinking)
289
328
  thinking += chunk.thinking;
329
+ if (chunk.toolCalls)
330
+ toolCalls = toolCalls.concat(chunk.toolCalls);
290
331
  if (chunk.stats)
291
332
  stats = chunk.stats;
292
333
  if (onChunk)
@@ -296,6 +337,7 @@ export class OllamaProvider extends MultiModalModel {
296
337
  role: 'assistant',
297
338
  message: content,
298
339
  thinking: thinking || undefined,
340
+ toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
299
341
  stats,
300
342
  };
301
343
  }
@@ -306,8 +348,16 @@ export class OllamaProvider extends MultiModalModel {
306
348
  const model = optionsArg.model || this.model;
307
349
  const timeout = optionsArg.timeout || this.defaultTimeout;
308
350
  const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
309
- // Format history messages with optional images
351
+ // Format history messages with optional images, reasoning, and tool role
310
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
+ }
311
361
  const formatted = {
312
362
  role: msg.role,
313
363
  content: msg.content,
@@ -315,6 +365,9 @@ export class OllamaProvider extends MultiModalModel {
315
365
  if (msg.images && msg.images.length > 0) {
316
366
  formatted.images = msg.images;
317
367
  }
368
+ if (msg.reasoning) {
369
+ formatted.reasoning = msg.reasoning;
370
+ }
318
371
  return formatted;
319
372
  });
320
373
  // Build user message with optional images
@@ -330,25 +383,49 @@ export class OllamaProvider extends MultiModalModel {
330
383
  ...historyMessages,
331
384
  userMessage,
332
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
+ }
333
401
  const response = await fetch(`${this.baseUrl}/api/chat`, {
334
402
  method: 'POST',
335
403
  headers: { 'Content-Type': 'application/json' },
336
- body: JSON.stringify({
337
- model,
338
- messages,
339
- stream: false,
340
- options: modelOptions,
341
- }),
404
+ body: JSON.stringify(requestBody),
342
405
  signal: AbortSignal.timeout(timeout),
343
406
  });
344
407
  if (!response.ok) {
345
408
  throw new Error(`Ollama API error: ${response.statusText}`);
346
409
  }
347
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
+ }
348
424
  return {
349
425
  role: 'assistant',
350
- message: result.message.content,
426
+ message: result.message.content || '',
351
427
  thinking: result.message.thinking,
428
+ toolCalls,
352
429
  stats: {
353
430
  totalDuration: result.total_duration,
354
431
  evalCount: result.eval_count,
@@ -439,4 +516,4 @@ export class OllamaProvider extends MultiModalModel {
439
516
  throw new Error('Image editing is not supported by Ollama. Please use OpenAI provider for image editing.');
440
517
  }
441
518
  }
442
- //# 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.12.1",
3
+ "version": "0.13.1",
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",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartai',
6
- version: '0.12.1',
6
+ version: '0.13.1',
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
  }
@@ -8,6 +8,8 @@ export interface ChatMessage {
8
8
  content: string;
9
9
  /** Base64-encoded images for vision-capable models */
10
10
  images?: string[];
11
+ /** Chain-of-thought reasoning for GPT-OSS models (e.g., Ollama) */
12
+ reasoning?: string;
11
13
  }
12
14
 
13
15
  /**
@@ -35,6 +37,8 @@ export interface StreamingChatOptions extends ChatOptions {
35
37
  export interface ChatResponse {
36
38
  role: 'assistant';
37
39
  message: string;
40
+ /** Chain-of-thought reasoning from reasoning models */
41
+ reasoning?: string;
38
42
  }
39
43
 
40
44
  /**
@@ -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;
@@ -205,13 +241,16 @@ export class OllamaProvider extends MultiModalModel {
205
241
  public async chat(optionsArg: ChatOptions): Promise<ChatResponse> {
206
242
  // Format messages for Ollama
207
243
  const historyMessages = optionsArg.messageHistory.map((msg) => {
208
- const formatted: { role: string; content: string; images?: string[] } = {
244
+ const formatted: { role: string; content: string; images?: string[]; reasoning?: string } = {
209
245
  role: msg.role,
210
246
  content: msg.content,
211
247
  };
212
248
  if (msg.images && msg.images.length > 0) {
213
249
  formatted.images = msg.images;
214
250
  }
251
+ if (msg.reasoning) {
252
+ formatted.reasoning = msg.reasoning;
253
+ }
215
254
  return formatted;
216
255
  });
217
256
 
@@ -230,18 +269,26 @@ export class OllamaProvider extends MultiModalModel {
230
269
  userMessage,
231
270
  ];
232
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
+
233
285
  // Make API call to Ollama with defaultOptions and timeout
234
286
  const response = await fetch(`${this.baseUrl}/api/chat`, {
235
287
  method: 'POST',
236
288
  headers: {
237
289
  'Content-Type': 'application/json',
238
290
  },
239
- body: JSON.stringify({
240
- model: this.model,
241
- messages: messages,
242
- stream: false,
243
- options: this.defaultOptions,
244
- }),
291
+ body: JSON.stringify(requestBody),
245
292
  signal: AbortSignal.timeout(this.defaultTimeout),
246
293
  });
247
294
 
@@ -254,6 +301,7 @@ export class OllamaProvider extends MultiModalModel {
254
301
  return {
255
302
  role: 'assistant' as const,
256
303
  message: result.message.content,
304
+ reasoning: result.message.thinking || result.message.reasoning,
257
305
  };
258
306
  }
259
307
 
@@ -283,6 +331,7 @@ export class OllamaProvider extends MultiModalModel {
283
331
  return {
284
332
  role: 'assistant' as const,
285
333
  message: response.message,
334
+ reasoning: response.thinking,
286
335
  };
287
336
  }
288
337
 
@@ -296,15 +345,18 @@ export class OllamaProvider extends MultiModalModel {
296
345
  const timeout = optionsArg.timeout || this.defaultTimeout;
297
346
  const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
298
347
 
299
- // Format history messages with optional images
348
+ // Format history messages with optional images and reasoning
300
349
  const historyMessages = optionsArg.messageHistory.map((msg) => {
301
- const formatted: { role: string; content: string; images?: string[] } = {
350
+ const formatted: { role: string; content: string; images?: string[]; reasoning?: string } = {
302
351
  role: msg.role,
303
352
  content: msg.content,
304
353
  };
305
354
  if (msg.images && msg.images.length > 0) {
306
355
  formatted.images = msg.images;
307
356
  }
357
+ if (msg.reasoning) {
358
+ formatted.reasoning = msg.reasoning;
359
+ }
308
360
  return formatted;
309
361
  });
310
362
 
@@ -323,15 +375,28 @@ export class OllamaProvider extends MultiModalModel {
323
375
  userMessage,
324
376
  ];
325
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
+
326
396
  const response = await fetch(`${this.baseUrl}/api/chat`, {
327
397
  method: 'POST',
328
398
  headers: { 'Content-Type': 'application/json' },
329
- body: JSON.stringify({
330
- model,
331
- messages,
332
- stream: true,
333
- options: modelOptions,
334
- }),
399
+ body: JSON.stringify(requestBody),
335
400
  signal: AbortSignal.timeout(timeout),
336
401
  });
337
402
 
@@ -356,9 +421,25 @@ export class OllamaProvider extends MultiModalModel {
356
421
  if (!line.trim()) continue;
357
422
  try {
358
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
+
359
439
  yield {
360
440
  content: json.message?.content || '',
361
441
  thinking: json.message?.thinking,
442
+ toolCalls,
362
443
  done: json.done || false,
363
444
  stats: json.done ? {
364
445
  totalDuration: json.total_duration,
@@ -385,11 +466,13 @@ export class OllamaProvider extends MultiModalModel {
385
466
  const stream = await this.chatStreamResponse(optionsArg);
386
467
  let content = '';
387
468
  let thinking = '';
469
+ let toolCalls: IOllamaToolCall[] = [];
388
470
  let stats: IOllamaChatResponse['stats'];
389
471
 
390
472
  for await (const chunk of stream) {
391
473
  if (chunk.content) content += chunk.content;
392
474
  if (chunk.thinking) thinking += chunk.thinking;
475
+ if (chunk.toolCalls) toolCalls = toolCalls.concat(chunk.toolCalls);
393
476
  if (chunk.stats) stats = chunk.stats;
394
477
  if (onChunk) onChunk(chunk);
395
478
  }
@@ -398,6 +481,7 @@ export class OllamaProvider extends MultiModalModel {
398
481
  role: 'assistant' as const,
399
482
  message: content,
400
483
  thinking: thinking || undefined,
484
+ toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
401
485
  stats,
402
486
  };
403
487
  }
@@ -410,15 +494,27 @@ export class OllamaProvider extends MultiModalModel {
410
494
  const timeout = optionsArg.timeout || this.defaultTimeout;
411
495
  const modelOptions = { ...this.defaultOptions, ...optionsArg.options };
412
496
 
413
- // Format history messages with optional images
497
+ // Format history messages with optional images, reasoning, and tool role
414
498
  const historyMessages = optionsArg.messageHistory.map((msg) => {
415
- const formatted: { role: string; content: string; images?: string[] } = {
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
+
508
+ const formatted: { role: string; content: string; images?: string[]; reasoning?: string } = {
416
509
  role: msg.role,
417
510
  content: msg.content,
418
511
  };
419
512
  if (msg.images && msg.images.length > 0) {
420
513
  formatted.images = msg.images;
421
514
  }
515
+ if (msg.reasoning) {
516
+ formatted.reasoning = msg.reasoning;
517
+ }
422
518
  return formatted;
423
519
  });
424
520
 
@@ -437,15 +533,28 @@ export class OllamaProvider extends MultiModalModel {
437
533
  userMessage,
438
534
  ];
439
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
+
440
554
  const response = await fetch(`${this.baseUrl}/api/chat`, {
441
555
  method: 'POST',
442
556
  headers: { 'Content-Type': 'application/json' },
443
- body: JSON.stringify({
444
- model,
445
- messages,
446
- stream: false,
447
- options: modelOptions,
448
- }),
557
+ body: JSON.stringify(requestBody),
449
558
  signal: AbortSignal.timeout(timeout),
450
559
  });
451
560
 
@@ -454,10 +563,26 @@ export class OllamaProvider extends MultiModalModel {
454
563
  }
455
564
 
456
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
+
457
581
  return {
458
582
  role: 'assistant' as const,
459
- message: result.message.content,
583
+ message: result.message.content || '',
460
584
  thinking: result.message.thinking,
585
+ toolCalls,
461
586
  stats: {
462
587
  totalDuration: result.total_duration,
463
588
  evalCount: result.eval_count,