@strands-agents/sdk 0.2.1 → 0.3.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/dist/src/__fixtures__/mock-hook-provider.d.ts.map +1 -1
- package/dist/src/__fixtures__/mock-hook-provider.js +2 -1
- package/dist/src/__fixtures__/mock-hook-provider.js.map +1 -1
- package/dist/src/__tests__/errors.test.js +33 -1
- package/dist/src/__tests__/errors.test.js.map +1 -1
- package/dist/src/agent/__tests__/agent.hook.test.js +25 -23
- package/dist/src/agent/__tests__/agent.hook.test.js.map +1 -1
- package/dist/src/agent/agent.d.ts.map +1 -1
- package/dist/src/agent/agent.js +2 -1
- package/dist/src/agent/agent.js.map +1 -1
- package/dist/src/errors.d.ts +16 -0
- package/dist/src/errors.d.ts.map +1 -1
- package/dist/src/errors.js +19 -0
- package/dist/src/errors.js.map +1 -1
- package/dist/src/hooks/__tests__/events.test.js +18 -1
- package/dist/src/hooks/__tests__/events.test.js.map +1 -1
- package/dist/src/hooks/events.d.ts +11 -0
- package/dist/src/hooks/events.d.ts.map +1 -1
- package/dist/src/hooks/events.js +12 -0
- package/dist/src/hooks/events.js.map +1 -1
- package/dist/src/hooks/index.d.ts +1 -1
- package/dist/src/hooks/index.d.ts.map +1 -1
- package/dist/src/hooks/index.js +1 -1
- package/dist/src/hooks/index.js.map +1 -1
- package/dist/src/index.d.ts +2 -2
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +2 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/models/__tests__/anthropic.test.d.ts +2 -0
- package/dist/src/models/__tests__/anthropic.test.d.ts.map +1 -0
- package/dist/src/models/__tests__/anthropic.test.js +481 -0
- package/dist/src/models/__tests__/anthropic.test.js.map +1 -0
- package/dist/src/models/__tests__/bedrock.test.js +86 -1
- package/dist/src/models/__tests__/bedrock.test.js.map +1 -1
- package/dist/src/models/__tests__/gemini.test.js +599 -62
- package/dist/src/models/__tests__/gemini.test.js.map +1 -1
- package/dist/src/models/__tests__/openai.test.js +104 -1
- package/dist/src/models/__tests__/openai.test.js.map +1 -1
- package/dist/src/models/anthropic.d.ts +28 -0
- package/dist/src/models/anthropic.d.ts.map +1 -0
- package/dist/src/models/anthropic.js +419 -0
- package/dist/src/models/anthropic.js.map +1 -0
- package/dist/src/models/bedrock.d.ts +6 -0
- package/dist/src/models/bedrock.d.ts.map +1 -1
- package/dist/src/models/bedrock.js +31 -4
- package/dist/src/models/bedrock.js.map +1 -1
- package/dist/src/models/gemini/adapters.d.ts +2 -1
- package/dist/src/models/gemini/adapters.d.ts.map +1 -1
- package/dist/src/models/gemini/adapters.js +259 -14
- package/dist/src/models/gemini/adapters.js.map +1 -1
- package/dist/src/models/gemini/model.d.ts.map +1 -1
- package/dist/src/models/gemini/model.js +38 -1
- package/dist/src/models/gemini/model.js.map +1 -1
- package/dist/src/models/gemini/types.d.ts +10 -1
- package/dist/src/models/gemini/types.d.ts.map +1 -1
- package/dist/src/models/model.d.ts.map +1 -1
- package/dist/src/models/model.js +4 -0
- package/dist/src/models/model.js.map +1 -1
- package/dist/src/models/openai.d.ts.map +1 -1
- package/dist/src/models/openai.js +20 -3
- package/dist/src/models/openai.js.map +1 -1
- package/dist/src/models/streaming.d.ts +5 -0
- package/dist/src/models/streaming.d.ts.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/types/media.d.ts +1 -1
- package/dist/src/types/media.d.ts.map +1 -1
- package/dist/src/types/media.js +18 -4
- package/dist/src/types/media.js.map +1 -1
- package/dist/src/types/messages.d.ts +10 -0
- package/dist/src/types/messages.d.ts.map +1 -1
- package/dist/src/types/messages.js +8 -0
- package/dist/src/types/messages.js.map +1 -1
- package/dist/src/vended-tools/bash/__tests__/bash.test.node.d.ts +2 -0
- package/dist/src/vended-tools/bash/__tests__/bash.test.node.d.ts.map +1 -0
- package/dist/src/vended-tools/bash/__tests__/{bash.test.js → bash.test.node.js} +3 -4
- package/dist/src/vended-tools/bash/__tests__/bash.test.node.js.map +1 -0
- package/dist/src/vended-tools/file_editor/__tests__/file-editor.test.node.d.ts +2 -0
- package/dist/src/vended-tools/file_editor/__tests__/file-editor.test.node.d.ts.map +1 -0
- package/dist/src/vended-tools/file_editor/__tests__/{file-editor.test.js → file-editor.test.node.js} +1 -1
- package/dist/src/vended-tools/file_editor/__tests__/file-editor.test.node.js.map +1 -0
- package/package.json +11 -2
- package/dist/src/vended-tools/bash/__tests__/bash.test.d.ts +0 -2
- package/dist/src/vended-tools/bash/__tests__/bash.test.d.ts.map +0 -1
- package/dist/src/vended-tools/bash/__tests__/bash.test.js.map +0 -1
- package/dist/src/vended-tools/file_editor/__tests__/file-editor.test.d.ts +0 -2
- package/dist/src/vended-tools/file_editor/__tests__/file-editor.test.d.ts.map +0 -1
- package/dist/src/vended-tools/file_editor/__tests__/file-editor.test.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../../../src/models/gemini/adapters.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,uBAAuB,
|
|
1
|
+
{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../../../src/models/gemini/adapters.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,uBAAuB,EAG5B,YAAY,IAAI,kBAAkB,EACnC,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EACV,OAAO,EACP,UAAU,EAKX,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAInD;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAE7E,CAAA;AAMD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CA6B7D;AA8MD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,iBAAiB,GAAG,gBAAgB,EAAE,CAmJnH"}
|
|
@@ -3,11 +3,14 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @internal This module is not part of the public API.
|
|
5
5
|
*/
|
|
6
|
-
import { FinishReason as GeminiFinishReason, } from '@google/genai';
|
|
6
|
+
import { FunctionResponse, FinishReason as GeminiFinishReason, } from '@google/genai';
|
|
7
|
+
import { encodeBase64, getMimeType } from '../../types/media.js';
|
|
8
|
+
import { logger } from '../../logging/logger.js';
|
|
7
9
|
/**
|
|
8
10
|
* Mapping of Gemini finish reasons to SDK stop reasons.
|
|
9
11
|
* Only MAX_TOKENS needs explicit mapping; everything else defaults to endTurn.
|
|
10
|
-
*
|
|
12
|
+
* Tool use stop reason is determined by the hasToolCalls flag in GeminiStreamState,
|
|
13
|
+
* since Gemini does not have a tool use finish reason.
|
|
11
14
|
*
|
|
12
15
|
* @internal
|
|
13
16
|
*/
|
|
@@ -27,13 +30,20 @@ export const FINISH_REASON_MAP = {
|
|
|
27
30
|
*/
|
|
28
31
|
export function formatMessages(messages) {
|
|
29
32
|
const contents = [];
|
|
33
|
+
// Build toolUseId → name mapping for resolving tool result names
|
|
34
|
+
const toolUseIdToName = new Map();
|
|
30
35
|
for (const message of messages) {
|
|
31
|
-
const parts = [];
|
|
32
36
|
for (const block of message.content) {
|
|
33
|
-
if (block.type === '
|
|
34
|
-
|
|
37
|
+
if (block.type === 'toolUseBlock') {
|
|
38
|
+
toolUseIdToName.set(block.toolUseId, block.name);
|
|
35
39
|
}
|
|
36
40
|
}
|
|
41
|
+
}
|
|
42
|
+
for (const message of messages) {
|
|
43
|
+
const parts = [];
|
|
44
|
+
for (const block of message.content) {
|
|
45
|
+
parts.push(...formatContentBlock(block, toolUseIdToName));
|
|
46
|
+
}
|
|
37
47
|
if (parts.length > 0) {
|
|
38
48
|
contents.push({
|
|
39
49
|
role: message.role === 'assistant' ? 'model' : 'user',
|
|
@@ -43,6 +53,174 @@ export function formatMessages(messages) {
|
|
|
43
53
|
}
|
|
44
54
|
return contents;
|
|
45
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Formats a content block to Gemini Parts.
|
|
58
|
+
*
|
|
59
|
+
* @param block - SDK content block
|
|
60
|
+
* @returns Array of Gemini Parts
|
|
61
|
+
*
|
|
62
|
+
* @internal
|
|
63
|
+
*/
|
|
64
|
+
function formatContentBlock(block, toolUseIdToName) {
|
|
65
|
+
switch (block.type) {
|
|
66
|
+
case 'textBlock':
|
|
67
|
+
return [{ text: block.text }];
|
|
68
|
+
case 'imageBlock':
|
|
69
|
+
return formatImageBlock(block);
|
|
70
|
+
case 'reasoningBlock':
|
|
71
|
+
return formatReasoningBlock(block);
|
|
72
|
+
case 'documentBlock':
|
|
73
|
+
return formatDocumentBlock(block);
|
|
74
|
+
case 'videoBlock':
|
|
75
|
+
return formatVideoBlock(block);
|
|
76
|
+
case 'toolUseBlock':
|
|
77
|
+
return formatToolUseBlock(block);
|
|
78
|
+
case 'toolResultBlock':
|
|
79
|
+
return formatToolResultBlock(block, toolUseIdToName);
|
|
80
|
+
case 'cachePointBlock':
|
|
81
|
+
logger.warn('block_type=<cachePointBlock> | cache points not supported by gemini, skipping');
|
|
82
|
+
return [];
|
|
83
|
+
case 'guardContentBlock':
|
|
84
|
+
logger.warn('block_type=<guardContentBlock> | guard content not supported by gemini, skipping');
|
|
85
|
+
return [];
|
|
86
|
+
default:
|
|
87
|
+
return [];
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Formats an image block to Gemini Parts.
|
|
92
|
+
*
|
|
93
|
+
* @param block - Image block to format
|
|
94
|
+
* @returns Array of Gemini Parts
|
|
95
|
+
*
|
|
96
|
+
* @internal
|
|
97
|
+
*/
|
|
98
|
+
function formatImageBlock(block) {
|
|
99
|
+
const mimeType = getMimeType(block.format) ?? `image/${block.format}`;
|
|
100
|
+
switch (block.source.type) {
|
|
101
|
+
case 'imageSourceBytes':
|
|
102
|
+
return [{ inlineData: { data: encodeBase64(block.source.bytes), mimeType } }];
|
|
103
|
+
case 'imageSourceUrl':
|
|
104
|
+
return [{ fileData: { fileUri: block.source.url, mimeType } }];
|
|
105
|
+
case 'imageSourceS3Location':
|
|
106
|
+
logger.warn('source_type=<imageSourceS3Location> | s3 sources not supported by gemini, skipping');
|
|
107
|
+
return [];
|
|
108
|
+
default:
|
|
109
|
+
return [];
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* Formats a reasoning block to Gemini Parts.
|
|
114
|
+
*
|
|
115
|
+
* @param block - Reasoning block to format
|
|
116
|
+
* @returns Array of Gemini Parts
|
|
117
|
+
*
|
|
118
|
+
* @internal
|
|
119
|
+
*/
|
|
120
|
+
function formatReasoningBlock(block) {
|
|
121
|
+
if (!block.text) {
|
|
122
|
+
return [];
|
|
123
|
+
}
|
|
124
|
+
const part = {
|
|
125
|
+
text: block.text,
|
|
126
|
+
thought: true,
|
|
127
|
+
};
|
|
128
|
+
// Add thought signature if present
|
|
129
|
+
if (block.signature) {
|
|
130
|
+
part.thoughtSignature = block.signature;
|
|
131
|
+
}
|
|
132
|
+
return [part];
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* Formats a document block to Gemini Parts.
|
|
136
|
+
*
|
|
137
|
+
* @param block - Document block to format
|
|
138
|
+
* @returns Array of Gemini Parts
|
|
139
|
+
*
|
|
140
|
+
* @internal
|
|
141
|
+
*/
|
|
142
|
+
function formatDocumentBlock(block) {
|
|
143
|
+
const mimeType = getMimeType(block.format) ?? `application/${block.format}`;
|
|
144
|
+
switch (block.source.type) {
|
|
145
|
+
case 'documentSourceBytes':
|
|
146
|
+
return [{ inlineData: { data: encodeBase64(block.source.bytes), mimeType } }];
|
|
147
|
+
case 'documentSourceText':
|
|
148
|
+
// Convert text to bytes - Gemini API doesn't accept text directly
|
|
149
|
+
return [{ inlineData: { data: encodeBase64(new TextEncoder().encode(block.source.text)), mimeType } }];
|
|
150
|
+
case 'documentSourceContentBlock':
|
|
151
|
+
return block.source.content.map((contentBlock) => ({ text: contentBlock.text }));
|
|
152
|
+
case 'documentSourceS3Location':
|
|
153
|
+
logger.warn('source_type=<documentSourceS3Location> | s3 sources not supported by gemini, skipping');
|
|
154
|
+
return [];
|
|
155
|
+
default:
|
|
156
|
+
return [];
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* Formats a video block to Gemini Parts.
|
|
161
|
+
*
|
|
162
|
+
* @param block - Video block to format
|
|
163
|
+
* @returns Array of Gemini Parts
|
|
164
|
+
*
|
|
165
|
+
* @internal
|
|
166
|
+
*/
|
|
167
|
+
function formatVideoBlock(block) {
|
|
168
|
+
const mimeType = getMimeType(block.format) ?? `video/${block.format}`;
|
|
169
|
+
switch (block.source.type) {
|
|
170
|
+
case 'videoSourceBytes':
|
|
171
|
+
return [{ inlineData: { data: encodeBase64(block.source.bytes), mimeType } }];
|
|
172
|
+
case 'videoSourceS3Location':
|
|
173
|
+
logger.warn('source_type=<videoSourceS3Location> | s3 sources not supported by gemini, skipping');
|
|
174
|
+
return [];
|
|
175
|
+
default:
|
|
176
|
+
return [];
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
/**
|
|
180
|
+
* Formats a tool use block to a Gemini Part.
|
|
181
|
+
*
|
|
182
|
+
* @param block - Tool use block to format
|
|
183
|
+
* @returns Array of Gemini Parts with functionCall
|
|
184
|
+
*
|
|
185
|
+
* @internal
|
|
186
|
+
*/
|
|
187
|
+
function formatToolUseBlock(block) {
|
|
188
|
+
return [
|
|
189
|
+
{
|
|
190
|
+
functionCall: {
|
|
191
|
+
id: block.toolUseId,
|
|
192
|
+
name: block.name,
|
|
193
|
+
args: block.input,
|
|
194
|
+
},
|
|
195
|
+
...(block.reasoningSignature && { thoughtSignature: block.reasoningSignature }),
|
|
196
|
+
},
|
|
197
|
+
];
|
|
198
|
+
}
|
|
199
|
+
/**
|
|
200
|
+
* Formats a tool result block to a Gemini Part.
|
|
201
|
+
*
|
|
202
|
+
* @param block - Tool result block to format
|
|
203
|
+
* @param toolUseIdToName - Mapping from tool use IDs to tool names
|
|
204
|
+
* @returns Array of Gemini Parts with functionResponse
|
|
205
|
+
*
|
|
206
|
+
* @internal
|
|
207
|
+
*/
|
|
208
|
+
function formatToolResultBlock(block, toolUseIdToName) {
|
|
209
|
+
const functionResponse = new FunctionResponse();
|
|
210
|
+
functionResponse.id = block.toolUseId;
|
|
211
|
+
functionResponse.name = toolUseIdToName.get(block.toolUseId) ?? block.toolUseId;
|
|
212
|
+
functionResponse.response = {
|
|
213
|
+
output: block.content.map((c) => {
|
|
214
|
+
switch (c.type) {
|
|
215
|
+
case 'textBlock':
|
|
216
|
+
return { text: c.text };
|
|
217
|
+
case 'jsonBlock':
|
|
218
|
+
return { json: c.json };
|
|
219
|
+
}
|
|
220
|
+
}),
|
|
221
|
+
};
|
|
222
|
+
return [{ functionResponse }];
|
|
223
|
+
}
|
|
46
224
|
// =============================================================================
|
|
47
225
|
// Gemini → Strands
|
|
48
226
|
// =============================================================================
|
|
@@ -84,31 +262,98 @@ export function mapChunkToEvents(chunk, streamState) {
|
|
|
84
262
|
const content = candidate.content;
|
|
85
263
|
if (content && content.parts) {
|
|
86
264
|
for (const part of content.parts) {
|
|
87
|
-
// Handle
|
|
88
|
-
if (
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
events.push({ type: '
|
|
265
|
+
// Handle function call parts
|
|
266
|
+
if (part.functionCall) {
|
|
267
|
+
// Close any open text/reasoning blocks before tool use
|
|
268
|
+
if (streamState.textContentBlockStarted) {
|
|
269
|
+
events.push({ type: 'modelContentBlockStopEvent' });
|
|
270
|
+
streamState.textContentBlockStarted = false;
|
|
92
271
|
}
|
|
272
|
+
if (streamState.reasoningContentBlockStarted) {
|
|
273
|
+
events.push({ type: 'modelContentBlockStopEvent' });
|
|
274
|
+
streamState.reasoningContentBlockStarted = false;
|
|
275
|
+
}
|
|
276
|
+
const toolUseId = part.functionCall.id || `tooluse_${globalThis.crypto.randomUUID()}`;
|
|
277
|
+
events.push({
|
|
278
|
+
type: 'modelContentBlockStartEvent',
|
|
279
|
+
start: {
|
|
280
|
+
type: 'toolUseStart',
|
|
281
|
+
name: part.functionCall.name,
|
|
282
|
+
toolUseId,
|
|
283
|
+
...(part.thoughtSignature && { reasoningSignature: part.thoughtSignature }),
|
|
284
|
+
},
|
|
285
|
+
});
|
|
93
286
|
events.push({
|
|
94
287
|
type: 'modelContentBlockDeltaEvent',
|
|
95
288
|
delta: {
|
|
96
|
-
type: '
|
|
97
|
-
|
|
289
|
+
type: 'toolUseInputDelta',
|
|
290
|
+
input: JSON.stringify(part.functionCall.args ?? {}),
|
|
98
291
|
},
|
|
99
292
|
});
|
|
293
|
+
events.push({ type: 'modelContentBlockStopEvent' });
|
|
294
|
+
streamState.hasToolCalls = true;
|
|
295
|
+
continue;
|
|
296
|
+
}
|
|
297
|
+
// Handle text and reasoning parts
|
|
298
|
+
if ('text' in part && part.text) {
|
|
299
|
+
const isThought = 'thought' in part && part.thought === true;
|
|
300
|
+
if (isThought) {
|
|
301
|
+
// Handle reasoning content
|
|
302
|
+
// Close text block if transitioning from text to reasoning
|
|
303
|
+
if (streamState.textContentBlockStarted) {
|
|
304
|
+
events.push({ type: 'modelContentBlockStopEvent' });
|
|
305
|
+
streamState.textContentBlockStarted = false;
|
|
306
|
+
}
|
|
307
|
+
if (!streamState.reasoningContentBlockStarted) {
|
|
308
|
+
streamState.reasoningContentBlockStarted = true;
|
|
309
|
+
events.push({ type: 'modelContentBlockStartEvent' });
|
|
310
|
+
}
|
|
311
|
+
// Extract signature if present
|
|
312
|
+
const signature = part.thoughtSignature;
|
|
313
|
+
events.push({
|
|
314
|
+
type: 'modelContentBlockDeltaEvent',
|
|
315
|
+
delta: {
|
|
316
|
+
type: 'reasoningContentDelta',
|
|
317
|
+
text: part.text,
|
|
318
|
+
...(signature !== undefined && { signature }),
|
|
319
|
+
},
|
|
320
|
+
});
|
|
321
|
+
}
|
|
322
|
+
else {
|
|
323
|
+
// Handle regular text content
|
|
324
|
+
// Close reasoning block if transitioning from reasoning to text
|
|
325
|
+
if (streamState.reasoningContentBlockStarted) {
|
|
326
|
+
events.push({ type: 'modelContentBlockStopEvent' });
|
|
327
|
+
streamState.reasoningContentBlockStarted = false;
|
|
328
|
+
}
|
|
329
|
+
if (!streamState.textContentBlockStarted) {
|
|
330
|
+
streamState.textContentBlockStarted = true;
|
|
331
|
+
events.push({ type: 'modelContentBlockStartEvent' });
|
|
332
|
+
}
|
|
333
|
+
events.push({
|
|
334
|
+
type: 'modelContentBlockDeltaEvent',
|
|
335
|
+
delta: {
|
|
336
|
+
type: 'textDelta',
|
|
337
|
+
text: part.text,
|
|
338
|
+
},
|
|
339
|
+
});
|
|
340
|
+
}
|
|
100
341
|
}
|
|
101
342
|
}
|
|
102
343
|
}
|
|
103
344
|
// Handle finish reason
|
|
104
345
|
const finishReason = candidate.finishReason;
|
|
105
346
|
if (finishReason && finishReason !== GeminiFinishReason.FINISH_REASON_UNSPECIFIED) {
|
|
106
|
-
// Close
|
|
347
|
+
// Close any open content blocks
|
|
107
348
|
if (streamState.textContentBlockStarted) {
|
|
108
349
|
events.push({ type: 'modelContentBlockStopEvent' });
|
|
109
350
|
streamState.textContentBlockStarted = false;
|
|
110
351
|
}
|
|
111
|
-
|
|
352
|
+
if (streamState.reasoningContentBlockStarted) {
|
|
353
|
+
events.push({ type: 'modelContentBlockStopEvent' });
|
|
354
|
+
streamState.reasoningContentBlockStarted = false;
|
|
355
|
+
}
|
|
356
|
+
const stopReason = streamState.hasToolCalls ? 'toolUse' : FINISH_REASON_MAP[finishReason] || 'endTurn';
|
|
112
357
|
events.push({
|
|
113
358
|
type: 'modelMessageStopEvent',
|
|
114
359
|
stopReason,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapters.js","sourceRoot":"","sources":["../../../../src/models/gemini/adapters.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAIL,YAAY,IAAI,kBAAkB,GACnC,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"adapters.js","sourceRoot":"","sources":["../../../../src/models/gemini/adapters.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../src/models/gemini/model.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../src/models/gemini/model.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAqB,MAAM,YAAY,CAAA;AAC1F,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,CAAA;AASrD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,WAAY,SAAQ,KAAK,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,OAAO,CAAa;IAE5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;gBACS,OAAO,CAAC,EAAE,kBAAkB;IAwBxC;;;;;;;;;;;;;OAaG;IACH,YAAY,CAAC,WAAW,EAAE,iBAAiB,GAAG,IAAI;IAIlD;;;;;;;;;;OAUG;IACH,SAAS,IAAI,iBAAiB;IAI9B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACI,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC,gBAAgB,CAAC;IA8C5F;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAI5B;;OAEG;IACH,OAAO,CAAC,cAAc;CAwEvB"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @see https://ai.google.dev/docs
|
|
8
8
|
*/
|
|
9
|
-
import { GoogleGenAI } from '@google/genai';
|
|
9
|
+
import { GoogleGenAI, FunctionCallingConfigMode, } from '@google/genai';
|
|
10
10
|
import { Model } from '../model.js';
|
|
11
11
|
import { ContextWindowOverflowError } from '../../errors.js';
|
|
12
12
|
import { classifyGeminiError } from './errors.js';
|
|
@@ -157,6 +157,8 @@ export class GeminiModel extends Model {
|
|
|
157
157
|
const streamState = {
|
|
158
158
|
messageStarted: false,
|
|
159
159
|
textContentBlockStarted: false,
|
|
160
|
+
reasoningContentBlockStarted: false,
|
|
161
|
+
hasToolCalls: false,
|
|
160
162
|
inputTokens: 0,
|
|
161
163
|
outputTokens: 0,
|
|
162
164
|
};
|
|
@@ -216,6 +218,41 @@ export class GeminiModel extends Model {
|
|
|
216
218
|
}
|
|
217
219
|
}
|
|
218
220
|
}
|
|
221
|
+
// Add tool specifications
|
|
222
|
+
if (options?.toolSpecs && options.toolSpecs.length > 0) {
|
|
223
|
+
config.tools = [
|
|
224
|
+
{
|
|
225
|
+
functionDeclarations: options.toolSpecs.map((spec) => ({
|
|
226
|
+
name: spec.name,
|
|
227
|
+
description: spec.description,
|
|
228
|
+
parametersJsonSchema: spec.inputSchema,
|
|
229
|
+
})),
|
|
230
|
+
},
|
|
231
|
+
];
|
|
232
|
+
if (options.toolChoice) {
|
|
233
|
+
if ('auto' in options.toolChoice) {
|
|
234
|
+
config.toolConfig = { functionCallingConfig: { mode: FunctionCallingConfigMode.AUTO } };
|
|
235
|
+
}
|
|
236
|
+
else if ('any' in options.toolChoice) {
|
|
237
|
+
config.toolConfig = { functionCallingConfig: { mode: FunctionCallingConfigMode.ANY } };
|
|
238
|
+
}
|
|
239
|
+
else if ('tool' in options.toolChoice) {
|
|
240
|
+
config.toolConfig = {
|
|
241
|
+
functionCallingConfig: {
|
|
242
|
+
mode: FunctionCallingConfigMode.ANY,
|
|
243
|
+
allowedFunctionNames: [options.toolChoice.tool.name],
|
|
244
|
+
},
|
|
245
|
+
};
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
// Append built-in tools (e.g., GoogleSearch, CodeExecution)
|
|
250
|
+
if (this._config.geminiTools && this._config.geminiTools.length > 0) {
|
|
251
|
+
if (!config.tools) {
|
|
252
|
+
config.tools = [];
|
|
253
|
+
}
|
|
254
|
+
config.tools.push(...this._config.geminiTools);
|
|
255
|
+
}
|
|
219
256
|
// Spread params object for forward compatibility
|
|
220
257
|
if (this._config.params) {
|
|
221
258
|
Object.assign(config, this._config.params);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/models/gemini/model.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/models/gemini/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Type definitions for the Gemini model provider.
|
|
3
3
|
*/
|
|
4
|
-
import type { GoogleGenAI, GoogleGenAIOptions } from '@google/genai';
|
|
4
|
+
import type { GoogleGenAI, GoogleGenAIOptions, Tool } from '@google/genai';
|
|
5
5
|
import type { BaseModelConfig } from '../model.js';
|
|
6
6
|
/**
|
|
7
7
|
* Configuration interface for Gemini model provider.
|
|
@@ -30,6 +30,13 @@ export interface GeminiModelConfig extends BaseModelConfig {
|
|
|
30
30
|
* @see https://ai.google.dev/api/generate-content#generationconfig
|
|
31
31
|
*/
|
|
32
32
|
params?: Record<string, unknown>;
|
|
33
|
+
/**
|
|
34
|
+
* Gemini-specific built-in tools (e.g., GoogleSearch, CodeExecution, UrlContext).
|
|
35
|
+
* These are appended as separate Tool objects alongside any functionDeclarations.
|
|
36
|
+
*
|
|
37
|
+
* @see https://ai.google.dev/gemini-api/docs/function-calling
|
|
38
|
+
*/
|
|
39
|
+
geminiTools?: Tool[];
|
|
33
40
|
}
|
|
34
41
|
/**
|
|
35
42
|
* Options interface for creating a GeminiModel instance.
|
|
@@ -56,6 +63,8 @@ export interface GeminiModelOptions extends GeminiModelConfig {
|
|
|
56
63
|
export interface GeminiStreamState {
|
|
57
64
|
messageStarted: boolean;
|
|
58
65
|
textContentBlockStarted: boolean;
|
|
66
|
+
reasoningContentBlockStarted: boolean;
|
|
67
|
+
hasToolCalls: boolean;
|
|
59
68
|
inputTokens: number;
|
|
60
69
|
outputTokens: number;
|
|
61
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/models/gemini/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/models/gemini/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAEhC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,IAAI,EAAE,CAAA;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAA;IAEpB;;;OAGG;IACH,YAAY,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;CAClD;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,OAAO,CAAA;IACvB,uBAAuB,EAAE,OAAO,CAAA;IAChC,4BAA4B,EAAE,OAAO,CAAA;IACrC,YAAY,EAAE,OAAO,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;CACrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/models/model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,OAAO,EAGP,KAAK,UAAU,EACf,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAML,kBAAkB,EAClB,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAA;AAGvB;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAA;IAE3B;;OAEG;IACH,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAA;IAEhB;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;OAEG;IACH,QAAQ,CAAC,EAAE,kBAAkB,CAAA;CAC9B;AAED;;;;;;;;GAQG;AACH,8BAAsB,KAAK,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IACrE;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI;IAE3C;;;;OAIG;IACH,QAAQ,CAAC,SAAS,IAAI,CAAC;IAEvB;;;;;;;OAOG;IACH,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC,gBAAgB,CAAC;IAE9F;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAmB/B;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACI,gBAAgB,CACrB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,CAAC,EAAE,aAAa,GACtB,cAAc,CAAC,gBAAgB,GAAG,YAAY,EAAE,sBAAsB,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/models/model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,OAAO,EAGP,KAAK,UAAU,EACf,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAML,kBAAkB,EAClB,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAA;AAGvB;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAA;IAE3B;;OAEG;IACH,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAA;IAEhB;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;OAEG;IACH,QAAQ,CAAC,EAAE,kBAAkB,CAAA;CAC9B;AAED;;;;;;;;GAQG;AACH,8BAAsB,KAAK,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IACrE;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI;IAE3C;;;;OAIG;IACH,QAAQ,CAAC,SAAS,IAAI,CAAC;IAEvB;;;;;;;OAOG;IACH,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC,gBAAgB,CAAC;IAE9F;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAmB/B;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACI,gBAAgB,CACrB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,CAAC,EAAE,aAAa,GACtB,cAAc,CAAC,gBAAgB,GAAG,YAAY,EAAE,sBAAsB,EAAE,SAAS,CAAC;CAuJtF"}
|
package/dist/src/models/model.js
CHANGED
|
@@ -71,6 +71,7 @@ export class Model {
|
|
|
71
71
|
let accumulatedToolInput = '';
|
|
72
72
|
let toolName = '';
|
|
73
73
|
let toolUseId = '';
|
|
74
|
+
let toolReasoningSignature = '';
|
|
74
75
|
let accumulatedReasoning = {};
|
|
75
76
|
let errorToThrow = undefined;
|
|
76
77
|
let stoppedMessage = null;
|
|
@@ -89,6 +90,7 @@ export class Model {
|
|
|
89
90
|
if (event.start?.type === 'toolUseStart') {
|
|
90
91
|
toolName = event.start.name;
|
|
91
92
|
toolUseId = event.start.toolUseId;
|
|
93
|
+
toolReasoningSignature = event.start.reasoningSignature ?? '';
|
|
92
94
|
}
|
|
93
95
|
accumulatedToolInput = '';
|
|
94
96
|
accumulatedText = '';
|
|
@@ -121,9 +123,11 @@ export class Model {
|
|
|
121
123
|
name: toolName,
|
|
122
124
|
toolUseId: toolUseId,
|
|
123
125
|
input: accumulatedToolInput ? JSON.parse(accumulatedToolInput) : {},
|
|
126
|
+
...(toolReasoningSignature && { reasoningSignature: toolReasoningSignature }),
|
|
124
127
|
});
|
|
125
128
|
toolUseId = ''; // Reset
|
|
126
129
|
toolName = '';
|
|
130
|
+
toolReasoningSignature = '';
|
|
127
131
|
}
|
|
128
132
|
else if (Object.keys(accumulatedReasoning).length > 0) {
|
|
129
133
|
block = new ReasoningBlock({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/models/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EACP,cAAc,EAId,SAAS,EACT,YAAY,GACb,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,0BAA0B,EAC1B,sBAAsB,EACtB,qBAAqB,EACrB,kBAAkB,GAEnB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAgFzE;;;;;;;;GAQG;AACH,MAAM,OAAgB,KAAK;IA0BzB;;;;;OAKG;IACK,uBAAuB,CAAC,UAA4B;QAC1D,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;YACxB,KAAK,wBAAwB;gBAC3B,OAAO,IAAI,sBAAsB,CAAC,UAAU,CAAC,CAAA;YAC/C,KAAK,6BAA6B;gBAChC,OAAO,IAAI,2BAA2B,CAAC,UAAU,CAAC,CAAA;YACpD,KAAK,6BAA6B;gBAChC,OAAO,IAAI,2BAA2B,CAAC,UAAU,CAAC,CAAA;YACpD,KAAK,4BAA4B;gBAC/B,OAAO,IAAI,0BAA0B,CAAC,UAAU,CAAC,CAAA;YACnD,KAAK,uBAAuB;gBAC1B,OAAO,IAAI,qBAAqB,CAAC,UAAU,CAAC,CAAA;YAC9C,KAAK,oBAAoB;gBACvB,OAAO,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAA;YAC3C;gBACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,KAAK,CAAC,CAAC,gBAAgB,CACrB,QAAmB,EACnB,OAAuB;QAEvB,IAAI,CAAC;YACH,8BAA8B;YAC9B,IAAI,WAAW,GAAgB,IAAI,CAAA;YACnC,MAAM,aAAa,GAAmB,EAAE,CAAA;YACxC,IAAI,eAAe,GAAG,EAAE,CAAA;YACxB,IAAI,oBAAoB,GAAG,EAAE,CAAA;YAC7B,IAAI,QAAQ,GAAG,EAAE,CAAA;YACjB,IAAI,SAAS,GAAG,EAAE,CAAA;YAClB,IAAI,oBAAoB,GAIpB,EAAE,CAAA;YACN,IAAI,YAAY,GAAsB,SAAS,CAAA;YAC/C,IAAI,cAAc,GAAmB,IAAI,CAAA;YACzC,IAAI,eAAe,GAAsB,IAAI,CAAA;YAC7C,IAAI,QAAQ,GAAmC,SAAS,CAAA;YAExD,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;gBAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAA;gBACtD,MAAM,KAAK,CAAA,CAAC,2BAA2B;gBAEvC,wCAAwC;gBACxC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;oBACnB,KAAK,wBAAwB;wBAC3B,WAAW,GAAG,KAAK,CAAC,IAAI,CAAA;wBACxB,aAAa,CAAC,MAAM,GAAG,CAAC,CAAA,CAAC,QAAQ;wBACjC,MAAK;oBAEP,KAAK,6BAA6B;wBAChC,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,KAAK,cAAc,EAAE,CAAC;4BACzC,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAA;4BAC3B,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/models/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/models/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,MAAM,EAAE,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACxE,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAG/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/models/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,MAAM,EAAE,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACxE,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAG/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAkD9D;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IAExB;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAA;IAE9B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf;;;OAGG;IACH,YAAY,CAAC,EAAE,aAAa,CAAA;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBAAa,WAAY,SAAQ,KAAK,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,OAAO,CAAQ;IAEvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuCG;gBACS,OAAO,CAAC,EAAE,kBAAkB;IA+BxC;;;;;;;;;;;;;;OAcG;IACH,YAAY,CAAC,WAAW,EAAE,iBAAiB,GAAG,IAAI;IAIlD;;;;;;;;;;OAUG;IACH,SAAS,IAAI,iBAAiB;IAI9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;IACI,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC,gBAAgB,CAAC;IA6F5F;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAwHtB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAwOvB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,aAAa;IAIrB;;;;;;;OAOG;IACH,OAAO,CAAC,0BAA0B;CAwInC"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
import OpenAI, {} from 'openai';
|
|
10
10
|
import { Model } from '../models/model.js';
|
|
11
11
|
import { encodeBase64, getMimeType } from '../types/media.js';
|
|
12
|
-
import { ContextWindowOverflowError } from '../errors.js';
|
|
12
|
+
import { ContextWindowOverflowError, ModelThrottledError } from '../errors.js';
|
|
13
13
|
import { logger } from '../logging/logger.js';
|
|
14
14
|
const DEFAULT_OPENAI_MODEL_ID = 'gpt-4o';
|
|
15
15
|
/**
|
|
@@ -24,6 +24,13 @@ const OPENAI_CONTEXT_WINDOW_OVERFLOW_PATTERNS = [
|
|
|
24
24
|
'too many tokens',
|
|
25
25
|
'context length',
|
|
26
26
|
];
|
|
27
|
+
/**
|
|
28
|
+
* Error patterns and status codes that indicate rate limiting.
|
|
29
|
+
* Used to detect when the API is throttling requests.
|
|
30
|
+
*
|
|
31
|
+
* @see https://platform.openai.com/docs/guides/error-codes
|
|
32
|
+
*/
|
|
33
|
+
const OPENAI_RATE_LIMIT_PATTERNS = ['rate_limit_exceeded', 'rate limit', 'too many requests'];
|
|
27
34
|
/**
|
|
28
35
|
* OpenAI model provider implementation.
|
|
29
36
|
*
|
|
@@ -243,6 +250,16 @@ export class OpenAIModel extends Model {
|
|
|
243
250
|
}
|
|
244
251
|
catch (error) {
|
|
245
252
|
const err = error;
|
|
253
|
+
// Check for rate limit errors - OpenAI SDK throws errors with status 429
|
|
254
|
+
// or code 'rate_limit_exceeded' for all rate limiting scenarios (TPM, RPM, etc.)
|
|
255
|
+
// This matches Python SDK behavior: `except openai.RateLimitError as e`
|
|
256
|
+
if (err.status === 429 ||
|
|
257
|
+
err.code === 'rate_limit_exceeded' ||
|
|
258
|
+
OPENAI_RATE_LIMIT_PATTERNS.some((pattern) => err.message?.toLowerCase().includes(pattern))) {
|
|
259
|
+
const message = err.message ?? 'Request was throttled by the model provider';
|
|
260
|
+
logger.debug(`throttled | error_message=<${message}>`);
|
|
261
|
+
throw new ModelThrottledError(message, { cause: err });
|
|
262
|
+
}
|
|
246
263
|
// Check for context window overflow using simple pattern matching
|
|
247
264
|
if (OPENAI_CONTEXT_WINDOW_OVERFLOW_PATTERNS.some((pattern) => err.message?.toLowerCase().includes(pattern))) {
|
|
248
265
|
throw new ContextWindowOverflowError(err.message);
|
|
@@ -406,7 +423,7 @@ export class OpenAIModel extends Model {
|
|
|
406
423
|
break;
|
|
407
424
|
}
|
|
408
425
|
case 'imageSourceBytes': {
|
|
409
|
-
const base64 = encodeBase64(
|
|
426
|
+
const base64 = encodeBase64(imageBlock.source.bytes);
|
|
410
427
|
const mimeType = getMimeType(imageBlock.format) || `image/${imageBlock.format}`;
|
|
411
428
|
contentParts.push({
|
|
412
429
|
type: 'image_url',
|
|
@@ -428,7 +445,7 @@ export class OpenAIModel extends Model {
|
|
|
428
445
|
switch (docBlock.source.type) {
|
|
429
446
|
case 'documentSourceBytes': {
|
|
430
447
|
const mimeType = getMimeType(docBlock.format) || `application/${docBlock.format}`;
|
|
431
|
-
const base64 = encodeBase64(
|
|
448
|
+
const base64 = encodeBase64(docBlock.source.bytes);
|
|
432
449
|
const file = {
|
|
433
450
|
type: 'file',
|
|
434
451
|
file: {
|