@mate-academy/llm-gateway 7.5.0 → 7.6.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/README.md +46 -0
- package/dist/LLMService.typedefs.d.ts +27 -0
- package/dist/LLMService.typedefs.js.map +1 -1
- package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAICompletion.service.js +17 -10
- package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAICompletion.service.js.map +1 -1
- package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAISpeechToText.service.js +10 -6
- package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAISpeechToText.service.js.map +1 -1
- package/dist/providers/LLMAPI/services/LLMAPIAssistance.service.d.ts +9 -0
- package/dist/providers/LLMAPI/services/LLMAPIAssistance.service.js +51 -10
- package/dist/providers/LLMAPI/services/LLMAPIAssistance.service.js.map +1 -1
- package/dist/providers/LLMAPI/services/LLMAPICompletion.service.js +25 -13
- package/dist/providers/LLMAPI/services/LLMAPICompletion.service.js.map +1 -1
- package/dist/providers/LLMAPI/utilities/LLMAPIJsonFixer.d.ts +2 -0
- package/dist/providers/LLMAPI/utilities/LLMAPIJsonFixer.js +15 -7
- package/dist/providers/LLMAPI/utilities/LLMAPIJsonFixer.js.map +1 -1
- package/dist/providers/OpenAICompatible/OpenAICompatibleCompletion.service.js +5 -0
- package/dist/providers/OpenAICompatible/OpenAICompatibleCompletion.service.js.map +1 -1
- package/dist/providers/OpenAICompatible/OpenAICompatibleSpeechToText.service.js +2 -1
- package/dist/providers/OpenAICompatible/OpenAICompatibleSpeechToText.service.js.map +1 -1
- package/dist/services/chatState/CompletionsChatState.d.ts +8 -0
- package/dist/services/chatState/CompletionsChatState.js +34 -0
- package/dist/services/chatState/CompletionsChatState.js.map +1 -1
- package/dist/utilities/calculateCosts.d.ts +3 -16
- package/dist/utilities/calculateCosts.js +20 -0
- package/dist/utilities/calculateCosts.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -547,6 +547,32 @@ if (result.data) {
|
|
|
547
547
|
}
|
|
548
548
|
```
|
|
549
549
|
|
|
550
|
+
#### Token Usage and Cost
|
|
551
|
+
|
|
552
|
+
Successful completion and transcription results expose two optional fields: `usage`
|
|
553
|
+
(`LLMModelUsage`) with the provider-reported token counts, and `cost`
|
|
554
|
+
(`LLMCostsResult`) with the absolute USD cost for the call, derived from that usage
|
|
555
|
+
and the model's pricing. Both are present only on the success branch (absent when
|
|
556
|
+
`result.error` is set), so read them after narrowing:
|
|
557
|
+
|
|
558
|
+
```typescript
|
|
559
|
+
const result = await completionService.sendMessage({
|
|
560
|
+
message: { /* ... */ },
|
|
561
|
+
model: preferredModel,
|
|
562
|
+
schema: mySchema,
|
|
563
|
+
});
|
|
564
|
+
|
|
565
|
+
if (!('error' in result) && result.usage) {
|
|
566
|
+
console.log('Input tokens:', result.usage.inputTextTokens);
|
|
567
|
+
console.log('Output tokens:', result.usage.outputTextTokens);
|
|
568
|
+
console.log('Total cost (USD):', result.cost?.total);
|
|
569
|
+
}
|
|
570
|
+
```
|
|
571
|
+
|
|
572
|
+
For the LLMAPI provider, the structured-output result's `usage` (and the `cost`
|
|
573
|
+
derived from it) includes the JSON-fix call's tokens (summed into the primary
|
|
574
|
+
call's usage) when a fix was required.
|
|
575
|
+
|
|
550
576
|
#### Provider Support
|
|
551
577
|
|
|
552
578
|
- **OpenAI**: Uses native `response_format` with `json_schema` for optimal performance
|
|
@@ -663,6 +689,26 @@ const customGemini31Model = {
|
|
|
663
689
|
|
|
664
690
|
**Note:** Gemini 3.x thinking models require `temperature: 1` and cannot be changed. The `thinkingConfig` allows you to control the model's reasoning depth.
|
|
665
691
|
|
|
692
|
+
**Gemini tool-loop replay handling (LLMAPI provider).** Gemini through the
|
|
693
|
+
LLMAPI Chat Completions proxy imposes two replay constraints on tool loops,
|
|
694
|
+
both handled internally by `LLMAPIAssistanceService`:
|
|
695
|
+
|
|
696
|
+
- *Parallel-call pairing*: Gemini emits id-less function calls and the proxy
|
|
697
|
+
synthesizes ids, so an assistant turn with several parallel tool calls is
|
|
698
|
+
recorded in chat history as sequential single-call turns (each function-call
|
|
699
|
+
turn has exactly one matching response).
|
|
700
|
+
- *thought_signature round-trip*: thinking models stamp
|
|
701
|
+
`tool_calls[n].extra_content.google.thought_signature` (only on the first of
|
|
702
|
+
N parallel calls) and require it echoed verbatim on replay. Split turns
|
|
703
|
+
without a signature carry the Google-documented
|
|
704
|
+
`skip_thought_signature_validator` bypass marker. If the provider still
|
|
705
|
+
rejects a replayed signature (HTTP 400 "Corrupted thought signature."), the
|
|
706
|
+
service downgrades every recorded signature to the bypass marker and retries
|
|
707
|
+
that round trip once.
|
|
708
|
+
|
|
709
|
+
Set `LLM_GATEWAY_DEBUG_TOOL_CALLS=true` to log the outgoing tool-call turn
|
|
710
|
+
shapes (ids, signature presence) for wire-level debugging.
|
|
711
|
+
|
|
666
712
|
#### File-based Assistance
|
|
667
713
|
|
|
668
714
|
```typescript
|
|
@@ -228,6 +228,27 @@ export interface LLMAssistanceMessage {
|
|
|
228
228
|
* Represents an error that occurred during an LLM request.
|
|
229
229
|
*/
|
|
230
230
|
export type LLMRequestError = Error;
|
|
231
|
+
/**
|
|
232
|
+
* Token usage reported by an LLM provider for a single call.
|
|
233
|
+
*/
|
|
234
|
+
export interface LLMModelUsage {
|
|
235
|
+
inputTextTokens?: number;
|
|
236
|
+
outputTextTokens?: number;
|
|
237
|
+
inputAudioTokens?: number;
|
|
238
|
+
outputAudioTokens?: number;
|
|
239
|
+
inputCachedTextTokens?: number;
|
|
240
|
+
inputCachedAudioTokens?: number;
|
|
241
|
+
outputReasoningTokens?: number;
|
|
242
|
+
}
|
|
243
|
+
/**
|
|
244
|
+
* Absolute USD cost for a single LLM call, derived from usage and model pricing.
|
|
245
|
+
*/
|
|
246
|
+
export interface LLMCostsResult {
|
|
247
|
+
input: number;
|
|
248
|
+
output: number;
|
|
249
|
+
total: number;
|
|
250
|
+
currency: string;
|
|
251
|
+
}
|
|
231
252
|
/**
|
|
232
253
|
* Generic result type for LLM requests that can either succeed or fail.
|
|
233
254
|
* @template ResponseType - The type of the successful result
|
|
@@ -240,6 +261,8 @@ export type LLMRequestResult<ResponseType> = ResponseType | {
|
|
|
240
261
|
*/
|
|
241
262
|
export type LLMCompletionResult = LLMRequestResult<{
|
|
242
263
|
text: string;
|
|
264
|
+
usage?: LLMModelUsage;
|
|
265
|
+
cost?: LLMCostsResult;
|
|
243
266
|
}>;
|
|
244
267
|
/**
|
|
245
268
|
* Base options for LLM methods that can be extended by specific method options.
|
|
@@ -276,6 +299,8 @@ export type LLMStructuredResult<T = any> = LLMRequestResult<{
|
|
|
276
299
|
parseError?: string;
|
|
277
300
|
toolIterationsUsed?: number;
|
|
278
301
|
toolIterationsExhausted?: true;
|
|
302
|
+
usage?: LLMModelUsage;
|
|
303
|
+
cost?: LLMCostsResult;
|
|
279
304
|
}>;
|
|
280
305
|
/**
|
|
281
306
|
* Limits for files that can be uploaded to LLM services.
|
|
@@ -481,6 +506,8 @@ export type LLMTranscribeOptions<Provider extends LLMProviders, Reporter extends
|
|
|
481
506
|
*/
|
|
482
507
|
export type LLMTranscribeResult = LLMRequestResult<{
|
|
483
508
|
text: string;
|
|
509
|
+
usage?: LLMModelUsage;
|
|
510
|
+
cost?: LLMCostsResult;
|
|
484
511
|
}>;
|
|
485
512
|
/**
|
|
486
513
|
* Provider-specific options for creating speech from text.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LLMService.typedefs.js","sourceRoot":"","sources":["../src/LLMService.typedefs.ts"],"names":[],"mappings":";;;AAkCA;;GAEG;AACH,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,yDAAyC,CAAA;IACzC,iCAAiB,CAAA;AACnB,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAoBD;;GAEG;AACH,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,wCAAyB,CAAA;IACzB,wCAAyB,CAAA;IACzB,8CAA+B,CAAA;IAC/B,8CAA+B,CAAA;AACjC,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAiLD;;GAEG;AACH,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,yBAAa,CAAA;IACb,mCAAuB,CAAA;AACzB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAED;;GAEG;AACH,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,sCAAa,CAAA;IACb,gDAAuB,CAAA;IACvB,kDAAyB,CAAA;AAC3B,CAAC,EAJW,qBAAqB,qCAArB,qBAAqB,QAIhC;
|
|
1
|
+
{"version":3,"file":"LLMService.typedefs.js","sourceRoot":"","sources":["../src/LLMService.typedefs.ts"],"names":[],"mappings":";;;AAkCA;;GAEG;AACH,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,yDAAyC,CAAA;IACzC,iCAAiB,CAAA;AACnB,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAoBD;;GAEG;AACH,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,wCAAyB,CAAA;IACzB,wCAAyB,CAAA;IACzB,8CAA+B,CAAA;IAC/B,8CAA+B,CAAA;AACjC,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAiLD;;GAEG;AACH,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,yBAAa,CAAA;IACb,mCAAuB,CAAA;AACzB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAED;;GAEG;AACH,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,sCAAa,CAAA;IACb,gDAAuB,CAAA;IACvB,kDAAyB,CAAA;AAC3B,CAAC,EAJW,qBAAqB,qCAArB,qBAAqB,QAIhC;AAgKD;;GAEG;AACH,IAAY,sBAeX;AAfD,WAAY,sBAAsB;IAChC,iDAAuB,CAAA;IACvB,mDAAyB,CAAA;IACzB,iDAAuB,CAAA;IACvB,iDAAuB,CAAA;IACvB,mDAAyB,CAAA;IACzB,yDAA+B,CAAA;IAC/B,iDAAuB,CAAA;IACvB,mDAAyB,CAAA;IACzB,oDAA0B,CAAA;IAC1B,iDAAuB,CAAA;IACvB,mDAAyB,CAAA;IACzB,iDAAuB,CAAA;IACvB,mDAAyB,CAAA;IACzB,iDAAuB,CAAA;AACzB,CAAC,EAfW,sBAAsB,sCAAtB,sBAAsB,QAejC"}
|
|
@@ -4,6 +4,7 @@ exports.GoogleGenerativeAICompletionService = void 0;
|
|
|
4
4
|
const genai_1 = require("@google/genai");
|
|
5
5
|
const LLMService_typedefs_1 = require("../../../LLMService.typedefs");
|
|
6
6
|
const serializeError_1 = require("../../../utilities/serializeError");
|
|
7
|
+
const utilities_1 = require("../../../utilities");
|
|
7
8
|
const services_1 = require("../../../services");
|
|
8
9
|
const GoogleGenerativeAI_entity_1 = require("../../../providers/GoogleGenerativeAI/GoogleGenerativeAI.entity");
|
|
9
10
|
class GoogleGenerativeAICompletionService extends services_1.LLMCompletionService {
|
|
@@ -46,18 +47,21 @@ class GoogleGenerativeAICompletionService extends services_1.LLMCompletionServic
|
|
|
46
47
|
const cachedTokens = result.usageMetadata?.cachedContentTokenCount ?? 0;
|
|
47
48
|
const regularInputTokens = promptTokens - cachedTokens;
|
|
48
49
|
const outputTokens = result.usageMetadata?.candidatesTokenCount ?? 0;
|
|
50
|
+
const usage = {
|
|
51
|
+
inputTextTokens: regularInputTokens,
|
|
52
|
+
inputCachedTextTokens: cachedTokens,
|
|
53
|
+
outputTextTokens: outputTokens,
|
|
54
|
+
};
|
|
49
55
|
await this.writeSuccessMetrics({
|
|
50
56
|
method: this.getMethodName(this.sendTextMessage),
|
|
51
57
|
model,
|
|
52
|
-
usage
|
|
53
|
-
inputTextTokens: regularInputTokens,
|
|
54
|
-
inputCachedTextTokens: cachedTokens,
|
|
55
|
-
outputTextTokens: outputTokens,
|
|
56
|
-
},
|
|
58
|
+
usage,
|
|
57
59
|
writeMetrics,
|
|
58
60
|
});
|
|
59
61
|
return {
|
|
60
62
|
text: result.text ?? '',
|
|
63
|
+
usage,
|
|
64
|
+
cost: (0, utilities_1.calculateCosts)(model, usage),
|
|
61
65
|
};
|
|
62
66
|
}
|
|
63
67
|
catch (error) {
|
|
@@ -123,20 +127,23 @@ class GoogleGenerativeAICompletionService extends services_1.LLMCompletionServic
|
|
|
123
127
|
const cachedTokens = result.usageMetadata?.cachedContentTokenCount ?? 0;
|
|
124
128
|
const regularInputTokens = promptTokens - cachedTokens;
|
|
125
129
|
const outputTokens = result.usageMetadata?.candidatesTokenCount ?? 0;
|
|
130
|
+
const usage = {
|
|
131
|
+
inputTextTokens: regularInputTokens,
|
|
132
|
+
inputCachedTextTokens: cachedTokens,
|
|
133
|
+
outputTextTokens: outputTokens,
|
|
134
|
+
};
|
|
126
135
|
await this.writeSuccessMetrics({
|
|
127
136
|
method: this.getMethodName(this.sendStructuredMessage),
|
|
128
137
|
model,
|
|
129
|
-
usage
|
|
130
|
-
inputTextTokens: regularInputTokens,
|
|
131
|
-
inputCachedTextTokens: cachedTokens,
|
|
132
|
-
outputTextTokens: outputTokens,
|
|
133
|
-
},
|
|
138
|
+
usage,
|
|
134
139
|
writeMetrics,
|
|
135
140
|
});
|
|
136
141
|
return {
|
|
137
142
|
text: content,
|
|
138
143
|
data: validation.data,
|
|
139
144
|
parseError: validation.error,
|
|
145
|
+
usage,
|
|
146
|
+
cost: (0, utilities_1.calculateCosts)(model, usage),
|
|
140
147
|
};
|
|
141
148
|
}
|
|
142
149
|
catch (parseError) {
|
package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAICompletion.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleGenerativeAICompletion.service.js","sourceRoot":"","sources":["../../../../src/providers/GoogleGenerativeAI/services/GoogleGenerativeAICompletion.service.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAC5C,+DAQ+B;AAG/B,+DAA4D;AAC5D,yCAAkD;AAClD,wGAAoG;AAGpG,MAAa,mCAEX,SAAQ,+BAA+D;IACvE,YACE,MAAsC,EACtC,QAAkB,EAClB,OAA6D;QAE7D,KAAK,CAAC,kCAAY,CAAC,kBAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,IAAI,mBAAW,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;IAUD,KAAK,CAAC,WAAW,CACf,OAAgG;QAEhG,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,qBAAqB,CAC/B,OAAiG,CAClG,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,OAA8D;QAE9D,MAAM,EACJ,KAAK,EACL,OAAO,EACP,OAAO,GAAG,EAAE,EACZ,YAAY,EACZ,WAAW,EACX,eAAe,GAChB,GAAG,OAAO,CAAC;QAEZ,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;QAEhE,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,oDAAwB;iBAC3C,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAEnC,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,gBAAgB,GAAG,MAAM,oDAAwB,CAAC,wBAAwB,CAAC;gBAC/E,OAAO;gBACP,OAAO;gBACP,KAAK;gBACL,aAAa;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC,CAAC;YAEH,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CACvD,oDAAwB,CAAC,oBAAoB,CAAC;gBAC5C,KAAK;gBACL,QAAQ,EAAE,gBAAgB;gBAC1B,YAAY;gBACZ,WAAW;aACZ,CAAC,CACH,CAAC;YAEF,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,EAAE,gBAAgB,IAAI,CAAC,CAAC;YACjE,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,EAAE,uBAAuB,IAAI,CAAC,CAAC;YACxE,MAAM,kBAAkB,GAAG,YAAY,GAAG,YAAY,CAAC;YACvD,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,EAAE,oBAAoB,IAAI,CAAC,CAAC;YAErE,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBAC7B,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC;gBAChD,KAAK;gBACL,KAAK
|
|
1
|
+
{"version":3,"file":"GoogleGenerativeAICompletion.service.js","sourceRoot":"","sources":["../../../../src/providers/GoogleGenerativeAI/services/GoogleGenerativeAICompletion.service.ts"],"names":[],"mappings":"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"}
|
package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAISpeechToText.service.js
CHANGED
|
@@ -8,6 +8,7 @@ const fs_1 = require("fs");
|
|
|
8
8
|
const genai_1 = require("@google/genai");
|
|
9
9
|
const LLMService_typedefs_1 = require("../../../LLMService.typedefs");
|
|
10
10
|
const serializeError_1 = require("../../../utilities/serializeError");
|
|
11
|
+
const utilities_1 = require("../../../utilities");
|
|
11
12
|
const services_1 = require("../../../services");
|
|
12
13
|
const GoogleGenerativeAI_entity_1 = require("../../../providers/GoogleGenerativeAI/GoogleGenerativeAI.entity");
|
|
13
14
|
const mime_types_1 = __importDefault(require("mime-types"));
|
|
@@ -78,19 +79,22 @@ class GoogleGenerativeAISpeechToTextService extends services_1.LLMSpeechToTextSe
|
|
|
78
79
|
const cachedTokens = response.usageMetadata?.cachedContentTokenCount ?? 0;
|
|
79
80
|
const regularInputTextTokens = inputTextTokens - cachedTokens;
|
|
80
81
|
const outputTokens = response.usageMetadata?.candidatesTokenCount ?? 0;
|
|
82
|
+
const usage = {
|
|
83
|
+
inputTextTokens: regularInputTextTokens,
|
|
84
|
+
inputCachedTextTokens: cachedTokens,
|
|
85
|
+
inputAudioTokens,
|
|
86
|
+
outputTextTokens: outputTokens,
|
|
87
|
+
};
|
|
81
88
|
await this.writeSuccessMetrics({
|
|
82
89
|
method: this.getMethodName(this.transcribe),
|
|
83
90
|
model,
|
|
84
|
-
usage
|
|
85
|
-
inputTextTokens: regularInputTextTokens,
|
|
86
|
-
inputCachedTextTokens: cachedTokens,
|
|
87
|
-
inputAudioTokens,
|
|
88
|
-
outputTextTokens: outputTokens,
|
|
89
|
-
},
|
|
91
|
+
usage,
|
|
90
92
|
writeMetrics,
|
|
91
93
|
});
|
|
92
94
|
return {
|
|
93
95
|
text: response.text ?? '',
|
|
96
|
+
usage,
|
|
97
|
+
cost: (0, utilities_1.calculateCosts)(model, usage),
|
|
94
98
|
};
|
|
95
99
|
}
|
|
96
100
|
catch (error) {
|
package/dist/providers/GoogleGenerativeAI/services/GoogleGenerativeAISpeechToText.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleGenerativeAISpeechToText.service.js","sourceRoot":"","sources":["../../../../src/providers/GoogleGenerativeAI/services/GoogleGenerativeAISpeechToText.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GoogleGenerativeAISpeechToText.service.js","sourceRoot":"","sources":["../../../../src/providers/GoogleGenerativeAI/services/GoogleGenerativeAISpeechToText.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,15 @@ export declare class LLMAPIAssistanceService<Reporter extends LLMReporterInterfa
|
|
|
32
32
|
private injectFileContext;
|
|
33
33
|
private buildToolsArray;
|
|
34
34
|
private executeToolLoop;
|
|
35
|
+
/**
|
|
36
|
+
* Executes one tool-loop round trip. Gemini through the proxy occasionally
|
|
37
|
+
* rejects a previously-issued thought_signature on replay with HTTP 400
|
|
38
|
+
* "Corrupted thought signature."; the recovery downgrades every recorded
|
|
39
|
+
* signature to the documented validator-bypass marker and retries the same
|
|
40
|
+
* request once.
|
|
41
|
+
*/
|
|
42
|
+
private createToolLoopCompletion;
|
|
43
|
+
private isCorruptedThoughtSignatureError;
|
|
35
44
|
private resolveToolCalls;
|
|
36
45
|
private appendToolInteractionMessages;
|
|
37
46
|
/**
|
|
@@ -256,10 +256,11 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
256
256
|
const text = (0, utilities_1.stripThinkingTags)(toolLoopResult.text);
|
|
257
257
|
schemaRestore?.();
|
|
258
258
|
this.chatState.appendAssistantMessage(chatId, text);
|
|
259
|
+
const usage = this.buildToolLoopUsage(toolLoopResult);
|
|
259
260
|
await this.writeSuccessMetrics({
|
|
260
261
|
method: this.getMethodName(this.assistInChatStructured),
|
|
261
262
|
model,
|
|
262
|
-
usage
|
|
263
|
+
usage,
|
|
263
264
|
writeMetrics,
|
|
264
265
|
});
|
|
265
266
|
const structuredResult = await this.getJsonFixer()
|
|
@@ -269,6 +270,7 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
269
270
|
jsonSchema,
|
|
270
271
|
reporterContext,
|
|
271
272
|
abortSignal,
|
|
273
|
+
primaryUsage: usage,
|
|
272
274
|
});
|
|
273
275
|
if ('error' in structuredResult) {
|
|
274
276
|
return structuredResult;
|
|
@@ -437,15 +439,13 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
437
439
|
toolIterationsExhausted = toolIterationsUsed >= maxToolIterations;
|
|
438
440
|
const hasTools = tools.length > 0;
|
|
439
441
|
this.logOutgoingToolCalls(chatId, iteration);
|
|
440
|
-
const response = await this.
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
}),
|
|
448
|
-
}, { signal: abortSignal });
|
|
442
|
+
const response = await this.createToolLoopCompletion({
|
|
443
|
+
chatId,
|
|
444
|
+
model,
|
|
445
|
+
tools: hasTools ? tools : undefined,
|
|
446
|
+
responseFormat,
|
|
447
|
+
abortSignal,
|
|
448
|
+
});
|
|
449
449
|
const choice = response.choices[0];
|
|
450
450
|
totalPromptTokens += response.usage?.prompt_tokens ?? 0;
|
|
451
451
|
totalCachedTokens +=
|
|
@@ -487,6 +487,47 @@ class LLMAPIAssistanceService extends services_1.LLMAssistanceService {
|
|
|
487
487
|
toolIterationsExhausted,
|
|
488
488
|
};
|
|
489
489
|
}
|
|
490
|
+
/**
|
|
491
|
+
* Executes one tool-loop round trip. Gemini through the proxy occasionally
|
|
492
|
+
* rejects a previously-issued thought_signature on replay with HTTP 400
|
|
493
|
+
* "Corrupted thought signature."; the recovery downgrades every recorded
|
|
494
|
+
* signature to the documented validator-bypass marker and retries the same
|
|
495
|
+
* request once.
|
|
496
|
+
*/
|
|
497
|
+
async createToolLoopCompletion(options) {
|
|
498
|
+
const { chatId, model, tools, responseFormat, abortSignal } = options;
|
|
499
|
+
const createCompletion = () => this.instance.chat.completions.create({
|
|
500
|
+
model: model.name,
|
|
501
|
+
messages: this.chatState.getMessages(chatId),
|
|
502
|
+
...model.config,
|
|
503
|
+
...(tools && { tools }),
|
|
504
|
+
...(responseFormat && {
|
|
505
|
+
response_format: responseFormat,
|
|
506
|
+
}),
|
|
507
|
+
}, { signal: abortSignal });
|
|
508
|
+
try {
|
|
509
|
+
return await createCompletion();
|
|
510
|
+
}
|
|
511
|
+
catch (error) {
|
|
512
|
+
if (!this.isCorruptedThoughtSignatureError(error)) {
|
|
513
|
+
throw error;
|
|
514
|
+
}
|
|
515
|
+
this.logger?.child(this.getMethodName(this.executeToolLoop)).warn('Recovering from corrupted thought signature', {
|
|
516
|
+
chatId,
|
|
517
|
+
model: model.name,
|
|
518
|
+
});
|
|
519
|
+
this.chatState.replaceThoughtSignatures(chatId, GEMINI_THOUGHT_SIGNATURE_VALIDATOR_BYPASS);
|
|
520
|
+
return createCompletion();
|
|
521
|
+
}
|
|
522
|
+
}
|
|
523
|
+
isCorruptedThoughtSignatureError(error) {
|
|
524
|
+
if (!(error instanceof Error)) {
|
|
525
|
+
return false;
|
|
526
|
+
}
|
|
527
|
+
const status = error.status;
|
|
528
|
+
return status === 400
|
|
529
|
+
&& error.message.includes('Corrupted thought signature');
|
|
530
|
+
}
|
|
490
531
|
resolveToolCalls(choice) {
|
|
491
532
|
const hasStandardToolCalls = choice?.finish_reason === 'tool_calls'
|
|
492
533
|
&& choice.message.tool_calls?.length;
|
|
@@ -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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"}
|
|
@@ -4,10 +4,11 @@ exports.LLMAPICompletionService = void 0;
|
|
|
4
4
|
const openai_1 = require("openai");
|
|
5
5
|
const LLMService_typedefs_1 = require("../../../LLMService.typedefs");
|
|
6
6
|
const serializeError_1 = require("../../../utilities/serializeError");
|
|
7
|
+
const utilities_1 = require("../../../utilities");
|
|
7
8
|
const OpenAICompatibleCompletion_service_1 = require("../../../providers/OpenAICompatible/OpenAICompatibleCompletion.service");
|
|
8
9
|
const LLMAPI_typedefs_1 = require("../../../providers/LLMAPI/LLMAPI.typedefs");
|
|
9
10
|
const OpenAI_entity_1 = require("../../../providers/OpenAI/OpenAI.entity");
|
|
10
|
-
const
|
|
11
|
+
const utilities_2 = require("../../../providers/LLMAPI/utilities");
|
|
11
12
|
class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenAICompatibleCompletionService {
|
|
12
13
|
jsonFixer;
|
|
13
14
|
constructor(logger, reporter, options) {
|
|
@@ -21,7 +22,7 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
21
22
|
}
|
|
22
23
|
getJsonFixer() {
|
|
23
24
|
if (!this.jsonFixer) {
|
|
24
|
-
this.jsonFixer = new
|
|
25
|
+
this.jsonFixer = new utilities_2.LLMAPIJsonFixer(this.instance, this.logger, this.reporter);
|
|
25
26
|
}
|
|
26
27
|
return this.jsonFixer;
|
|
27
28
|
}
|
|
@@ -36,7 +37,7 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
36
37
|
if ('text' in result && result.text) {
|
|
37
38
|
return {
|
|
38
39
|
...result,
|
|
39
|
-
text: (0,
|
|
40
|
+
text: (0, utilities_2.stripThinkingTags)(result.text),
|
|
40
41
|
};
|
|
41
42
|
}
|
|
42
43
|
return result;
|
|
@@ -61,13 +62,13 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
61
62
|
const supportsStructuredOutputs = model.capabilities?.structuredOutputs === true;
|
|
62
63
|
const schemaInstruction = supportsStructuredOutputs
|
|
63
64
|
? null
|
|
64
|
-
: (0,
|
|
65
|
+
: (0, utilities_2.buildSchemaInstruction)(jsonSchema);
|
|
65
66
|
const fullInstructions = this.combineInstructions(instructions, schemaInstruction);
|
|
66
67
|
const systemMessage = fullInstructions
|
|
67
68
|
? [{ role: 'system', content: fullInstructions }]
|
|
68
69
|
: [];
|
|
69
70
|
abortSignal?.throwIfAborted();
|
|
70
|
-
const responseFormat = (0,
|
|
71
|
+
const responseFormat = (0, utilities_2.buildLLMAPIResponseFormat)(model, jsonSchema);
|
|
71
72
|
const completion = await this.instance.chat.completions.create({
|
|
72
73
|
model: model.name,
|
|
73
74
|
messages: [
|
|
@@ -82,7 +83,7 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
82
83
|
});
|
|
83
84
|
abortSignal?.throwIfAborted();
|
|
84
85
|
const rawContent = completion.choices[0]?.message.content ?? '';
|
|
85
|
-
const content = (0,
|
|
86
|
+
const content = (0, utilities_2.stripThinkingTags)(rawContent);
|
|
86
87
|
if (!content) {
|
|
87
88
|
throw new Error(`Empty response from ${this.provider}`);
|
|
88
89
|
}
|
|
@@ -93,24 +94,35 @@ class LLMAPICompletionService extends OpenAICompatibleCompletion_service_1.OpenA
|
|
|
93
94
|
const outputTokens = completion.usage?.completion_tokens ?? 0;
|
|
94
95
|
const reasoningTokens = completion.usage?.completion_tokens_details
|
|
95
96
|
?.reasoning_tokens ?? 0;
|
|
97
|
+
const usage = {
|
|
98
|
+
inputTextTokens: regularInputTokens,
|
|
99
|
+
inputCachedTextTokens: cachedTokens,
|
|
100
|
+
outputTextTokens: outputTokens,
|
|
101
|
+
outputReasoningTokens: reasoningTokens,
|
|
102
|
+
};
|
|
96
103
|
await this.writeSuccessMetrics({
|
|
97
104
|
method: this.getMethodName(this.sendStructuredMessage),
|
|
98
105
|
model,
|
|
99
|
-
usage
|
|
100
|
-
inputTextTokens: regularInputTokens,
|
|
101
|
-
inputCachedTextTokens: cachedTokens,
|
|
102
|
-
outputTextTokens: outputTokens,
|
|
103
|
-
outputReasoningTokens: reasoningTokens,
|
|
104
|
-
},
|
|
106
|
+
usage,
|
|
105
107
|
writeMetrics,
|
|
106
108
|
});
|
|
107
|
-
|
|
109
|
+
const structuredResult = await this.getJsonFixer().parseStructuredResponse({
|
|
108
110
|
content,
|
|
109
111
|
schema,
|
|
110
112
|
jsonSchema,
|
|
111
113
|
reporterContext,
|
|
112
114
|
abortSignal,
|
|
115
|
+
primaryUsage: usage,
|
|
113
116
|
});
|
|
117
|
+
if ('error' in structuredResult) {
|
|
118
|
+
return structuredResult;
|
|
119
|
+
}
|
|
120
|
+
return {
|
|
121
|
+
...structuredResult,
|
|
122
|
+
cost: structuredResult.usage
|
|
123
|
+
? (0, utilities_1.calculateCosts)(model, structuredResult.usage)
|
|
124
|
+
: undefined,
|
|
125
|
+
};
|
|
114
126
|
}
|
|
115
127
|
catch (error) {
|
|
116
128
|
await this.writeErrorMetrics({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LLMAPICompletion.service.js","sourceRoot":"","sources":["../../../../src/providers/LLMAPI/services/LLMAPICompletion.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"LLMAPICompletion.service.js","sourceRoot":"","sources":["../../../../src/providers/LLMAPI/services/LLMAPICompletion.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,14 @@ import type { LLMLoggerInterface } from '../../../utilities/logger';
|
|
|
3
3
|
import type { LLMReporterInterface } from '../../../utilities/reporter';
|
|
4
4
|
import type { LLMSchemaInterface } from '../../../utilities/schema';
|
|
5
5
|
import type { LLMStructuredResult } from '../../../LLMService.typedefs';
|
|
6
|
+
import { type LLMModelUsage } from '../../../utilities';
|
|
6
7
|
interface ParseStructuredResponseOptions {
|
|
7
8
|
content: string;
|
|
8
9
|
schema: LLMSchemaInterface;
|
|
9
10
|
jsonSchema: any;
|
|
10
11
|
reporterContext?: any;
|
|
11
12
|
abortSignal?: AbortSignal;
|
|
13
|
+
primaryUsage: LLMModelUsage;
|
|
12
14
|
}
|
|
13
15
|
export declare class LLMAPIJsonFixer {
|
|
14
16
|
private readonly instance;
|
|
@@ -15,7 +15,7 @@ class LLMAPIJsonFixer {
|
|
|
15
15
|
this.reporter = reporter;
|
|
16
16
|
}
|
|
17
17
|
async parseStructuredResponse(options) {
|
|
18
|
-
const { content, schema, jsonSchema, reporterContext, abortSignal, } = options;
|
|
18
|
+
const { content, schema, jsonSchema, reporterContext, abortSignal, primaryUsage, } = options;
|
|
19
19
|
const sanitized = sanitizeJsonResponse(content);
|
|
20
20
|
try {
|
|
21
21
|
const parsed = JSON.parse(sanitized);
|
|
@@ -31,11 +31,13 @@ class LLMAPIJsonFixer {
|
|
|
31
31
|
jsonSchema,
|
|
32
32
|
reporterContext,
|
|
33
33
|
abortSignal,
|
|
34
|
+
primaryUsage,
|
|
34
35
|
});
|
|
35
36
|
}
|
|
36
37
|
return {
|
|
37
38
|
text: sanitized,
|
|
38
39
|
data: validation.data,
|
|
40
|
+
usage: primaryUsage,
|
|
39
41
|
};
|
|
40
42
|
}
|
|
41
43
|
catch (parseError) {
|
|
@@ -52,11 +54,12 @@ class LLMAPIJsonFixer {
|
|
|
52
54
|
jsonSchema,
|
|
53
55
|
reporterContext,
|
|
54
56
|
abortSignal,
|
|
57
|
+
primaryUsage,
|
|
55
58
|
});
|
|
56
59
|
}
|
|
57
60
|
}
|
|
58
61
|
async fixAndParseJson(options) {
|
|
59
|
-
const { rawResponse, parsingError, schema, jsonSchema, reporterContext, abortSignal, } = options;
|
|
62
|
+
const { rawResponse, parsingError, schema, jsonSchema, reporterContext, abortSignal, primaryUsage, } = options;
|
|
60
63
|
const fixWriteMetrics = this.reporter?.initWriter(reporterContext);
|
|
61
64
|
try {
|
|
62
65
|
abortSignal?.throwIfAborted();
|
|
@@ -91,15 +94,17 @@ class LLMAPIJsonFixer {
|
|
|
91
94
|
const fixCachedTokens = fixCompletion.usage?.prompt_tokens_details
|
|
92
95
|
?.cached_tokens ?? 0;
|
|
93
96
|
const fixOutputTokens = fixCompletion.usage?.completion_tokens ?? 0;
|
|
97
|
+
const fixUsage = {
|
|
98
|
+
inputTextTokens: fixPromptTokens - fixCachedTokens,
|
|
99
|
+
inputCachedTextTokens: fixCachedTokens,
|
|
100
|
+
outputTextTokens: fixOutputTokens,
|
|
101
|
+
};
|
|
94
102
|
await writeSuccessMetrics({
|
|
95
103
|
model: LLMAPI_typedefs_1.LLMAPI_JSON_FIX_MODEL,
|
|
96
|
-
usage:
|
|
97
|
-
inputTextTokens: fixPromptTokens - fixCachedTokens,
|
|
98
|
-
inputCachedTextTokens: fixCachedTokens,
|
|
99
|
-
outputTextTokens: fixOutputTokens,
|
|
100
|
-
},
|
|
104
|
+
usage: fixUsage,
|
|
101
105
|
writeMetrics: fixWriteMetrics,
|
|
102
106
|
});
|
|
107
|
+
const combinedUsage = (0, utilities_1.addUsage)(primaryUsage, fixUsage);
|
|
103
108
|
const parsed = JSON.parse(fixedContent);
|
|
104
109
|
const validation = schema._parse(parsed);
|
|
105
110
|
if (validation.error) {
|
|
@@ -112,6 +117,7 @@ class LLMAPIJsonFixer {
|
|
|
112
117
|
return {
|
|
113
118
|
text: fixedContent,
|
|
114
119
|
parseError: validation.error,
|
|
120
|
+
usage: combinedUsage,
|
|
115
121
|
};
|
|
116
122
|
}
|
|
117
123
|
this.logger
|
|
@@ -120,6 +126,7 @@ class LLMAPIJsonFixer {
|
|
|
120
126
|
return {
|
|
121
127
|
text: fixedContent,
|
|
122
128
|
data: validation.data,
|
|
129
|
+
usage: combinedUsage,
|
|
123
130
|
};
|
|
124
131
|
}
|
|
125
132
|
catch (fixError) {
|
|
@@ -137,6 +144,7 @@ class LLMAPIJsonFixer {
|
|
|
137
144
|
text: rawResponse,
|
|
138
145
|
error: fixError,
|
|
139
146
|
parseError: 'Failed to fix structured response from LLMAPI',
|
|
147
|
+
usage: primaryUsage,
|
|
140
148
|
};
|
|
141
149
|
}
|
|
142
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LLMAPIJsonFixer.js","sourceRoot":"","sources":["../../../../src/providers/LLMAPI/utilities/LLMAPIJsonFixer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"LLMAPIJsonFixer.js","sourceRoot":"","sources":["../../../../src/providers/LLMAPI/utilities/LLMAPIJsonFixer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.OpenAICompatibleCompletionService = void 0;
|
|
4
4
|
const openai_1 = require("openai");
|
|
5
5
|
const serializeError_1 = require("../../utilities/serializeError");
|
|
6
|
+
const utilities_1 = require("../../utilities");
|
|
6
7
|
const services_1 = require("../../services");
|
|
7
8
|
const OpenAI_entity_1 = require("../../providers/OpenAI/OpenAI.entity");
|
|
8
9
|
class OpenAICompatibleCompletionService extends services_1.LLMCompletionService {
|
|
@@ -51,6 +52,8 @@ class OpenAICompatibleCompletionService extends services_1.LLMCompletionService
|
|
|
51
52
|
});
|
|
52
53
|
return {
|
|
53
54
|
text: completion.choices[0]?.message.content ?? '',
|
|
55
|
+
usage,
|
|
56
|
+
cost: (0, utilities_1.calculateCosts)(model, usage),
|
|
54
57
|
};
|
|
55
58
|
}
|
|
56
59
|
catch (error) {
|
|
@@ -118,6 +121,8 @@ class OpenAICompatibleCompletionService extends services_1.LLMCompletionService
|
|
|
118
121
|
text: content,
|
|
119
122
|
data: validation.data,
|
|
120
123
|
parseError: validation.error,
|
|
124
|
+
usage,
|
|
125
|
+
cost: (0, utilities_1.calculateCosts)(model, usage),
|
|
121
126
|
};
|
|
122
127
|
}
|
|
123
128
|
catch (parseError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAICompatibleCompletion.service.js","sourceRoot":"","sources":["../../../src/providers/OpenAICompatible/OpenAICompatibleCompletion.service.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAehC,+DAA4D;AAC5D,yCAAkD;AAClD,oEAAgE;AAQhE,MAAa,iCAGX,SAAQ,+BAAwC;IAChD,YACE,QAAkB,EAClB,MAAsC,EACtC,QAAkB,EAClB,OAAsC;QAEtC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,mBAAmB,CAC7B,GAAG,EAAE,CAAC,IAAI,eAAM,CAAC,IAAI,CAAC,OAAO,CAAsB,CACpD,CAAC;IACJ,CAAC;IAWD,KAAK,CAAC,WAAW,CACf,OACmC;QAEnC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,qBAAqB,CAC/B,OACkC,CACnC,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,WAAW,CACf,QAAgC,EAChC,MAA0B;QAE1B,MAAM,aAAa,GAAG,4BAAY,CAAC,gBAAgB,EAAE,CAAC;QACtD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAClC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAC7B,CAAC;QAEF,OAAO,aAAa,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IAES,KAAK,CAAC,eAAe,CAC7B,OAAkD;QAElD,MAAM,EACJ,KAAK,EACL,WAAW,EACX,eAAe,GAChB,GAAG,OAAO,CAAC;QAEZ,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;QAEhE,IAAI,CAAC;YACH,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,EACJ,aAAa,EACb,YAAY,GACb,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;YAElD,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC7D,KAAK,EAAE,KAAK,CAAC,IAAI;gBACjB,QAAQ,EAAE;oBACR,GAAG,aAAa;oBAChB,GAAG,YAAY;iBAChB;gBACD,CAAC,EAAE,CAAC;gBACJ,GAAG,KAAK,CAAC,MAAM;aAChB,EAAE;gBACD,MAAM,EAAE,WAAW;aACpB,CAAC,CAAC;YAEH,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,KAAK,GAAG,IAAI,CAAC,0BAA0B,CAC3C,UAAU,CACX,CAAC;YAEF,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBAC7B,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC;gBAChD,KAAK;gBACL,KAAK;gBACL,YAAY;aACb,CAAC,CAAC;YAEH,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"OpenAICompatibleCompletion.service.js","sourceRoot":"","sources":["../../../src/providers/OpenAICompatible/OpenAICompatibleCompletion.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ exports.OpenAICompatibleSpeechToTextService = void 0;
|
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const openai_1 = require("openai");
|
|
9
9
|
const serializeError_1 = require("../../utilities/serializeError");
|
|
10
|
+
const utilities_1 = require("../../utilities");
|
|
10
11
|
const services_1 = require("../../services");
|
|
11
12
|
const OpenAI_entity_1 = require("../../providers/OpenAI/OpenAI.entity");
|
|
12
13
|
const mime_types_1 = __importDefault(require("mime-types"));
|
|
@@ -56,7 +57,7 @@ class OpenAICompatibleSpeechToTextService extends services_1.LLMSpeechToTextServ
|
|
|
56
57
|
usage,
|
|
57
58
|
writeMetrics,
|
|
58
59
|
});
|
|
59
|
-
return { text: response.text };
|
|
60
|
+
return { text: response.text, usage, cost: (0, utilities_1.calculateCosts)(model, usage) };
|
|
60
61
|
}
|
|
61
62
|
catch (error) {
|
|
62
63
|
await this.writeErrorMetrics({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAICompatibleSpeechToText.service.js","sourceRoot":"","sources":["../../../src/providers/OpenAICompatible/OpenAICompatibleSpeechToText.service.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAgD;AAEhD,mCAAgC;AAWhC,+DAA4D;AAC5D,yCAAoD;AACpD,oEAAgE;AAChE,4DAA8B;AAU9B,MAAsB,mCAGpB,SAAQ,iCAA0C;IAClD,YACE,QAAkB,EAClB,MAAsC,EACtC,QAAkB,EAClB,OAAsC;QAEtC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,mBAAmB,CAC7B,GAAG,EAAE,CAAC,IAAI,eAAM,CAAC,IAAI,CAAC,OAAO,CAAsB,CACpD,CAAC;IACJ,CAAC;IAED,IAAc,gBAAgB;QAC5B,OAAO,4BAAY,CAAC,gBAAgB,CAAC;IACvC,CAAC;IAES,wBAAwB,CAChC,OAAiD,EACjD,eAA2B;QAE3B,OAAO;YACL,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;YACzB,IAAI,EAAE,eAAe;YACrB,eAAe,EAAE,MAAM;YACvB,MAAM,EAAE,OAAO,CAAC,YAAY;SAC7B,CAAC;IACJ,CAAC;IAOD,KAAK,CAAC,UAAU,CACd,OAA6D;QAE7D,MAAM,EACJ,KAAK,EACL,WAAW,EACX,QAAQ,EACR,WAAW,EACX,eAAe,GAChB,GAAG,OAAO,CAAC;QAEZ,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;QAEhE,IAAI,CAAC;YACH,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,EACJ,WAAW,EACX,kBAAkB,GACnB,GAAG,IAAI,CAAC,gBAAgB,CAAC;YAE1B,MAAM,QAAQ,GAAG,IAAA,aAAQ,EAAC,WAAW,CAAC,CAAC,IAAI,CAAC;YAE5C,IAAI,QAAQ,GAAG,WAAW,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CACb,kCAAkC,WAAW,QAAQ,CACtD,CAAC;YACJ,CAAC;YAED,MAAM,gBAAgB,GAAG,QAAQ,IAAI,oBAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAE9D,IAAI,CAAC,gBAAgB,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,gBAAuB,CAAC,EAAE,CAAC;gBAC/E,MAAM,IAAI,KAAK,CACb,gCAAgC,gBAAgB,0BAA0B,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1G,CAAC;YACJ,CAAC;YAED,MAAM,eAAe,GAAG,IAAA,qBAAgB,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;YAE/E,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,MAAM,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YAEvE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvE,MAAM,EAAE,WAAW;aACpB,CAAC,CAAC;YAEH,WAAW,EAAE,cAAc,EAAE,CAAC;YAE9B,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAEpD,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBAC7B,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC3C,KAAK;gBACL,KAAK;gBACL,YAAY;aACb,CAAC,CAAC;YAEH,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"OpenAICompatibleSpeechToText.service.js","sourceRoot":"","sources":["../../../src/providers/OpenAICompatible/OpenAICompatibleSpeechToText.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,14 @@ export declare class CompletionsChatState {
|
|
|
22
22
|
appendToolCallMessages(chatId: string, toolCalls: ChatCompletionToolCallWithExtraContent[], reasoningContent?: string, content?: string): void;
|
|
23
23
|
appendToolResult(chatId: string, toolCallId: string, content: string): void;
|
|
24
24
|
getMessages(chatId: string): ChatCompletionMessageParam[];
|
|
25
|
+
/**
|
|
26
|
+
* Replaces every recorded thought_signature in the chat's assistant
|
|
27
|
+
* tool-call turns with the given marker. Recovery path for providers that
|
|
28
|
+
* reject a previously-issued signature on replay ("Corrupted thought
|
|
29
|
+
* signature"): downgrading to the documented validator-bypass marker lets
|
|
30
|
+
* the conversation continue without the rejected signatures.
|
|
31
|
+
*/
|
|
32
|
+
replaceThoughtSignatures(chatId: string, marker: string): void;
|
|
25
33
|
deleteChat(chatId: string): void;
|
|
26
34
|
}
|
|
27
35
|
export {};
|
|
@@ -76,6 +76,40 @@ class CompletionsChatState {
|
|
|
76
76
|
}
|
|
77
77
|
return chat.messages;
|
|
78
78
|
}
|
|
79
|
+
/**
|
|
80
|
+
* Replaces every recorded thought_signature in the chat's assistant
|
|
81
|
+
* tool-call turns with the given marker. Recovery path for providers that
|
|
82
|
+
* reject a previously-issued signature on replay ("Corrupted thought
|
|
83
|
+
* signature"): downgrading to the documented validator-bypass marker lets
|
|
84
|
+
* the conversation continue without the rejected signatures.
|
|
85
|
+
*/
|
|
86
|
+
replaceThoughtSignatures(chatId, marker) {
|
|
87
|
+
const chat = this.chats.get(chatId);
|
|
88
|
+
if (!chat) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
chat.messages = chat.messages.map((message) => {
|
|
92
|
+
if (message.role !== 'assistant' || !Array.isArray(message.tool_calls)) {
|
|
93
|
+
return message;
|
|
94
|
+
}
|
|
95
|
+
const toolCalls = message.tool_calls;
|
|
96
|
+
return {
|
|
97
|
+
...message,
|
|
98
|
+
tool_calls: toolCalls.map((toolCall) => (toolCall.extra_content?.google?.thought_signature
|
|
99
|
+
? {
|
|
100
|
+
...toolCall,
|
|
101
|
+
extra_content: {
|
|
102
|
+
...toolCall.extra_content,
|
|
103
|
+
google: {
|
|
104
|
+
...toolCall.extra_content.google,
|
|
105
|
+
thought_signature: marker,
|
|
106
|
+
},
|
|
107
|
+
},
|
|
108
|
+
}
|
|
109
|
+
: toolCall)),
|
|
110
|
+
};
|
|
111
|
+
});
|
|
112
|
+
}
|
|
79
113
|
deleteChat(chatId) {
|
|
80
114
|
this.chats.delete(chatId);
|
|
81
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompletionsChatState.js","sourceRoot":"","sources":["../../../src/services/chatState/CompletionsChatState.ts"],"names":[],"mappings":";;;AAuBA,MAAa,oBAAoB;IACvB,KAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;IAElD,UAAU,CACR,MAAc,EACd,YAAqB,EACrB,SAAkB,EAClB,OAAsC;QAEtC,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAElD,IAAI,YAAY,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,YAAY;aACtB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE;YACrB,YAAY;YACZ,SAAS;YACT,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;IACxC,CAAC;IAED,iBAAiB,CACf,MAAc,EACd,OAAoC;QAEpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,MAAM;YACZ,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB,CACpB,MAAc,EACd,OAAe;QAEf,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,WAAW;YACjB,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB,CACpB,MAAc,EACd,SAAmD,EACnD,gBAAyB,EACzB,OAAO,GAAG,EAAE;QAEZ,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAA+B;YAC1C,IAAI,EAAE,WAAW;YACjB,OAAO;YACP,UAAU,EAAE,SAAS;YACrB,GAAG,CAAC,gBAAgB,KAAK,SAAS,IAAI;gBACpC,iBAAiB,EAAE,gBAAgB;aACpC,CAAC;SACH,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,gBAAgB,CACd,MAAc,EACd,UAAkB,EAClB,OAAe;QAEf,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,MAAM;YACZ,YAAY,EAAE,UAAU;YACxB,OAAO,EAAE,OAAO,IAAI,YAAY;SACjC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,UAAU,CAAC,MAAc;QACvB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"CompletionsChatState.js","sourceRoot":"","sources":["../../../src/services/chatState/CompletionsChatState.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,4 @@
|
|
|
1
|
-
import { type LLMProviders, type LLMModel } from '../LLMService.typedefs';
|
|
2
|
-
export
|
|
3
|
-
|
|
4
|
-
outputTextTokens?: number;
|
|
5
|
-
inputAudioTokens?: number;
|
|
6
|
-
outputAudioTokens?: number;
|
|
7
|
-
inputCachedTextTokens?: number;
|
|
8
|
-
inputCachedAudioTokens?: number;
|
|
9
|
-
outputReasoningTokens?: number;
|
|
10
|
-
}
|
|
11
|
-
export interface LLMCostsResult {
|
|
12
|
-
input: number;
|
|
13
|
-
output: number;
|
|
14
|
-
total: number;
|
|
15
|
-
currency: string;
|
|
16
|
-
}
|
|
1
|
+
import { type LLMProviders, type LLMModel, type LLMModelUsage, type LLMCostsResult } from '../LLMService.typedefs';
|
|
2
|
+
export type { LLMModelUsage, LLMCostsResult } from '../LLMService.typedefs';
|
|
3
|
+
export declare function addUsage(first: LLMModelUsage, second: LLMModelUsage): LLMModelUsage;
|
|
17
4
|
export declare const calculateCosts: <Provider extends LLMProviders>(model: LLMModel<Provider> | null, usage: LLMModelUsage) => LLMCostsResult;
|
|
@@ -1,6 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.calculateCosts = void 0;
|
|
4
|
+
exports.addUsage = addUsage;
|
|
5
|
+
const USAGE_TOKEN_KEY_MAP = {
|
|
6
|
+
inputTextTokens: true,
|
|
7
|
+
outputTextTokens: true,
|
|
8
|
+
inputAudioTokens: true,
|
|
9
|
+
outputAudioTokens: true,
|
|
10
|
+
inputCachedTextTokens: true,
|
|
11
|
+
inputCachedAudioTokens: true,
|
|
12
|
+
outputReasoningTokens: true,
|
|
13
|
+
};
|
|
14
|
+
const USAGE_TOKEN_KEYS = Object.keys(USAGE_TOKEN_KEY_MAP);
|
|
15
|
+
function addUsage(first, second) {
|
|
16
|
+
return USAGE_TOKEN_KEYS.reduce((accumulated, tokenKey) => {
|
|
17
|
+
const total = (first[tokenKey] ?? 0) + (second[tokenKey] ?? 0);
|
|
18
|
+
if (total === 0) {
|
|
19
|
+
return accumulated;
|
|
20
|
+
}
|
|
21
|
+
return { ...accumulated, [tokenKey]: total };
|
|
22
|
+
}, {});
|
|
23
|
+
}
|
|
4
24
|
const calculateCosts = (model, usage) => {
|
|
5
25
|
const { inputTextTokens = 0, outputTextTokens = 0, inputAudioTokens = 0, outputAudioTokens = 0, inputCachedTextTokens = 0, inputCachedAudioTokens = 0, outputReasoningTokens = 0, } = usage;
|
|
6
26
|
if (!model) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateCosts.js","sourceRoot":"","sources":["../../src/utilities/calculateCosts.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"calculateCosts.js","sourceRoot":"","sources":["../../src/utilities/calculateCosts.ts"],"names":[],"mappings":";;;AAuBA,4BAgBC;AA9BD,MAAM,mBAAmB,GAAG;IAC1B,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,IAAI;IACtB,gBAAgB,EAAE,IAAI;IACtB,iBAAiB,EAAE,IAAI;IACvB,qBAAqB,EAAE,IAAI;IAC3B,sBAAsB,EAAE,IAAI;IAC5B,qBAAqB,EAAE,IAAI;CAC0B,CAAC;AAExD,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAClC,mBAAmB,CACO,CAAC;AAE7B,SAAgB,QAAQ,CACtB,KAAoB,EACpB,MAAqB;IAErB,OAAO,gBAAgB,CAAC,MAAM,CAC5B,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;QACxB,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/D,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,OAAO,EAAE,GAAG,WAAW,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IAC/C,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC;AAEM,MAAM,cAAc,GAAG,CAC5B,KAAgC,EAChC,KAAoB,EACJ,EAAE;IAClB,MAAM,EACJ,eAAe,GAAG,CAAC,EACnB,gBAAgB,GAAG,CAAC,EACpB,gBAAgB,GAAG,CAAC,EACpB,iBAAiB,GAAG,CAAC,EACrB,qBAAqB,GAAG,CAAC,EACzB,sBAAsB,GAAG,CAAC,EAC1B,qBAAqB,GAAG,CAAC,GAC1B,GAAG,KAAK,CAAC;IAEV,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO;YACL,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAE1B,sBAAsB;IACtB,MAAM,gBAAgB,GAAG,CACvB,OAAO,CAAC,oBAAoB,CAAC,eAAe,CAAC;UAC3C,OAAO,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAClD,CAAC;IAEF,6FAA6F;IAC7F,MAAM,eAAe,GAAG,CACtB,CAAC,OAAO,CAAC,0BAA0B,EAAE,CAAC,qBAAqB,CAAC;WACvD,OAAO,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC;UACvD,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,sBAAsB,CAAC;eAC3D,OAAO,CAAC,qBAAqB,CAAC,sBAAsB,CAAC,CAAC,CAC5D,CAAC;IAEF,+DAA+D;IAC/D,MAAM,UAAU,GAAG,CACjB,OAAO,CAAC,qBAAqB,CAAC,gBAAgB,GAAG,qBAAqB,CAAC;UACrE,OAAO,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CACpD,CAAC;IAEF,MAAM,cAAc,GAAG,gBAAgB,GAAG,eAAe,CAAC;IAC1D,MAAM,SAAS,GAAG,cAAc,GAAG,UAAU,CAAC;IAE9C,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACrC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACnC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ;KACjC,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,cAAc,kBAsDzB"}
|