@openai/agents-core 0.3.7 → 0.3.8
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/errors.d.ts +40 -0
- package/dist/errors.js +38 -1
- package/dist/errors.js.map +1 -1
- package/dist/errors.mjs +34 -0
- package/dist/errors.mjs.map +1 -1
- package/dist/index.d.ts +6 -2
- package/dist/index.js +13 -2
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +3 -1
- package/dist/index.mjs.map +1 -1
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/result.d.ts +17 -0
- package/dist/result.js +71 -24
- package/dist/result.js.map +1 -1
- package/dist/result.mjs +69 -22
- package/dist/result.mjs.map +1 -1
- package/dist/run.d.ts +14 -47
- package/dist/run.js +421 -994
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +405 -978
- package/dist/run.mjs.map +1 -1
- package/dist/runState.d.ts +1286 -172
- package/dist/runState.js +146 -16
- package/dist/runState.js.map +1 -1
- package/dist/runState.mjs +142 -12
- package/dist/runState.mjs.map +1 -1
- package/dist/runner/constants.d.ts +1 -0
- package/dist/runner/constants.js +6 -0
- package/dist/runner/constants.js.map +1 -0
- package/dist/runner/constants.mjs +3 -0
- package/dist/runner/constants.mjs.map +1 -0
- package/dist/runner/conversation.d.ts +85 -0
- package/dist/runner/conversation.js +275 -0
- package/dist/runner/conversation.js.map +1 -0
- package/dist/runner/conversation.mjs +269 -0
- package/dist/runner/conversation.mjs.map +1 -0
- package/dist/runner/guardrails.d.ts +23 -0
- package/dist/runner/guardrails.js +174 -0
- package/dist/runner/guardrails.js.map +1 -0
- package/dist/runner/guardrails.mjs +166 -0
- package/dist/runner/guardrails.mjs.map +1 -0
- package/dist/runner/items.d.ts +18 -0
- package/dist/runner/items.js +89 -0
- package/dist/runner/items.js.map +1 -0
- package/dist/runner/items.mjs +79 -0
- package/dist/runner/items.mjs.map +1 -0
- package/dist/runner/mcpApprovals.d.ts +25 -0
- package/dist/runner/mcpApprovals.js +66 -0
- package/dist/runner/mcpApprovals.js.map +1 -0
- package/dist/runner/mcpApprovals.mjs +63 -0
- package/dist/runner/mcpApprovals.mjs.map +1 -0
- package/dist/runner/modelOutputs.d.ts +10 -0
- package/dist/runner/modelOutputs.js +206 -0
- package/dist/runner/modelOutputs.js.map +1 -0
- package/dist/runner/modelOutputs.mjs +203 -0
- package/dist/runner/modelOutputs.mjs.map +1 -0
- package/dist/runner/modelPreparation.d.ts +8 -0
- package/dist/runner/modelPreparation.js +41 -0
- package/dist/runner/modelPreparation.js.map +1 -0
- package/dist/runner/modelPreparation.mjs +38 -0
- package/dist/runner/modelPreparation.mjs.map +1 -0
- package/dist/runner/modelSettings.d.ts +20 -0
- package/dist/runner/modelSettings.js +97 -0
- package/dist/runner/modelSettings.js.map +1 -0
- package/dist/runner/modelSettings.mjs +92 -0
- package/dist/runner/modelSettings.mjs.map +1 -0
- package/dist/runner/runLoop.d.ts +32 -0
- package/dist/runner/runLoop.js +62 -0
- package/dist/runner/runLoop.js.map +1 -0
- package/dist/runner/runLoop.mjs +57 -0
- package/dist/runner/runLoop.mjs.map +1 -0
- package/dist/runner/sessionPersistence.d.ts +26 -0
- package/dist/runner/sessionPersistence.js +441 -0
- package/dist/runner/sessionPersistence.js.map +1 -0
- package/dist/runner/sessionPersistence.mjs +431 -0
- package/dist/runner/sessionPersistence.mjs.map +1 -0
- package/dist/runner/steps.d.ts +48 -0
- package/dist/runner/steps.js +40 -0
- package/dist/runner/steps.js.map +1 -0
- package/dist/runner/steps.mjs +36 -0
- package/dist/runner/steps.mjs.map +1 -0
- package/dist/runner/streaming.d.ts +9 -0
- package/dist/runner/streaming.js +74 -0
- package/dist/runner/streaming.js.map +1 -0
- package/dist/runner/streaming.mjs +65 -0
- package/dist/runner/streaming.mjs.map +1 -0
- package/dist/runner/toolExecution.d.ts +15 -0
- package/dist/runner/toolExecution.js +997 -0
- package/dist/runner/toolExecution.js.map +1 -0
- package/dist/runner/toolExecution.mjs +984 -0
- package/dist/runner/toolExecution.mjs.map +1 -0
- package/dist/runner/toolUseTracker.d.ts +9 -0
- package/dist/runner/toolUseTracker.js +34 -0
- package/dist/runner/toolUseTracker.js.map +1 -0
- package/dist/runner/toolUseTracker.mjs +30 -0
- package/dist/runner/toolUseTracker.mjs.map +1 -0
- package/dist/runner/tracing.d.ts +23 -0
- package/dist/runner/tracing.js +45 -0
- package/dist/runner/tracing.js.map +1 -0
- package/dist/runner/tracing.mjs +41 -0
- package/dist/runner/tracing.mjs.map +1 -0
- package/dist/runner/turnPreparation.d.ts +30 -0
- package/dist/runner/turnPreparation.js +80 -0
- package/dist/runner/turnPreparation.js.map +1 -0
- package/dist/runner/turnPreparation.mjs +74 -0
- package/dist/runner/turnPreparation.mjs.map +1 -0
- package/dist/runner/turnResolution.d.ts +3 -0
- package/dist/runner/turnResolution.js +531 -0
- package/dist/runner/turnResolution.js.map +1 -0
- package/dist/runner/turnResolution.mjs +526 -0
- package/dist/runner/turnResolution.mjs.map +1 -0
- package/dist/runner/types.d.ts +66 -0
- package/dist/runner/types.js +3 -0
- package/dist/runner/types.js.map +1 -0
- package/dist/runner/types.mjs +2 -0
- package/dist/runner/types.mjs.map +1 -0
- package/dist/shims/mcp-server/node.js +51 -6
- package/dist/shims/mcp-server/node.js.map +1 -1
- package/dist/shims/mcp-server/node.mjs +51 -6
- package/dist/shims/mcp-server/node.mjs.map +1 -1
- package/dist/tool.d.ts +28 -2
- package/dist/tool.js +7 -1
- package/dist/tool.js.map +1 -1
- package/dist/tool.mjs +8 -2
- package/dist/tool.mjs.map +1 -1
- package/dist/toolGuardrail.d.ts +101 -0
- package/dist/toolGuardrail.js +58 -0
- package/dist/toolGuardrail.js.map +1 -0
- package/dist/toolGuardrail.mjs +51 -0
- package/dist/toolGuardrail.mjs.map +1 -0
- package/dist/tracing/config.d.ts +3 -0
- package/dist/tracing/config.js +3 -0
- package/dist/tracing/config.js.map +1 -0
- package/dist/tracing/config.mjs +2 -0
- package/dist/tracing/config.mjs.map +1 -0
- package/dist/tracing/context.d.ts +2 -0
- package/dist/tracing/context.js +95 -24
- package/dist/tracing/context.js.map +1 -1
- package/dist/tracing/context.mjs +95 -24
- package/dist/tracing/context.mjs.map +1 -1
- package/dist/tracing/createSpans.d.ts +11 -11
- package/dist/tracing/index.d.ts +2 -0
- package/dist/tracing/index.js.map +1 -1
- package/dist/tracing/index.mjs.map +1 -1
- package/dist/tracing/provider.js +54 -4
- package/dist/tracing/provider.js.map +1 -1
- package/dist/tracing/provider.mjs +54 -4
- package/dist/tracing/provider.mjs.map +1 -1
- package/dist/tracing/spans.d.ts +2 -0
- package/dist/tracing/spans.js +6 -0
- package/dist/tracing/spans.js.map +1 -1
- package/dist/tracing/spans.mjs +6 -0
- package/dist/tracing/spans.mjs.map +1 -1
- package/dist/tracing/traces.d.ts +11 -1
- package/dist/tracing/traces.js +15 -2
- package/dist/tracing/traces.js.map +1 -1
- package/dist/tracing/traces.mjs +15 -2
- package/dist/tracing/traces.mjs.map +1 -1
- package/dist/types/protocol.d.ts +11 -0
- package/dist/types/protocol.js +1 -0
- package/dist/types/protocol.js.map +1 -1
- package/dist/types/protocol.mjs +1 -0
- package/dist/types/protocol.mjs.map +1 -1
- package/dist/utils/binary.d.ts +6 -0
- package/dist/utils/binary.js +53 -0
- package/dist/utils/binary.js.map +1 -0
- package/dist/utils/binary.mjs +49 -0
- package/dist/utils/binary.mjs.map +1 -0
- package/dist/utils/toolGuardrails.d.ts +24 -0
- package/dist/utils/toolGuardrails.js +58 -0
- package/dist/utils/toolGuardrails.js.map +1 -0
- package/dist/utils/toolGuardrails.mjs +54 -0
- package/dist/utils/toolGuardrails.mjs.map +1 -0
- package/package.json +4 -3
- package/dist/runImplementation.d.ts +0 -161
- package/dist/runImplementation.js +0 -2054
- package/dist/runImplementation.js.map +0 -1
- package/dist/runImplementation.mjs +0 -2028
- package/dist/runImplementation.mjs.map +0 -1
package/dist/result.mjs
CHANGED
|
@@ -1,7 +1,38 @@
|
|
|
1
1
|
import { ReadableStream as _ReadableStream, TransformStream, Readable, } from '@openai/agents-core/_shims';
|
|
2
|
-
import { getTurnInput } from "./
|
|
2
|
+
import { getTurnInput } from "./runner/items.mjs";
|
|
3
3
|
import logger from "./logger.mjs";
|
|
4
4
|
import { StreamEventTextStream } from "./types/protocol.mjs";
|
|
5
|
+
function combineAbortSignals(...signals) {
|
|
6
|
+
const active = signals.filter(Boolean);
|
|
7
|
+
if (active.length === 0) {
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
const anyFn = AbortSignal.any;
|
|
11
|
+
if (typeof anyFn === 'function') {
|
|
12
|
+
try {
|
|
13
|
+
return anyFn(active);
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
logger.debug(`AbortSignal.any failed, falling back: ${error}`);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
const controller = new AbortController();
|
|
20
|
+
const abortCombined = (reason) => {
|
|
21
|
+
if (!controller.signal.aborted) {
|
|
22
|
+
controller.abort(reason);
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
for (const signal of active) {
|
|
26
|
+
if (signal.aborted) {
|
|
27
|
+
abortCombined(signal.reason);
|
|
28
|
+
break;
|
|
29
|
+
}
|
|
30
|
+
signal.addEventListener('abort', () => abortCombined(signal.reason), {
|
|
31
|
+
once: true,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
return controller.signal;
|
|
35
|
+
}
|
|
5
36
|
class RunResultBase {
|
|
6
37
|
state;
|
|
7
38
|
constructor(state) {
|
|
@@ -74,6 +105,18 @@ class RunResultBase {
|
|
|
74
105
|
get outputGuardrailResults() {
|
|
75
106
|
return this.state._outputGuardrailResults;
|
|
76
107
|
}
|
|
108
|
+
/**
|
|
109
|
+
* Guardrail results for tool inputs.
|
|
110
|
+
*/
|
|
111
|
+
get toolInputGuardrailResults() {
|
|
112
|
+
return this.state._toolInputGuardrailResults;
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Guardrail results for tool outputs.
|
|
116
|
+
*/
|
|
117
|
+
get toolOutputGuardrailResults() {
|
|
118
|
+
return this.state._toolOutputGuardrailResults;
|
|
119
|
+
}
|
|
77
120
|
/**
|
|
78
121
|
* Any interruptions that occurred during the agent run for example for tool approvals.
|
|
79
122
|
*/
|
|
@@ -122,7 +165,8 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
122
165
|
*/
|
|
123
166
|
maxTurns;
|
|
124
167
|
#error = null;
|
|
125
|
-
#
|
|
168
|
+
#combinedSignal;
|
|
169
|
+
#abortController;
|
|
126
170
|
#readableController;
|
|
127
171
|
#readableStream;
|
|
128
172
|
#completedPromise;
|
|
@@ -132,20 +176,23 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
132
176
|
#streamLoopPromise;
|
|
133
177
|
constructor(result = {}) {
|
|
134
178
|
super(result.state);
|
|
135
|
-
this.#
|
|
179
|
+
this.#abortController = new AbortController();
|
|
180
|
+
this.#combinedSignal = combineAbortSignals(result.signal, this.#abortController.signal);
|
|
136
181
|
this.#readableStream = new _ReadableStream({
|
|
137
182
|
start: (controller) => {
|
|
138
183
|
this.#readableController = controller;
|
|
139
184
|
},
|
|
140
185
|
cancel: () => {
|
|
141
|
-
this.#
|
|
186
|
+
if (!this.#abortController.signal.aborted) {
|
|
187
|
+
this.#abortController.abort();
|
|
188
|
+
}
|
|
142
189
|
},
|
|
143
190
|
});
|
|
144
191
|
this.#completedPromise = new Promise((resolve, reject) => {
|
|
145
192
|
this.#completedPromiseResolve = resolve;
|
|
146
193
|
this.#completedPromiseReject = reject;
|
|
147
194
|
});
|
|
148
|
-
if (this.#
|
|
195
|
+
if (this.#combinedSignal) {
|
|
149
196
|
const handleAbort = () => {
|
|
150
197
|
if (this.#cancelled) {
|
|
151
198
|
return;
|
|
@@ -153,30 +200,23 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
153
200
|
this.#cancelled = true;
|
|
154
201
|
const controller = this.#readableController;
|
|
155
202
|
this.#readableController = undefined;
|
|
156
|
-
if (
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
logger.debug(`Failed to close readable stream on abort: ${err}`);
|
|
163
|
-
}
|
|
203
|
+
if (controller) {
|
|
204
|
+
try {
|
|
205
|
+
controller.close();
|
|
206
|
+
}
|
|
207
|
+
catch (err) {
|
|
208
|
+
logger.debug(`Failed to close readable stream on abort: ${err}`);
|
|
164
209
|
}
|
|
165
|
-
}
|
|
166
|
-
else {
|
|
167
|
-
void this.#readableStream
|
|
168
|
-
.cancel(this.#signal?.reason)
|
|
169
|
-
.catch((err) => {
|
|
170
|
-
logger.debug(`Failed to cancel readable stream on abort: ${err}`);
|
|
171
|
-
});
|
|
172
210
|
}
|
|
173
211
|
this.#completedPromiseResolve?.();
|
|
174
212
|
};
|
|
175
|
-
if (this.#
|
|
213
|
+
if (this.#combinedSignal.aborted) {
|
|
176
214
|
handleAbort();
|
|
177
215
|
}
|
|
178
216
|
else {
|
|
179
|
-
this.#
|
|
217
|
+
this.#combinedSignal.addEventListener('abort', handleAbort, {
|
|
218
|
+
once: true,
|
|
219
|
+
});
|
|
180
220
|
}
|
|
181
221
|
}
|
|
182
222
|
}
|
|
@@ -275,5 +315,12 @@ export class StreamedRunResult extends RunResultBase {
|
|
|
275
315
|
_getStreamLoopPromise() {
|
|
276
316
|
return this.#streamLoopPromise;
|
|
277
317
|
}
|
|
318
|
+
/**
|
|
319
|
+
* @internal
|
|
320
|
+
* Returns the abort signal that should be used to cancel the streaming run.
|
|
321
|
+
*/
|
|
322
|
+
_getAbortSignal() {
|
|
323
|
+
return this.#combinedSignal;
|
|
324
|
+
}
|
|
278
325
|
}
|
|
279
326
|
//# 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/dist/run.d.ts
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { Agent, AgentOutputType } from './agent';
|
|
2
2
|
import { InputGuardrail, OutputGuardrail } from './guardrail';
|
|
3
3
|
import { HandoffInputFilter } from './handoff';
|
|
4
|
-
import {
|
|
4
|
+
import { RunHooks } from './lifecycle';
|
|
5
|
+
import { Model, ModelProvider, ModelSettings } from './model';
|
|
5
6
|
import { RunContext } from './runContext';
|
|
6
|
-
import { AgentInputItem } from './types';
|
|
7
7
|
import { RunResult, StreamedRunResult } from './result';
|
|
8
|
-
import { RunHooks } from './lifecycle';
|
|
9
|
-
import { RunItem } from './items';
|
|
10
8
|
import { RunState } from './runState';
|
|
9
|
+
import type { TracingConfig } from './tracing';
|
|
11
10
|
import type { Session, SessionInputCallback } from './memory/session';
|
|
11
|
+
import type { AgentInputItem } from './types';
|
|
12
|
+
import type { CallModelInputFilter } from './runner/types';
|
|
13
|
+
export type { CallModelInputFilter, CallModelInputFilterArgs, ModelInputData, } from './runner/types';
|
|
14
|
+
export { getTracing } from './runner/tracing';
|
|
15
|
+
export { selectModel } from './runner/modelSettings';
|
|
16
|
+
export { getTurnInput } from './runner/items';
|
|
12
17
|
/**
|
|
13
18
|
* Configures settings for the entire agent run.
|
|
14
19
|
*/
|
|
@@ -69,6 +74,10 @@ export type RunConfig = {
|
|
|
69
74
|
* An optional dictionary of additional metadata to include with the trace.
|
|
70
75
|
*/
|
|
71
76
|
traceMetadata?: Record<string, string>;
|
|
77
|
+
/**
|
|
78
|
+
* Tracing configuration for this run. Use this to override the API key used when exporting traces.
|
|
79
|
+
*/
|
|
80
|
+
tracing?: TracingConfig;
|
|
72
81
|
/**
|
|
73
82
|
* Customizes how session history is combined with the current turn's input.
|
|
74
83
|
* When omitted, history items are appended before the new input.
|
|
@@ -92,6 +101,7 @@ type SharedRunOptions<TContext = undefined> = {
|
|
|
92
101
|
session?: Session;
|
|
93
102
|
sessionInputCallback?: SessionInputCallback;
|
|
94
103
|
callModelInputFilter?: CallModelInputFilter;
|
|
104
|
+
tracing?: TracingConfig;
|
|
95
105
|
};
|
|
96
106
|
/**
|
|
97
107
|
* Options for runs that stream incremental events as the model responds.
|
|
@@ -165,46 +175,3 @@ export declare class Runner extends RunHooks<any, AgentOutputType<unknown>> {
|
|
|
165
175
|
private readonly inputGuardrailDefs;
|
|
166
176
|
private readonly outputGuardrailDefs;
|
|
167
177
|
}
|
|
168
|
-
/**
|
|
169
|
-
* Mutable view of the instructions + input items that the model will receive.
|
|
170
|
-
* Filters always see a copy so they can edit without side effects.
|
|
171
|
-
*/
|
|
172
|
-
export type ModelInputData = {
|
|
173
|
-
input: AgentInputItem[];
|
|
174
|
-
instructions?: string;
|
|
175
|
-
};
|
|
176
|
-
/**
|
|
177
|
-
* Shape of the payload given to `callModelInputFilter`. Mirrored in the Python SDK so filters can
|
|
178
|
-
* share the same implementation across languages.
|
|
179
|
-
*/
|
|
180
|
-
export type CallModelInputFilterArgs<TContext = unknown> = {
|
|
181
|
-
modelData: ModelInputData;
|
|
182
|
-
agent: Agent<TContext, AgentOutputType>;
|
|
183
|
-
context: TContext | undefined;
|
|
184
|
-
};
|
|
185
|
-
/**
|
|
186
|
-
* Hook invoked immediately before a model call is issued, allowing callers to adjust the
|
|
187
|
-
* instructions or input array. Returning a new array enables redaction, truncation, or
|
|
188
|
-
* augmentation of the payload that will be sent to the provider.
|
|
189
|
-
*/
|
|
190
|
-
export type CallModelInputFilter<TContext = unknown> = (args: CallModelInputFilterArgs<TContext>) => ModelInputData | Promise<ModelInputData>;
|
|
191
|
-
/**
|
|
192
|
-
* Constructs the model input array for the current turn by combining the original turn input with
|
|
193
|
-
* any new run items (excluding tool approval placeholders). This helps ensure that repeated calls
|
|
194
|
-
* to the Responses API only send newly generated content.
|
|
195
|
-
*
|
|
196
|
-
* See: https://platform.openai.com/docs/guides/conversation-state?api-mode=responses.
|
|
197
|
-
*/
|
|
198
|
-
export declare function getTurnInput(originalInput: string | AgentInputItem[], generatedItems: RunItem[]): AgentInputItem[];
|
|
199
|
-
/**
|
|
200
|
-
* Resolves the effective model for the next turn by giving precedence to the agent-specific
|
|
201
|
-
* configuration when present, otherwise falling back to the runner-level default.
|
|
202
|
-
*/
|
|
203
|
-
export declare function selectModel(agentModel: string | Model, runConfigModel: string | Model | undefined): string | Model;
|
|
204
|
-
/**
|
|
205
|
-
* Normalizes tracing configuration into the format expected by model providers.
|
|
206
|
-
* Returns `false` to disable tracing, `true` to include full payload data, or
|
|
207
|
-
* `'enabled_without_data'` to omit sensitive content while still emitting spans.
|
|
208
|
-
*/
|
|
209
|
-
export declare function getTracing(tracingDisabled: boolean, traceIncludeSensitiveData: boolean): ModelTracing;
|
|
210
|
-
export {};
|