@openai/agents-openai 0.0.16 → 0.0.17
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/defaults.js +31 -17
- package/dist/defaults.js.map +1 -1
- package/dist/index.js +22 -6
- package/dist/index.js.map +1 -1
- package/dist/logger.js +5 -3
- package/dist/logger.js.map +1 -1
- package/dist/metadata.d.ts +0 -1
- package/dist/metadata.js +7 -5
- package/dist/metadata.js.map +1 -1
- package/dist/metadata.mjs +2 -3
- package/dist/metadata.mjs.map +1 -1
- package/dist/openaiChatCompletionsConverter.js +18 -10
- package/dist/openaiChatCompletionsConverter.js.map +1 -1
- package/dist/openaiChatCompletionsModel.js +33 -26
- package/dist/openaiChatCompletionsModel.js.map +1 -1
- package/dist/openaiChatCompletionsStreaming.js +7 -4
- package/dist/openaiChatCompletionsStreaming.js.map +1 -1
- package/dist/openaiProvider.js +19 -12
- package/dist/openaiProvider.js.map +1 -1
- package/dist/openaiResponsesModel.js +68 -58
- package/dist/openaiResponsesModel.js.map +1 -1
- package/dist/openaiResponsesModel.mjs +1 -1
- package/dist/openaiResponsesModel.mjs.map +1 -1
- package/dist/openaiTracingExporter.js +24 -16
- package/dist/openaiTracingExporter.js.map +1 -1
- package/dist/tools.d.ts +1 -1
- package/dist/tools.js +16 -9
- package/dist/tools.js.map +1 -1
- package/dist/tools.mjs +1 -1
- package/dist/tools.mjs.map +1 -1
- package/dist/types/providerData.js +2 -1
- package/dist/utils/providerData.js +4 -1
- package/dist/utils/providerData.js.map +1 -1
- package/package.json +9 -9
package/dist/defaults.js
CHANGED
|
@@ -1,36 +1,50 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.HEADERS = exports.DEFAULT_OPENAI_MODEL = exports.DEFAULT_OPENAI_API = void 0;
|
|
7
|
+
exports.setTracingExportApiKey = setTracingExportApiKey;
|
|
8
|
+
exports.getTracingExportApiKey = getTracingExportApiKey;
|
|
9
|
+
exports.shouldUseResponsesByDefault = shouldUseResponsesByDefault;
|
|
10
|
+
exports.setOpenAIAPI = setOpenAIAPI;
|
|
11
|
+
exports.setDefaultOpenAIClient = setDefaultOpenAIClient;
|
|
12
|
+
exports.getDefaultOpenAIClient = getDefaultOpenAIClient;
|
|
13
|
+
exports.setDefaultOpenAIKey = setDefaultOpenAIKey;
|
|
14
|
+
exports.getDefaultOpenAIKey = getDefaultOpenAIKey;
|
|
15
|
+
const _shims_1 = require("@openai/agents-core/_shims");
|
|
16
|
+
const metadata_1 = __importDefault(require("./metadata.js"));
|
|
17
|
+
exports.DEFAULT_OPENAI_API = 'responses';
|
|
18
|
+
exports.DEFAULT_OPENAI_MODEL = 'gpt-4.1';
|
|
19
|
+
let _defaultOpenAIAPI = exports.DEFAULT_OPENAI_API;
|
|
6
20
|
let _defaultOpenAIClient;
|
|
7
21
|
let _defaultOpenAIKey = undefined;
|
|
8
22
|
let _defaultTracingApiKey = undefined;
|
|
9
|
-
|
|
23
|
+
function setTracingExportApiKey(key) {
|
|
10
24
|
_defaultTracingApiKey = key;
|
|
11
25
|
}
|
|
12
|
-
|
|
13
|
-
return _defaultTracingApiKey ?? loadEnv().OPENAI_API_KEY;
|
|
26
|
+
function getTracingExportApiKey() {
|
|
27
|
+
return _defaultTracingApiKey ?? (0, _shims_1.loadEnv)().OPENAI_API_KEY;
|
|
14
28
|
}
|
|
15
|
-
|
|
29
|
+
function shouldUseResponsesByDefault() {
|
|
16
30
|
return _defaultOpenAIAPI === 'responses';
|
|
17
31
|
}
|
|
18
|
-
|
|
32
|
+
function setOpenAIAPI(value) {
|
|
19
33
|
_defaultOpenAIAPI = value;
|
|
20
34
|
}
|
|
21
|
-
|
|
35
|
+
function setDefaultOpenAIClient(client) {
|
|
22
36
|
_defaultOpenAIClient = client;
|
|
23
37
|
}
|
|
24
|
-
|
|
38
|
+
function getDefaultOpenAIClient() {
|
|
25
39
|
return _defaultOpenAIClient;
|
|
26
40
|
}
|
|
27
|
-
|
|
41
|
+
function setDefaultOpenAIKey(key) {
|
|
28
42
|
_defaultOpenAIKey = key;
|
|
29
43
|
}
|
|
30
|
-
|
|
31
|
-
return _defaultOpenAIKey ?? loadEnv().OPENAI_API_KEY;
|
|
44
|
+
function getDefaultOpenAIKey() {
|
|
45
|
+
return _defaultOpenAIKey ?? (0, _shims_1.loadEnv)().OPENAI_API_KEY;
|
|
32
46
|
}
|
|
33
|
-
|
|
34
|
-
'User-Agent': `Agents/JavaScript ${
|
|
47
|
+
exports.HEADERS = {
|
|
48
|
+
'User-Agent': `Agents/JavaScript ${metadata_1.default.version}`,
|
|
35
49
|
};
|
|
36
50
|
//# sourceMappingURL=defaults.js.map
|
package/dist/defaults.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../src/defaults.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../src/defaults.ts"],"names":[],"mappings":";;;;;;AAYA,wDAEC;AAED,wDAEC;AAED,kEAEC;AAED,oCAEC;AAED,wDAEC;AAED,wDAEC;AAED,kDAEC;AAED,kDAEC;AAzCD,uDAAqD;AACrD,6DAAkC;AAErB,QAAA,kBAAkB,GAAG,WAAW,CAAC;AACjC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AAE9C,IAAI,iBAAiB,GAAG,0BAAkB,CAAC;AAC3C,IAAI,oBAAwC,CAAC;AAC7C,IAAI,iBAAiB,GAAuB,SAAS,CAAC;AACtD,IAAI,qBAAqB,GAAuB,SAAS,CAAC;AAE1D,SAAgB,sBAAsB,CAAC,GAAW;IAChD,qBAAqB,GAAG,GAAG,CAAC;AAC9B,CAAC;AAED,SAAgB,sBAAsB;IACpC,OAAO,qBAAqB,IAAI,IAAA,gBAAO,GAAE,CAAC,cAAc,CAAC;AAC3D,CAAC;AAED,SAAgB,2BAA2B;IACzC,OAAO,iBAAiB,KAAK,WAAW,CAAC;AAC3C,CAAC;AAED,SAAgB,YAAY,CAAC,KAAuC;IAClE,iBAAiB,GAAG,KAAK,CAAC;AAC5B,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACnD,oBAAoB,GAAG,MAAM,CAAC;AAChC,CAAC;AAED,SAAgB,sBAAsB;IACpC,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,iBAAiB,GAAG,GAAG,CAAC;AAC1B,CAAC;AAED,SAAgB,mBAAmB;IACjC,OAAO,iBAAiB,IAAI,IAAA,gBAAO,GAAE,CAAC,cAAc,CAAC;AACvD,CAAC;AAEY,QAAA,OAAO,GAAG;IACrB,YAAY,EAAE,qBAAqB,kBAAQ,CAAC,OAAO,EAAE;CACtD,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.imageGenerationTool = exports.codeInterpreterTool = exports.fileSearchTool = exports.webSearchTool = exports.OpenAITracingExporter = exports.setDefaultOpenAITracingExporter = exports.setTracingExportApiKey = exports.setDefaultOpenAIKey = exports.setOpenAIAPI = exports.setDefaultOpenAIClient = exports.OpenAIChatCompletionsModel = exports.OpenAIResponsesModel = exports.OpenAIProvider = void 0;
|
|
4
|
+
var openaiProvider_1 = require("./openaiProvider.js");
|
|
5
|
+
Object.defineProperty(exports, "OpenAIProvider", { enumerable: true, get: function () { return openaiProvider_1.OpenAIProvider; } });
|
|
6
|
+
var openaiResponsesModel_1 = require("./openaiResponsesModel.js");
|
|
7
|
+
Object.defineProperty(exports, "OpenAIResponsesModel", { enumerable: true, get: function () { return openaiResponsesModel_1.OpenAIResponsesModel; } });
|
|
8
|
+
var openaiChatCompletionsModel_1 = require("./openaiChatCompletionsModel.js");
|
|
9
|
+
Object.defineProperty(exports, "OpenAIChatCompletionsModel", { enumerable: true, get: function () { return openaiChatCompletionsModel_1.OpenAIChatCompletionsModel; } });
|
|
10
|
+
var defaults_1 = require("./defaults.js");
|
|
11
|
+
Object.defineProperty(exports, "setDefaultOpenAIClient", { enumerable: true, get: function () { return defaults_1.setDefaultOpenAIClient; } });
|
|
12
|
+
Object.defineProperty(exports, "setOpenAIAPI", { enumerable: true, get: function () { return defaults_1.setOpenAIAPI; } });
|
|
13
|
+
Object.defineProperty(exports, "setDefaultOpenAIKey", { enumerable: true, get: function () { return defaults_1.setDefaultOpenAIKey; } });
|
|
14
|
+
Object.defineProperty(exports, "setTracingExportApiKey", { enumerable: true, get: function () { return defaults_1.setTracingExportApiKey; } });
|
|
15
|
+
var openaiTracingExporter_1 = require("./openaiTracingExporter.js");
|
|
16
|
+
Object.defineProperty(exports, "setDefaultOpenAITracingExporter", { enumerable: true, get: function () { return openaiTracingExporter_1.setDefaultOpenAITracingExporter; } });
|
|
17
|
+
Object.defineProperty(exports, "OpenAITracingExporter", { enumerable: true, get: function () { return openaiTracingExporter_1.OpenAITracingExporter; } });
|
|
18
|
+
var tools_1 = require("./tools.js");
|
|
19
|
+
Object.defineProperty(exports, "webSearchTool", { enumerable: true, get: function () { return tools_1.webSearchTool; } });
|
|
20
|
+
Object.defineProperty(exports, "fileSearchTool", { enumerable: true, get: function () { return tools_1.fileSearchTool; } });
|
|
21
|
+
Object.defineProperty(exports, "codeInterpreterTool", { enumerable: true, get: function () { return tools_1.codeInterpreterTool; } });
|
|
22
|
+
Object.defineProperty(exports, "imageGenerationTool", { enumerable: true, get: function () { return tools_1.imageGenerationTool; } });
|
|
7
23
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,sDAAkD;AAAzC,gHAAA,cAAc,OAAA;AACvB,kEAA8D;AAArD,4HAAA,oBAAoB,OAAA;AAC7B,8EAA0E;AAAjE,wIAAA,0BAA0B,OAAA;AACnC,0CAKoB;AAJlB,kHAAA,sBAAsB,OAAA;AACtB,wGAAA,YAAY,OAAA;AACZ,+GAAA,mBAAmB,OAAA;AACnB,kHAAA,sBAAsB,OAAA;AAExB,oEAIiC;AAH/B,wIAAA,+BAA+B,OAAA;AAC/B,8HAAA,qBAAqB,OAAA;AAGvB,oCAKiB;AAJf,sGAAA,aAAa,OAAA;AACb,uGAAA,cAAc,OAAA;AACd,4GAAA,mBAAmB,OAAA;AACnB,4GAAA,mBAAmB,OAAA"}
|
package/dist/logger.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const agents_core_1 = require("@openai/agents-core");
|
|
4
|
+
const logger = (0, agents_core_1.getLogger)('openai-agents:openai');
|
|
5
|
+
exports.default = logger;
|
|
4
6
|
//# sourceMappingURL=logger.js.map
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;AAAA,qDAAgD;AAEhD,MAAM,MAAM,GAAG,IAAA,uBAAS,EAAC,sBAAsB,CAAC,CAAC;AAEjD,kBAAe,MAAM,CAAC"}
|
package/dist/metadata.d.ts
CHANGED
package/dist/metadata.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
// This file is automatically generated
|
|
2
|
-
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.METADATA = void 0;
|
|
5
|
+
exports.METADATA = {
|
|
3
6
|
"name": "@openai/agents-openai",
|
|
4
|
-
"version": "0.0.
|
|
7
|
+
"version": "0.0.17",
|
|
5
8
|
"versions": {
|
|
6
|
-
"@openai/agents-openai": "0.0.
|
|
9
|
+
"@openai/agents-openai": "0.0.17",
|
|
7
10
|
"@openai/agents-core": "workspace:*",
|
|
8
|
-
"@openai/zod": "npm:zod@3.25.40 - 3.25.67",
|
|
9
11
|
"openai": "^5.10.1"
|
|
10
12
|
}
|
|
11
13
|
};
|
|
12
|
-
|
|
14
|
+
exports.default = exports.METADATA;
|
|
13
15
|
//# sourceMappingURL=metadata.js.map
|
package/dist/metadata.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,uCAAuC
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":";AACA,uCAAuC;;;AAE1B,QAAA,QAAQ,GAAG;IACtB,MAAM,EAAE,uBAAuB;IAC/B,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE;QACV,uBAAuB,EAAE,QAAQ;QACjC,qBAAqB,EAAE,aAAa;QACpC,QAAQ,EAAE,SAAS;KACpB;CACF,CAAC;AAEF,kBAAe,gBAAQ,CAAC"}
|
package/dist/metadata.mjs
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
// This file is automatically generated
|
|
2
2
|
export const METADATA = {
|
|
3
3
|
"name": "@openai/agents-openai",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.17",
|
|
5
5
|
"versions": {
|
|
6
|
-
"@openai/agents-openai": "0.0.
|
|
6
|
+
"@openai/agents-openai": "0.0.17",
|
|
7
7
|
"@openai/agents-core": "workspace:*",
|
|
8
|
-
"@openai/zod": "npm:zod@3.25.40 - 3.25.67",
|
|
9
8
|
"openai": "^5.10.1"
|
|
10
9
|
}
|
|
11
10
|
};
|
package/dist/metadata.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.mjs","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,uCAAuC;AAEvC,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,MAAM,EAAE,uBAAuB;IAC/B,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE;QACV,uBAAuB,EAAE,QAAQ;QACjC,qBAAqB,EAAE,aAAa;QACpC,
|
|
1
|
+
{"version":3,"file":"metadata.mjs","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,uCAAuC;AAEvC,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,MAAM,EAAE,uBAAuB;IAC/B,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE;QACV,uBAAuB,EAAE,QAAQ;QACjC,qBAAqB,EAAE,aAAa;QACpC,QAAQ,EAAE,SAAS;KACpB;CACF,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,5 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.convertToolChoice = convertToolChoice;
|
|
4
|
+
exports.extractAllAssistantContent = extractAllAssistantContent;
|
|
5
|
+
exports.extractAllUserContent = extractAllUserContent;
|
|
6
|
+
exports.itemsToMessages = itemsToMessages;
|
|
7
|
+
exports.toolToOpenAI = toolToOpenAI;
|
|
8
|
+
exports.convertHandoffTool = convertHandoffTool;
|
|
9
|
+
const agents_core_1 = require("@openai/agents-core");
|
|
10
|
+
function convertToolChoice(toolChoice) {
|
|
3
11
|
if (toolChoice == undefined || toolChoice == null)
|
|
4
12
|
return undefined;
|
|
5
13
|
if (toolChoice === 'auto' ||
|
|
@@ -11,7 +19,7 @@ export function convertToolChoice(toolChoice) {
|
|
|
11
19
|
function: { name: toolChoice },
|
|
12
20
|
};
|
|
13
21
|
}
|
|
14
|
-
|
|
22
|
+
function extractAllAssistantContent(content) {
|
|
15
23
|
if (typeof content === 'string') {
|
|
16
24
|
return content;
|
|
17
25
|
}
|
|
@@ -42,7 +50,7 @@ export function extractAllAssistantContent(content) {
|
|
|
42
50
|
}
|
|
43
51
|
return out;
|
|
44
52
|
}
|
|
45
|
-
|
|
53
|
+
function extractAllUserContent(content) {
|
|
46
54
|
if (typeof content === 'string') {
|
|
47
55
|
return content;
|
|
48
56
|
}
|
|
@@ -95,7 +103,7 @@ function isMessageItem(item) {
|
|
|
95
103
|
}
|
|
96
104
|
return false;
|
|
97
105
|
}
|
|
98
|
-
|
|
106
|
+
function itemsToMessages(items) {
|
|
99
107
|
if (typeof items === 'string') {
|
|
100
108
|
return [{ role: 'user', content: items }];
|
|
101
109
|
}
|
|
@@ -183,13 +191,13 @@ export function itemsToMessages(items) {
|
|
|
183
191
|
continue;
|
|
184
192
|
}
|
|
185
193
|
else {
|
|
186
|
-
throw new UserError('Hosted tool calls are not supported for chat completions. Got item: ' +
|
|
194
|
+
throw new agents_core_1.UserError('Hosted tool calls are not supported for chat completions. Got item: ' +
|
|
187
195
|
JSON.stringify(item));
|
|
188
196
|
}
|
|
189
197
|
}
|
|
190
198
|
else if (item.type === 'computer_call' ||
|
|
191
199
|
item.type === 'computer_call_result') {
|
|
192
|
-
throw new UserError('Computer use calls are not supported for chat completions. Got item: ' +
|
|
200
|
+
throw new agents_core_1.UserError('Computer use calls are not supported for chat completions. Got item: ' +
|
|
193
201
|
JSON.stringify(item));
|
|
194
202
|
}
|
|
195
203
|
else if (item.type === 'function_call') {
|
|
@@ -210,7 +218,7 @@ export function itemsToMessages(items) {
|
|
|
210
218
|
flushAssistantMessage();
|
|
211
219
|
const funcOutput = item;
|
|
212
220
|
if (funcOutput.output.type !== 'text') {
|
|
213
|
-
throw new UserError('Only text output is supported for chat completions. Got item: ' +
|
|
221
|
+
throw new agents_core_1.UserError('Only text output is supported for chat completions. Got item: ' +
|
|
214
222
|
JSON.stringify(item));
|
|
215
223
|
}
|
|
216
224
|
result.push({
|
|
@@ -233,7 +241,7 @@ export function itemsToMessages(items) {
|
|
|
233
241
|
flushAssistantMessage();
|
|
234
242
|
return result;
|
|
235
243
|
}
|
|
236
|
-
|
|
244
|
+
function toolToOpenAI(tool) {
|
|
237
245
|
if (tool.type === 'function') {
|
|
238
246
|
return {
|
|
239
247
|
type: 'function',
|
|
@@ -247,7 +255,7 @@ export function toolToOpenAI(tool) {
|
|
|
247
255
|
}
|
|
248
256
|
throw new Error(`Hosted tools are not supported with the ChatCompletions API. Got tool type: ${tool.type}, tool: ${JSON.stringify(tool)}`);
|
|
249
257
|
}
|
|
250
|
-
|
|
258
|
+
function convertHandoffTool(handoff) {
|
|
251
259
|
return {
|
|
252
260
|
type: 'function',
|
|
253
261
|
function: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsConverter.js","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsConverter.js","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.OpenAIChatCompletionsModel = exports.FAKE_ID = void 0;
|
|
7
|
+
const agents_core_1 = require("@openai/agents-core");
|
|
8
|
+
const logger_1 = __importDefault(require("./logger.js"));
|
|
9
|
+
const defaults_1 = require("./defaults.js");
|
|
10
|
+
const openaiChatCompletionsStreaming_1 = require("./openaiChatCompletionsStreaming.js");
|
|
11
|
+
const openaiChatCompletionsConverter_1 = require("./openaiChatCompletionsConverter.js");
|
|
12
|
+
exports.FAKE_ID = 'FAKE_ID';
|
|
7
13
|
function hasReasoningContent(message) {
|
|
8
14
|
return ('reasoning' in message &&
|
|
9
15
|
typeof message.reasoning === 'string' &&
|
|
@@ -12,7 +18,7 @@ function hasReasoningContent(message) {
|
|
|
12
18
|
/**
|
|
13
19
|
* A model that uses (or is compatible with) OpenAI's Chat Completions API.
|
|
14
20
|
*/
|
|
15
|
-
|
|
21
|
+
class OpenAIChatCompletionsModel {
|
|
16
22
|
#client;
|
|
17
23
|
#model;
|
|
18
24
|
constructor(client, model) {
|
|
@@ -20,7 +26,7 @@ export class OpenAIChatCompletionsModel {
|
|
|
20
26
|
this.#model = model;
|
|
21
27
|
}
|
|
22
28
|
async getResponse(request) {
|
|
23
|
-
const response = await withGenerationSpan(async (span) => {
|
|
29
|
+
const response = await (0, agents_core_1.withGenerationSpan)(async (span) => {
|
|
24
30
|
span.spanData.model = this.#model;
|
|
25
31
|
span.spanData.model_config = request.modelSettings
|
|
26
32
|
? {
|
|
@@ -123,8 +129,8 @@ export class OpenAIChatCompletionsModel {
|
|
|
123
129
|
}
|
|
124
130
|
const modelResponse = {
|
|
125
131
|
usage: response.usage
|
|
126
|
-
? new Usage(toResponseUsage(response.usage))
|
|
127
|
-
: new Usage(),
|
|
132
|
+
? new agents_core_1.Usage(toResponseUsage(response.usage))
|
|
133
|
+
: new agents_core_1.Usage(),
|
|
128
134
|
output,
|
|
129
135
|
responseId: response.id,
|
|
130
136
|
providerData: response,
|
|
@@ -132,15 +138,15 @@ export class OpenAIChatCompletionsModel {
|
|
|
132
138
|
return modelResponse;
|
|
133
139
|
}
|
|
134
140
|
async *getStreamedResponse(request) {
|
|
135
|
-
const span = request.tracing ? createGenerationSpan() : undefined;
|
|
141
|
+
const span = request.tracing ? (0, agents_core_1.createGenerationSpan)() : undefined;
|
|
136
142
|
try {
|
|
137
143
|
if (span) {
|
|
138
144
|
span.start();
|
|
139
|
-
setCurrentSpan(span);
|
|
145
|
+
(0, agents_core_1.setCurrentSpan)(span);
|
|
140
146
|
}
|
|
141
147
|
const stream = await this.#fetchResponse(request, span, true);
|
|
142
148
|
const response = {
|
|
143
|
-
id: FAKE_ID,
|
|
149
|
+
id: exports.FAKE_ID,
|
|
144
150
|
created: Math.floor(Date.now() / 1000),
|
|
145
151
|
model: this.#model,
|
|
146
152
|
object: 'chat.completion',
|
|
@@ -151,7 +157,7 @@ export class OpenAIChatCompletionsModel {
|
|
|
151
157
|
total_tokens: 0,
|
|
152
158
|
},
|
|
153
159
|
};
|
|
154
|
-
for await (const event of convertChatCompletionsStreamToResponses(response, stream)) {
|
|
160
|
+
for await (const event of (0, openaiChatCompletionsStreaming_1.convertChatCompletionsStreamToResponses)(response, stream)) {
|
|
155
161
|
yield event;
|
|
156
162
|
}
|
|
157
163
|
if (span && response && request.tracing === true) {
|
|
@@ -176,7 +182,7 @@ export class OpenAIChatCompletionsModel {
|
|
|
176
182
|
finally {
|
|
177
183
|
if (span) {
|
|
178
184
|
span.end();
|
|
179
|
-
resetCurrentSpan();
|
|
185
|
+
(0, agents_core_1.resetCurrentSpan)();
|
|
180
186
|
}
|
|
181
187
|
}
|
|
182
188
|
}
|
|
@@ -184,12 +190,12 @@ export class OpenAIChatCompletionsModel {
|
|
|
184
190
|
const tools = [];
|
|
185
191
|
if (request.tools) {
|
|
186
192
|
for (const tool of request.tools) {
|
|
187
|
-
tools.push(toolToOpenAI(tool));
|
|
193
|
+
tools.push((0, openaiChatCompletionsConverter_1.toolToOpenAI)(tool));
|
|
188
194
|
}
|
|
189
195
|
}
|
|
190
196
|
if (request.handoffs) {
|
|
191
197
|
for (const handoff of request.handoffs) {
|
|
192
|
-
tools.push(convertHandoffTool(handoff));
|
|
198
|
+
tools.push((0, openaiChatCompletionsConverter_1.convertHandoffTool)(handoff));
|
|
193
199
|
}
|
|
194
200
|
}
|
|
195
201
|
const responseFormat = getResponseFormat(request.outputType);
|
|
@@ -200,7 +206,7 @@ export class OpenAIChatCompletionsModel {
|
|
|
200
206
|
}
|
|
201
207
|
parallelToolCalls = request.modelSettings.parallelToolCalls;
|
|
202
208
|
}
|
|
203
|
-
const messages = itemsToMessages(request.input);
|
|
209
|
+
const messages = (0, openaiChatCompletionsConverter_1.itemsToMessages)(request.input);
|
|
204
210
|
if (request.systemInstructions) {
|
|
205
211
|
messages.unshift({
|
|
206
212
|
content: request.systemInstructions,
|
|
@@ -219,32 +225,33 @@ export class OpenAIChatCompletionsModel {
|
|
|
219
225
|
frequency_penalty: request.modelSettings.frequencyPenalty,
|
|
220
226
|
presence_penalty: request.modelSettings.presencePenalty,
|
|
221
227
|
max_tokens: request.modelSettings.maxTokens,
|
|
222
|
-
tool_choice: convertToolChoice(request.modelSettings.toolChoice),
|
|
228
|
+
tool_choice: (0, openaiChatCompletionsConverter_1.convertToolChoice)(request.modelSettings.toolChoice),
|
|
223
229
|
response_format: responseFormat,
|
|
224
230
|
parallel_tool_calls: parallelToolCalls,
|
|
225
231
|
stream,
|
|
226
232
|
store: request.modelSettings.store,
|
|
227
233
|
...request.modelSettings.providerData,
|
|
228
234
|
};
|
|
229
|
-
if (
|
|
230
|
-
|
|
235
|
+
if (logger_1.default.dontLogModelData) {
|
|
236
|
+
logger_1.default.debug('Calling LLM');
|
|
231
237
|
}
|
|
232
238
|
else {
|
|
233
|
-
|
|
239
|
+
logger_1.default.debug(`Calling LLM. Request data: ${JSON.stringify(requestData, null, 2)}`);
|
|
234
240
|
}
|
|
235
241
|
const completion = await this.#client.chat.completions.create(requestData, {
|
|
236
|
-
headers: HEADERS,
|
|
242
|
+
headers: defaults_1.HEADERS,
|
|
237
243
|
signal: request.signal,
|
|
238
244
|
});
|
|
239
|
-
if (
|
|
240
|
-
|
|
245
|
+
if (logger_1.default.dontLogModelData) {
|
|
246
|
+
logger_1.default.debug('Response received');
|
|
241
247
|
}
|
|
242
248
|
else {
|
|
243
|
-
|
|
249
|
+
logger_1.default.debug(`Response received: ${JSON.stringify(completion, null, 2)}`);
|
|
244
250
|
}
|
|
245
251
|
return completion;
|
|
246
252
|
}
|
|
247
253
|
}
|
|
254
|
+
exports.OpenAIChatCompletionsModel = OpenAIChatCompletionsModel;
|
|
248
255
|
function getResponseFormat(outputType) {
|
|
249
256
|
if (outputType === 'text') {
|
|
250
257
|
return { type: 'text' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsModel.js","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsModel.js","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.convertChatCompletionsStreamToResponses = convertChatCompletionsStreamToResponses;
|
|
4
|
+
const openaiChatCompletionsModel_1 = require("./openaiChatCompletionsModel.js");
|
|
5
|
+
async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
3
6
|
let usage = undefined;
|
|
4
7
|
const state = {
|
|
5
8
|
started: false,
|
|
@@ -65,7 +68,7 @@ export async function* convertChatCompletionsStreamToResponses(response, stream)
|
|
|
65
68
|
for (const tc_delta of delta.tool_calls) {
|
|
66
69
|
if (!(tc_delta.index in state.function_calls)) {
|
|
67
70
|
state.function_calls[tc_delta.index] = {
|
|
68
|
-
id: FAKE_ID,
|
|
71
|
+
id: openaiChatCompletionsModel_1.FAKE_ID,
|
|
69
72
|
arguments: '',
|
|
70
73
|
name: '',
|
|
71
74
|
type: 'function_call',
|
|
@@ -92,7 +95,7 @@ export async function* convertChatCompletionsStreamToResponses(response, stream)
|
|
|
92
95
|
if (state.text_content_index_and_output ||
|
|
93
96
|
state.refusal_content_index_and_output) {
|
|
94
97
|
const assistant_msg = {
|
|
95
|
-
id: FAKE_ID,
|
|
98
|
+
id: openaiChatCompletionsModel_1.FAKE_ID,
|
|
96
99
|
content: [],
|
|
97
100
|
role: 'assistant',
|
|
98
101
|
type: 'message',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsStreaming.js","sourceRoot":"","sources":["../src/openaiChatCompletionsStreaming.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsStreaming.js","sourceRoot":"","sources":["../src/openaiChatCompletionsStreaming.ts"],"names":[],"mappings":"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"}
|
package/dist/openaiProvider.js
CHANGED
|
@@ -1,11 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.OpenAIProvider = void 0;
|
|
7
|
+
const openai_1 = __importDefault(require("openai"));
|
|
8
|
+
const defaults_1 = require("./defaults.js");
|
|
9
|
+
const openaiResponsesModel_1 = require("./openaiResponsesModel.js");
|
|
10
|
+
const openaiChatCompletionsModel_1 = require("./openaiChatCompletionsModel.js");
|
|
5
11
|
/**
|
|
6
12
|
* The provider of OpenAI's models (or Chat Completions compatible ones)
|
|
7
13
|
*/
|
|
8
|
-
|
|
14
|
+
class OpenAIProvider {
|
|
9
15
|
#client;
|
|
10
16
|
#useResponses;
|
|
11
17
|
#options;
|
|
@@ -31,10 +37,10 @@ export class OpenAIProvider {
|
|
|
31
37
|
if (!this.#client) {
|
|
32
38
|
this.#client =
|
|
33
39
|
// this provider checks if there is the default client first,
|
|
34
|
-
getDefaultOpenAIClient() ??
|
|
40
|
+
(0, defaults_1.getDefaultOpenAIClient)() ??
|
|
35
41
|
// and then manually creates a new one.
|
|
36
|
-
new
|
|
37
|
-
apiKey: this.#options.apiKey ?? getDefaultOpenAIKey(),
|
|
42
|
+
new openai_1.default({
|
|
43
|
+
apiKey: this.#options.apiKey ?? (0, defaults_1.getDefaultOpenAIKey)(),
|
|
38
44
|
baseURL: this.#options.baseURL,
|
|
39
45
|
organization: this.#options.organization,
|
|
40
46
|
project: this.#options.project,
|
|
@@ -43,12 +49,13 @@ export class OpenAIProvider {
|
|
|
43
49
|
return this.#client;
|
|
44
50
|
}
|
|
45
51
|
async getModel(modelName) {
|
|
46
|
-
const model = modelName || DEFAULT_OPENAI_MODEL;
|
|
47
|
-
const useResponses = this.#useResponses ?? shouldUseResponsesByDefault();
|
|
52
|
+
const model = modelName || defaults_1.DEFAULT_OPENAI_MODEL;
|
|
53
|
+
const useResponses = this.#useResponses ?? (0, defaults_1.shouldUseResponsesByDefault)();
|
|
48
54
|
if (useResponses) {
|
|
49
|
-
return new OpenAIResponsesModel(this.#getClient(), model);
|
|
55
|
+
return new openaiResponsesModel_1.OpenAIResponsesModel(this.#getClient(), model);
|
|
50
56
|
}
|
|
51
|
-
return new OpenAIChatCompletionsModel(this.#getClient(), model);
|
|
57
|
+
return new openaiChatCompletionsModel_1.OpenAIChatCompletionsModel(this.#getClient(), model);
|
|
52
58
|
}
|
|
53
59
|
}
|
|
60
|
+
exports.OpenAIProvider = OpenAIProvider;
|
|
54
61
|
//# sourceMappingURL=openaiProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiProvider.js","sourceRoot":"","sources":["../src/openaiProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openaiProvider.js","sourceRoot":"","sources":["../src/openaiProvider.ts"],"names":[],"mappings":";;;;;;AACA,oDAA4B;AAC5B,4CAKoB;AACpB,oEAA8D;AAC9D,gFAA0E;AAc1E;;GAEG;AACH,MAAa,cAAc;IACzB,OAAO,CAAU;IACjB,aAAa,CAAW;IACxB,QAAQ,CAAwB;IAEhC,YAAY,UAAiC,EAAE;QAC7C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;YACjE,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClE,CAAC;YACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,UAAU;QACR,wDAAwD;QACxD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO;gBACV,6DAA6D;gBAC7D,IAAA,iCAAsB,GAAE;oBACxB,uCAAuC;oBACvC,IAAI,gBAAM,CAAC;wBACT,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAA,8BAAmB,GAAE;wBACrD,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;wBAC9B,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;wBACxC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;qBAC/B,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,SAA8B;QAC3C,MAAM,KAAK,GAAG,SAAS,IAAI,+BAAoB,CAAC;QAChD,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,IAAI,IAAA,sCAA2B,GAAE,CAAC;QAEzE,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,IAAI,2CAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,IAAI,uDAA0B,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;CACF;AAlDD,wCAkDC"}
|