@openai/agents-openai 0.5.4 → 0.7.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/index.d.ts +2 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -1
- package/dist/index.mjs.map +1 -1
- package/dist/metadata.js +3 -3
- package/dist/metadata.mjs +3 -3
- package/dist/openaiChatCompletionsConverter.d.ts +1 -0
- package/dist/openaiChatCompletionsConverter.js +122 -16
- package/dist/openaiChatCompletionsConverter.js.map +1 -1
- package/dist/openaiChatCompletionsConverter.mjs +121 -16
- package/dist/openaiChatCompletionsConverter.mjs.map +1 -1
- package/dist/openaiChatCompletionsModel.d.ts +2 -1
- package/dist/openaiChatCompletionsModel.js +20 -3
- package/dist/openaiChatCompletionsModel.js.map +1 -1
- package/dist/openaiChatCompletionsModel.mjs +22 -5
- package/dist/openaiChatCompletionsModel.mjs.map +1 -1
- package/dist/openaiResponsesModel.d.ts +19 -5
- package/dist/openaiResponsesModel.js +724 -74
- package/dist/openaiResponsesModel.js.map +1 -1
- package/dist/openaiResponsesModel.mjs +726 -76
- package/dist/openaiResponsesModel.mjs.map +1 -1
- package/dist/retryAdvice.d.ts +2 -0
- package/dist/retryAdvice.js +98 -0
- package/dist/retryAdvice.js.map +1 -0
- package/dist/retryAdvice.mjs +95 -0
- package/dist/retryAdvice.mjs.map +1 -0
- package/dist/tools.d.ts +22 -1
- package/dist/tools.js +38 -0
- package/dist/tools.js.map +1 -1
- package/dist/tools.mjs +37 -0
- package/dist/tools.mjs.map +1 -1
- package/dist/types/providerData.d.ts +4 -0
- package/dist/utils/providerData.d.ts +26 -2
- package/dist/utils/providerData.js +60 -8
- package/dist/utils/providerData.js.map +1 -1
- package/dist/utils/providerData.mjs +57 -8
- package/dist/utils/providerData.mjs.map +1 -1
- package/package.json +3 -3
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { UserError, } from '@openai/agents-core';
|
|
2
|
+
import { getProviderDataWithoutReservedKeys } from "./utils/providerData.mjs";
|
|
3
|
+
const CHAT_COMPLETIONS_FUNCTION_NAME_PATTERN = /^[a-zA-Z0-9_-]+$/;
|
|
2
4
|
export function convertToolChoice(toolChoice) {
|
|
3
5
|
if (toolChoice == undefined || toolChoice == null)
|
|
4
6
|
return undefined;
|
|
@@ -13,6 +15,30 @@ export function convertToolChoice(toolChoice) {
|
|
|
13
15
|
function: { name: toolChoice },
|
|
14
16
|
};
|
|
15
17
|
}
|
|
18
|
+
export function getCompatibleToolChoice(toolChoice, tools) {
|
|
19
|
+
const converted = convertToolChoice(toolChoice);
|
|
20
|
+
if (converted == undefined || converted === 'auto' || converted === 'none') {
|
|
21
|
+
return converted;
|
|
22
|
+
}
|
|
23
|
+
if (converted === 'required') {
|
|
24
|
+
if (tools.length === 0) {
|
|
25
|
+
throw new UserError('modelSettings.toolChoice="required" requires at least one available tool in Chat Completions mode.');
|
|
26
|
+
}
|
|
27
|
+
return converted;
|
|
28
|
+
}
|
|
29
|
+
if (typeof converted !== 'object' || !('function' in converted)) {
|
|
30
|
+
return converted;
|
|
31
|
+
}
|
|
32
|
+
const availableToolNames = new Set(tools
|
|
33
|
+
.map((tool) => tool.type === 'function' && 'function' in tool
|
|
34
|
+
? tool.function.name
|
|
35
|
+
: undefined)
|
|
36
|
+
.filter((name) => typeof name === 'string'));
|
|
37
|
+
if (!availableToolNames.has(converted.function.name)) {
|
|
38
|
+
throw new UserError(`modelSettings.toolChoice="${converted.function.name}" does not match any available tool or handoff in Chat Completions mode.`);
|
|
39
|
+
}
|
|
40
|
+
return converted;
|
|
41
|
+
}
|
|
16
42
|
export function extractAllAssistantContent(content) {
|
|
17
43
|
if (typeof content === 'string') {
|
|
18
44
|
return content;
|
|
@@ -23,14 +49,17 @@ export function extractAllAssistantContent(content) {
|
|
|
23
49
|
out.push({
|
|
24
50
|
type: 'text',
|
|
25
51
|
text: c.text,
|
|
26
|
-
...c.providerData,
|
|
52
|
+
...getProviderDataWithoutReservedKeys(c.providerData, ['type', 'text']),
|
|
27
53
|
});
|
|
28
54
|
}
|
|
29
55
|
else if (c.type === 'refusal') {
|
|
30
56
|
out.push({
|
|
31
57
|
type: 'refusal',
|
|
32
58
|
refusal: c.refusal,
|
|
33
|
-
...c.providerData,
|
|
59
|
+
...getProviderDataWithoutReservedKeys(c.providerData, [
|
|
60
|
+
'type',
|
|
61
|
+
'refusal',
|
|
62
|
+
]),
|
|
34
63
|
});
|
|
35
64
|
}
|
|
36
65
|
else if (c.type === 'audio' || c.type === 'image') {
|
|
@@ -51,7 +80,11 @@ export function extractAllUserContent(content) {
|
|
|
51
80
|
const out = [];
|
|
52
81
|
for (const c of content) {
|
|
53
82
|
if (c.type === 'input_text') {
|
|
54
|
-
out.push({
|
|
83
|
+
out.push({
|
|
84
|
+
type: 'text',
|
|
85
|
+
text: c.text,
|
|
86
|
+
...getProviderDataWithoutReservedKeys(c.providerData, ['type', 'text']),
|
|
87
|
+
});
|
|
55
88
|
}
|
|
56
89
|
else if (c.type === 'input_image') {
|
|
57
90
|
// The Chat Completions API only accepts image URLs. If we see a file reference we reject it
|
|
@@ -64,12 +97,16 @@ export function extractAllUserContent(content) {
|
|
|
64
97
|
if (!imageSource) {
|
|
65
98
|
throw new Error(`Only image URLs are supported for input_image: ${JSON.stringify(c)}`);
|
|
66
99
|
}
|
|
67
|
-
const
|
|
100
|
+
const rest = getProviderDataWithoutReservedKeys(c.providerData, [
|
|
101
|
+
'type',
|
|
102
|
+
'image_url',
|
|
103
|
+
]);
|
|
104
|
+
const imageUrl = getProviderDataWithoutReservedKeys(c.providerData?.image_url, ['url']);
|
|
68
105
|
out.push({
|
|
69
106
|
type: 'image_url',
|
|
70
107
|
image_url: {
|
|
71
108
|
url: imageSource,
|
|
72
|
-
...
|
|
109
|
+
...imageUrl,
|
|
73
110
|
},
|
|
74
111
|
...rest,
|
|
75
112
|
});
|
|
@@ -100,7 +137,11 @@ export function extractAllUserContent(content) {
|
|
|
100
137
|
else if (c.providerData?.filename) {
|
|
101
138
|
file.filename = c.providerData.filename;
|
|
102
139
|
}
|
|
103
|
-
const
|
|
140
|
+
const rest = getProviderDataWithoutReservedKeys(c.providerData, [
|
|
141
|
+
'type',
|
|
142
|
+
'file',
|
|
143
|
+
'filename',
|
|
144
|
+
]);
|
|
104
145
|
out.push({
|
|
105
146
|
type: 'file',
|
|
106
147
|
file,
|
|
@@ -108,12 +149,29 @@ export function extractAllUserContent(content) {
|
|
|
108
149
|
});
|
|
109
150
|
}
|
|
110
151
|
else if (c.type === 'audio') {
|
|
111
|
-
|
|
152
|
+
if (typeof c.audio !== 'string') {
|
|
153
|
+
throw new UserError(`Chat Completions only supports inline audio data for input_audio: ${JSON.stringify(c)}`);
|
|
154
|
+
}
|
|
155
|
+
const inputAudioFormat = c.format === 'wav' || c.format === 'mp3'
|
|
156
|
+
? c.format
|
|
157
|
+
: c.providerData?.input_audio?.format === 'wav' ||
|
|
158
|
+
c.providerData?.input_audio?.format === 'mp3'
|
|
159
|
+
? c.providerData.input_audio.format
|
|
160
|
+
: undefined;
|
|
161
|
+
if (!inputAudioFormat) {
|
|
162
|
+
throw new UserError(`Chat Completions input_audio requires format "wav" or "mp3": ${JSON.stringify(c)}`);
|
|
163
|
+
}
|
|
164
|
+
const rest = getProviderDataWithoutReservedKeys(c.providerData, [
|
|
165
|
+
'type',
|
|
166
|
+
'input_audio',
|
|
167
|
+
]);
|
|
168
|
+
const inputAudio = getProviderDataWithoutReservedKeys(c.providerData?.input_audio, ['data', 'format']);
|
|
112
169
|
out.push({
|
|
113
170
|
type: 'input_audio',
|
|
114
171
|
input_audio: {
|
|
115
172
|
data: c.audio,
|
|
116
|
-
|
|
173
|
+
format: inputAudioFormat,
|
|
174
|
+
...inputAudio,
|
|
117
175
|
},
|
|
118
176
|
...rest,
|
|
119
177
|
});
|
|
@@ -168,7 +226,12 @@ export function itemsToMessages(items) {
|
|
|
168
226
|
const assistant = {
|
|
169
227
|
role: 'assistant',
|
|
170
228
|
content: extractAllAssistantContent(content),
|
|
171
|
-
...providerData,
|
|
229
|
+
...getProviderDataWithoutReservedKeys(providerData, [
|
|
230
|
+
'role',
|
|
231
|
+
'content',
|
|
232
|
+
'tool_calls',
|
|
233
|
+
'audio',
|
|
234
|
+
]),
|
|
172
235
|
};
|
|
173
236
|
if (Array.isArray(content)) {
|
|
174
237
|
const audio = content.find((c) => c.type === 'audio');
|
|
@@ -185,14 +248,20 @@ export function itemsToMessages(items) {
|
|
|
185
248
|
result.push({
|
|
186
249
|
role,
|
|
187
250
|
content: extractAllUserContent(content),
|
|
188
|
-
...providerData,
|
|
251
|
+
...getProviderDataWithoutReservedKeys(providerData, [
|
|
252
|
+
'role',
|
|
253
|
+
'content',
|
|
254
|
+
]),
|
|
189
255
|
});
|
|
190
256
|
}
|
|
191
257
|
else if (role === 'system') {
|
|
192
258
|
result.push({
|
|
193
259
|
role: 'system',
|
|
194
260
|
content: content,
|
|
195
|
-
...providerData,
|
|
261
|
+
...getProviderDataWithoutReservedKeys(providerData, [
|
|
262
|
+
'role',
|
|
263
|
+
'content',
|
|
264
|
+
]),
|
|
196
265
|
});
|
|
197
266
|
}
|
|
198
267
|
}
|
|
@@ -218,11 +287,21 @@ export function itemsToMessages(items) {
|
|
|
218
287
|
arguments: JSON.stringify({
|
|
219
288
|
queries: fileSearch.providerData?.queries ?? [],
|
|
220
289
|
status: fileSearch.status,
|
|
221
|
-
...argumentData,
|
|
290
|
+
...getProviderDataWithoutReservedKeys(argumentData, [
|
|
291
|
+
'queries',
|
|
292
|
+
'status',
|
|
293
|
+
]),
|
|
222
294
|
}),
|
|
223
|
-
...remainingFunctionData,
|
|
295
|
+
...getProviderDataWithoutReservedKeys(remainingFunctionData, [
|
|
296
|
+
'name',
|
|
297
|
+
'arguments',
|
|
298
|
+
]),
|
|
224
299
|
},
|
|
225
|
-
...rest,
|
|
300
|
+
...getProviderDataWithoutReservedKeys(rest, [
|
|
301
|
+
'id',
|
|
302
|
+
'type',
|
|
303
|
+
'function',
|
|
304
|
+
]),
|
|
226
305
|
});
|
|
227
306
|
asst.tool_calls = toolCalls;
|
|
228
307
|
continue;
|
|
@@ -241,20 +320,42 @@ export function itemsToMessages(items) {
|
|
|
241
320
|
throw new UserError('Computer use calls are not supported for chat completions. Got item: ' +
|
|
242
321
|
JSON.stringify(item));
|
|
243
322
|
}
|
|
323
|
+
else if (item.type === 'tool_search_call' ||
|
|
324
|
+
item.type === 'tool_search_output') {
|
|
325
|
+
throw new UserError('Tool search items are not supported for chat completions. Please use the Responses API when replaying tool search history.');
|
|
326
|
+
}
|
|
244
327
|
else if (item.type === 'function_call') {
|
|
328
|
+
const hasQualifiedOrInvalidName = typeof item.name === 'string' &&
|
|
329
|
+
!CHAT_COMPLETIONS_FUNCTION_NAME_PATTERN.test(item.name);
|
|
330
|
+
if (hasQualifiedOrInvalidName ||
|
|
331
|
+
(typeof item.namespace === 'string' && item.namespace.trim().length > 0)) {
|
|
332
|
+
throw new UserError('Namespaced function call history is not supported for chat completions. Please use the Responses API when replaying namespaced tool calls.');
|
|
333
|
+
}
|
|
245
334
|
const asst = ensureAssistantMessage();
|
|
246
335
|
const toolCalls = asst.tool_calls ?? [];
|
|
247
336
|
const funcCall = item;
|
|
337
|
+
const toolCallProviderData = getProviderDataWithoutReservedKeys(funcCall.providerData, ['id', 'type', 'function', 'role', 'content', 'tool_calls', 'audio']);
|
|
338
|
+
const functionProviderData = getProviderDataWithoutReservedKeys(funcCall.providerData?.function, ['name', 'arguments']);
|
|
248
339
|
toolCalls.push({
|
|
249
340
|
id: funcCall.callId,
|
|
250
341
|
type: 'function',
|
|
251
342
|
function: {
|
|
252
343
|
name: funcCall.name,
|
|
253
344
|
arguments: funcCall.arguments ?? '{}',
|
|
345
|
+
...functionProviderData,
|
|
254
346
|
},
|
|
347
|
+
...toolCallProviderData,
|
|
255
348
|
});
|
|
256
349
|
asst.tool_calls = toolCalls;
|
|
257
|
-
Object.assign(asst, funcCall.providerData
|
|
350
|
+
Object.assign(asst, getProviderDataWithoutReservedKeys(funcCall.providerData, [
|
|
351
|
+
'role',
|
|
352
|
+
'content',
|
|
353
|
+
'tool_calls',
|
|
354
|
+
'audio',
|
|
355
|
+
'id',
|
|
356
|
+
'type',
|
|
357
|
+
'function',
|
|
358
|
+
]));
|
|
258
359
|
}
|
|
259
360
|
else if (item.type === 'function_call_result') {
|
|
260
361
|
flushAssistantMessage();
|
|
@@ -264,7 +365,11 @@ export function itemsToMessages(items) {
|
|
|
264
365
|
role: 'tool',
|
|
265
366
|
tool_call_id: funcOutput.callId,
|
|
266
367
|
content: toolContent,
|
|
267
|
-
...funcOutput.providerData,
|
|
368
|
+
...getProviderDataWithoutReservedKeys(funcOutput.providerData, [
|
|
369
|
+
'role',
|
|
370
|
+
'tool_call_id',
|
|
371
|
+
'content',
|
|
372
|
+
]),
|
|
268
373
|
});
|
|
269
374
|
}
|
|
270
375
|
else if (item.type === 'unknown') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsConverter.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsConverter.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Model } from '@openai/agents-core';
|
|
2
|
-
import type { ModelRequest, ModelResponse, ResponseStreamEvent } from '@openai/agents-core';
|
|
2
|
+
import type { ModelRetryAdvice, ModelRetryAdviceRequest, ModelRequest, ModelResponse, ResponseStreamEvent } from '@openai/agents-core';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
export declare const FAKE_ID = "FAKE_ID";
|
|
5
5
|
/**
|
|
@@ -8,6 +8,7 @@ export declare const FAKE_ID = "FAKE_ID";
|
|
|
8
8
|
export declare class OpenAIChatCompletionsModel implements Model {
|
|
9
9
|
#private;
|
|
10
10
|
constructor(client: OpenAI, model: string);
|
|
11
|
+
getRetryAdvice(args: ModelRetryAdviceRequest): ModelRetryAdvice | undefined;
|
|
11
12
|
getResponse(request: ModelRequest): Promise<ModelResponse>;
|
|
12
13
|
getStreamedResponse(request: ModelRequest): AsyncIterable<ResponseStreamEvent>;
|
|
13
14
|
}
|
|
@@ -9,6 +9,7 @@ const logger_1 = __importDefault(require("./logger.js"));
|
|
|
9
9
|
const defaults_1 = require("./defaults.js");
|
|
10
10
|
const openaiChatCompletionsStreaming_1 = require("./openaiChatCompletionsStreaming.js");
|
|
11
11
|
const openaiChatCompletionsConverter_1 = require("./openaiChatCompletionsConverter.js");
|
|
12
|
+
const retryAdvice_1 = require("./retryAdvice.js");
|
|
12
13
|
exports.FAKE_ID = 'FAKE_ID';
|
|
13
14
|
function hasReasoningContent(message) {
|
|
14
15
|
return ('reasoning' in message &&
|
|
@@ -25,6 +26,9 @@ class OpenAIChatCompletionsModel {
|
|
|
25
26
|
this.#client = client;
|
|
26
27
|
this.#model = model;
|
|
27
28
|
}
|
|
29
|
+
getRetryAdvice(args) {
|
|
30
|
+
return (0, retryAdvice_1.getOpenAIRetryAdvice)(args);
|
|
31
|
+
}
|
|
28
32
|
async getResponse(request) {
|
|
29
33
|
const response = await (0, agents_core_1.withGenerationSpan)(async (span) => {
|
|
30
34
|
span.spanData.model = this.#model;
|
|
@@ -210,6 +214,15 @@ class OpenAIChatCompletionsModel {
|
|
|
210
214
|
const tools = [];
|
|
211
215
|
if (request.tools) {
|
|
212
216
|
for (const tool of request.tools) {
|
|
217
|
+
if (tool.type === 'function') {
|
|
218
|
+
if (typeof tool.namespace === 'string' &&
|
|
219
|
+
tool.namespace.trim().length > 0) {
|
|
220
|
+
throw new agents_core_1.UserError('Namespaced function tools created with toolNamespace() are only supported with the Responses API.');
|
|
221
|
+
}
|
|
222
|
+
if (tool.deferLoading === true) {
|
|
223
|
+
throw new agents_core_1.UserError('Function tools with deferLoading: true are only supported with the Responses API.');
|
|
224
|
+
}
|
|
225
|
+
}
|
|
213
226
|
tools.push((0, openaiChatCompletionsConverter_1.toolToOpenAI)(tool));
|
|
214
227
|
}
|
|
215
228
|
}
|
|
@@ -255,7 +268,7 @@ class OpenAIChatCompletionsModel {
|
|
|
255
268
|
frequency_penalty: request.modelSettings.frequencyPenalty,
|
|
256
269
|
presence_penalty: request.modelSettings.presencePenalty,
|
|
257
270
|
max_tokens: request.modelSettings.maxTokens,
|
|
258
|
-
tool_choice: (0, openaiChatCompletionsConverter_1.
|
|
271
|
+
tool_choice: (0, openaiChatCompletionsConverter_1.getCompatibleToolChoice)(request.modelSettings.toolChoice, tools),
|
|
259
272
|
parallel_tool_calls: parallelToolCalls,
|
|
260
273
|
stream: stream ? true : false,
|
|
261
274
|
stream_options: stream ? { include_usage: true } : undefined,
|
|
@@ -272,10 +285,14 @@ class OpenAIChatCompletionsModel {
|
|
|
272
285
|
else {
|
|
273
286
|
logger_1.default.debug(`Calling LLM. Request data: ${JSON.stringify(requestData, null, 2)}`);
|
|
274
287
|
}
|
|
275
|
-
const
|
|
288
|
+
const requestOptions = {
|
|
276
289
|
headers: defaults_1.HEADERS,
|
|
277
290
|
signal: request.signal,
|
|
278
|
-
}
|
|
291
|
+
};
|
|
292
|
+
if (request._internal?.runnerManagedRetry === true) {
|
|
293
|
+
requestOptions.maxRetries = 0;
|
|
294
|
+
}
|
|
295
|
+
const completion = await this.#client.chat.completions.create(requestData, requestOptions);
|
|
279
296
|
if (logger_1.default.dontLogModelData) {
|
|
280
297
|
logger_1.default.debug('Response received');
|
|
281
298
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsModel.js","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsModel.js","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":";;;;;;AAAA,qDAQ6B;AAW7B,yDAA8B;AAC9B,4CAAqC;AASrC,wFAA2F;AAC3F,wFAK0C;AAE1C,kDAAqD;AAExC,QAAA,OAAO,GAAG,SAAS,CAAC;AASjC,SAAS,mBAAmB,CAC1B,OAAsD;IAEtD,OAAO,CACL,WAAW,IAAI,OAAO;QACtB,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;QACrC,OAAO,CAAC,SAAS,KAAK,EAAE,CACzB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAa,0BAA0B;IACrC,OAAO,CAAS;IAChB,MAAM,CAAS;IACf,YAAY,MAAc,EAAE,KAAa;QACvC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,cAAc,CAAC,IAA6B;QAC1C,OAAO,IAAA,kCAAoB,EAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAqB;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAkB,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvD,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,aAAa;gBAChD,CAAC,CAAC;oBACE,WAAW,EAAE,OAAO,CAAC,aAAa,CAAC,WAAW;oBAC9C,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;oBACjC,iBAAiB,EAAE,OAAO,CAAC,aAAa,CAAC,gBAAgB;oBACzD,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,eAAe;oBACvD,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM;oBACzD,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS;iBACjD;gBACH,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACjE,IAAI,IAAI,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAE5C,IAAI,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,EAAE;oBACX,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,gBAAgB;4BACtB,IAAI,EAAE,OAAO,CAAC,SAAS;yBACxB;qBACF;iBACF,CAAC,CAAC;YACL,CAAC;YACD,MAAM,UAAU,GACd,OAAO,CAAC,OAAO,KAAK,SAAS;gBAC7B,OAAO,CAAC,OAAO,KAAK,IAAI;gBACxB,6FAA6F;gBAC7F,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;YAElD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;gBACrC,MAAM,CAAC,IAAI,CAAC;oBACV,EAAE,EAAE,QAAQ,CAAC,EAAE;oBACf,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,aAAa;4BACnB,IAAI,EAAE,OAAO,IAAI,EAAE;4BACnB,YAAY,EAAE,IAAI;yBACnB;qBACF;oBACD,MAAM,EAAE,WAAW;iBACpB,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC3B,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;gBACrC,MAAM,CAAC,IAAI,CAAC;oBACV,EAAE,EAAE,QAAQ,CAAC,EAAE;oBACf,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,OAAO,IAAI,EAAE;4BACtB,YAAY,EAAE,IAAI;yBACnB;qBACF;oBACD,MAAM,EAAE,WAAW;iBACpB,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACzB,MAAM,EAAE,IAAI,EAAE,GAAG,kBAAkB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;gBACtD,MAAM,CAAC,IAAI,CAAC;oBACV,EAAE,EAAE,QAAQ,CAAC,EAAE;oBACf,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,IAAI;4BACX,YAAY,EAAE,kBAAkB;yBACjC;qBACF;oBACD,MAAM,EAAE,WAAW;iBACpB,CAAC,CAAC;YACL,CAAC;YAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBACvB,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;oBAC3C,IAAI,SAAS,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBAClC,+CAA+C;wBAC/C,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,qBAAqB,EAAE,GAAG,SAAS,CAAC;wBAC3D,MAAM,EACJ,SAAS,EAAE,IAAI,EACf,IAAI,EACJ,GAAG,qBAAqB,EACzB,GAAG,SAAS,CAAC,QAAQ,CAAC;wBACvB,MAAM,CAAC,IAAI,CAAC;4BACV,EAAE,EAAE,QAAQ,CAAC,EAAE;4BACf,IAAI,EAAE,eAAe;4BACrB,SAAS,EAAE,IAAI;4BACf,IAAI,EAAE,IAAI;4BACV,MAAM,EAAE,MAAM;4BACd,MAAM,EAAE,WAAW;4BACnB,YAAY,EAAE;gCACZ,GAAG,qBAAqB;gCACxB,GAAG,qBAAqB;6BACzB;yBACF,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,aAAa,GAAkB;YACnC,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACnB,CAAC,CAAC,IAAI,mBAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAC5C,CAAC,CAAC,IAAI,mBAAK,EAAE;YACf,MAAM;YACN,UAAU,EAAE,QAAQ,CAAC,EAAE;YACvB,YAAY,EAAE,QAAQ;SACvB,CAAC;QAEF,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,CAAC,mBAAmB,CACxB,OAAqB;QAErB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,kCAAoB,GAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAClE,IAAI,CAAC;YACH,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,IAAA,4BAAc,EAAC,IAAI,CAAC,CAAC;YACvB,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAE9D,MAAM,QAAQ,GAA2C;gBACvD,EAAE,EAAE,eAAO;gBACX,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;gBACtC,KAAK,EAAE,IAAI,CAAC,MAAM;gBAClB,MAAM,EAAE,iBAAiB;gBACzB,OAAO,EAAE,EAAE;gBACX,KAAK,EAAE;oBACL,aAAa,EAAE,CAAC;oBAChB,iBAAiB,EAAE,CAAC;oBACpB,YAAY,EAAE,CAAC;iBAChB;aACF,CAAC;YACF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAA,wEAAuC,EAC/D,QAAQ,EACR,MAAM,CACP,EAAE,CAAC;gBACF,IACE,KAAK,CAAC,IAAI,KAAK,eAAe;oBAC9B,QAAQ,CAAC,KAAK,EAAE,YAAY,KAAK,CAAC,EAClC,CAAC;oBACD,QAAQ,CAAC,KAAK,GAAG;wBACf,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW;wBAC/C,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY;wBACpD,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW;wBAC9C,qBAAqB,EAAE,KAAK,CAAC,OAAO,CAClC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CACxC;4BACC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;4BAC5C,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB;wBAC3C,yBAAyB,EAAE,KAAK,CAAC,OAAO,CACtC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CACzC;4BACC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;4BAC7C,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB;qBAC7C,CAAC;gBACJ,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;YAED,IAAI,IAAI,IAAI,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBACjD,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,QAAQ,CAAC;oBACZ,OAAO,EAAE,0BAA0B;oBACnC,IAAI,EAAE;wBACJ,KAAK,EACH,OAAO,CAAC,OAAO,KAAK,IAAI;4BACtB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;4BACf,CAAC,CAAC,KAAK,YAAY,KAAK;gCACtB,CAAC,CAAC,KAAK,CAAC,IAAI;gCACZ,CAAC,CAAC,SAAS;qBAClB;iBACF,CAAC,CAAC;YACL,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,GAAG,EAAE,CAAC;gBACX,IAAA,8BAAgB,GAAE,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAeD,KAAK,CAAC,cAAc,CAClB,OAAqB,EACrB,IAA0C,EAC1C,MAAe;QAKf,MAAM,KAAK,GAAiD,EAAE,CAAC;QAC/D,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC7B,IACE,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ;wBAClC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAChC,CAAC;wBACD,MAAM,IAAI,uBAAS,CACjB,mGAAmG,CACpG,CAAC;oBACJ,CAAC;oBACD,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;wBAC/B,MAAM,IAAI,uBAAS,CACjB,mFAAmF,CACpF,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,IAAA,6CAAY,EAAC,IAAI,CAAC,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;QACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACvC,KAAK,CAAC,IAAI,CAAC,IAAA,mDAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;QACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE7D,IAAI,iBAAiB,GAAwB,SAAS,CAAC;QACvD,IAAI,OAAO,OAAO,CAAC,aAAa,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACjE,IAAI,OAAO,CAAC,aAAa,CAAC,iBAAiB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YACzE,CAAC;YAED,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC;QAC9D,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,gDAAe,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAC/B,QAAQ,CAAC,OAAO,CAAC;gBACf,OAAO,EAAE,OAAO,CAAC,kBAAkB;gBACnC,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;QACL,CAAC;QAED,IAAI,IAAI,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YACrC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC;QACjC,CAAC;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9D,IACE,OAAO,CAAC,aAAa,CAAC,SAAS;YAC/B,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,EACtC,CAAC;YACD,0DAA0D;YAC1D,YAAY,CAAC,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC;QACzE,CAAC;QACD,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACvE,wDAAwD;YACxD,YAAY,CAAC,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;QAChE,CAAC;QAQD,MAAM,WAAW,GAAgC;YAC/C,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,QAAQ;YACR,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACvC,WAAW,EAAE,OAAO,CAAC,aAAa,CAAC,WAAW;YAC9C,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;YACjC,iBAAiB,EAAE,OAAO,CAAC,aAAa,CAAC,gBAAgB;YACzD,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,eAAe;YACvD,UAAU,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS;YAC3C,WAAW,EAAE,IAAA,wDAAuB,EAClC,OAAO,CAAC,aAAa,CAAC,UAAU,EAChC,KAAK,CACN;YACD,mBAAmB,EAAE,iBAAiB;YACtC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YAC7B,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS;YAC5D,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK;YAClC,sBAAsB,EAAE,OAAO,CAAC,aAAa,CAAC,oBAAoB;YAClE,GAAG,YAAY;SAChB,CAAC;QAEF,IAAI,cAAc,EAAE,CAAC;YACnB,WAAW,CAAC,eAAe,GAAG,cAAc,CAAC;QAC/C,CAAC;QAED,IAAI,gBAAM,CAAC,gBAAgB,EAAE,CAAC;YAC5B,gBAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,gBAAM,CAAC,KAAK,CACV,8BAA8B,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACrE,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAIhB;YACF,OAAO,EAAE,kBAAO;YAChB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;QACF,IAEI,OAGD,CAAC,SAAS,EAAE,kBAAkB,KAAK,IAAI,EACxC,CAAC;YACD,cAAc,CAAC,UAAU,GAAG,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAC3D,WAAW,EACX,cAAc,CACf,CAAC;QAEF,IAAI,gBAAM,CAAC,gBAAgB,EAAE,CAAC;YAC5B,gBAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,gBAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AA/WD,gEA+WC;AAED,SAAS,iBAAiB,CACxB,UAAgC;IAMhC,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QAC1B,uFAAuF;QACvF,uFAAuF;QACvF,gEAAgE;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACtC,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE;gBACX,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B;SACF,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,eAAe,CACtB,KAAsB;IAEtB,OAAO;QACL,QAAQ,EAAE,CAAC;QACX,YAAY,EAAE,KAAK,CAAC,aAAa;QACjC,aAAa,EAAE,KAAK,CAAC,iBAAiB;QACtC,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,oBAAoB,EAAE;YACpB,aAAa,EAAE,KAAK,CAAC,qBAAqB,EAAE,aAAa,IAAI,CAAC;SAC/D;QACD,qBAAqB,EAAE;YACrB,gBAAgB,EAAE,KAAK,CAAC,yBAAyB,EAAE,gBAAgB,IAAI,CAAC;SACzE;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { Usage, withGenerationSpan, resetCurrentSpan, createGenerationSpan, setCurrentSpan, } from '@openai/agents-core';
|
|
1
|
+
import { Usage, UserError, withGenerationSpan, resetCurrentSpan, createGenerationSpan, setCurrentSpan, } from '@openai/agents-core';
|
|
2
2
|
import logger from "./logger.mjs";
|
|
3
3
|
import { HEADERS } from "./defaults.mjs";
|
|
4
4
|
import { convertChatCompletionsStreamToResponses } from "./openaiChatCompletionsStreaming.mjs";
|
|
5
|
-
import {
|
|
5
|
+
import { getCompatibleToolChoice, toolToOpenAI, convertHandoffTool, itemsToMessages, } from "./openaiChatCompletionsConverter.mjs";
|
|
6
|
+
import { getOpenAIRetryAdvice } from "./retryAdvice.mjs";
|
|
6
7
|
export const FAKE_ID = 'FAKE_ID';
|
|
7
8
|
function hasReasoningContent(message) {
|
|
8
9
|
return ('reasoning' in message &&
|
|
@@ -19,6 +20,9 @@ export class OpenAIChatCompletionsModel {
|
|
|
19
20
|
this.#client = client;
|
|
20
21
|
this.#model = model;
|
|
21
22
|
}
|
|
23
|
+
getRetryAdvice(args) {
|
|
24
|
+
return getOpenAIRetryAdvice(args);
|
|
25
|
+
}
|
|
22
26
|
async getResponse(request) {
|
|
23
27
|
const response = await withGenerationSpan(async (span) => {
|
|
24
28
|
span.spanData.model = this.#model;
|
|
@@ -204,6 +208,15 @@ export class OpenAIChatCompletionsModel {
|
|
|
204
208
|
const tools = [];
|
|
205
209
|
if (request.tools) {
|
|
206
210
|
for (const tool of request.tools) {
|
|
211
|
+
if (tool.type === 'function') {
|
|
212
|
+
if (typeof tool.namespace === 'string' &&
|
|
213
|
+
tool.namespace.trim().length > 0) {
|
|
214
|
+
throw new UserError('Namespaced function tools created with toolNamespace() are only supported with the Responses API.');
|
|
215
|
+
}
|
|
216
|
+
if (tool.deferLoading === true) {
|
|
217
|
+
throw new UserError('Function tools with deferLoading: true are only supported with the Responses API.');
|
|
218
|
+
}
|
|
219
|
+
}
|
|
207
220
|
tools.push(toolToOpenAI(tool));
|
|
208
221
|
}
|
|
209
222
|
}
|
|
@@ -249,7 +262,7 @@ export class OpenAIChatCompletionsModel {
|
|
|
249
262
|
frequency_penalty: request.modelSettings.frequencyPenalty,
|
|
250
263
|
presence_penalty: request.modelSettings.presencePenalty,
|
|
251
264
|
max_tokens: request.modelSettings.maxTokens,
|
|
252
|
-
tool_choice:
|
|
265
|
+
tool_choice: getCompatibleToolChoice(request.modelSettings.toolChoice, tools),
|
|
253
266
|
parallel_tool_calls: parallelToolCalls,
|
|
254
267
|
stream: stream ? true : false,
|
|
255
268
|
stream_options: stream ? { include_usage: true } : undefined,
|
|
@@ -266,10 +279,14 @@ export class OpenAIChatCompletionsModel {
|
|
|
266
279
|
else {
|
|
267
280
|
logger.debug(`Calling LLM. Request data: ${JSON.stringify(requestData, null, 2)}`);
|
|
268
281
|
}
|
|
269
|
-
const
|
|
282
|
+
const requestOptions = {
|
|
270
283
|
headers: HEADERS,
|
|
271
284
|
signal: request.signal,
|
|
272
|
-
}
|
|
285
|
+
};
|
|
286
|
+
if (request._internal?.runnerManagedRetry === true) {
|
|
287
|
+
requestOptions.maxRetries = 0;
|
|
288
|
+
}
|
|
289
|
+
const completion = await this.#client.chat.completions.create(requestData, requestOptions);
|
|
273
290
|
if (logger.dontLogModelData) {
|
|
274
291
|
logger.debug('Response received');
|
|
275
292
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsModel.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsModel.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Model, protocol } from '@openai/agents-core';
|
|
2
|
-
import type { SerializedTool, ModelRequest, ModelResponse, ModelSettingsToolChoice, ResponseStreamEvent } from '@openai/agents-core';
|
|
2
|
+
import type { ModelRetryAdvice, ModelRetryAdviceRequest, SerializedTool, ModelRequest, ModelResponse, ModelSettingsToolChoice, ResponseStreamEvent } from '@openai/agents-core';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
import { ToolChoiceFunction, ToolChoiceOptions, ToolChoiceTypes } from 'openai/resources/responses/responses';
|
|
5
5
|
import { headerAccumulatorToSDKHeaders } from './responsesTransportUtils';
|
|
6
6
|
type ToolChoice = ToolChoiceOptions | ToolChoiceTypes | {
|
|
7
7
|
type: 'web_search';
|
|
8
|
+
} | {
|
|
9
|
+
type: 'tool_search';
|
|
8
10
|
} | ToolChoiceFunction;
|
|
9
11
|
type ResponsesCreateRequestSDKHeaders = ReturnType<typeof headerAccumulatorToSDKHeaders>;
|
|
10
12
|
type BuiltResponsesCreateRequest = {
|
|
@@ -17,10 +19,20 @@ type BuiltResponsesCreateRequest = {
|
|
|
17
19
|
type ResponseOutputItemWithFunctionResult = OpenAI.Responses.ResponseOutputItem | (OpenAI.Responses.ResponseFunctionToolCallOutputItem & {
|
|
18
20
|
name?: string;
|
|
19
21
|
function_name?: string;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
namespace?: string;
|
|
23
|
+
}) | OpenAI.Responses.ResponseToolSearchCall | OpenAI.Responses.ResponseToolSearchOutputItem;
|
|
24
|
+
type ResponsesTool = OpenAI.Responses.Tool | Record<string, any>;
|
|
25
|
+
declare function getToolChoice(toolChoice?: ModelSettingsToolChoice, options?: {
|
|
26
|
+
tools?: Array<{
|
|
27
|
+
type?: unknown;
|
|
28
|
+
}>;
|
|
29
|
+
model?: string;
|
|
30
|
+
allowPromptSuppliedComputerTool?: boolean;
|
|
31
|
+
}): ToolChoice | undefined;
|
|
32
|
+
declare function converTool<_TContext = unknown>(tool: SerializedTool, options?: {
|
|
33
|
+
usePreviewComputerTool?: boolean;
|
|
34
|
+
}): {
|
|
35
|
+
tool: ResponsesTool;
|
|
24
36
|
include?: OpenAI.Responses.ResponseIncludable[];
|
|
25
37
|
};
|
|
26
38
|
declare function getInputItems(input: ModelRequest['input']): OpenAI.Responses.ResponseInputItem[];
|
|
@@ -33,6 +45,7 @@ export declare class OpenAIResponsesModel implements Model {
|
|
|
33
45
|
protected readonly _client: OpenAI;
|
|
34
46
|
protected readonly _model: string;
|
|
35
47
|
constructor(client: OpenAI, model: string);
|
|
48
|
+
getRetryAdvice(args: ModelRetryAdviceRequest): ModelRetryAdvice | undefined;
|
|
36
49
|
protected _fetchResponse(request: ModelRequest, stream: false): Promise<OpenAI.Responses.Response>;
|
|
37
50
|
protected _buildResponsesCreateRequest(request: ModelRequest, stream: boolean): BuiltResponsesCreateRequest;
|
|
38
51
|
/**
|
|
@@ -60,6 +73,7 @@ export type OpenAIResponsesWSModelOptions = {
|
|
|
60
73
|
export declare class OpenAIResponsesWSModel extends OpenAIResponsesModel {
|
|
61
74
|
#private;
|
|
62
75
|
constructor(client: OpenAI, model: string, options?: OpenAIResponsesWSModelOptions);
|
|
76
|
+
getRetryAdvice(args: ModelRetryAdviceRequest): ModelRetryAdvice | undefined;
|
|
63
77
|
protected _fetchResponse(request: ModelRequest, stream: false): Promise<OpenAI.Responses.Response>;
|
|
64
78
|
close(): Promise<void>;
|
|
65
79
|
}
|