openai 7.25.0 → 7.26.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/CHANGELOG.md +31 -0
- package/client.d.mts +5 -6
- package/client.d.mts.map +1 -1
- package/client.d.ts +5 -6
- package/client.d.ts.map +1 -1
- package/client.js +38 -10
- package/client.js.map +1 -1
- package/client.mjs +39 -11
- package/client.mjs.map +1 -1
- package/core/streaming.d.mts +4 -0
- package/core/streaming.d.mts.map +1 -1
- package/core/streaming.d.ts +4 -0
- package/core/streaming.d.ts.map +1 -1
- package/core/streaming.js +6 -0
- package/core/streaming.js.map +1 -1
- package/core/streaming.mjs +6 -0
- package/core/streaming.mjs.map +1 -1
- package/helpers/beta/agents/standard-schema.d.mts +7 -0
- package/helpers/beta/agents/standard-schema.d.mts.map +1 -0
- package/helpers/beta/agents/standard-schema.d.ts +7 -0
- package/helpers/beta/agents/standard-schema.d.ts.map +1 -0
- package/helpers/beta/agents/standard-schema.js +12 -0
- package/helpers/beta/agents/standard-schema.js.map +1 -0
- package/helpers/beta/agents/standard-schema.mjs +9 -0
- package/helpers/beta/agents/standard-schema.mjs.map +1 -0
- package/helpers/beta/agents/zod.d.mts +10 -0
- package/helpers/beta/agents/zod.d.mts.map +1 -0
- package/helpers/beta/agents/zod.d.ts +10 -0
- package/helpers/beta/agents/zod.d.ts.map +1 -0
- package/helpers/beta/agents/zod.js +12 -0
- package/helpers/beta/agents/zod.js.map +1 -0
- package/helpers/beta/agents/zod.mjs +9 -0
- package/helpers/beta/agents/zod.mjs.map +1 -0
- package/internal/realtime-credentials.d.mts +22 -1
- package/internal/realtime-credentials.d.mts.map +1 -1
- package/internal/realtime-credentials.d.ts +22 -1
- package/internal/realtime-credentials.d.ts.map +1 -1
- package/internal/realtime-credentials.js +48 -4
- package/internal/realtime-credentials.js.map +1 -1
- package/internal/realtime-credentials.mjs +45 -4
- package/internal/realtime-credentials.mjs.map +1 -1
- package/internal/responses-ws-credentials.d.mts +23 -0
- package/internal/responses-ws-credentials.d.mts.map +1 -0
- package/internal/responses-ws-credentials.d.ts +23 -0
- package/internal/responses-ws-credentials.d.ts.map +1 -0
- package/internal/responses-ws-credentials.js +108 -0
- package/internal/responses-ws-credentials.js.map +1 -0
- package/internal/responses-ws-credentials.mjs +104 -0
- package/internal/responses-ws-credentials.mjs.map +1 -0
- package/internal/ws-adapter-node.d.mts +4 -0
- package/internal/ws-adapter-node.d.mts.map +1 -1
- package/internal/ws-adapter-node.d.ts +4 -0
- package/internal/ws-adapter-node.d.ts.map +1 -1
- package/internal/ws-adapter-node.js +56 -0
- package/internal/ws-adapter-node.js.map +1 -1
- package/internal/ws-adapter-node.mjs +55 -0
- package/internal/ws-adapter-node.mjs.map +1 -1
- package/internal/ws.d.mts +27 -4
- package/internal/ws.d.mts.map +1 -1
- package/internal/ws.d.ts +27 -4
- package/internal/ws.d.ts.map +1 -1
- package/internal/ws.js +105 -5
- package/internal/ws.js.map +1 -1
- package/internal/ws.mjs +102 -4
- package/internal/ws.mjs.map +1 -1
- package/lib/agents/agent-session-stream.d.mts +13 -4
- package/lib/agents/agent-session-stream.d.mts.map +1 -1
- package/lib/agents/agent-session-stream.d.ts +13 -4
- package/lib/agents/agent-session-stream.d.ts.map +1 -1
- package/lib/agents/agent-session-stream.js +24 -21
- package/lib/agents/agent-session-stream.js.map +1 -1
- package/lib/agents/agent-session-stream.mjs +24 -21
- package/lib/agents/agent-session-stream.mjs.map +1 -1
- package/lib/beta/agents/agent-session-create-stream.d.mts +15 -0
- package/lib/beta/agents/agent-session-create-stream.d.mts.map +1 -0
- package/lib/beta/agents/agent-session-create-stream.d.ts +15 -0
- package/lib/beta/agents/agent-session-create-stream.d.ts.map +1 -0
- package/lib/beta/agents/agent-session-create-stream.js +25 -0
- package/lib/beta/agents/agent-session-create-stream.js.map +1 -0
- package/lib/beta/agents/agent-session-create-stream.mjs +22 -0
- package/lib/beta/agents/agent-session-create-stream.mjs.map +1 -0
- package/lib/beta/agents/agent-turn-result-collector.d.mts +17 -0
- package/lib/beta/agents/agent-turn-result-collector.d.mts.map +1 -0
- package/lib/beta/agents/agent-turn-result-collector.d.ts +17 -0
- package/lib/beta/agents/agent-turn-result-collector.d.ts.map +1 -0
- package/lib/beta/agents/agent-turn-result-collector.js +99 -0
- package/lib/beta/agents/agent-turn-result-collector.js.map +1 -0
- package/lib/beta/agents/agent-turn-result-collector.mjs +95 -0
- package/lib/beta/agents/agent-turn-result-collector.mjs.map +1 -0
- package/lib/beta/agents/agent-turn-result-error.d.mts +16 -0
- package/lib/beta/agents/agent-turn-result-error.d.mts.map +1 -0
- package/lib/beta/agents/agent-turn-result-error.d.ts +16 -0
- package/lib/beta/agents/agent-turn-result-error.d.ts.map +1 -0
- package/lib/beta/agents/agent-turn-result-error.js +22 -0
- package/lib/beta/agents/agent-turn-result-error.js.map +1 -0
- package/lib/beta/agents/agent-turn-result-error.mjs +18 -0
- package/lib/beta/agents/agent-turn-result-error.mjs.map +1 -0
- package/lib/beta/agents/agent-turn-result.d.mts +12 -0
- package/lib/beta/agents/agent-turn-result.d.mts.map +1 -0
- package/lib/beta/agents/agent-turn-result.d.ts +12 -0
- package/lib/beta/agents/agent-turn-result.d.ts.map +1 -0
- package/lib/beta/agents/agent-turn-result.js +22 -0
- package/lib/beta/agents/agent-turn-result.js.map +1 -0
- package/lib/beta/agents/agent-turn-result.mjs +18 -0
- package/lib/beta/agents/agent-turn-result.mjs.map +1 -0
- package/lib/beta/agents/function-tool.d.mts +27 -0
- package/lib/beta/agents/function-tool.d.mts.map +1 -0
- package/lib/beta/agents/function-tool.d.ts +27 -0
- package/lib/beta/agents/function-tool.d.ts.map +1 -0
- package/lib/beta/agents/function-tool.js +48 -0
- package/lib/beta/agents/function-tool.js.map +1 -0
- package/lib/beta/agents/function-tool.mjs +45 -0
- package/lib/beta/agents/function-tool.mjs.map +1 -0
- package/lib/beta/agents/output-format-types.d.mts +11 -0
- package/lib/beta/agents/output-format-types.d.mts.map +1 -0
- package/lib/beta/agents/output-format-types.d.ts +11 -0
- package/lib/beta/agents/output-format-types.d.ts.map +1 -0
- package/lib/beta/agents/output-format-types.js +3 -0
- package/lib/beta/agents/output-format-types.js.map +1 -0
- package/lib/beta/agents/output-format-types.mjs +2 -0
- package/lib/beta/agents/output-format-types.mjs.map +1 -0
- package/lib/beta/agents/output-format.d.mts +8 -0
- package/lib/beta/agents/output-format.d.mts.map +1 -0
- package/lib/beta/agents/output-format.d.ts +8 -0
- package/lib/beta/agents/output-format.d.ts.map +1 -0
- package/lib/beta/agents/output-format.js +20 -0
- package/lib/beta/agents/output-format.js.map +1 -0
- package/lib/beta/agents/output-format.mjs +14 -0
- package/lib/beta/agents/output-format.mjs.map +1 -0
- package/lib/beta/agents/output-parse-error.d.mts +11 -0
- package/lib/beta/agents/output-parse-error.d.mts.map +1 -0
- package/lib/beta/agents/output-parse-error.d.ts +11 -0
- package/lib/beta/agents/output-parse-error.d.ts.map +1 -0
- package/lib/beta/agents/output-parse-error.js +22 -0
- package/lib/beta/agents/output-parse-error.js.map +1 -0
- package/lib/beta/agents/output-parse-error.mjs +18 -0
- package/lib/beta/agents/output-parse-error.mjs.map +1 -0
- package/lib/beta/agents/parse-result.d.mts +95 -0
- package/lib/beta/agents/parse-result.d.mts.map +1 -0
- package/lib/beta/agents/parse-result.d.ts +95 -0
- package/lib/beta/agents/parse-result.d.ts.map +1 -0
- package/lib/beta/agents/parse-result.js +116 -0
- package/lib/beta/agents/parse-result.js.map +1 -0
- package/lib/beta/agents/parse-result.mjs +110 -0
- package/lib/beta/agents/parse-result.mjs.map +1 -0
- package/lib/beta/agents/parsed-agent-turn-result.d.mts +8 -0
- package/lib/beta/agents/parsed-agent-turn-result.d.mts.map +1 -0
- package/lib/beta/agents/parsed-agent-turn-result.d.ts +8 -0
- package/lib/beta/agents/parsed-agent-turn-result.d.ts.map +1 -0
- package/lib/beta/agents/parsed-agent-turn-result.js +14 -0
- package/lib/beta/agents/parsed-agent-turn-result.js.map +1 -0
- package/lib/beta/agents/parsed-agent-turn-result.mjs +10 -0
- package/lib/beta/agents/parsed-agent-turn-result.mjs.map +1 -0
- package/lib/beta/agents/result-collection.d.mts +15 -0
- package/lib/beta/agents/result-collection.d.mts.map +1 -0
- package/lib/beta/agents/result-collection.d.ts +15 -0
- package/lib/beta/agents/result-collection.d.ts.map +1 -0
- package/lib/beta/agents/result-collection.js +110 -0
- package/lib/beta/agents/result-collection.js.map +1 -0
- package/lib/beta/agents/result-collection.mjs +106 -0
- package/lib/beta/agents/result-collection.mjs.map +1 -0
- package/lib/beta/agents/tool-output.d.mts +7 -0
- package/lib/beta/agents/tool-output.d.mts.map +1 -0
- package/lib/beta/agents/tool-output.d.ts +7 -0
- package/lib/beta/agents/tool-output.d.ts.map +1 -0
- package/lib/beta/agents/tool-output.js +26 -0
- package/lib/beta/agents/tool-output.js.map +1 -0
- package/lib/beta/agents/tool-output.mjs +23 -0
- package/lib/beta/agents/tool-output.mjs.map +1 -0
- package/lib/responses/responses-websocket-session.d.mts +1 -1
- package/lib/responses/responses-websocket-session.d.mts.map +1 -1
- package/lib/responses/responses-websocket-session.d.ts +1 -1
- package/lib/responses/responses-websocket-session.d.ts.map +1 -1
- package/lib/responses/responses-websocket-session.js +12 -2
- package/lib/responses/responses-websocket-session.js.map +1 -1
- package/lib/responses/responses-websocket-session.mjs +12 -2
- package/lib/responses/responses-websocket-session.mjs.map +1 -1
- package/package.json +1 -1
- package/resources/beta/agents/agents.d.mts +9 -0
- package/resources/beta/agents/agents.d.mts.map +1 -1
- package/resources/beta/agents/agents.d.ts +9 -0
- package/resources/beta/agents/agents.d.ts.map +1 -1
- package/resources/beta/agents/agents.js.map +1 -1
- package/resources/beta/agents/agents.mjs.map +1 -1
- package/resources/beta/agents/sessions/events.d.mts +6 -5
- package/resources/beta/agents/sessions/events.d.mts.map +1 -1
- package/resources/beta/agents/sessions/events.d.ts +6 -5
- package/resources/beta/agents/sessions/events.d.ts.map +1 -1
- package/resources/beta/agents/sessions/events.js +6 -5
- package/resources/beta/agents/sessions/events.js.map +1 -1
- package/resources/beta/agents/sessions/events.mjs +6 -5
- package/resources/beta/agents/sessions/events.mjs.map +1 -1
- package/resources/beta/agents/sessions/index.d.mts +1 -0
- package/resources/beta/agents/sessions/index.d.mts.map +1 -1
- package/resources/beta/agents/sessions/index.d.ts +1 -0
- package/resources/beta/agents/sessions/index.d.ts.map +1 -1
- package/resources/beta/agents/sessions/index.js +3 -1
- package/resources/beta/agents/sessions/index.js.map +1 -1
- package/resources/beta/agents/sessions/index.mjs +1 -0
- package/resources/beta/agents/sessions/index.mjs.map +1 -1
- package/resources/beta/agents/sessions/sessions.d.mts +16 -4
- package/resources/beta/agents/sessions/sessions.d.mts.map +1 -1
- package/resources/beta/agents/sessions/sessions.d.ts +16 -4
- package/resources/beta/agents/sessions/sessions.d.ts.map +1 -1
- package/resources/beta/agents/sessions/sessions.js +17 -4
- package/resources/beta/agents/sessions/sessions.js.map +1 -1
- package/resources/beta/agents/sessions/sessions.mjs +17 -4
- package/resources/beta/agents/sessions/sessions.mjs.map +1 -1
- package/resources/beta/agents/sessions/traces.d.mts +68 -0
- package/resources/beta/agents/sessions/traces.d.mts.map +1 -0
- package/resources/beta/agents/sessions/traces.d.ts +68 -0
- package/resources/beta/agents/sessions/traces.d.ts.map +1 -0
- package/resources/beta/agents/sessions/traces.js +81 -0
- package/resources/beta/agents/sessions/traces.js.map +1 -0
- package/resources/beta/agents/sessions/traces.mjs +77 -0
- package/resources/beta/agents/sessions/traces.mjs.map +1 -0
- package/resources/beta/responses/ws-base.d.mts +3 -1
- package/resources/beta/responses/ws-base.d.mts.map +1 -1
- package/resources/beta/responses/ws-base.d.ts +3 -1
- package/resources/beta/responses/ws-base.d.ts.map +1 -1
- package/resources/beta/responses/ws-base.js +35 -6
- package/resources/beta/responses/ws-base.js.map +1 -1
- package/resources/beta/responses/ws-base.mjs +35 -6
- package/resources/beta/responses/ws-base.mjs.map +1 -1
- package/resources/beta/responses/ws.d.mts +10 -0
- package/resources/beta/responses/ws.d.mts.map +1 -1
- package/resources/beta/responses/ws.d.ts +10 -0
- package/resources/beta/responses/ws.d.ts.map +1 -1
- package/resources/beta/responses/ws.js +23 -22
- package/resources/beta/responses/ws.js.map +1 -1
- package/resources/beta/responses/ws.mjs +24 -23
- package/resources/beta/responses/ws.mjs.map +1 -1
- package/resources/chat/completions/completions.d.mts +1 -1
- package/resources/chat/completions/completions.d.mts.map +1 -1
- package/resources/chat/completions/completions.d.ts +1 -1
- package/resources/chat/completions/completions.d.ts.map +1 -1
- package/resources/evals/runs/runs.js +1 -1
- package/resources/evals/runs/runs.js.map +1 -1
- package/resources/evals/runs/runs.mjs +1 -1
- package/resources/evals/runs/runs.mjs.map +1 -1
- package/resources/live/forks/forks.d.mts +5 -1
- package/resources/live/forks/forks.d.mts.map +1 -1
- package/resources/live/forks/forks.d.ts +5 -1
- package/resources/live/forks/forks.d.ts.map +1 -1
- package/resources/live/live.d.mts +5 -1
- package/resources/live/live.d.mts.map +1 -1
- package/resources/live/live.d.ts +5 -1
- package/resources/live/live.d.ts.map +1 -1
- package/resources/live/live.js.map +1 -1
- package/resources/live/live.mjs.map +1 -1
- package/resources/responses/ws-base.d.mts +3 -1
- package/resources/responses/ws-base.d.mts.map +1 -1
- package/resources/responses/ws-base.d.ts +3 -1
- package/resources/responses/ws-base.d.ts.map +1 -1
- package/resources/responses/ws-base.js +35 -6
- package/resources/responses/ws-base.js.map +1 -1
- package/resources/responses/ws-base.mjs +35 -6
- package/resources/responses/ws-base.mjs.map +1 -1
- package/resources/responses/ws.d.mts +10 -0
- package/resources/responses/ws.d.mts.map +1 -1
- package/resources/responses/ws.d.ts +10 -0
- package/resources/responses/ws.d.ts.map +1 -1
- package/resources/responses/ws.js +23 -22
- package/resources/responses/ws.js.map +1 -1
- package/resources/responses/ws.mjs +24 -23
- package/resources/responses/ws.mjs.map +1 -1
- package/src/client.ts +55 -19
- package/src/core/streaming.ts +9 -0
- package/src/helpers/beta/agents/standard-schema.ts +13 -0
- package/src/helpers/beta/agents/zod.ts +10 -0
- package/src/internal/realtime-credentials.ts +70 -4
- package/src/internal/responses-ws-credentials.ts +160 -0
- package/src/internal/ws-adapter-node.ts +66 -0
- package/src/internal/ws.ts +139 -11
- package/src/lib/agents/agent-session-stream.ts +36 -24
- package/src/lib/beta/agents/agent-session-create-stream.ts +36 -0
- package/src/lib/beta/agents/agent-turn-result-collector.ts +122 -0
- package/src/lib/beta/agents/agent-turn-result-error.ts +33 -0
- package/src/lib/beta/agents/agent-turn-result.ts +22 -0
- package/src/lib/beta/agents/function-tool.ts +60 -0
- package/src/lib/beta/agents/output-format-types.ts +12 -0
- package/src/lib/beta/agents/output-format.ts +20 -0
- package/src/lib/beta/agents/output-parse-error.ts +16 -0
- package/src/lib/beta/agents/parse-result.ts +133 -0
- package/src/lib/beta/agents/parsed-agent-turn-result.ts +12 -0
- package/src/lib/beta/agents/result-collection.ts +115 -0
- package/src/lib/beta/agents/tool-output.ts +22 -0
- package/src/lib/responses/responses-websocket-session.ts +14 -3
- package/src/resources/beta/agents/agents.ts +11 -0
- package/src/resources/beta/agents/sessions/events.ts +6 -5
- package/src/resources/beta/agents/sessions/index.ts +1 -0
- package/src/resources/beta/agents/sessions/sessions.ts +48 -18
- package/src/resources/beta/agents/sessions/traces.ts +298 -0
- package/src/resources/beta/responses/ws-base.ts +40 -6
- package/src/resources/beta/responses/ws.ts +37 -27
- package/src/resources/chat/completions/completions.ts +1 -1
- package/src/resources/evals/runs/runs.ts +1 -1
- package/src/resources/live/forks/forks.ts +6 -1
- package/src/resources/live/live.ts +6 -1
- package/src/resources/responses/ws-base.ts +40 -6
- package/src/resources/responses/ws.ts +37 -27
- package/src/tsconfig.dist-src-node.d.ts +7 -0
- package/src/tsconfig.dist-src.d.ts +3 -1
- package/src/version.ts +1 -1
- package/version.d.mts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/version.mjs +1 -1
package/internal/ws.mjs
CHANGED
|
@@ -36,15 +36,44 @@ const REDIRECT_SAFE_WEBSOCKET_HEADERS = new Set([
|
|
|
36
36
|
'x-token-budget',
|
|
37
37
|
'x-trace-id',
|
|
38
38
|
]);
|
|
39
|
+
const WEBSOCKET_METADATA_HEADER_NAMES = new Set([
|
|
40
|
+
'accept',
|
|
41
|
+
'accept-encoding',
|
|
42
|
+
'accept-language',
|
|
43
|
+
'content-type',
|
|
44
|
+
'x-request-id',
|
|
45
|
+
'x-client-request-id',
|
|
46
|
+
'x-correlation-id',
|
|
47
|
+
'traceparent',
|
|
48
|
+
'tracestate',
|
|
49
|
+
'sentry-trace',
|
|
50
|
+
'x-amzn-trace-id',
|
|
51
|
+
'x-cloud-trace-context',
|
|
52
|
+
'x-datadog-trace-id',
|
|
53
|
+
'x-datadog-parent-id',
|
|
54
|
+
'x-datadog-sampling-priority',
|
|
55
|
+
'x-datadog-origin',
|
|
56
|
+
'x-datadog-tags',
|
|
57
|
+
'baggage',
|
|
58
|
+
'b3',
|
|
59
|
+
]);
|
|
60
|
+
// Request and tracing metadata do not authenticate a Responses socket, but remain protected on redirects.
|
|
61
|
+
export const WEBSOCKET_METADATA_HEADERS = {
|
|
62
|
+
has: (name, values) => WEBSOCKET_METADATA_HEADER_NAMES.has(name) ||
|
|
63
|
+
name.startsWith('x-b3-') ||
|
|
64
|
+
(name === 'sec-websocket-protocol' &&
|
|
65
|
+
!values.some((value) => typeof value === 'string' &&
|
|
66
|
+
value.split(',').some((protocol) => protocol.trim().startsWith('openai-insecure-api-key.')))),
|
|
67
|
+
};
|
|
39
68
|
function isWebSocketCredentialHeader(name) {
|
|
40
69
|
return !REDIRECT_SAFE_WEBSOCKET_HEADERS.has(name.toLowerCase().split('_').join('-'));
|
|
41
70
|
}
|
|
42
71
|
/**
|
|
43
72
|
* Snapshots credential values in final socket options before validation and dispatch.
|
|
44
|
-
* Reports potential caller authentication,
|
|
45
|
-
* remains responsible for validating credentials. Noncredential headers are left intact.
|
|
73
|
+
* Reports potential caller authentication, excluding additional metadata when requested.
|
|
74
|
+
* The server remains responsible for validating credentials. Noncredential headers are left intact.
|
|
46
75
|
*/
|
|
47
|
-
export function snapshotWebSocketCredentials(options) {
|
|
76
|
+
export function snapshotWebSocketCredentials(options, metadataHeaders) {
|
|
48
77
|
if (options.auth !== null && options.auth !== undefined) {
|
|
49
78
|
options.auth = String(options.auth);
|
|
50
79
|
}
|
|
@@ -67,12 +96,81 @@ export function snapshotWebSocketCredentials(options) {
|
|
|
67
96
|
}
|
|
68
97
|
headers[name] = snapshot;
|
|
69
98
|
const values = Array.isArray(snapshot) ? snapshot : [snapshot];
|
|
70
|
-
|
|
99
|
+
if (!metadataHeaders?.has(normalizedName, values)) {
|
|
100
|
+
credentials.set(name.toLowerCase(), values.some((item) => typeof item === 'string' && item.trim().length > 0));
|
|
101
|
+
}
|
|
71
102
|
}
|
|
72
103
|
// Node applies header names case-insensitively, and Authorization overrides Basic auth.
|
|
73
104
|
return ([...credentials.values()].some(Boolean) ||
|
|
74
105
|
(!credentials.has('authorization') && typeof options.auth === 'string' && options.auth.trim().length > 0));
|
|
75
106
|
}
|
|
107
|
+
/** Merge transport authentication before explicit caller overrides and header removals. */
|
|
108
|
+
export function mergeWebSocketAuthHeaders(options, authHeaders, removedHeaders) {
|
|
109
|
+
const headers = new Map(Object.entries(authHeaders).map(([name, value]) => [name.toLowerCase(), value]));
|
|
110
|
+
for (const name of removedHeaders) {
|
|
111
|
+
headers.delete(name);
|
|
112
|
+
}
|
|
113
|
+
for (const [name, value] of Object.entries(options.headers ?? {})) {
|
|
114
|
+
headers.set(name, value);
|
|
115
|
+
}
|
|
116
|
+
return { ...options, headers: Object.fromEntries(headers) };
|
|
117
|
+
}
|
|
118
|
+
/** Removal sink for one synchronous header-hook call, including legacy one-argument overrides. */
|
|
119
|
+
export const webSocketHeaderRemovals = new WeakMap();
|
|
120
|
+
const preparedWebSocketHeaders = new WeakMap();
|
|
121
|
+
/** Build a WebSocket handshake with explicit caller headers applied after the client defaults. */
|
|
122
|
+
export function buildWebSocketOptions(client, authHeaders, options, removedHeaders, usePreparedHeaders = false) {
|
|
123
|
+
// Capture the base result even through older overrides that forward only one argument.
|
|
124
|
+
const previous = webSocketHeaderRemovals.get(client);
|
|
125
|
+
const prepared = usePreparedHeaders && options ? preparedWebSocketHeaders.get(options) : undefined;
|
|
126
|
+
const context = {
|
|
127
|
+
removedHeaders,
|
|
128
|
+
baseHeaders: prepared?.baseHeaders,
|
|
129
|
+
};
|
|
130
|
+
webSocketHeaderRemovals.set(client, context);
|
|
131
|
+
let headers;
|
|
132
|
+
try {
|
|
133
|
+
headers = new Map(Object.entries(client._buildWebSocketHeaders(authHeaders, removedHeaders)).map(([name, value]) => [
|
|
134
|
+
name.toLowerCase(),
|
|
135
|
+
value,
|
|
136
|
+
]));
|
|
137
|
+
}
|
|
138
|
+
finally {
|
|
139
|
+
if (previous) {
|
|
140
|
+
webSocketHeaderRemovals.set(client, previous);
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
webSocketHeaderRemovals.delete(client);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
// The first hook output is not a caller override of the final, credentialed hook.
|
|
147
|
+
// Save transport names and explicit nulls separately, then reuse their validated values.
|
|
148
|
+
const transportHeaders = new Map();
|
|
149
|
+
const currentHeaders = new Map(Object.entries(options?.headers ?? {}));
|
|
150
|
+
const overrides = prepared
|
|
151
|
+
? [...prepared.transportHeaders].map(([name, removed]) => [name, removed ? null : currentHeaders.get(name)])
|
|
152
|
+
: currentHeaders;
|
|
153
|
+
for (const [name, value] of overrides) {
|
|
154
|
+
const normalizedName = name.toLowerCase();
|
|
155
|
+
if (value === null) {
|
|
156
|
+
headers.delete(normalizedName);
|
|
157
|
+
removedHeaders?.add(normalizedName);
|
|
158
|
+
transportHeaders.set(normalizedName, true);
|
|
159
|
+
}
|
|
160
|
+
else if (value !== undefined) {
|
|
161
|
+
headers.set(normalizedName, value);
|
|
162
|
+
removedHeaders?.delete(normalizedName);
|
|
163
|
+
transportHeaders.set(normalizedName, false);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
const result = {
|
|
167
|
+
...options,
|
|
168
|
+
headers: Object.fromEntries(headers),
|
|
169
|
+
followRedirects: false,
|
|
170
|
+
};
|
|
171
|
+
preparedWebSocketHeaders.set(result, { baseHeaders: context.baseHeaders, transportHeaders });
|
|
172
|
+
return result;
|
|
173
|
+
}
|
|
76
174
|
/** Prevents WebSocket redirects from forwarding caller or SDK credentials to another origin. */
|
|
77
175
|
export function protectWebSocketOptionsFromCredentialRedirects(options) {
|
|
78
176
|
const hasSensitiveHeader = Object.keys(options.headers ?? {}).some(isWebSocketCredentialHeader);
|
package/internal/ws.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws.mjs","sourceRoot":"","sources":["../src/internal/ws.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ws.mjs","sourceRoot":"","sources":["../src/internal/ws.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { AgentOutputFormat, AgentResult } from "../beta/agents/output-format-types.mjs";
|
|
1
2
|
import type { RequestOptions } from "../../internal/request-options.mjs";
|
|
2
3
|
import type { AgentFunctionCallOutputParam, AgentSessionEvent, AgentSessionInputMessageParam } from "../../resources/beta/agents/agents.mjs";
|
|
3
4
|
import type { Sessions } from "../../resources/beta/agents/sessions/sessions.mjs";
|
|
@@ -6,14 +7,18 @@ export type AgentToolOutput = AgentFunctionCallOutputParam | object | null;
|
|
|
6
7
|
/** Receives a detached JSON object and may return a result asynchronously. */
|
|
7
8
|
export type AgentToolHandler = (arguments_: Record<string, unknown>) => AgentToolOutput | PromiseLike<AgentToolOutput>;
|
|
8
9
|
/** Input and optional sequential tool handlers for one turn on an idle session. */
|
|
9
|
-
export
|
|
10
|
+
export type AgentSessionStreamParams<T = never> = {
|
|
11
|
+
/** Beta: parse this turn locally; does not change the existing session schema. */
|
|
12
|
+
outputFormat?: AgentOutputFormat<T>;
|
|
10
13
|
/** User messages, or text normalized to a single user message. Must not be empty. */
|
|
11
14
|
input: string | AgentSessionInputMessageParam[];
|
|
12
15
|
/** Registered functions run after their call event is yielded; unknown functions remain manual. */
|
|
13
16
|
toolHandlers?: Record<string, AgentToolHandler>;
|
|
14
17
|
/** Key for the input submission only; request headers take precedence, case-insensitively. */
|
|
15
18
|
idempotencyKey?: string;
|
|
16
|
-
}
|
|
19
|
+
} & ([T] extends [never] ? unknown : {
|
|
20
|
+
outputFormat: AgentOutputFormat<T>;
|
|
21
|
+
});
|
|
17
22
|
/**
|
|
18
23
|
* A single-use, lazy async iterable of original session events for one turn.
|
|
19
24
|
* Requires an idle session and a single input writer: the input endpoint does not
|
|
@@ -27,15 +32,19 @@ export interface AgentSessionStreamParams {
|
|
|
27
32
|
* idempotency key. Breaking iteration or calling abort closes local requests;
|
|
28
33
|
* neither cancels the backend turn. No work starts until iteration begins.
|
|
29
34
|
*/
|
|
30
|
-
export declare class AgentSessionStream implements AsyncIterable<AgentSessionEvent> {
|
|
35
|
+
export declare class AgentSessionStream<T = never> implements AsyncIterable<AgentSessionEvent> {
|
|
31
36
|
#private;
|
|
32
37
|
/** Aborts local requests and iteration without cancelling the backend turn. */
|
|
33
38
|
readonly controller: AbortController;
|
|
34
39
|
/** Creates an unstarted helper. Prefer client.beta.agents.sessions.stream(). */
|
|
35
|
-
constructor(sessions: Sessions, sessionID: string, params: AgentSessionStreamParams
|
|
40
|
+
constructor(sessions: Sessions, sessionID: string, params: AgentSessionStreamParams<T>, options?: RequestOptions);
|
|
36
41
|
/** Closes local requests without cancelling the turn; an optional reason becomes the abort error's cause. */
|
|
37
42
|
abort(reason?: unknown): void;
|
|
38
43
|
/** Starts iteration once; use for await to ensure early exits close the connection. */
|
|
39
44
|
[Symbol.asyncIterator](): AsyncIterator<AgentSessionEvent>;
|
|
45
|
+
/** Beta: opt into retaining completed final messages before iterating progress events. */
|
|
46
|
+
withResultCollection(): this;
|
|
47
|
+
/** Beta: drain this turn, dispatch registered tools, and collect its final assistant messages. */
|
|
48
|
+
finalResult(): Promise<AgentResult<T>>;
|
|
40
49
|
}
|
|
41
50
|
//# sourceMappingURL=agent-session-stream.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-stream.d.mts","sourceRoot":"","sources":["../../src/lib/agents/agent-session-stream.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent-session-stream.d.mts","sourceRoot":"","sources":["../../src/lib/agents/agent-session-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,+CAA2C;AAOzF,OAAO,KAAK,EAAE,cAAc,EAAE,2CAAuC;AAIrE,OAAO,KAAK,EAEV,4BAA4B,EAC5B,iBAAiB,EACjB,6BAA6B,EAE9B,+CAA2C;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,0DAAsD;AAE9E,qEAAqE;AACrE,MAAM,MAAM,eAAe,GAAG,4BAA4B,GAAG,MAAM,GAAG,IAAI,CAAC;AAC3E,8EAA8E;AAC9E,MAAM,MAAM,gBAAgB,GAAG,CAC7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAChC,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;AAEpD,mFAAmF;AACnF,MAAM,MAAM,wBAAwB,CAAC,CAAC,GAAG,KAAK,IAAI;IAChD,kFAAkF;IAClF,YAAY,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACpC,qFAAqF;IACrF,KAAK,EAAE,MAAM,GAAG,6BAA6B,EAAE,CAAC;IAChD,mGAAmG;IACnG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAChD,8FAA8F;IAC9F,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG;IAAE,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC,CAAC;AAuC7E;;;;;;;;;;;;GAYG;AACH,qBAAa,kBAAkB,CAAC,CAAC,GAAG,KAAK,CAAE,YAAW,aAAa,CAAC,iBAAiB,CAAC;;IACpF,+EAA+E;IAC/E,QAAQ,CAAC,UAAU,kBAAyB;IAe5C,gFAAgF;gBAE9E,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,wBAAwB,CAAC,CAAC,CAAC,EACnC,OAAO,CAAC,EAAE,cAAc;IAmC1B,6GAA6G;IAC7G,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAQ7B,uFAAuF;IACvF,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,iBAAiB,CAAC;IAQ1D,0FAA0F;IAC1F,oBAAoB,IAAI,IAAI;IAK5B,kGAAkG;IAClG,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;CAwKvC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { AgentOutputFormat, AgentResult } from "../beta/agents/output-format-types.js";
|
|
1
2
|
import type { RequestOptions } from "../../internal/request-options.js";
|
|
2
3
|
import type { AgentFunctionCallOutputParam, AgentSessionEvent, AgentSessionInputMessageParam } from "../../resources/beta/agents/agents.js";
|
|
3
4
|
import type { Sessions } from "../../resources/beta/agents/sessions/sessions.js";
|
|
@@ -6,14 +7,18 @@ export type AgentToolOutput = AgentFunctionCallOutputParam | object | null;
|
|
|
6
7
|
/** Receives a detached JSON object and may return a result asynchronously. */
|
|
7
8
|
export type AgentToolHandler = (arguments_: Record<string, unknown>) => AgentToolOutput | PromiseLike<AgentToolOutput>;
|
|
8
9
|
/** Input and optional sequential tool handlers for one turn on an idle session. */
|
|
9
|
-
export
|
|
10
|
+
export type AgentSessionStreamParams<T = never> = {
|
|
11
|
+
/** Beta: parse this turn locally; does not change the existing session schema. */
|
|
12
|
+
outputFormat?: AgentOutputFormat<T>;
|
|
10
13
|
/** User messages, or text normalized to a single user message. Must not be empty. */
|
|
11
14
|
input: string | AgentSessionInputMessageParam[];
|
|
12
15
|
/** Registered functions run after their call event is yielded; unknown functions remain manual. */
|
|
13
16
|
toolHandlers?: Record<string, AgentToolHandler>;
|
|
14
17
|
/** Key for the input submission only; request headers take precedence, case-insensitively. */
|
|
15
18
|
idempotencyKey?: string;
|
|
16
|
-
}
|
|
19
|
+
} & ([T] extends [never] ? unknown : {
|
|
20
|
+
outputFormat: AgentOutputFormat<T>;
|
|
21
|
+
});
|
|
17
22
|
/**
|
|
18
23
|
* A single-use, lazy async iterable of original session events for one turn.
|
|
19
24
|
* Requires an idle session and a single input writer: the input endpoint does not
|
|
@@ -27,15 +32,19 @@ export interface AgentSessionStreamParams {
|
|
|
27
32
|
* idempotency key. Breaking iteration or calling abort closes local requests;
|
|
28
33
|
* neither cancels the backend turn. No work starts until iteration begins.
|
|
29
34
|
*/
|
|
30
|
-
export declare class AgentSessionStream implements AsyncIterable<AgentSessionEvent> {
|
|
35
|
+
export declare class AgentSessionStream<T = never> implements AsyncIterable<AgentSessionEvent> {
|
|
31
36
|
#private;
|
|
32
37
|
/** Aborts local requests and iteration without cancelling the backend turn. */
|
|
33
38
|
readonly controller: AbortController;
|
|
34
39
|
/** Creates an unstarted helper. Prefer client.beta.agents.sessions.stream(). */
|
|
35
|
-
constructor(sessions: Sessions, sessionID: string, params: AgentSessionStreamParams
|
|
40
|
+
constructor(sessions: Sessions, sessionID: string, params: AgentSessionStreamParams<T>, options?: RequestOptions);
|
|
36
41
|
/** Closes local requests without cancelling the turn; an optional reason becomes the abort error's cause. */
|
|
37
42
|
abort(reason?: unknown): void;
|
|
38
43
|
/** Starts iteration once; use for await to ensure early exits close the connection. */
|
|
39
44
|
[Symbol.asyncIterator](): AsyncIterator<AgentSessionEvent>;
|
|
45
|
+
/** Beta: opt into retaining completed final messages before iterating progress events. */
|
|
46
|
+
withResultCollection(): this;
|
|
47
|
+
/** Beta: drain this turn, dispatch registered tools, and collect its final assistant messages. */
|
|
48
|
+
finalResult(): Promise<AgentResult<T>>;
|
|
40
49
|
}
|
|
41
50
|
//# sourceMappingURL=agent-session-stream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-stream.d.ts","sourceRoot":"","sources":["../../src/lib/agents/agent-session-stream.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent-session-stream.d.ts","sourceRoot":"","sources":["../../src/lib/agents/agent-session-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,8CAA2C;AAOzF,OAAO,KAAK,EAAE,cAAc,EAAE,0CAAuC;AAIrE,OAAO,KAAK,EAEV,4BAA4B,EAC5B,iBAAiB,EACjB,6BAA6B,EAE9B,8CAA2C;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,yDAAsD;AAE9E,qEAAqE;AACrE,MAAM,MAAM,eAAe,GAAG,4BAA4B,GAAG,MAAM,GAAG,IAAI,CAAC;AAC3E,8EAA8E;AAC9E,MAAM,MAAM,gBAAgB,GAAG,CAC7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAChC,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;AAEpD,mFAAmF;AACnF,MAAM,MAAM,wBAAwB,CAAC,CAAC,GAAG,KAAK,IAAI;IAChD,kFAAkF;IAClF,YAAY,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACpC,qFAAqF;IACrF,KAAK,EAAE,MAAM,GAAG,6BAA6B,EAAE,CAAC;IAChD,mGAAmG;IACnG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAChD,8FAA8F;IAC9F,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG;IAAE,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC,CAAC;AAuC7E;;;;;;;;;;;;GAYG;AACH,qBAAa,kBAAkB,CAAC,CAAC,GAAG,KAAK,CAAE,YAAW,aAAa,CAAC,iBAAiB,CAAC;;IACpF,+EAA+E;IAC/E,QAAQ,CAAC,UAAU,kBAAyB;IAe5C,gFAAgF;gBAE9E,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,wBAAwB,CAAC,CAAC,CAAC,EACnC,OAAO,CAAC,EAAE,cAAc;IAmC1B,6GAA6G;IAC7G,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAQ7B,uFAAuF;IACvF,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,iBAAiB,CAAC;IAQ1D,0FAA0F;IAC1F,oBAAoB,IAAI,IAAI;IAK5B,kGAAkG;IAClG,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;CAwKvC"}
|
|
@@ -1,35 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _AgentSessionStream_instances, _AgentSessionStream_consumed, _AgentSessionStream_stream, _AgentSessionStream_response, _AgentSessionStream_reading, _AgentSessionStream_sessions, _AgentSessionStream_sessionID, _AgentSessionStream_input, _AgentSessionStream_handlers, _AgentSessionStream_inputKey, _AgentSessionStream_options, _AgentSessionStream_iterate, _AgentSessionStream_result, _AgentSessionStream_checkAbort, _AgentSessionStream_abortError, _AgentSessionStream_wait, _AgentSessionStream_submit;
|
|
2
|
+
var _AgentSessionStream_instances, _AgentSessionStream_consumed, _AgentSessionStream_format, _AgentSessionStream_parsedResult, _AgentSessionStream_collection, _AgentSessionStream_stream, _AgentSessionStream_response, _AgentSessionStream_reading, _AgentSessionStream_sessions, _AgentSessionStream_sessionID, _AgentSessionStream_input, _AgentSessionStream_handlers, _AgentSessionStream_inputKey, _AgentSessionStream_options, _AgentSessionStream_iterate, _AgentSessionStream_result, _AgentSessionStream_checkAbort, _AgentSessionStream_abortError, _AgentSessionStream_wait, _AgentSessionStream_submit;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.AgentSessionStream = void 0;
|
|
5
5
|
const tslib_1 = require("../../internal/tslib.js");
|
|
6
6
|
const turn_state_1 = require("./turn-state.js");
|
|
7
|
+
const parse_result_1 = require("../beta/agents/parse-result.js");
|
|
8
|
+
const result_collection_1 = require("../beta/agents/result-collection.js");
|
|
7
9
|
const error_1 = require("../../core/error.js");
|
|
8
10
|
const headers_1 = require("../../internal/headers.js");
|
|
9
11
|
const uuid_1 = require("../../internal/utils/uuid.js");
|
|
10
12
|
const values_1 = require("../../internal/utils/values.js");
|
|
11
|
-
|
|
12
|
-
if (!(0, values_1.isObj)(value)) {
|
|
13
|
-
return false;
|
|
14
|
-
}
|
|
15
|
-
const content = value;
|
|
16
|
-
let field;
|
|
17
|
-
if (content['type'] === 'input_text') {
|
|
18
|
-
field = 'text';
|
|
19
|
-
}
|
|
20
|
-
else if (content['type'] === 'input_image') {
|
|
21
|
-
field = 'image_url';
|
|
22
|
-
}
|
|
23
|
-
else {
|
|
24
|
-
return false;
|
|
25
|
-
}
|
|
26
|
-
return (0, values_1.hasOwn)(content, 'type') && (0, values_1.hasOwn)(content, field) && typeof content[field] === 'string';
|
|
27
|
-
}
|
|
13
|
+
const tool_output_1 = require("../beta/agents/tool-output.js");
|
|
28
14
|
function normalizedOutput(value) {
|
|
29
15
|
if (value === null) {
|
|
30
16
|
return null;
|
|
31
17
|
}
|
|
32
|
-
if (typeof value === 'string' || (Array.isArray(value) && value.every(isInputContent))) {
|
|
18
|
+
if (typeof value === 'string' || (Array.isArray(value) && value.every(tool_output_1.isInputContent))) {
|
|
33
19
|
return value;
|
|
34
20
|
}
|
|
35
21
|
throw new error_1.OpenAIError('Tool output must be text, content, a JSON object, or null');
|
|
@@ -78,6 +64,9 @@ class AgentSessionStream {
|
|
|
78
64
|
/** Aborts local requests and iteration without cancelling the backend turn. */
|
|
79
65
|
this.controller = new AbortController();
|
|
80
66
|
_AgentSessionStream_consumed.set(this, false);
|
|
67
|
+
_AgentSessionStream_format.set(this, void 0);
|
|
68
|
+
_AgentSessionStream_parsedResult.set(this, void 0);
|
|
69
|
+
_AgentSessionStream_collection.set(this, void 0);
|
|
81
70
|
_AgentSessionStream_stream.set(this, void 0);
|
|
82
71
|
_AgentSessionStream_response.set(this, void 0);
|
|
83
72
|
_AgentSessionStream_reading.set(this, false);
|
|
@@ -93,6 +82,10 @@ class AgentSessionStream {
|
|
|
93
82
|
if (params.input.length === 0) {
|
|
94
83
|
throw new error_1.OpenAIError('input must not be empty');
|
|
95
84
|
}
|
|
85
|
+
tslib_1.__classPrivateFieldSet(this, _AgentSessionStream_format, (0, parse_result_1.agentFormatParser)(params.outputFormat), "f");
|
|
86
|
+
if (params.outputFormat && !tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_format, "f")) {
|
|
87
|
+
throw new error_1.OpenAIError('outputFormat must have its own parser function');
|
|
88
|
+
}
|
|
96
89
|
tslib_1.__classPrivateFieldSet(this, _AgentSessionStream_sessions, sessions, "f");
|
|
97
90
|
tslib_1.__classPrivateFieldSet(this, _AgentSessionStream_sessionID, sessionID, "f");
|
|
98
91
|
tslib_1.__classPrivateFieldSet(this, _AgentSessionStream_input, { type: 'agent.session.input.message', input }, "f");
|
|
@@ -108,6 +101,7 @@ class AgentSessionStream {
|
|
|
108
101
|
headers.nulls.delete('idempotency-key');
|
|
109
102
|
const { idempotencyKey: _key, ...rest } = options ?? {};
|
|
110
103
|
tslib_1.__classPrivateFieldSet(this, _AgentSessionStream_options, { ...rest, headers }, "f");
|
|
104
|
+
tslib_1.__classPrivateFieldSet(this, _AgentSessionStream_collection, new result_collection_1.ResultCollection(() => tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_instances, "m", _AgentSessionStream_iterate).call(this), (name) => tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_handlers, "f").has(name), sessionID), "f");
|
|
111
105
|
}
|
|
112
106
|
/** Closes local requests without cancelling the turn; an optional reason becomes the abort error's cause. */
|
|
113
107
|
abort(reason) {
|
|
@@ -118,12 +112,21 @@ class AgentSessionStream {
|
|
|
118
112
|
}
|
|
119
113
|
}
|
|
120
114
|
/** Starts iteration once; use for await to ensure early exits close the connection. */
|
|
121
|
-
[(_AgentSessionStream_consumed = new WeakMap(), _AgentSessionStream_stream = new WeakMap(), _AgentSessionStream_response = new WeakMap(), _AgentSessionStream_reading = new WeakMap(), _AgentSessionStream_sessions = new WeakMap(), _AgentSessionStream_sessionID = new WeakMap(), _AgentSessionStream_input = new WeakMap(), _AgentSessionStream_handlers = new WeakMap(), _AgentSessionStream_inputKey = new WeakMap(), _AgentSessionStream_options = new WeakMap(), _AgentSessionStream_instances = new WeakSet(), Symbol.asyncIterator)]() {
|
|
115
|
+
[(_AgentSessionStream_consumed = new WeakMap(), _AgentSessionStream_format = new WeakMap(), _AgentSessionStream_parsedResult = new WeakMap(), _AgentSessionStream_collection = new WeakMap(), _AgentSessionStream_stream = new WeakMap(), _AgentSessionStream_response = new WeakMap(), _AgentSessionStream_reading = new WeakMap(), _AgentSessionStream_sessions = new WeakMap(), _AgentSessionStream_sessionID = new WeakMap(), _AgentSessionStream_input = new WeakMap(), _AgentSessionStream_handlers = new WeakMap(), _AgentSessionStream_inputKey = new WeakMap(), _AgentSessionStream_options = new WeakMap(), _AgentSessionStream_instances = new WeakSet(), Symbol.asyncIterator)]() {
|
|
122
116
|
if (tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_consumed, "f")) {
|
|
123
117
|
throw new error_1.OpenAIError('An AgentSessionStream can only be consumed once');
|
|
124
118
|
}
|
|
125
119
|
tslib_1.__classPrivateFieldSet(this, _AgentSessionStream_consumed, true, "f");
|
|
126
|
-
return tslib_1.__classPrivateFieldGet(this,
|
|
120
|
+
return tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_collection, "f").iterate();
|
|
121
|
+
}
|
|
122
|
+
/** Beta: opt into retaining completed final messages before iterating progress events. */
|
|
123
|
+
withResultCollection() {
|
|
124
|
+
tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_collection, "f").enable();
|
|
125
|
+
return this;
|
|
126
|
+
}
|
|
127
|
+
/** Beta: drain this turn, dispatch registered tools, and collect its final assistant messages. */
|
|
128
|
+
finalResult() {
|
|
129
|
+
return (tslib_1.__classPrivateFieldSet(this, _AgentSessionStream_parsedResult, tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_parsedResult, "f") ?? (0, parse_result_1.parseAgentResultPromise)(tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_collection, "f").finalResult(), tslib_1.__classPrivateFieldGet(this, _AgentSessionStream_format, "f")), "f"));
|
|
127
130
|
}
|
|
128
131
|
}
|
|
129
132
|
exports.AgentSessionStream = AgentSessionStream;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-stream.js","sourceRoot":"","sources":["../../src/lib/agents/agent-session-stream.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"agent-session-stream.js","sourceRoot":"","sources":["../../src/lib/agents/agent-session-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,13 @@
|
|
|
1
|
-
var _AgentSessionStream_instances, _AgentSessionStream_consumed, _AgentSessionStream_stream, _AgentSessionStream_response, _AgentSessionStream_reading, _AgentSessionStream_sessions, _AgentSessionStream_sessionID, _AgentSessionStream_input, _AgentSessionStream_handlers, _AgentSessionStream_inputKey, _AgentSessionStream_options, _AgentSessionStream_iterate, _AgentSessionStream_result, _AgentSessionStream_checkAbort, _AgentSessionStream_abortError, _AgentSessionStream_wait, _AgentSessionStream_submit;
|
|
1
|
+
var _AgentSessionStream_instances, _AgentSessionStream_consumed, _AgentSessionStream_format, _AgentSessionStream_parsedResult, _AgentSessionStream_collection, _AgentSessionStream_stream, _AgentSessionStream_response, _AgentSessionStream_reading, _AgentSessionStream_sessions, _AgentSessionStream_sessionID, _AgentSessionStream_input, _AgentSessionStream_handlers, _AgentSessionStream_inputKey, _AgentSessionStream_options, _AgentSessionStream_iterate, _AgentSessionStream_result, _AgentSessionStream_checkAbort, _AgentSessionStream_abortError, _AgentSessionStream_wait, _AgentSessionStream_submit;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "../../internal/tslib.mjs";
|
|
3
3
|
import { TurnState } from "./turn-state.mjs";
|
|
4
|
+
import { agentFormatParser, parseAgentResultPromise } from "../beta/agents/parse-result.mjs";
|
|
5
|
+
import { ResultCollection } from "../beta/agents/result-collection.mjs";
|
|
4
6
|
import { APIUserAbortError, BadRequestError, OpenAIError } from "../../core/error.mjs";
|
|
5
7
|
import { buildHeaders } from "../../internal/headers.mjs";
|
|
6
8
|
import { uuid4 } from "../../internal/utils/uuid.mjs";
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
if (!isObj(value)) {
|
|
10
|
-
return false;
|
|
11
|
-
}
|
|
12
|
-
const content = value;
|
|
13
|
-
let field;
|
|
14
|
-
if (content['type'] === 'input_text') {
|
|
15
|
-
field = 'text';
|
|
16
|
-
}
|
|
17
|
-
else if (content['type'] === 'input_image') {
|
|
18
|
-
field = 'image_url';
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
return false;
|
|
22
|
-
}
|
|
23
|
-
return hasOwn(content, 'type') && hasOwn(content, field) && typeof content[field] === 'string';
|
|
24
|
-
}
|
|
9
|
+
import { isObj } from "../../internal/utils/values.mjs";
|
|
10
|
+
import { isInputContent } from "../beta/agents/tool-output.mjs";
|
|
25
11
|
function normalizedOutput(value) {
|
|
26
12
|
if (value === null) {
|
|
27
13
|
return null;
|
|
@@ -75,6 +61,9 @@ export class AgentSessionStream {
|
|
|
75
61
|
/** Aborts local requests and iteration without cancelling the backend turn. */
|
|
76
62
|
this.controller = new AbortController();
|
|
77
63
|
_AgentSessionStream_consumed.set(this, false);
|
|
64
|
+
_AgentSessionStream_format.set(this, void 0);
|
|
65
|
+
_AgentSessionStream_parsedResult.set(this, void 0);
|
|
66
|
+
_AgentSessionStream_collection.set(this, void 0);
|
|
78
67
|
_AgentSessionStream_stream.set(this, void 0);
|
|
79
68
|
_AgentSessionStream_response.set(this, void 0);
|
|
80
69
|
_AgentSessionStream_reading.set(this, false);
|
|
@@ -90,6 +79,10 @@ export class AgentSessionStream {
|
|
|
90
79
|
if (params.input.length === 0) {
|
|
91
80
|
throw new OpenAIError('input must not be empty');
|
|
92
81
|
}
|
|
82
|
+
__classPrivateFieldSet(this, _AgentSessionStream_format, agentFormatParser(params.outputFormat), "f");
|
|
83
|
+
if (params.outputFormat && !__classPrivateFieldGet(this, _AgentSessionStream_format, "f")) {
|
|
84
|
+
throw new OpenAIError('outputFormat must have its own parser function');
|
|
85
|
+
}
|
|
93
86
|
__classPrivateFieldSet(this, _AgentSessionStream_sessions, sessions, "f");
|
|
94
87
|
__classPrivateFieldSet(this, _AgentSessionStream_sessionID, sessionID, "f");
|
|
95
88
|
__classPrivateFieldSet(this, _AgentSessionStream_input, { type: 'agent.session.input.message', input }, "f");
|
|
@@ -105,6 +98,7 @@ export class AgentSessionStream {
|
|
|
105
98
|
headers.nulls.delete('idempotency-key');
|
|
106
99
|
const { idempotencyKey: _key, ...rest } = options ?? {};
|
|
107
100
|
__classPrivateFieldSet(this, _AgentSessionStream_options, { ...rest, headers }, "f");
|
|
101
|
+
__classPrivateFieldSet(this, _AgentSessionStream_collection, new ResultCollection(() => __classPrivateFieldGet(this, _AgentSessionStream_instances, "m", _AgentSessionStream_iterate).call(this), (name) => __classPrivateFieldGet(this, _AgentSessionStream_handlers, "f").has(name), sessionID), "f");
|
|
108
102
|
}
|
|
109
103
|
/** Closes local requests without cancelling the turn; an optional reason becomes the abort error's cause. */
|
|
110
104
|
abort(reason) {
|
|
@@ -115,12 +109,21 @@ export class AgentSessionStream {
|
|
|
115
109
|
}
|
|
116
110
|
}
|
|
117
111
|
/** Starts iteration once; use for await to ensure early exits close the connection. */
|
|
118
|
-
[(_AgentSessionStream_consumed = new WeakMap(), _AgentSessionStream_stream = new WeakMap(), _AgentSessionStream_response = new WeakMap(), _AgentSessionStream_reading = new WeakMap(), _AgentSessionStream_sessions = new WeakMap(), _AgentSessionStream_sessionID = new WeakMap(), _AgentSessionStream_input = new WeakMap(), _AgentSessionStream_handlers = new WeakMap(), _AgentSessionStream_inputKey = new WeakMap(), _AgentSessionStream_options = new WeakMap(), _AgentSessionStream_instances = new WeakSet(), Symbol.asyncIterator)]() {
|
|
112
|
+
[(_AgentSessionStream_consumed = new WeakMap(), _AgentSessionStream_format = new WeakMap(), _AgentSessionStream_parsedResult = new WeakMap(), _AgentSessionStream_collection = new WeakMap(), _AgentSessionStream_stream = new WeakMap(), _AgentSessionStream_response = new WeakMap(), _AgentSessionStream_reading = new WeakMap(), _AgentSessionStream_sessions = new WeakMap(), _AgentSessionStream_sessionID = new WeakMap(), _AgentSessionStream_input = new WeakMap(), _AgentSessionStream_handlers = new WeakMap(), _AgentSessionStream_inputKey = new WeakMap(), _AgentSessionStream_options = new WeakMap(), _AgentSessionStream_instances = new WeakSet(), Symbol.asyncIterator)]() {
|
|
119
113
|
if (__classPrivateFieldGet(this, _AgentSessionStream_consumed, "f")) {
|
|
120
114
|
throw new OpenAIError('An AgentSessionStream can only be consumed once');
|
|
121
115
|
}
|
|
122
116
|
__classPrivateFieldSet(this, _AgentSessionStream_consumed, true, "f");
|
|
123
|
-
return __classPrivateFieldGet(this,
|
|
117
|
+
return __classPrivateFieldGet(this, _AgentSessionStream_collection, "f").iterate();
|
|
118
|
+
}
|
|
119
|
+
/** Beta: opt into retaining completed final messages before iterating progress events. */
|
|
120
|
+
withResultCollection() {
|
|
121
|
+
__classPrivateFieldGet(this, _AgentSessionStream_collection, "f").enable();
|
|
122
|
+
return this;
|
|
123
|
+
}
|
|
124
|
+
/** Beta: drain this turn, dispatch registered tools, and collect its final assistant messages. */
|
|
125
|
+
finalResult() {
|
|
126
|
+
return (__classPrivateFieldSet(this, _AgentSessionStream_parsedResult, __classPrivateFieldGet(this, _AgentSessionStream_parsedResult, "f") ?? parseAgentResultPromise(__classPrivateFieldGet(this, _AgentSessionStream_collection, "f").finalResult(), __classPrivateFieldGet(this, _AgentSessionStream_format, "f")), "f"));
|
|
124
127
|
}
|
|
125
128
|
}
|
|
126
129
|
_AgentSessionStream_iterate = async function* _AgentSessionStream_iterate() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-stream.mjs","sourceRoot":"","sources":["../../src/lib/agents/agent-session-stream.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"agent-session-stream.mjs","sourceRoot":"","sources":["../../src/lib/agents/agent-session-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { AgentOutputFormat, AgentResult } from "./output-format-types.mjs";
|
|
2
|
+
import type { Stream } from "../../../core/streaming.mjs";
|
|
3
|
+
import type { AgentSessionEvent } from "../../../resources/beta/agents/agents.mjs";
|
|
4
|
+
/** Beta: the original creation stream with optional collection of its initial root turn. */
|
|
5
|
+
export type AgentSessionCreateStream<T = never> = Stream<AgentSessionEvent> & {
|
|
6
|
+
/** Drain through the selected turn's completion and idle event, then return its final messages. */
|
|
7
|
+
finalResult: () => Promise<AgentResult<T>>;
|
|
8
|
+
/** Opt into retaining completed final messages before iterating progress events. */
|
|
9
|
+
withResultCollection: () => AgentSessionCreateStream<T>;
|
|
10
|
+
};
|
|
11
|
+
/** Add beta result collection without replacing custom stream instances.
|
|
12
|
+
* @internal
|
|
13
|
+
*/
|
|
14
|
+
export declare function withAgentTurnResult<T = never>(stream: Stream<AgentSessionEvent>, format?: AgentOutputFormat<T>): AgentSessionCreateStream<T>;
|
|
15
|
+
//# sourceMappingURL=agent-session-create-stream.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-session-create-stream.d.mts","sourceRoot":"","sources":["../../../src/lib/beta/agents/agent-session-create-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,kCAA8B;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAgC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,kDAA8C;AAI/E,4FAA4F;AAC5F,MAAM,MAAM,wBAAwB,CAAC,CAAC,GAAG,KAAK,IAAI,MAAM,CAAC,iBAAiB,CAAC,GAAG;IAC5E,mGAAmG;IACnG,WAAW,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,oFAAoF;IACpF,oBAAoB,EAAE,MAAM,wBAAwB,CAAC,CAAC,CAAC,CAAC;CACzD,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,GAAG,KAAK,EAC3C,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,EACjC,MAAM,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAC5B,wBAAwB,CAAC,CAAC,CAAC,CAe7B"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { AgentOutputFormat, AgentResult } from "./output-format-types.js";
|
|
2
|
+
import type { Stream } from "../../../core/streaming.js";
|
|
3
|
+
import type { AgentSessionEvent } from "../../../resources/beta/agents/agents.js";
|
|
4
|
+
/** Beta: the original creation stream with optional collection of its initial root turn. */
|
|
5
|
+
export type AgentSessionCreateStream<T = never> = Stream<AgentSessionEvent> & {
|
|
6
|
+
/** Drain through the selected turn's completion and idle event, then return its final messages. */
|
|
7
|
+
finalResult: () => Promise<AgentResult<T>>;
|
|
8
|
+
/** Opt into retaining completed final messages before iterating progress events. */
|
|
9
|
+
withResultCollection: () => AgentSessionCreateStream<T>;
|
|
10
|
+
};
|
|
11
|
+
/** Add beta result collection without replacing custom stream instances.
|
|
12
|
+
* @internal
|
|
13
|
+
*/
|
|
14
|
+
export declare function withAgentTurnResult<T = never>(stream: Stream<AgentSessionEvent>, format?: AgentOutputFormat<T>): AgentSessionCreateStream<T>;
|
|
15
|
+
//# sourceMappingURL=agent-session-create-stream.d.ts.map
|