@openai/agents-core 0.6.0 → 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/agentToolRunConfig.js +2 -10
- package/dist/agentToolRunConfig.js.map +1 -1
- package/dist/agentToolRunConfig.mjs +2 -10
- package/dist/agentToolRunConfig.mjs.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -0
- package/dist/index.mjs.map +1 -1
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/model.d.ts +146 -0
- package/dist/run.js +4 -6
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +5 -7
- package/dist/run.mjs.map +1 -1
- package/dist/runner/modelRetry.d.ts +13 -0
- package/dist/runner/modelRetry.js +581 -0
- package/dist/runner/modelRetry.js.map +1 -0
- package/dist/runner/modelRetry.mjs +576 -0
- package/dist/runner/modelRetry.mjs.map +1 -0
- package/dist/runner/modelSettings.d.ts +1 -0
- package/dist/runner/modelSettings.js +9 -0
- package/dist/runner/modelSettings.js.map +1 -1
- package/dist/runner/modelSettings.mjs +7 -0
- package/dist/runner/modelSettings.mjs.map +1 -1
- package/dist/runner/modelSettingsMerge.d.ts +2 -0
- package/dist/runner/modelSettingsMerge.js +54 -0
- package/dist/runner/modelSettingsMerge.js.map +1 -0
- package/dist/runner/modelSettingsMerge.mjs +51 -0
- package/dist/runner/modelSettingsMerge.mjs.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelSettings.mjs","sourceRoot":"","sources":["../../src/runner/modelSettings.ts"],"names":[],"mappings":"OAAO,EAAE,KAAK,EAAE;OACT,EAAE,6BAA6B,EAAE,aAAa,EAAE;
|
|
1
|
+
{"version":3,"file":"modelSettings.mjs","sourceRoot":"","sources":["../../src/runner/modelSettings.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.mergeModelSettings = mergeModelSettings;
|
|
4
|
+
const NESTED_MODEL_SETTINGS_MERGE_KEYS = ['reasoning', 'text'];
|
|
5
|
+
function isPlainObjectLike(value) {
|
|
6
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
7
|
+
}
|
|
8
|
+
function mergeNestedObjectMap(targetRecord, inheritedRecord, overrideRecord, key) {
|
|
9
|
+
if (isPlainObjectLike(inheritedRecord[key]) &&
|
|
10
|
+
isPlainObjectLike(overrideRecord[key])) {
|
|
11
|
+
targetRecord[key] = {
|
|
12
|
+
...inheritedRecord[key],
|
|
13
|
+
...overrideRecord[key],
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function mergeRetrySettings(targetRecord, inheritedRecord, overrideRecord) {
|
|
18
|
+
if (!isPlainObjectLike(inheritedRecord.retry) ||
|
|
19
|
+
!isPlainObjectLike(overrideRecord.retry)) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
const inheritedRetry = inheritedRecord.retry;
|
|
23
|
+
const overrideRetry = overrideRecord.retry;
|
|
24
|
+
const mergedRetry = {
|
|
25
|
+
...inheritedRetry,
|
|
26
|
+
...overrideRetry,
|
|
27
|
+
};
|
|
28
|
+
if (isPlainObjectLike(inheritedRetry.backoff) &&
|
|
29
|
+
isPlainObjectLike(overrideRetry.backoff)) {
|
|
30
|
+
mergedRetry.backoff = {
|
|
31
|
+
...inheritedRetry.backoff,
|
|
32
|
+
...overrideRetry.backoff,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
targetRecord.retry = mergedRetry;
|
|
36
|
+
}
|
|
37
|
+
function mergeModelSettings(inheritedModelSettings, overrideModelSettings) {
|
|
38
|
+
const mergedModelSettings = {
|
|
39
|
+
...inheritedModelSettings,
|
|
40
|
+
...overrideModelSettings,
|
|
41
|
+
};
|
|
42
|
+
if (!inheritedModelSettings || !overrideModelSettings) {
|
|
43
|
+
return mergedModelSettings;
|
|
44
|
+
}
|
|
45
|
+
const inheritedModelSettingsRecord = inheritedModelSettings;
|
|
46
|
+
const overrideModelSettingsRecord = overrideModelSettings;
|
|
47
|
+
const mergedModelSettingsRecord = mergedModelSettings;
|
|
48
|
+
for (const key of NESTED_MODEL_SETTINGS_MERGE_KEYS) {
|
|
49
|
+
mergeNestedObjectMap(mergedModelSettingsRecord, inheritedModelSettingsRecord, overrideModelSettingsRecord, key);
|
|
50
|
+
}
|
|
51
|
+
mergeRetrySettings(mergedModelSettingsRecord, inheritedModelSettingsRecord, overrideModelSettingsRecord);
|
|
52
|
+
return mergedModelSettings;
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=modelSettingsMerge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modelSettingsMerge.js","sourceRoot":"","sources":["../../src/runner/modelSettingsMerge.ts"],"names":[],"mappings":";;AAyDA,gDAyCC;AAhGD,MAAM,gCAAgC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAU,CAAC;AAExE,SAAS,iBAAiB,CAAC,KAAc;IACvC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,oBAAoB,CAC3B,YAAqC,EACrC,eAAwC,EACxC,cAAuC,EACvC,GAAW;IAEX,IACE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACvC,iBAAiB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACtC,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,GAAG;YAClB,GAAG,eAAe,CAAC,GAAG,CAAC;YACvB,GAAG,cAAc,CAAC,GAAG,CAAC;SACvB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,YAAqC,EACrC,eAAwC,EACxC,cAAuC;IAEvC,IACE,CAAC,iBAAiB,CAAC,eAAe,CAAC,KAAK,CAAC;QACzC,CAAC,iBAAiB,CAAC,cAAc,CAAC,KAAK,CAAC,EACxC,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC;IAC7C,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC;IAC3C,MAAM,WAAW,GAAG;QAClB,GAAG,cAAc;QACjB,GAAG,aAAa;KACjB,CAAC;IAEF,IACE,iBAAiB,CAAC,cAAc,CAAC,OAAO,CAAC;QACzC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,EACxC,CAAC;QACD,WAAW,CAAC,OAAO,GAAG;YACpB,GAAG,cAAc,CAAC,OAAO;YACzB,GAAG,aAAa,CAAC,OAAO;SACzB,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,KAAK,GAAG,WAAW,CAAC;AACnC,CAAC;AAED,SAAgB,kBAAkB,CAChC,sBAAsC,EACtC,qBAAqC;IAErC,MAAM,mBAAmB,GAAkB;QACzC,GAAG,sBAAsB;QACzB,GAAG,qBAAqB;KACzB,CAAC;IAEF,IAAI,CAAC,sBAAsB,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACtD,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,MAAM,4BAA4B,GAAG,sBAGpC,CAAC;IACF,MAAM,2BAA2B,GAAG,qBAGnC,CAAC;IACF,MAAM,yBAAyB,GAAG,mBAGjC,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,gCAAgC,EAAE,CAAC;QACnD,oBAAoB,CAClB,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,EAC3B,GAAG,CACJ,CAAC;IACJ,CAAC;IACD,kBAAkB,CAChB,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,CAC5B,CAAC;IAEF,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
const NESTED_MODEL_SETTINGS_MERGE_KEYS = ['reasoning', 'text'];
|
|
2
|
+
function isPlainObjectLike(value) {
|
|
3
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
4
|
+
}
|
|
5
|
+
function mergeNestedObjectMap(targetRecord, inheritedRecord, overrideRecord, key) {
|
|
6
|
+
if (isPlainObjectLike(inheritedRecord[key]) &&
|
|
7
|
+
isPlainObjectLike(overrideRecord[key])) {
|
|
8
|
+
targetRecord[key] = {
|
|
9
|
+
...inheritedRecord[key],
|
|
10
|
+
...overrideRecord[key],
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
function mergeRetrySettings(targetRecord, inheritedRecord, overrideRecord) {
|
|
15
|
+
if (!isPlainObjectLike(inheritedRecord.retry) ||
|
|
16
|
+
!isPlainObjectLike(overrideRecord.retry)) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
const inheritedRetry = inheritedRecord.retry;
|
|
20
|
+
const overrideRetry = overrideRecord.retry;
|
|
21
|
+
const mergedRetry = {
|
|
22
|
+
...inheritedRetry,
|
|
23
|
+
...overrideRetry,
|
|
24
|
+
};
|
|
25
|
+
if (isPlainObjectLike(inheritedRetry.backoff) &&
|
|
26
|
+
isPlainObjectLike(overrideRetry.backoff)) {
|
|
27
|
+
mergedRetry.backoff = {
|
|
28
|
+
...inheritedRetry.backoff,
|
|
29
|
+
...overrideRetry.backoff,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
targetRecord.retry = mergedRetry;
|
|
33
|
+
}
|
|
34
|
+
export function mergeModelSettings(inheritedModelSettings, overrideModelSettings) {
|
|
35
|
+
const mergedModelSettings = {
|
|
36
|
+
...inheritedModelSettings,
|
|
37
|
+
...overrideModelSettings,
|
|
38
|
+
};
|
|
39
|
+
if (!inheritedModelSettings || !overrideModelSettings) {
|
|
40
|
+
return mergedModelSettings;
|
|
41
|
+
}
|
|
42
|
+
const inheritedModelSettingsRecord = inheritedModelSettings;
|
|
43
|
+
const overrideModelSettingsRecord = overrideModelSettings;
|
|
44
|
+
const mergedModelSettingsRecord = mergedModelSettings;
|
|
45
|
+
for (const key of NESTED_MODEL_SETTINGS_MERGE_KEYS) {
|
|
46
|
+
mergeNestedObjectMap(mergedModelSettingsRecord, inheritedModelSettingsRecord, overrideModelSettingsRecord, key);
|
|
47
|
+
}
|
|
48
|
+
mergeRetrySettings(mergedModelSettingsRecord, inheritedModelSettingsRecord, overrideModelSettingsRecord);
|
|
49
|
+
return mergedModelSettings;
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=modelSettingsMerge.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modelSettingsMerge.mjs","sourceRoot":"","sources":["../../src/runner/modelSettingsMerge.ts"],"names":[],"mappings":"AAEA,MAAM,gCAAgC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAU,CAAC;AAExE,SAAS,iBAAiB,CAAC,KAAc;IACvC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,oBAAoB,CAC3B,YAAqC,EACrC,eAAwC,EACxC,cAAuC,EACvC,GAAW;IAEX,IACE,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACvC,iBAAiB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACtC,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,GAAG;YAClB,GAAG,eAAe,CAAC,GAAG,CAAC;YACvB,GAAG,cAAc,CAAC,GAAG,CAAC;SACvB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,YAAqC,EACrC,eAAwC,EACxC,cAAuC;IAEvC,IACE,CAAC,iBAAiB,CAAC,eAAe,CAAC,KAAK,CAAC;QACzC,CAAC,iBAAiB,CAAC,cAAc,CAAC,KAAK,CAAC,EACxC,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC;IAC7C,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC;IAC3C,MAAM,WAAW,GAAG;QAClB,GAAG,cAAc;QACjB,GAAG,aAAa;KACjB,CAAC;IAEF,IACE,iBAAiB,CAAC,cAAc,CAAC,OAAO,CAAC;QACzC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,EACxC,CAAC;QACD,WAAW,CAAC,OAAO,GAAG;YACpB,GAAG,cAAc,CAAC,OAAO;YACzB,GAAG,aAAa,CAAC,OAAO;SACzB,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,KAAK,GAAG,WAAW,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,sBAAsC,EACtC,qBAAqC;IAErC,MAAM,mBAAmB,GAAkB;QACzC,GAAG,sBAAsB;QACzB,GAAG,qBAAqB;KACzB,CAAC;IAEF,IAAI,CAAC,sBAAsB,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACtD,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,MAAM,4BAA4B,GAAG,sBAGpC,CAAC;IACF,MAAM,2BAA2B,GAAG,qBAGnC,CAAC;IACF,MAAM,yBAAyB,GAAG,mBAGjC,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,gCAAgC,EAAE,CAAC;QACnD,oBAAoB,CAClB,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,EAC3B,GAAG,CACJ,CAAC;IACJ,CAAC;IACD,kBAAkB,CAChB,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,CAC5B,CAAC;IAEF,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@openai/agents-core",
|
|
3
3
|
"repository": "https://github.com/openai/openai-agents-js",
|
|
4
4
|
"homepage": "https://openai.github.io/openai-agents-js/",
|
|
5
|
-
"version": "0.
|
|
5
|
+
"version": "0.7.0",
|
|
6
6
|
"description": "The OpenAI Agents SDK is a lightweight yet powerful framework for building multi-agent workflows.",
|
|
7
7
|
"author": "OpenAI <support@openai.com>",
|
|
8
8
|
"main": "dist/index.js",
|