@theia/ai-ollama 1.75.0-next.46 → 1.75.0

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.
Files changed (5) hide show
  1. package/lib/node/ollama-language-model.d.ts.map +1 -1
  2. package/lib/node/ollama-language-model.js +12 -5
  3. package/lib/node/ollama-language-model.js.map +1 -1
  4. package/package.json +7 -7
  5. package/src/node/ollama-language-model.ts +15 -4
package/lib/node/ollama-language-model.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ollama-language-model.d.ts","sourceRoot":"","sources":["../../src/node/ollama-language-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ollama-language-model.d.ts","sourceRoot":"","sources":["../../src/node/ollama-language-model.ts"],"names":[],"mappings":"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"}
package/lib/node/ollama-language-model.js CHANGED
@@ -318,13 +318,23 @@ class OllamaModel {
318
318
  return new ollama_1.Ollama({ host: host, fetch: (0, node_1.createProxyFetch)(this.proxy) });
319
319
  }
320
320
  toOllamaTool(tool) {
321
+ const resolveType = (prop) => {
322
+ if (prop.type) {
323
+ return prop.type;
324
+ }
325
+ if (prop.anyOf) {
326
+ const nonNull = prop.anyOf.find(p => p.type && p.type !== 'null');
327
+ return nonNull?.type ?? undefined;
328
+ }
329
+ return undefined;
330
+ };
321
331
  const transform = (props) => {
322
332
  if (!props) {
323
333
  return undefined;
324
334
  }
325
335
  const result = {};
326
336
  for (const [key, prop] of Object.entries(props)) {
327
- const type = prop.type;
337
+ const type = resolveType(prop);
328
338
  if (type) {
329
339
  const description = typeof prop.description == 'string' ? prop.description : '';
330
340
  result[key] = {
@@ -332,9 +342,6 @@ class OllamaModel {
332
342
  description: description
333
343
  };
334
344
  }
335
- else {
336
- // TODO: Should handle anyOf, but this is not supported by the Ollama type yet
337
- }
338
345
  }
339
346
  return result;
340
347
  };
@@ -364,7 +371,7 @@ class OllamaModel {
364
371
  result.tool_calls = [{ function: { name: message.name, arguments: message.input } }];
365
372
  }
366
373
  else if (ai_core_1.LanguageModelMessage.isToolResultMessage(message)) {
367
- result.content = `Tool call ${message.name} returned: ${message.content}`;
374
+ result.content = `Tool call ${message.name} returned: ${(0, ai_core_1.formatToolCallContentForModel)(message.content)}`;
368
375
  }
369
376
  else if (ai_core_1.LanguageModelMessage.isThinkingMessage(message)) {
370
377
  result.thinking = message.thinking;
package/lib/node/ollama-language-model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ollama-language-model.js","sourceRoot":"","sources":["../../src/node/ollama-language-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ollama-language-model.js","sourceRoot":"","sources":["../../src/node/ollama-language-model.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@theia/ai-ollama",
3
- "version": "1.75.0-next.46+eb558223a",
3
+ "version": "1.75.0",
4
4
  "description": "Theia - Ollama Integration",
5
5
  "dependencies": {
6
- "@theia/ai-core": "1.75.0-next.46+eb558223a",
7
- "@theia/core": "1.75.0-next.46+eb558223a",
8
- "@theia/filesystem": "1.75.0-next.46+eb558223a",
9
- "@theia/workspace": "1.75.0-next.46+eb558223a",
6
+ "@theia/ai-core": "1.75.0",
7
+ "@theia/core": "1.75.0",
8
+ "@theia/filesystem": "1.75.0",
9
+ "@theia/workspace": "1.75.0",
10
10
  "ollama": "^0.5.18",
11
11
  "tslib": "^2.8.1"
12
12
  },
@@ -44,10 +44,10 @@
44
44
  "watch": "theiaext watch"
45
45
  },
46
46
  "devDependencies": {
47
- "@theia/ext-scripts": "1.74.0"
47
+ "@theia/ext-scripts": "1.75.0"
48
48
  },
49
49
  "nyc": {
50
50
  "extends": "../../configs/nyc.json"
51
51
  },
52
- "gitHead": "eb558223aae4b1ebf0a64deeb51741032cb8ea50"
52
+ "gitHead": "6d8e911f05f0fd9a13d76797e79b21ee3f038bc2"
53
53
  }
package/src/node/ollama-language-model.ts CHANGED
@@ -25,8 +25,10 @@ import {
25
25
  ReasoningSupport,
26
26
  ToolCall,
27
27
  ToolRequest,
28
+ ToolRequestParameterProperty,
28
29
  ToolRequestParametersProperties,
29
30
  ImageContent,
31
+ formatToolCallContentForModel,
30
32
  LanguageModelRequest,
31
33
  LanguageModelStatus,
32
34
  LanguageModelTextResponse,
@@ -400,6 +402,17 @@ export class OllamaModel implements LanguageModel {
400
402
  }
401
403
 
402
404
  protected toOllamaTool(tool: ToolRequest): ToolWithHandler {
405
+ const resolveType = (prop: ToolRequestParameterProperty): string | undefined => {
406
+ if (prop.type) {
407
+ return prop.type;
408
+ }
409
+ if (prop.anyOf) {
410
+ const nonNull = prop.anyOf.find(p => p.type && p.type !== 'null');
411
+ return nonNull?.type ?? undefined;
412
+ }
413
+ return undefined;
414
+ };
415
+
403
416
  const transform = (props: ToolRequestParametersProperties | undefined) => {
404
417
  if (!props) {
405
418
  return undefined;
@@ -407,15 +420,13 @@ export class OllamaModel implements LanguageModel {
407
420
 
408
421
  const result: Record<string, { type: string, description: string, enum?: string[] }> = {};
409
422
  for (const [key, prop] of Object.entries(props)) {
410
- const type = prop.type;
423
+ const type = resolveType(prop);
411
424
  if (type) {
412
425
  const description = typeof prop.description == 'string' ? prop.description : '';
413
426
  result[key] = {
414
427
  type: type,
415
428
  description: description
416
429
  };
417
- } else {
418
- // TODO: Should handle anyOf, but this is not supported by the Ollama type yet
419
430
  }
420
431
  }
421
432
  return result;
@@ -446,7 +457,7 @@ export class OllamaModel implements LanguageModel {
446
457
  } else if (LanguageModelMessage.isToolUseMessage(message)) {
447
458
  result.tool_calls = [{ function: { name: message.name, arguments: message.input as Record<string, unknown> } }];
448
459
  } else if (LanguageModelMessage.isToolResultMessage(message)) {
449
- result.content = `Tool call ${message.name} returned: ${message.content}`;
460
+ result.content = `Tool call ${message.name} returned: ${formatToolCallContentForModel(message.content)}`;
450
461
  } else if (LanguageModelMessage.isThinkingMessage(message)) {
451
462
  result.thinking = message.thinking;
452
463
  } else if (LanguageModelMessage.isImageMessage(message) && ImageContent.isBase64(message.image)) {