@theia/ai-ollama 1.76.0-next.6 → 1.76.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.
- package/lib/node/ollama-language-model.js +2 -2
- package/lib/node/ollama-language-model.js.map +1 -1
- package/lib/node/ollama-language-model.spec.js +38 -0
- package/lib/node/ollama-language-model.spec.js.map +1 -1
- package/package.json +7 -7
- package/src/node/ollama-language-model.spec.ts +56 -1
- package/src/node/ollama-language-model.ts +2 -2
|
@@ -121,7 +121,7 @@ class OllamaModel {
|
|
|
121
121
|
if (chunk.prompt_eval_count !== undefined && chunk.eval_count !== undefined) {
|
|
122
122
|
yield { input_tokens: chunk.prompt_eval_count, output_tokens: chunk.eval_count };
|
|
123
123
|
}
|
|
124
|
-
if (chunk.done_reason && chunk.done_reason !== 'stop') {
|
|
124
|
+
if (chunk.done_reason && chunk.done_reason !== 'stop' && chunk.done_reason !== 'tool_calls') {
|
|
125
125
|
throw new Error('Ollama stopped unexpectedly. Reason: ' + chunk.done_reason);
|
|
126
126
|
}
|
|
127
127
|
}
|
|
@@ -237,7 +237,7 @@ class OllamaModel {
|
|
|
237
237
|
lastUpdated = chunk.created_at;
|
|
238
238
|
inputTokenCount = chunk.prompt_eval_count;
|
|
239
239
|
outputTokenCount = chunk.eval_count;
|
|
240
|
-
if (chunk.done_reason && chunk.done_reason !== 'stop') {
|
|
240
|
+
if (chunk.done_reason && chunk.done_reason !== 'stop' && chunk.done_reason !== 'tool_calls') {
|
|
241
241
|
throw new Error('Ollama stopped unexpectedly. Reason: ' + chunk.done_reason);
|
|
242
242
|
}
|
|
243
243
|
}
|
|
@@ -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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"}
|
|
@@ -24,6 +24,13 @@ class TestableOllamaModel extends ollama_language_model_1.OllamaModel {
|
|
|
24
24
|
callMergeConsecutiveAssistantMessages(messages) {
|
|
25
25
|
return this.mergeConsecutiveAssistantMessages(messages);
|
|
26
26
|
}
|
|
27
|
+
callHandleStreamingRequest(ollama, messages) {
|
|
28
|
+
return this.handleStreamingRequest(ollama, {
|
|
29
|
+
model: 'test-model',
|
|
30
|
+
messages,
|
|
31
|
+
stream: true
|
|
32
|
+
});
|
|
33
|
+
}
|
|
27
34
|
}
|
|
28
35
|
describe('OllamaModel - mergeConsecutiveAssistantMessages', () => {
|
|
29
36
|
const model = new TestableOllamaModel();
|
|
@@ -112,4 +119,35 @@ describe('OllamaModel - mergeConsecutiveAssistantMessages', () => {
|
|
|
112
119
|
(0, chai_1.expect)(result).to.deep.equal(messages);
|
|
113
120
|
});
|
|
114
121
|
});
|
|
122
|
+
describe('OllamaModel - handleStreamingRequest', () => {
|
|
123
|
+
it('should accept tool_calls as a valid done reason', async () => {
|
|
124
|
+
const model = new TestableOllamaModel();
|
|
125
|
+
const responseStream = {
|
|
126
|
+
async *[Symbol.asyncIterator]() {
|
|
127
|
+
yield {
|
|
128
|
+
created_at: new Date(),
|
|
129
|
+
done: true,
|
|
130
|
+
done_reason: 'tool_calls',
|
|
131
|
+
message: {
|
|
132
|
+
role: 'assistant',
|
|
133
|
+
content: ''
|
|
134
|
+
}
|
|
135
|
+
};
|
|
136
|
+
},
|
|
137
|
+
abort: () => undefined
|
|
138
|
+
};
|
|
139
|
+
const ollama = {
|
|
140
|
+
show: async () => ({ capabilities: [] }),
|
|
141
|
+
chat: async () => responseStream
|
|
142
|
+
};
|
|
143
|
+
const response = await model.callHandleStreamingRequest(ollama, [
|
|
144
|
+
{ role: 'user', content: 'use a tool' }
|
|
145
|
+
]);
|
|
146
|
+
const parts = [];
|
|
147
|
+
for await (const part of response.stream) {
|
|
148
|
+
parts.push(part);
|
|
149
|
+
}
|
|
150
|
+
(0, chai_1.expect)(parts).to.deep.equal([]);
|
|
151
|
+
});
|
|
152
|
+
});
|
|
115
153
|
//# sourceMappingURL=ollama-language-model.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama-language-model.spec.js","sourceRoot":"","sources":["../../src/node/ollama-language-model.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,+BAA8B;AAE9B,mEAAsD;AAEtD,MAAM,mBAAoB,SAAQ,mCAAW;IACzC;QACI,KAAK,CAAC,SAAS,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,wBAAwB,CAAC,CAAC;IACxF,CAAC;IAEM,qCAAqC,CAAC,QAAmB;QAC5D,OAAO,IAAI,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama-language-model.spec.js","sourceRoot":"","sources":["../../src/node/ollama-language-model.spec.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.76.0
|
|
3
|
+
"version": "1.76.0",
|
|
4
4
|
"description": "Theia - Ollama Integration",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/ai-core": "1.76.0
|
|
7
|
-
"@theia/core": "1.76.0
|
|
8
|
-
"@theia/filesystem": "1.76.0
|
|
9
|
-
"@theia/workspace": "1.76.0
|
|
6
|
+
"@theia/ai-core": "1.76.0",
|
|
7
|
+
"@theia/core": "1.76.0",
|
|
8
|
+
"@theia/filesystem": "1.76.0",
|
|
9
|
+
"@theia/workspace": "1.76.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.
|
|
47
|
+
"@theia/ext-scripts": "1.76.0"
|
|
48
48
|
},
|
|
49
49
|
"nyc": {
|
|
50
50
|
"extends": "../../configs/nyc.json"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "b9b54c500b46515512e2b44371bc0c7122947bed"
|
|
53
53
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
|
-
import { Message } from 'ollama';
|
|
18
|
+
import { Message, Ollama } from 'ollama';
|
|
19
19
|
import { OllamaModel } from './ollama-language-model';
|
|
20
20
|
|
|
21
21
|
class TestableOllamaModel extends OllamaModel {
|
|
@@ -26,6 +26,15 @@ class TestableOllamaModel extends OllamaModel {
|
|
|
26
26
|
public callMergeConsecutiveAssistantMessages(messages: Message[]): Message[] {
|
|
27
27
|
return this.mergeConsecutiveAssistantMessages(messages);
|
|
28
28
|
}
|
|
29
|
+
|
|
30
|
+
public callHandleStreamingRequest(ollama: Ollama, messages: Message[]): ReturnType<OllamaModel['handleStreamingRequest']> {
|
|
31
|
+
return this.handleStreamingRequest(ollama, {
|
|
32
|
+
model: 'test-model',
|
|
33
|
+
messages,
|
|
34
|
+
stream: true
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
|
|
29
38
|
}
|
|
30
39
|
|
|
31
40
|
describe('OllamaModel - mergeConsecutiveAssistantMessages', () => {
|
|
@@ -121,3 +130,49 @@ describe('OllamaModel - mergeConsecutiveAssistantMessages', () => {
|
|
|
121
130
|
expect(result).to.deep.equal(messages);
|
|
122
131
|
});
|
|
123
132
|
});
|
|
133
|
+
|
|
134
|
+
describe('OllamaModel - handleStreamingRequest', () => {
|
|
135
|
+
|
|
136
|
+
it('should accept tool_calls as a valid done reason', async () => {
|
|
137
|
+
const model = new TestableOllamaModel();
|
|
138
|
+
|
|
139
|
+
const responseStream = {
|
|
140
|
+
async *[Symbol.asyncIterator](): AsyncGenerator<{
|
|
141
|
+
created_at: Date;
|
|
142
|
+
done: boolean;
|
|
143
|
+
done_reason: string;
|
|
144
|
+
message: { role: string; content: string };
|
|
145
|
+
}> {
|
|
146
|
+
yield {
|
|
147
|
+
created_at: new Date(),
|
|
148
|
+
done: true,
|
|
149
|
+
done_reason: 'tool_calls',
|
|
150
|
+
message: {
|
|
151
|
+
role: 'assistant',
|
|
152
|
+
content: ''
|
|
153
|
+
}
|
|
154
|
+
};
|
|
155
|
+
},
|
|
156
|
+
abort: () => undefined
|
|
157
|
+
};
|
|
158
|
+
|
|
159
|
+
const ollama = {
|
|
160
|
+
show: async () => ({ capabilities: [] }),
|
|
161
|
+
chat: async () => responseStream
|
|
162
|
+
} as unknown as Ollama;
|
|
163
|
+
|
|
164
|
+
const response = await model.callHandleStreamingRequest(ollama, [
|
|
165
|
+
{ role: 'user', content: 'use a tool' }
|
|
166
|
+
]);
|
|
167
|
+
|
|
168
|
+
const parts = [];
|
|
169
|
+
|
|
170
|
+
for await (const part of response.stream) {
|
|
171
|
+
parts.push(part);
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
expect(parts).to.deep.equal([]);
|
|
175
|
+
});
|
|
176
|
+
|
|
177
|
+
});
|
|
178
|
+
|
|
@@ -172,7 +172,7 @@ export class OllamaModel implements LanguageModel {
|
|
|
172
172
|
if (chunk.prompt_eval_count !== undefined && chunk.eval_count !== undefined) {
|
|
173
173
|
yield { input_tokens: chunk.prompt_eval_count, output_tokens: chunk.eval_count };
|
|
174
174
|
}
|
|
175
|
-
if (chunk.done_reason && chunk.done_reason !== 'stop') {
|
|
175
|
+
if (chunk.done_reason && chunk.done_reason !== 'stop' && chunk.done_reason !== 'tool_calls') {
|
|
176
176
|
throw new Error('Ollama stopped unexpectedly. Reason: ' + chunk.done_reason);
|
|
177
177
|
}
|
|
178
178
|
}
|
|
@@ -311,7 +311,7 @@ export class OllamaModel implements LanguageModel {
|
|
|
311
311
|
lastUpdated = chunk.created_at;
|
|
312
312
|
inputTokenCount = chunk.prompt_eval_count;
|
|
313
313
|
outputTokenCount = chunk.eval_count;
|
|
314
|
-
if (chunk.done_reason && chunk.done_reason !== 'stop') {
|
|
314
|
+
if (chunk.done_reason && chunk.done_reason !== 'stop' && chunk.done_reason !== 'tool_calls') {
|
|
315
315
|
throw new Error('Ollama stopped unexpectedly. Reason: ' + chunk.done_reason);
|
|
316
316
|
}
|
|
317
317
|
}
|