@mate-academy/llm-gateway 6.2.0 → 6.2.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.
- package/dist/LLMService.constants.d.ts +2 -2
- package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAIAssistance.service.d.ts +4 -0
- package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAIAssistance.service.js +145 -163
- package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAIAssistance.service.js.map +1 -1
- package/dist/providers/LLMAPI/LLMAPI.constants.d.ts +3 -3
- package/dist/providers/LLMAPI/LLMAPI.constants.js +1 -1
- package/dist/providers/LLMAPI/LLMAPI.constants.js.map +1 -1
- package/dist/providers/LLMAPI/LLMAPI.entity.js +1 -2
- package/dist/providers/LLMAPI/LLMAPI.entity.js.map +1 -1
- package/dist/providers/LLMAPI/LLMAPI.typedefs.js.map +1 -1
- package/dist/providers/LLMAPI/services/LLMAPIAssistance.service.d.ts +5 -2
- package/dist/providers/LLMAPI/services/LLMAPIAssistance.service.js +145 -142
- package/dist/providers/LLMAPI/services/LLMAPIAssistance.service.js.map +1 -1
- package/dist/providers/LLMAPI/services/LLMAPICompletion.service.d.ts +0 -1
- package/dist/providers/LLMAPI/services/LLMAPICompletion.service.js +10 -16
- package/dist/providers/LLMAPI/services/LLMAPICompletion.service.js.map +1 -1
- package/dist/providers/LLMAPI/utilities/LLMAPIJsonFixer.js +2 -4
- package/dist/providers/LLMAPI/utilities/LLMAPIJsonFixer.js.map +1 -1
- package/dist/providers/LLMAPI/utilities/index.d.ts +2 -0
- package/dist/providers/LLMAPI/utilities/index.js +5 -1
- package/dist/providers/LLMAPI/utilities/index.js.map +1 -1
- package/dist/providers/LLMAPI/utilities/parseXmlToolCalls.d.ts +7 -0
- package/dist/providers/LLMAPI/utilities/parseXmlToolCalls.js +35 -0
- package/dist/providers/LLMAPI/utilities/parseXmlToolCalls.js.map +1 -0
- package/dist/providers/LLMAPI/utilities/stripThinkingTags.d.ts +1 -0
- package/dist/providers/LLMAPI/utilities/stripThinkingTags.js +7 -0
- package/dist/providers/LLMAPI/utilities/stripThinkingTags.js.map +1 -0
- package/dist/providers/OpenAI/services/OpenAIAssistance.service.d.ts +3 -0
- package/dist/providers/OpenAI/services/OpenAIAssistance.service.js +100 -156
- package/dist/providers/OpenAI/services/OpenAIAssistance.service.js.map +1 -1
- package/dist/providers/OpenAICompatible/OpenAICompatibleCompletion.service.d.ts +2 -0
- package/dist/providers/OpenAICompatible/OpenAICompatibleCompletion.service.js +60 -76
- package/dist/providers/OpenAICompatible/OpenAICompatibleCompletion.service.js.map +1 -1
- package/dist/services/chatState/CompletionsChatState.js.map +1 -1
- package/dist/services/fileStorage/fileStorageTools.js +2 -1
- package/dist/services/fileStorage/fileStorageTools.js.map +1 -1
- package/package.json +1 -1
|
@@ -37,12 +37,10 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
37
37
|
}
|
|
38
38
|
async uploadFile(fileOptions) {
|
|
39
39
|
const { path, name, mimeType, abortSignal, reporterContext, } = fileOptions;
|
|
40
|
-
const writeMetrics = this.reporter
|
|
41
|
-
?.initWriter(reporterContext);
|
|
40
|
+
const writeMetrics = this.reporter?.initWriter(reporterContext);
|
|
42
41
|
try {
|
|
43
42
|
abortSignal?.throwIfAborted();
|
|
44
|
-
const existingFile = this.fileStorage
|
|
45
|
-
.getFileByPath(path);
|
|
43
|
+
const existingFile = this.fileStorage.getFileByPath(path);
|
|
46
44
|
if (existingFile) {
|
|
47
45
|
await this.writeSuccessMetrics({
|
|
48
46
|
method: this.getMethodName(this.uploadFile),
|
|
@@ -57,8 +55,7 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
57
55
|
mimeType: existingFile.mimeType,
|
|
58
56
|
};
|
|
59
57
|
}
|
|
60
|
-
const storedFile = this.fileStorage
|
|
61
|
-
.addFile(path, name, mimeType);
|
|
58
|
+
const storedFile = this.fileStorage.addFile(path, name, mimeType);
|
|
62
59
|
const uploadedFileInfo = {
|
|
63
60
|
fileId: storedFile.fileId,
|
|
64
61
|
name: storedFile.name,
|
|
@@ -79,13 +76,16 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
79
76
|
model: null,
|
|
80
77
|
writeMetrics,
|
|
81
78
|
});
|
|
82
|
-
this.logger
|
|
83
|
-
?.child(this.getMethodName(this.uploadFile))
|
|
79
|
+
this.logger?.child(this.getMethodName(this.uploadFile))
|
|
84
80
|
.error('Error uploading file', {
|
|
85
81
|
error: (0, serializeError_1.serializeError)(error),
|
|
86
82
|
file: fileOptions,
|
|
87
83
|
});
|
|
88
|
-
return {
|
|
84
|
+
return {
|
|
85
|
+
error: error instanceof Error
|
|
86
|
+
? error
|
|
87
|
+
: new Error(String(error)),
|
|
88
|
+
};
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
async getFile(path) {
|
|
@@ -105,8 +105,7 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
105
105
|
}
|
|
106
106
|
async createFileStorage(options) {
|
|
107
107
|
const { uploadedFiles, abortSignal, reporterContext, } = options;
|
|
108
|
-
const writeMetrics = this.reporter
|
|
109
|
-
?.initWriter(reporterContext);
|
|
108
|
+
const writeMetrics = this.reporter?.initWriter(reporterContext);
|
|
110
109
|
try {
|
|
111
110
|
abortSignal?.throwIfAborted();
|
|
112
111
|
const storageId = this.fileStorage.createStorage(uploadedFiles.map((file) => file.fileId));
|
|
@@ -124,22 +123,24 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
124
123
|
model: null,
|
|
125
124
|
writeMetrics,
|
|
126
125
|
});
|
|
127
|
-
this.logger
|
|
128
|
-
?.child(this.getMethodName(this.createFileStorage))
|
|
126
|
+
this.logger?.child(this.getMethodName(this.createFileStorage))
|
|
129
127
|
.error('Error creating file storage', {
|
|
130
128
|
error: (0, serializeError_1.serializeError)(error),
|
|
131
129
|
uploadedFiles,
|
|
132
130
|
});
|
|
133
|
-
return {
|
|
131
|
+
return {
|
|
132
|
+
error: error instanceof Error
|
|
133
|
+
? error
|
|
134
|
+
: new Error(String(error)),
|
|
135
|
+
};
|
|
134
136
|
}
|
|
135
137
|
}
|
|
136
138
|
async deleteFileStorage(storageId) {
|
|
137
139
|
this.fileStorage.removeStorage(storageId);
|
|
138
140
|
}
|
|
139
141
|
async createChat(options) {
|
|
140
|
-
const { instructions, history = [], storageId, abortSignal, reporterContext, } = options;
|
|
141
|
-
const writeMetrics = this.reporter
|
|
142
|
-
?.initWriter(reporterContext);
|
|
142
|
+
const { model, instructions, history = [], storageId, abortSignal, reporterContext, } = options;
|
|
143
|
+
const writeMetrics = this.reporter?.initWriter(reporterContext);
|
|
143
144
|
try {
|
|
144
145
|
abortSignal?.throwIfAborted();
|
|
145
146
|
const chatId = (0, uuid_1.v4)();
|
|
@@ -148,7 +149,7 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
148
149
|
this.chatState.createChat(chatId, instructions, storageId, convertedHistory);
|
|
149
150
|
await this.writeSuccessMetrics({
|
|
150
151
|
method: this.getMethodName(this.createChat),
|
|
151
|
-
model
|
|
152
|
+
model,
|
|
152
153
|
usage: {},
|
|
153
154
|
writeMetrics,
|
|
154
155
|
});
|
|
@@ -157,16 +158,19 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
157
158
|
catch (error) {
|
|
158
159
|
await this.writeErrorMetrics({
|
|
159
160
|
method: this.getMethodName(this.createChat),
|
|
160
|
-
model
|
|
161
|
+
model,
|
|
161
162
|
writeMetrics,
|
|
162
163
|
});
|
|
163
|
-
this.logger
|
|
164
|
-
?.child(this.getMethodName(this.createChat))
|
|
164
|
+
this.logger?.child(this.getMethodName(this.createChat))
|
|
165
165
|
.error('Error creating chat', {
|
|
166
166
|
error: (0, serializeError_1.serializeError)(error),
|
|
167
167
|
options,
|
|
168
168
|
});
|
|
169
|
-
return {
|
|
169
|
+
return {
|
|
170
|
+
error: error instanceof Error
|
|
171
|
+
? error
|
|
172
|
+
: new Error(String(error)),
|
|
173
|
+
};
|
|
170
174
|
}
|
|
171
175
|
}
|
|
172
176
|
async deleteChat(chatId) {
|
|
@@ -174,28 +178,16 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
174
178
|
this.fileContextInjectedChats.delete(chatId);
|
|
175
179
|
}
|
|
176
180
|
async countTokens(messages) {
|
|
177
|
-
const countTokensFn = OpenAI_entity_1.OpenAIEntity
|
|
178
|
-
.getCountTokensFn();
|
|
181
|
+
const countTokensFn = OpenAI_entity_1.OpenAIEntity.getCountTokensFn();
|
|
179
182
|
const messageContents = messages.flatMap((message) => message.content);
|
|
180
183
|
return countTokensFn(messageContents);
|
|
181
184
|
}
|
|
182
185
|
async assistInChatText(options) {
|
|
183
|
-
const { model,
|
|
184
|
-
const writeMetrics = this.reporter
|
|
185
|
-
?.initWriter(reporterContext);
|
|
186
|
+
const { model, chatId, abortSignal, reporterContext, tools: customTools, maxToolIterations = LLMService_constants_1.DEFAULT_MAX_TOOL_ITERATIONS, } = options;
|
|
187
|
+
const writeMetrics = this.reporter?.initWriter(reporterContext);
|
|
186
188
|
try {
|
|
187
|
-
const
|
|
188
|
-
|
|
189
|
-
throw new Error('Chat session not found');
|
|
190
|
-
}
|
|
191
|
-
const storageId = chat.storageId
|
|
192
|
-
?? optionsStorageId;
|
|
193
|
-
const convertedMessage = LLMAPI_entity_1.LLMAPIEntity
|
|
194
|
-
.convertAssistanceMessageToCompletion(message);
|
|
195
|
-
this.appendConvertedUserMessage(chatId, convertedMessage);
|
|
196
|
-
this.injectFileContext(chatId, storageId);
|
|
197
|
-
const tools = this.buildToolsArray(storageId, customTools);
|
|
198
|
-
const { text: rawText, totalPromptTokens, totalCachedTokens, totalOutputTokens, totalReasoningTokens, } = await this.executeToolLoop({
|
|
189
|
+
const { storageId, tools, } = this.prepareChatForAssist(options);
|
|
190
|
+
const toolLoopResult = await this.executeToolLoop({
|
|
199
191
|
chatId,
|
|
200
192
|
model,
|
|
201
193
|
tools,
|
|
@@ -204,18 +196,12 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
204
196
|
maxToolIterations,
|
|
205
197
|
abortSignal,
|
|
206
198
|
});
|
|
207
|
-
const text =
|
|
199
|
+
const text = (0, utilities_1.stripThinkingTags)(toolLoopResult.text);
|
|
208
200
|
this.chatState.appendAssistantMessage(chatId, text);
|
|
209
|
-
const regularInputTokens = totalPromptTokens - totalCachedTokens;
|
|
210
201
|
await this.writeSuccessMetrics({
|
|
211
202
|
method: this.getMethodName(this.assistInChatText),
|
|
212
203
|
model,
|
|
213
|
-
usage:
|
|
214
|
-
inputTextTokens: regularInputTokens,
|
|
215
|
-
inputCachedTextTokens: totalCachedTokens,
|
|
216
|
-
outputTextTokens: totalOutputTokens,
|
|
217
|
-
outputReasoningTokens: totalReasoningTokens,
|
|
218
|
-
},
|
|
204
|
+
usage: this.buildToolLoopUsage(toolLoopResult),
|
|
219
205
|
writeMetrics,
|
|
220
206
|
});
|
|
221
207
|
return { text };
|
|
@@ -227,60 +213,25 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
227
213
|
isAborted: abortSignal?.aborted,
|
|
228
214
|
writeMetrics,
|
|
229
215
|
});
|
|
230
|
-
this.logger
|
|
231
|
-
?.child(this.getMethodName(this.assistInChatText))
|
|
232
|
-
.error('Error assisting in chat', {
|
|
216
|
+
this.logger?.child(this.getMethodName(this.assistInChatText)).error('Error assisting in chat', {
|
|
233
217
|
error: (0, serializeError_1.serializeError)(error),
|
|
234
218
|
options,
|
|
235
219
|
});
|
|
236
|
-
return {
|
|
220
|
+
return {
|
|
221
|
+
error: error instanceof Error
|
|
222
|
+
? error
|
|
223
|
+
: new Error(String(error)),
|
|
224
|
+
};
|
|
237
225
|
}
|
|
238
226
|
}
|
|
239
227
|
async assistInChatStructured(options) {
|
|
240
|
-
const { model,
|
|
241
|
-
const writeMetrics = this.reporter
|
|
242
|
-
?.initWriter(reporterContext);
|
|
228
|
+
const { model, chatId, abortSignal, schema, reporterContext, tools: customTools, maxToolIterations = LLMService_constants_1.DEFAULT_MAX_TOOL_ITERATIONS, } = options;
|
|
229
|
+
const writeMetrics = this.reporter?.initWriter(reporterContext);
|
|
243
230
|
try {
|
|
244
|
-
const
|
|
245
|
-
if (!chat) {
|
|
246
|
-
throw new Error('Chat session not found');
|
|
247
|
-
}
|
|
248
|
-
const storageId = chat.storageId
|
|
249
|
-
?? optionsStorageId;
|
|
250
|
-
const convertedMessage = LLMAPI_entity_1.LLMAPIEntity
|
|
251
|
-
.convertAssistanceMessageToCompletion(message);
|
|
252
|
-
this.appendConvertedUserMessage(chatId, convertedMessage);
|
|
253
|
-
this.injectFileContext(chatId, storageId);
|
|
231
|
+
const { storageId, tools } = this.prepareChatForAssist(options);
|
|
254
232
|
const jsonSchema = schema._toProviderSchema(LLMService_typedefs_1.LLMProviders.LLMAPI);
|
|
255
|
-
const
|
|
256
|
-
|
|
257
|
-
+ JSON.stringify(jsonSchema, null, 2);
|
|
258
|
-
const messages = this.chatState
|
|
259
|
-
.getMessages(chatId);
|
|
260
|
-
const systemMessageIndex = messages.findIndex((msg) => msg.role === 'system');
|
|
261
|
-
let originalSystemMessage;
|
|
262
|
-
if (systemMessageIndex >= 0) {
|
|
263
|
-
originalSystemMessage
|
|
264
|
-
= messages[systemMessageIndex];
|
|
265
|
-
const existingContent = typeof originalSystemMessage.content
|
|
266
|
-
=== 'string'
|
|
267
|
-
? originalSystemMessage.content
|
|
268
|
-
: '';
|
|
269
|
-
messages[systemMessageIndex] = {
|
|
270
|
-
role: 'system',
|
|
271
|
-
content: existingContent
|
|
272
|
-
? `${existingContent}\n\n${schemaInstruction}`
|
|
273
|
-
: schemaInstruction,
|
|
274
|
-
};
|
|
275
|
-
}
|
|
276
|
-
else {
|
|
277
|
-
messages.unshift({
|
|
278
|
-
role: 'system',
|
|
279
|
-
content: schemaInstruction,
|
|
280
|
-
});
|
|
281
|
-
}
|
|
282
|
-
const tools = this.buildToolsArray(storageId, customTools);
|
|
283
|
-
const { text: rawText, totalPromptTokens, totalCachedTokens, totalOutputTokens, totalReasoningTokens, } = await this.executeToolLoop({
|
|
233
|
+
const schemaRestore = this.injectSchemaInstruction(chatId, jsonSchema);
|
|
234
|
+
const toolLoopResult = await this.executeToolLoop({
|
|
284
235
|
chatId,
|
|
285
236
|
model,
|
|
286
237
|
tools,
|
|
@@ -290,25 +241,13 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
290
241
|
abortSignal,
|
|
291
242
|
responseFormat: { type: 'json_object' },
|
|
292
243
|
});
|
|
293
|
-
const text =
|
|
294
|
-
|
|
295
|
-
messages[systemMessageIndex] =
|
|
296
|
-
originalSystemMessage;
|
|
297
|
-
}
|
|
298
|
-
else {
|
|
299
|
-
messages.shift();
|
|
300
|
-
}
|
|
244
|
+
const text = (0, utilities_1.stripThinkingTags)(toolLoopResult.text);
|
|
245
|
+
schemaRestore();
|
|
301
246
|
this.chatState.appendAssistantMessage(chatId, text);
|
|
302
|
-
const regularInputTokens = totalPromptTokens - totalCachedTokens;
|
|
303
247
|
await this.writeSuccessMetrics({
|
|
304
248
|
method: this.getMethodName(this.assistInChatStructured),
|
|
305
249
|
model,
|
|
306
|
-
usage:
|
|
307
|
-
inputTextTokens: regularInputTokens,
|
|
308
|
-
inputCachedTextTokens: totalCachedTokens,
|
|
309
|
-
outputTextTokens: totalOutputTokens,
|
|
310
|
-
outputReasoningTokens: totalReasoningTokens,
|
|
311
|
-
},
|
|
250
|
+
usage: this.buildToolLoopUsage(toolLoopResult),
|
|
312
251
|
writeMetrics,
|
|
313
252
|
});
|
|
314
253
|
return this.getJsonFixer()
|
|
@@ -327,9 +266,8 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
327
266
|
isAborted: abortSignal?.aborted,
|
|
328
267
|
writeMetrics,
|
|
329
268
|
});
|
|
330
|
-
this.logger
|
|
331
|
-
|
|
332
|
-
.error('Error assisting in chat with structured output', {
|
|
269
|
+
this.logger?.child(this.getMethodName(this.assistInChatStructured)).error('Error assisting in chat'
|
|
270
|
+
+ ' with structured output', {
|
|
333
271
|
error: (0, serializeError_1.serializeError)(error),
|
|
334
272
|
options,
|
|
335
273
|
});
|
|
@@ -343,7 +281,21 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
343
281
|
};
|
|
344
282
|
}
|
|
345
283
|
}
|
|
346
|
-
|
|
284
|
+
prepareChatForAssist(options) {
|
|
285
|
+
const { chatId, message, storageId: optionsStorageId, tools: customTools, } = options;
|
|
286
|
+
const chat = this.chatState.getChat(chatId);
|
|
287
|
+
if (!chat) {
|
|
288
|
+
throw new Error('Chat session not found');
|
|
289
|
+
}
|
|
290
|
+
const storageId = chat.storageId ?? optionsStorageId;
|
|
291
|
+
this.appendUserMessageToChat(chatId, message);
|
|
292
|
+
this.injectFileContext(chatId, storageId);
|
|
293
|
+
const tools = this.buildToolsArray(storageId, customTools);
|
|
294
|
+
return { storageId, tools };
|
|
295
|
+
}
|
|
296
|
+
appendUserMessageToChat(chatId, message) {
|
|
297
|
+
const convertedMessage = LLMAPI_entity_1.LLMAPIEntity
|
|
298
|
+
.convertAssistanceMessageToCompletion(message);
|
|
347
299
|
const content = convertedMessage.content;
|
|
348
300
|
if (typeof content === 'string') {
|
|
349
301
|
this.chatState.appendUserMessage(chatId, [{ type: 'text', text: content }]);
|
|
@@ -355,8 +307,44 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
355
307
|
}
|
|
356
308
|
this.chatState.appendUserMessage(chatId, [{ type: 'text', text: '' }]);
|
|
357
309
|
}
|
|
358
|
-
|
|
359
|
-
|
|
310
|
+
injectSchemaInstruction(chatId, jsonSchema) {
|
|
311
|
+
const schemaInstruction = 'You MUST respond with a valid JSON object'
|
|
312
|
+
+ ' matching this JSON schema:\n'
|
|
313
|
+
+ JSON.stringify(jsonSchema, null, 2);
|
|
314
|
+
const messages = this.chatState.getMessages(chatId);
|
|
315
|
+
const systemMessageIndex = messages.findIndex((msg) => msg.role === 'system');
|
|
316
|
+
if (systemMessageIndex >= 0) {
|
|
317
|
+
const originalMessage = messages[systemMessageIndex];
|
|
318
|
+
const existingContent = typeof originalMessage.content === 'string'
|
|
319
|
+
? originalMessage.content
|
|
320
|
+
: '';
|
|
321
|
+
messages[systemMessageIndex] = {
|
|
322
|
+
role: 'system',
|
|
323
|
+
content: existingContent
|
|
324
|
+
? `${existingContent}\n\n`
|
|
325
|
+
+ schemaInstruction
|
|
326
|
+
: schemaInstruction,
|
|
327
|
+
};
|
|
328
|
+
return () => {
|
|
329
|
+
messages[systemMessageIndex] = originalMessage;
|
|
330
|
+
};
|
|
331
|
+
}
|
|
332
|
+
messages.unshift({
|
|
333
|
+
role: 'system',
|
|
334
|
+
content: schemaInstruction,
|
|
335
|
+
});
|
|
336
|
+
return () => {
|
|
337
|
+
messages.shift();
|
|
338
|
+
};
|
|
339
|
+
}
|
|
340
|
+
buildToolLoopUsage(result) {
|
|
341
|
+
return {
|
|
342
|
+
inputTextTokens: result.totalPromptTokens
|
|
343
|
+
- result.totalCachedTokens,
|
|
344
|
+
inputCachedTextTokens: result.totalCachedTokens,
|
|
345
|
+
outputTextTokens: result.totalOutputTokens,
|
|
346
|
+
outputReasoningTokens: result.totalReasoningTokens,
|
|
347
|
+
};
|
|
360
348
|
}
|
|
361
349
|
injectFileContext(chatId, storageId) {
|
|
362
350
|
if (!storageId) {
|
|
@@ -365,8 +353,7 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
365
353
|
if (this.fileContextInjectedChats.has(chatId)) {
|
|
366
354
|
return;
|
|
367
355
|
}
|
|
368
|
-
const files = this.fileStorage
|
|
369
|
-
.getStorageFiles(storageId);
|
|
356
|
+
const files = this.fileStorage.getStorageFiles(storageId);
|
|
370
357
|
if (files.length === 0) {
|
|
371
358
|
return;
|
|
372
359
|
}
|
|
@@ -376,8 +363,7 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
376
363
|
const fileContext = 'The following files have been uploaded'
|
|
377
364
|
+ ' for reference:\n\n'
|
|
378
365
|
+ fileContents;
|
|
379
|
-
const messages = this.chatState
|
|
380
|
-
.getMessages(chatId);
|
|
366
|
+
const messages = this.chatState.getMessages(chatId);
|
|
381
367
|
const systemMessage = messages.find((msg) => msg.role === 'system');
|
|
382
368
|
if (systemMessage && 'content' in systemMessage) {
|
|
383
369
|
const existingContent = typeof systemMessage.content === 'string'
|
|
@@ -425,11 +411,9 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
425
411
|
let lastResponseText = '';
|
|
426
412
|
for (let iteration = 0; iteration < maxToolIterations; iteration++) {
|
|
427
413
|
abortSignal?.throwIfAborted();
|
|
428
|
-
const response = await this.instance
|
|
429
|
-
.chat.completions.create({
|
|
414
|
+
const response = await this.instance.chat.completions.create({
|
|
430
415
|
model: model.name,
|
|
431
|
-
messages: this.chatState
|
|
432
|
-
.getMessages(chatId),
|
|
416
|
+
messages: this.chatState.getMessages(chatId),
|
|
433
417
|
...model.config,
|
|
434
418
|
...(tools.length > 0 && { tools }),
|
|
435
419
|
...(responseFormat && {
|
|
@@ -437,29 +421,39 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
437
421
|
}),
|
|
438
422
|
}, { signal: abortSignal });
|
|
439
423
|
const choice = response.choices[0];
|
|
440
|
-
totalPromptTokens
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
totalReasoningTokens
|
|
448
|
-
+= response.usage?.completion_tokens_details
|
|
449
|
-
?.reasoning_tokens ?? 0;
|
|
450
|
-
const hasToolCalls = choice?.finish_reason === 'tool_calls'
|
|
424
|
+
totalPromptTokens += response.usage?.prompt_tokens ?? 0;
|
|
425
|
+
totalCachedTokens +=
|
|
426
|
+
response.usage?.prompt_tokens_details?.cached_tokens ?? 0;
|
|
427
|
+
totalOutputTokens += response.usage?.completion_tokens ?? 0;
|
|
428
|
+
totalReasoningTokens +=
|
|
429
|
+
response.usage?.completion_tokens_details?.reasoning_tokens ?? 0;
|
|
430
|
+
const hasStandardToolCalls = choice?.finish_reason === 'tool_calls'
|
|
451
431
|
&& choice.message.tool_calls?.length;
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
432
|
+
let toolCalls;
|
|
433
|
+
let usedXmlParsing = false;
|
|
434
|
+
if (hasStandardToolCalls) {
|
|
435
|
+
toolCalls = choice.message
|
|
436
|
+
.tool_calls;
|
|
437
|
+
}
|
|
438
|
+
else {
|
|
439
|
+
const responseText = choice?.message.content ?? '';
|
|
440
|
+
const xmlParsed = (0, utilities_1.parseXmlToolCalls)(responseText);
|
|
441
|
+
if (xmlParsed.toolCalls.length === 0) {
|
|
442
|
+
lastResponseText = responseText;
|
|
443
|
+
break;
|
|
444
|
+
}
|
|
445
|
+
toolCalls = xmlParsed.toolCalls;
|
|
446
|
+
usedXmlParsing = true;
|
|
456
447
|
}
|
|
457
|
-
const toolCalls = choice.message
|
|
458
|
-
.tool_calls;
|
|
459
|
-
this.chatState.appendToolCallMessages(chatId, toolCalls);
|
|
460
448
|
const results = await Promise.all(toolCalls.map((toolCall) => this.dispatchToolCall(storageId, toolCall, customTools)));
|
|
461
|
-
|
|
462
|
-
this.
|
|
449
|
+
if (usedXmlParsing) {
|
|
450
|
+
this.appendXmlToolResults(chatId, choice?.message.content ?? '', toolCalls, results);
|
|
451
|
+
}
|
|
452
|
+
else {
|
|
453
|
+
this.chatState.appendToolCallMessages(chatId, toolCalls);
|
|
454
|
+
for (let index = 0; index < toolCalls.length; index++) {
|
|
455
|
+
this.chatState.appendToolResult(chatId, toolCalls[index].id, results[index]);
|
|
456
|
+
}
|
|
463
457
|
}
|
|
464
458
|
}
|
|
465
459
|
return {
|
|
@@ -470,6 +464,15 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
470
464
|
totalReasoningTokens,
|
|
471
465
|
};
|
|
472
466
|
}
|
|
467
|
+
appendXmlToolResults(chatId, originalContent, toolCalls, results) {
|
|
468
|
+
this.chatState.appendAssistantMessage(chatId, originalContent);
|
|
469
|
+
const toolResultsSummary = toolCalls.map((call, index) => `[Tool "${call.function.name}"`
|
|
470
|
+
+ ` result]: ${results[index]}`).join('\n\n');
|
|
471
|
+
this.chatState.appendUserMessage(chatId, [{
|
|
472
|
+
type: 'text',
|
|
473
|
+
text: toolResultsSummary,
|
|
474
|
+
}]);
|
|
475
|
+
}
|
|
473
476
|
async dispatchToolCall(storageId, toolCall, customTools) {
|
|
474
477
|
const toolName = toolCall.function.name;
|
|
475
478
|
const isFileStorageTool = FILE_STORAGE_TOOL_NAMES.includes(toolName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LLMAPIAssistance.service.js","sourceRoot":"","sources":["../../../../src/providers/LLMAPI/services/LLMAPIAssistance.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"LLMAPIAssistance.service.js","sourceRoot":"","sources":["../../../../src/providers/LLMAPI/services/LLMAPIAssistance.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ export declare class LLMAPICompletionService<Reporter extends LLMReporterInterfa
|
|
|
10
10
|
constructor(logger: LLMLoggerInterface | undefined, reporter: Reporter, options?: LLMInstanceOptions[LLMProviders.LLMAPI]);
|
|
11
11
|
get instance(): OpenAI;
|
|
12
12
|
private getJsonFixer;
|
|
13
|
-
private stripThinkingTags;
|
|
14
13
|
protected sendTextMessage(options: LLMSendMessageOptions<LLMProviders.LLMAPI, Reporter>): Promise<LLMCompletionResult>;
|
|
15
14
|
protected sendStructuredMessage(options: LLMSendMessageOptions<LLMProviders.LLMAPI, Reporter> & {
|
|
16
15
|
schema: LLMSchemaInterface;
|
|
@@ -25,28 +25,23 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
25
25
|
}
|
|
26
26
|
return this.jsonFixer;
|
|
27
27
|
}
|
|
28
|
-
stripThinkingTags(text) {
|
|
29
|
-
return text.replace(/<think>[\s\S]*?<\/think>\s*/g, '').trim();
|
|
30
|
-
}
|
|
31
28
|
async sendTextMessage(options) {
|
|
32
29
|
const result = await super.sendTextMessage(options);
|
|
33
30
|
if ('text' in result && result.text) {
|
|
34
31
|
return {
|
|
35
32
|
...result,
|
|
36
|
-
text:
|
|
33
|
+
text: (0, utilities_1.stripThinkingTags)(result.text),
|
|
37
34
|
};
|
|
38
35
|
}
|
|
39
36
|
return result;
|
|
40
37
|
}
|
|
41
38
|
async sendStructuredMessage(options) {
|
|
42
39
|
const { model, message, history = [], instructions, abortSignal, schema, reporterContext, } = options;
|
|
43
|
-
const writeMetrics = this.reporter
|
|
44
|
-
?.initWriter(reporterContext);
|
|
40
|
+
const writeMetrics = this.reporter?.initWriter(reporterContext);
|
|
45
41
|
try {
|
|
46
42
|
abortSignal?.throwIfAborted();
|
|
47
43
|
const countTokensFn = OpenAI_entity_1.OpenAIEntity.getCountTokensFn();
|
|
48
|
-
const combinedMessages = await OpenAI_entity_1.OpenAIEntity
|
|
49
|
-
.combineMessagesWithLimit({
|
|
44
|
+
const combinedMessages = await OpenAI_entity_1.OpenAIEntity.combineMessagesWithLimit({
|
|
50
45
|
history,
|
|
51
46
|
message,
|
|
52
47
|
model,
|
|
@@ -63,10 +58,11 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
63
58
|
const fullInstructions = instructions
|
|
64
59
|
? `${instructions}\n\n${schemaInstruction}`
|
|
65
60
|
: schemaInstruction;
|
|
66
|
-
const systemMessage = [
|
|
61
|
+
const systemMessage = [
|
|
62
|
+
{ role: 'system', content: fullInstructions },
|
|
63
|
+
];
|
|
67
64
|
abortSignal?.throwIfAborted();
|
|
68
|
-
const completion = await this.instance
|
|
69
|
-
.chat.completions.create({
|
|
65
|
+
const completion = await this.instance.chat.completions.create({
|
|
70
66
|
model: model.name,
|
|
71
67
|
messages: [
|
|
72
68
|
...systemMessage,
|
|
@@ -80,7 +76,7 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
80
76
|
});
|
|
81
77
|
abortSignal?.throwIfAborted();
|
|
82
78
|
const rawContent = completion.choices[0]?.message.content ?? '';
|
|
83
|
-
const content =
|
|
79
|
+
const content = (0, utilities_1.stripThinkingTags)(rawContent);
|
|
84
80
|
if (!content) {
|
|
85
81
|
throw new Error(`Empty response from ${this.provider}`);
|
|
86
82
|
}
|
|
@@ -117,8 +113,7 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
117
113
|
isAborted: abortSignal?.aborted,
|
|
118
114
|
writeMetrics,
|
|
119
115
|
});
|
|
120
|
-
this.logger
|
|
121
|
-
?.child(this.getMethodName(this.sendStructuredMessage))
|
|
116
|
+
this.logger?.child(this.getMethodName(this.sendStructuredMessage))
|
|
122
117
|
.error('Error sending structured message', {
|
|
123
118
|
error: (0, serializeError_1.serializeError)(error),
|
|
124
119
|
options,
|
|
@@ -128,8 +123,7 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
128
123
|
error: error instanceof Error
|
|
129
124
|
? error
|
|
130
125
|
: new Error(String(error)),
|
|
131
|
-
parseError: `Failed to get structured response
|
|
132
|
-
+ ` from ${this.provider}`,
|
|
126
|
+
parseError: `Failed to get structured response from ${this.provider}`,
|
|
133
127
|
};
|
|
134
128
|
}
|
|
135
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LLMAPICompletion.service.js","sourceRoot":"","sources":["../../../../src/providers/LLMAPI/services/LLMAPICompletion.service.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAShC,+DAG+B;AAG/B,+DAA4D;AAC5D,wHAEyE;AACzE,
|
|
1
|
+
{"version":3,"file":"LLMAPICompletion.service.js","sourceRoot":"","sources":["../../../../src/providers/LLMAPI/services/LLMAPICompletion.service.ts"],"names":[],"mappings":"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"}
|