@openai/agents-core 0.4.2 → 0.4.3
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/logger.js +2 -2
- package/dist/logger.js.map +1 -1
- package/dist/logger.mjs +2 -2
- package/dist/logger.mjs.map +1 -1
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/result.js +55 -17
- package/dist/result.js.map +1 -1
- package/dist/result.mjs +55 -17
- package/dist/result.mjs.map +1 -1
- package/package.json +1 -1
package/dist/logger.js
CHANGED
|
@@ -27,8 +27,8 @@ function getLogger(namespace = 'openai-agents') {
|
|
|
27
27
|
return {
|
|
28
28
|
namespace,
|
|
29
29
|
debug: (0, debug_1.default)(namespace),
|
|
30
|
-
error: console.error,
|
|
31
|
-
warn: console.warn,
|
|
30
|
+
error: (...args) => console.error(...args),
|
|
31
|
+
warn: (...args) => console.warn(...args),
|
|
32
32
|
dontLogModelData,
|
|
33
33
|
dontLogToolData,
|
|
34
34
|
};
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AA0DA,8BASC;AAnED,kDAA0B;AAC1B,wCAAmC;AAEnC;;;GAGG;AACH,MAAM,gBAAgB,GAAG,gBAAO,CAAC,gBAAgB,CAAC;AAElD;;;GAGG;AACH,MAAM,eAAe,GAAG,gBAAO,CAAC,eAAe,CAAC;AAuChD;;;;;GAKG;AACH,SAAgB,SAAS,CAAC,YAAoB,eAAe;IAC3D,OAAO;QACL,SAAS;QACT,KAAK,EAAE,IAAA,eAAK,EAAC,SAAS,CAAC;QACvB,KAAK,EAAE,OAAO,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AA0DA,8BASC;AAnED,kDAA0B;AAC1B,wCAAmC;AAEnC;;;GAGG;AACH,MAAM,gBAAgB,GAAG,gBAAO,CAAC,gBAAgB,CAAC;AAElD;;;GAGG;AACH,MAAM,eAAe,GAAG,gBAAO,CAAC,eAAe,CAAC;AAuChD;;;;;GAKG;AACH,SAAgB,SAAS,CAAC,YAAoB,eAAe;IAC3D,OAAO;QACL,SAAS;QACT,KAAK,EAAE,IAAA,eAAK,EAAC,SAAS,CAAC;QACvB,KAAK,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QACjD,IAAI,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC/C,gBAAgB;QAChB,eAAe;KAChB,CAAC;AACJ,CAAC;AAEY,QAAA,MAAM,GAAG,SAAS,CAAC,oBAAoB,CAAC,CAAC;AAEtD,kBAAe,cAAM,CAAC"}
|
package/dist/logger.mjs
CHANGED
|
@@ -20,8 +20,8 @@ export function getLogger(namespace = 'openai-agents') {
|
|
|
20
20
|
return {
|
|
21
21
|
namespace,
|
|
22
22
|
debug: debug(namespace),
|
|
23
|
-
error: console.error,
|
|
24
|
-
warn: console.warn,
|
|
23
|
+
error: (...args) => console.error(...args),
|
|
24
|
+
warn: (...args) => console.warn(...args),
|
|
25
25
|
dontLogModelData,
|
|
26
26
|
dontLogToolData,
|
|
27
27
|
};
|
package/dist/logger.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.mjs","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"OAAO,KAAK,MAAM,OAAO;OAClB,EAAE,OAAO,EAAE;AAElB;;;GAGG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;AAElD;;;GAGG;AACH,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;AAuChD;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,YAAoB,eAAe;IAC3D,OAAO;QACL,SAAS;QACT,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;QACvB,KAAK,EAAE,OAAO,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"logger.mjs","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"OAAO,KAAK,MAAM,OAAO;OAClB,EAAE,OAAO,EAAE;AAElB;;;GAGG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;AAElD;;;GAGG;AACH,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;AAuChD;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,YAAoB,eAAe;IAC3D,OAAO;QACL,SAAS;QACT,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;QACvB,KAAK,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QACjD,IAAI,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC/C,gBAAgB;QAChB,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,oBAAoB,CAAC,CAAC;AAEtD,eAAe,MAAM,CAAC"}
|
package/dist/metadata.js
CHANGED
|
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.METADATA = void 0;
|
|
5
5
|
exports.METADATA = {
|
|
6
6
|
"name": "@openai/agents-core",
|
|
7
|
-
"version": "0.4.
|
|
7
|
+
"version": "0.4.3",
|
|
8
8
|
"versions": {
|
|
9
|
-
"@openai/agents-core": "0.4.
|
|
9
|
+
"@openai/agents-core": "0.4.3",
|
|
10
10
|
"openai": "^6"
|
|
11
11
|
}
|
|
12
12
|
};
|
package/dist/metadata.mjs
CHANGED
package/dist/result.js
CHANGED
|
@@ -8,6 +8,13 @@ const _shims_1 = require("@openai/agents-core/_shims");
|
|
|
8
8
|
const items_1 = require("./runner/items.js");
|
|
9
9
|
const logger_1 = __importDefault(require("./logger.js"));
|
|
10
10
|
const protocol_1 = require("./types/protocol.js");
|
|
11
|
+
function createAbortHandlerRef() {
|
|
12
|
+
const ref = {};
|
|
13
|
+
const handler = () => {
|
|
14
|
+
ref.current?.();
|
|
15
|
+
};
|
|
16
|
+
return { ref, handler };
|
|
17
|
+
}
|
|
11
18
|
function combineAbortSignals(...signals) {
|
|
12
19
|
const active = signals.filter(Boolean);
|
|
13
20
|
if (active.length === 0) {
|
|
@@ -180,6 +187,7 @@ class StreamedRunResult extends RunResultBase {
|
|
|
180
187
|
maxTurns;
|
|
181
188
|
#error = null;
|
|
182
189
|
#combinedSignal;
|
|
190
|
+
#abortSignalSnapshot;
|
|
183
191
|
#abortController;
|
|
184
192
|
#readableController;
|
|
185
193
|
#readableStream;
|
|
@@ -188,10 +196,13 @@ class StreamedRunResult extends RunResultBase {
|
|
|
188
196
|
#completedPromiseReject;
|
|
189
197
|
#cancelled = false;
|
|
190
198
|
#streamLoopPromise;
|
|
199
|
+
#abortHandler;
|
|
200
|
+
#abortHandlerRef;
|
|
191
201
|
constructor(result = {}) {
|
|
192
202
|
super(result.state);
|
|
193
203
|
this.#abortController = new AbortController();
|
|
194
204
|
this.#combinedSignal = combineAbortSignals(result.signal, this.#abortController.signal);
|
|
205
|
+
this.#abortSignalSnapshot = this.#combinedSignal;
|
|
195
206
|
this.#readableStream = new _shims_1.ReadableStream({
|
|
196
207
|
start: (controller) => {
|
|
197
208
|
this.#readableController = controller;
|
|
@@ -207,23 +218,13 @@ class StreamedRunResult extends RunResultBase {
|
|
|
207
218
|
this.#completedPromiseReject = reject;
|
|
208
219
|
});
|
|
209
220
|
if (this.#combinedSignal) {
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
this.#cancelled = true;
|
|
215
|
-
const controller = this.#readableController;
|
|
216
|
-
this.#readableController = undefined;
|
|
217
|
-
if (controller) {
|
|
218
|
-
try {
|
|
219
|
-
controller.close();
|
|
220
|
-
}
|
|
221
|
-
catch (err) {
|
|
222
|
-
logger_1.default.debug(`Failed to close readable stream on abort: ${err}`);
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
this.#completedPromiseResolve?.();
|
|
221
|
+
// Create the handler outside this scope so it cannot capture the run via lexical this.
|
|
222
|
+
const { ref: abortRef, handler: handleAbort } = createAbortHandlerRef();
|
|
223
|
+
abortRef.current = () => {
|
|
224
|
+
this.#handleAbort();
|
|
226
225
|
};
|
|
226
|
+
this.#abortHandler = handleAbort;
|
|
227
|
+
this.#abortHandlerRef = abortRef;
|
|
227
228
|
if (this.#combinedSignal.aborted) {
|
|
228
229
|
handleAbort();
|
|
229
230
|
}
|
|
@@ -253,6 +254,7 @@ class StreamedRunResult extends RunResultBase {
|
|
|
253
254
|
this.#readableController = undefined;
|
|
254
255
|
this.#completedPromiseResolve?.();
|
|
255
256
|
}
|
|
257
|
+
this.#detachAbortHandler();
|
|
256
258
|
}
|
|
257
259
|
/**
|
|
258
260
|
* @internal
|
|
@@ -268,6 +270,7 @@ class StreamedRunResult extends RunResultBase {
|
|
|
268
270
|
this.#completedPromise.catch((e) => {
|
|
269
271
|
logger_1.default.debug(`Resulted in an error: ${e}`);
|
|
270
272
|
});
|
|
273
|
+
this.#detachAbortHandler();
|
|
271
274
|
}
|
|
272
275
|
/**
|
|
273
276
|
* Returns true if the stream has been cancelled.
|
|
@@ -334,7 +337,42 @@ class StreamedRunResult extends RunResultBase {
|
|
|
334
337
|
* Returns the abort signal that should be used to cancel the streaming run.
|
|
335
338
|
*/
|
|
336
339
|
_getAbortSignal() {
|
|
337
|
-
return this.#combinedSignal;
|
|
340
|
+
return this.#abortSignalSnapshot ?? this.#combinedSignal;
|
|
341
|
+
}
|
|
342
|
+
#handleAbort() {
|
|
343
|
+
if (this.#cancelled) {
|
|
344
|
+
this.#detachAbortHandler();
|
|
345
|
+
return;
|
|
346
|
+
}
|
|
347
|
+
this.#cancelled = true;
|
|
348
|
+
const controller = this.#readableController;
|
|
349
|
+
this.#readableController = undefined;
|
|
350
|
+
if (controller) {
|
|
351
|
+
try {
|
|
352
|
+
controller.close();
|
|
353
|
+
}
|
|
354
|
+
catch (err) {
|
|
355
|
+
logger_1.default.debug(`Failed to close readable stream on abort: ${err}`);
|
|
356
|
+
}
|
|
357
|
+
}
|
|
358
|
+
this.#completedPromiseResolve?.();
|
|
359
|
+
this.#detachAbortHandler();
|
|
360
|
+
}
|
|
361
|
+
#detachAbortHandler() {
|
|
362
|
+
// Clear the indirection first so a retained signal cannot keep this run alive.
|
|
363
|
+
if (this.#abortHandlerRef) {
|
|
364
|
+
this.#abortHandlerRef.current = undefined;
|
|
365
|
+
}
|
|
366
|
+
if (this.#combinedSignal && this.#abortHandler) {
|
|
367
|
+
try {
|
|
368
|
+
this.#combinedSignal.removeEventListener('abort', this.#abortHandler);
|
|
369
|
+
}
|
|
370
|
+
catch (err) {
|
|
371
|
+
logger_1.default.debug(`Failed to remove abort listener: ${err}`);
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
this.#abortHandler = undefined;
|
|
375
|
+
this.#abortHandlerRef = undefined;
|
|
338
376
|
}
|
|
339
377
|
}
|
|
340
378
|
exports.StreamedRunResult = StreamedRunResult;
|
package/dist/result.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result.js","sourceRoot":"","sources":["../src/result.ts"],"names":[],"mappings":";;;;;;AAUA,uDAKoC;AAGpC,6CAA8C;AAG9C,yDAA8B;AAC9B,kDAAyD;
|
|
1
|
+
{"version":3,"file":"result.js","sourceRoot":"","sources":["../src/result.ts"],"names":[],"mappings":"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"}
|
package/dist/result.mjs
CHANGED
|
@@ -2,6 +2,13 @@ import { ReadableStream as _ReadableStream, TransformStream, Readable, } from '@
|
|
|
2
2
|
import { getTurnInput } from "./runner/items.mjs";
|
|
3
3
|
import logger from "./logger.mjs";
|
|
4
4
|
import { StreamEventTextStream } from "./types/protocol.mjs";
|
|
5
|
+
function createAbortHandlerRef() {
|
|
6
|
+
const ref = {};
|
|
7
|
+
const handler = () => {
|
|
8
|
+
ref.current?.();
|
|
9
|
+
};
|
|
10
|
+
return { ref, handler };
|
|
11
|
+
}
|
|
5
12
|
function combineAbortSignals(...signals) {
|
|
6
13
|
const active = signals.filter(Boolean);
|
|
7
14
|
if (active.length === 0) {
|
|
@@ -173,6 +180,7 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
173
180
|
maxTurns;
|
|
174
181
|
#error = null;
|
|
175
182
|
#combinedSignal;
|
|
183
|
+
#abortSignalSnapshot;
|
|
176
184
|
#abortController;
|
|
177
185
|
#readableController;
|
|
178
186
|
#readableStream;
|
|
@@ -181,10 +189,13 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
181
189
|
#completedPromiseReject;
|
|
182
190
|
#cancelled = false;
|
|
183
191
|
#streamLoopPromise;
|
|
192
|
+
#abortHandler;
|
|
193
|
+
#abortHandlerRef;
|
|
184
194
|
constructor(result = {}) {
|
|
185
195
|
super(result.state);
|
|
186
196
|
this.#abortController = new AbortController();
|
|
187
197
|
this.#combinedSignal = combineAbortSignals(result.signal, this.#abortController.signal);
|
|
198
|
+
this.#abortSignalSnapshot = this.#combinedSignal;
|
|
188
199
|
this.#readableStream = new _ReadableStream({
|
|
189
200
|
start: (controller) => {
|
|
190
201
|
this.#readableController = controller;
|
|
@@ -200,23 +211,13 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
200
211
|
this.#completedPromiseReject = reject;
|
|
201
212
|
});
|
|
202
213
|
if (this.#combinedSignal) {
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
this.#cancelled = true;
|
|
208
|
-
const controller = this.#readableController;
|
|
209
|
-
this.#readableController = undefined;
|
|
210
|
-
if (controller) {
|
|
211
|
-
try {
|
|
212
|
-
controller.close();
|
|
213
|
-
}
|
|
214
|
-
catch (err) {
|
|
215
|
-
logger.debug(`Failed to close readable stream on abort: ${err}`);
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
this.#completedPromiseResolve?.();
|
|
214
|
+
// Create the handler outside this scope so it cannot capture the run via lexical this.
|
|
215
|
+
const { ref: abortRef, handler: handleAbort } = createAbortHandlerRef();
|
|
216
|
+
abortRef.current = () => {
|
|
217
|
+
this.#handleAbort();
|
|
219
218
|
};
|
|
219
|
+
this.#abortHandler = handleAbort;
|
|
220
|
+
this.#abortHandlerRef = abortRef;
|
|
220
221
|
if (this.#combinedSignal.aborted) {
|
|
221
222
|
handleAbort();
|
|
222
223
|
}
|
|
@@ -246,6 +247,7 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
246
247
|
this.#readableController = undefined;
|
|
247
248
|
this.#completedPromiseResolve?.();
|
|
248
249
|
}
|
|
250
|
+
this.#detachAbortHandler();
|
|
249
251
|
}
|
|
250
252
|
/**
|
|
251
253
|
* @internal
|
|
@@ -261,6 +263,7 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
261
263
|
this.#completedPromise.catch((e) => {
|
|
262
264
|
logger.debug(`Resulted in an error: ${e}`);
|
|
263
265
|
});
|
|
266
|
+
this.#detachAbortHandler();
|
|
264
267
|
}
|
|
265
268
|
/**
|
|
266
269
|
* Returns true if the stream has been cancelled.
|
|
@@ -327,7 +330,42 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
327
330
|
* Returns the abort signal that should be used to cancel the streaming run.
|
|
328
331
|
*/
|
|
329
332
|
_getAbortSignal() {
|
|
330
|
-
return this.#combinedSignal;
|
|
333
|
+
return this.#abortSignalSnapshot ?? this.#combinedSignal;
|
|
334
|
+
}
|
|
335
|
+
#handleAbort() {
|
|
336
|
+
if (this.#cancelled) {
|
|
337
|
+
this.#detachAbortHandler();
|
|
338
|
+
return;
|
|
339
|
+
}
|
|
340
|
+
this.#cancelled = true;
|
|
341
|
+
const controller = this.#readableController;
|
|
342
|
+
this.#readableController = undefined;
|
|
343
|
+
if (controller) {
|
|
344
|
+
try {
|
|
345
|
+
controller.close();
|
|
346
|
+
}
|
|
347
|
+
catch (err) {
|
|
348
|
+
logger.debug(`Failed to close readable stream on abort: ${err}`);
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
this.#completedPromiseResolve?.();
|
|
352
|
+
this.#detachAbortHandler();
|
|
353
|
+
}
|
|
354
|
+
#detachAbortHandler() {
|
|
355
|
+
// Clear the indirection first so a retained signal cannot keep this run alive.
|
|
356
|
+
if (this.#abortHandlerRef) {
|
|
357
|
+
this.#abortHandlerRef.current = undefined;
|
|
358
|
+
}
|
|
359
|
+
if (this.#combinedSignal && this.#abortHandler) {
|
|
360
|
+
try {
|
|
361
|
+
this.#combinedSignal.removeEventListener('abort', this.#abortHandler);
|
|
362
|
+
}
|
|
363
|
+
catch (err) {
|
|
364
|
+
logger.debug(`Failed to remove abort listener: ${err}`);
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
this.#abortHandler = undefined;
|
|
368
|
+
this.#abortHandlerRef = undefined;
|
|
331
369
|
}
|
|
332
370
|
}
|
|
333
371
|
//# sourceMappingURL=result.mjs.map
|
package/dist/result.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result.mjs","sourceRoot":"","sources":["../src/result.ts"],"names":[],"mappings":"OAUO,EAEL,cAAc,IAAI,eAAe,EACjC,eAAe,EACf,QAAQ,GACT,MAAM,4BAA4B;OAG5B,EAAE,YAAY,EAAE;OAGhB,MAAM;OACN,EAAE,qBAAqB,EAAE;
|
|
1
|
+
{"version":3,"file":"result.mjs","sourceRoot":"","sources":["../src/result.ts"],"names":[],"mappings":"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"}
|
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.4.
|
|
5
|
+
"version": "0.4.3",
|
|
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",
|