@openai/agents-openai 0.6.0 → 0.7.1
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/index.d.ts +2 -0
- package/dist/index.js +6 -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/openaiChatCompletionsModel.d.ts +2 -1
- package/dist/openaiChatCompletionsModel.js +10 -2
- package/dist/openaiChatCompletionsModel.js.map +1 -1
- package/dist/openaiChatCompletionsModel.mjs +10 -2
- package/dist/openaiChatCompletionsModel.mjs.map +1 -1
- package/dist/openaiChatCompletionsStreaming.js +4 -0
- package/dist/openaiChatCompletionsStreaming.js.map +1 -1
- package/dist/openaiChatCompletionsStreaming.mjs +4 -0
- package/dist/openaiChatCompletionsStreaming.mjs.map +1 -1
- package/dist/openaiResponsesModel.d.ts +3 -1
- package/dist/openaiResponsesModel.js +77 -7
- package/dist/openaiResponsesModel.js.map +1 -1
- package/dist/openaiResponsesModel.mjs +77 -7
- package/dist/openaiResponsesModel.mjs.map +1 -1
- package/dist/rawModelEvents.d.ts +24 -0
- package/dist/rawModelEvents.js +18 -0
- package/dist/rawModelEvents.js.map +1 -0
- package/dist/rawModelEvents.mjs +13 -0
- package/dist/rawModelEvents.mjs.map +1 -0
- package/dist/retryAdvice.d.ts +2 -0
- package/dist/retryAdvice.js +98 -0
- package/dist/retryAdvice.js.map +1 -0
- package/dist/retryAdvice.mjs +95 -0
- package/dist/retryAdvice.mjs.map +1 -0
- package/package.json +2 -2
package/dist/index.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ export { OpenAIProvider } from './openaiProvider';
|
|
|
2
2
|
export { withResponsesWebSocketSession, type ResponsesWebSocketSession, type ResponsesWebSocketSessionOptions, } from './responsesWebSocketSession';
|
|
3
3
|
export { OpenAIResponsesModel, OpenAIResponsesWSModel, } from './openaiResponsesModel';
|
|
4
4
|
export { OpenAIChatCompletionsModel } from './openaiChatCompletionsModel';
|
|
5
|
+
export { isOpenAIResponsesRawModelStreamEvent, isOpenAIChatCompletionsRawModelStreamEvent, OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE, OPENAI_CHAT_COMPLETIONS_RAW_MODEL_EVENT_SOURCE, } from './rawModelEvents';
|
|
6
|
+
export type { OpenAIRawModelEventSource, OpenAIResponsesRawModelStreamEvent, OpenAIChatCompletionsRawModelStreamEvent, } from './rawModelEvents';
|
|
5
7
|
export { setDefaultOpenAIClient, setOpenAIAPI, setOpenAIResponsesTransport, setDefaultOpenAIKey, setTracingExportApiKey, } from './defaults';
|
|
6
8
|
export { setDefaultOpenAITracingExporter, OpenAITracingExporter, OpenAITracingExporterOptions, } from './openaiTracingExporter';
|
|
7
9
|
export { webSearchTool, fileSearchTool, codeInterpreterTool, toolSearchTool, imageGenerationTool, } from './tools';
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.OpenAIResponsesCompactionSession = exports.startOpenAIConversationsSession = exports.OpenAIConversationsSession = exports.imageGenerationTool = exports.toolSearchTool = exports.codeInterpreterTool = exports.fileSearchTool = exports.webSearchTool = exports.OpenAITracingExporter = exports.setDefaultOpenAITracingExporter = exports.setTracingExportApiKey = exports.setDefaultOpenAIKey = exports.setOpenAIResponsesTransport = exports.setOpenAIAPI = exports.setDefaultOpenAIClient = exports.OpenAIChatCompletionsModel = exports.OpenAIResponsesWSModel = exports.OpenAIResponsesModel = exports.withResponsesWebSocketSession = exports.OpenAIProvider = void 0;
|
|
3
|
+
exports.OpenAIResponsesCompactionSession = exports.startOpenAIConversationsSession = exports.OpenAIConversationsSession = exports.imageGenerationTool = exports.toolSearchTool = exports.codeInterpreterTool = exports.fileSearchTool = exports.webSearchTool = exports.OpenAITracingExporter = exports.setDefaultOpenAITracingExporter = exports.setTracingExportApiKey = exports.setDefaultOpenAIKey = exports.setOpenAIResponsesTransport = exports.setOpenAIAPI = exports.setDefaultOpenAIClient = exports.OPENAI_CHAT_COMPLETIONS_RAW_MODEL_EVENT_SOURCE = exports.OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE = exports.isOpenAIChatCompletionsRawModelStreamEvent = exports.isOpenAIResponsesRawModelStreamEvent = exports.OpenAIChatCompletionsModel = exports.OpenAIResponsesWSModel = exports.OpenAIResponsesModel = exports.withResponsesWebSocketSession = exports.OpenAIProvider = void 0;
|
|
4
4
|
var openaiProvider_1 = require("./openaiProvider.js");
|
|
5
5
|
Object.defineProperty(exports, "OpenAIProvider", { enumerable: true, get: function () { return openaiProvider_1.OpenAIProvider; } });
|
|
6
6
|
var responsesWebSocketSession_1 = require("./responsesWebSocketSession.js");
|
|
@@ -10,6 +10,11 @@ Object.defineProperty(exports, "OpenAIResponsesModel", { enumerable: true, get:
|
|
|
10
10
|
Object.defineProperty(exports, "OpenAIResponsesWSModel", { enumerable: true, get: function () { return openaiResponsesModel_1.OpenAIResponsesWSModel; } });
|
|
11
11
|
var openaiChatCompletionsModel_1 = require("./openaiChatCompletionsModel.js");
|
|
12
12
|
Object.defineProperty(exports, "OpenAIChatCompletionsModel", { enumerable: true, get: function () { return openaiChatCompletionsModel_1.OpenAIChatCompletionsModel; } });
|
|
13
|
+
var rawModelEvents_1 = require("./rawModelEvents.js");
|
|
14
|
+
Object.defineProperty(exports, "isOpenAIResponsesRawModelStreamEvent", { enumerable: true, get: function () { return rawModelEvents_1.isOpenAIResponsesRawModelStreamEvent; } });
|
|
15
|
+
Object.defineProperty(exports, "isOpenAIChatCompletionsRawModelStreamEvent", { enumerable: true, get: function () { return rawModelEvents_1.isOpenAIChatCompletionsRawModelStreamEvent; } });
|
|
16
|
+
Object.defineProperty(exports, "OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE", { enumerable: true, get: function () { return rawModelEvents_1.OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE; } });
|
|
17
|
+
Object.defineProperty(exports, "OPENAI_CHAT_COMPLETIONS_RAW_MODEL_EVENT_SOURCE", { enumerable: true, get: function () { return rawModelEvents_1.OPENAI_CHAT_COMPLETIONS_RAW_MODEL_EVENT_SOURCE; } });
|
|
13
18
|
var defaults_1 = require("./defaults.js");
|
|
14
19
|
Object.defineProperty(exports, "setDefaultOpenAIClient", { enumerable: true, get: function () { return defaults_1.setDefaultOpenAIClient; } });
|
|
15
20
|
Object.defineProperty(exports, "setOpenAIAPI", { enumerable: true, get: function () { return defaults_1.setOpenAIAPI; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,sDAAkD;AAAzC,gHAAA,cAAc,OAAA;AACvB,4EAIqC;AAHnC,0IAAA,6BAA6B,OAAA;AAI/B,kEAGgC;AAF9B,4HAAA,oBAAoB,OAAA;AACpB,8HAAA,sBAAsB,OAAA;AAExB,8EAA0E;AAAjE,wIAAA,0BAA0B,OAAA;AACnC,0CAMoB;AALlB,kHAAA,sBAAsB,OAAA;AACtB,wGAAA,YAAY,OAAA;AACZ,uHAAA,2BAA2B,OAAA;AAC3B,+GAAA,mBAAmB,OAAA;AACnB,kHAAA,sBAAsB,OAAA;AAExB,oEAIiC;AAH/B,wIAAA,+BAA+B,OAAA;AAC/B,8HAAA,qBAAqB,OAAA;AAGvB,oCAMiB;AALf,sGAAA,aAAa,OAAA;AACb,uGAAA,cAAc,OAAA;AACd,4GAAA,mBAAmB,OAAA;AACnB,uGAAA,cAAc,OAAA;AACd,4GAAA,mBAAmB,OAAA;AAGrB,qFAI6C;AAH3C,wIAAA,0BAA0B,OAAA;AAC1B,6IAAA,+BAA+B,OAAA;AAGjC,iGAKmD;AAJjD,oJAAA,gCAAgC,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,sDAAkD;AAAzC,gHAAA,cAAc,OAAA;AACvB,4EAIqC;AAHnC,0IAAA,6BAA6B,OAAA;AAI/B,kEAGgC;AAF9B,4HAAA,oBAAoB,OAAA;AACpB,8HAAA,sBAAsB,OAAA;AAExB,8EAA0E;AAAjE,wIAAA,0BAA0B,OAAA;AACnC,sDAK0B;AAJxB,sIAAA,oCAAoC,OAAA;AACpC,4IAAA,0CAA0C,OAAA;AAC1C,yIAAA,uCAAuC,OAAA;AACvC,gJAAA,8CAA8C,OAAA;AAOhD,0CAMoB;AALlB,kHAAA,sBAAsB,OAAA;AACtB,wGAAA,YAAY,OAAA;AACZ,uHAAA,2BAA2B,OAAA;AAC3B,+GAAA,mBAAmB,OAAA;AACnB,kHAAA,sBAAsB,OAAA;AAExB,oEAIiC;AAH/B,wIAAA,+BAA+B,OAAA;AAC/B,8HAAA,qBAAqB,OAAA;AAGvB,oCAMiB;AALf,sGAAA,aAAa,OAAA;AACb,uGAAA,cAAc,OAAA;AACd,4GAAA,mBAAmB,OAAA;AACnB,uGAAA,cAAc,OAAA;AACd,4GAAA,mBAAmB,OAAA;AAGrB,qFAI6C;AAH3C,wIAAA,0BAA0B,OAAA;AAC1B,6IAAA,+BAA+B,OAAA;AAGjC,iGAKmD;AAJjD,oJAAA,gCAAgC,OAAA"}
|
package/dist/index.mjs
CHANGED
|
@@ -2,6 +2,7 @@ export { OpenAIProvider } from "./openaiProvider.mjs";
|
|
|
2
2
|
export { withResponsesWebSocketSession, } from "./responsesWebSocketSession.mjs";
|
|
3
3
|
export { OpenAIResponsesModel, OpenAIResponsesWSModel, } from "./openaiResponsesModel.mjs";
|
|
4
4
|
export { OpenAIChatCompletionsModel } from "./openaiChatCompletionsModel.mjs";
|
|
5
|
+
export { isOpenAIResponsesRawModelStreamEvent, isOpenAIChatCompletionsRawModelStreamEvent, OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE, OPENAI_CHAT_COMPLETIONS_RAW_MODEL_EVENT_SOURCE, } from "./rawModelEvents.mjs";
|
|
5
6
|
export { setDefaultOpenAIClient, setOpenAIAPI, setOpenAIResponsesTransport, setDefaultOpenAIKey, setTracingExportApiKey, } from "./defaults.mjs";
|
|
6
7
|
export { setDefaultOpenAITracingExporter, OpenAITracingExporter, } from "./openaiTracingExporter.mjs";
|
|
7
8
|
export { webSearchTool, fileSearchTool, codeInterpreterTool, toolSearchTool, imageGenerationTool, } from "./tools.mjs";
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"OAAO,EAAE,cAAc,EAAE;OAClB,EACL,6BAA6B,GAG9B;OACM,EACL,oBAAoB,EACpB,sBAAsB,GACvB;OACM,EAAE,0BAA0B,EAAE;OAC9B,EACL,sBAAsB,EACtB,YAAY,EACZ,2BAA2B,EAC3B,mBAAmB,EACnB,sBAAsB,GACvB;OACM,EACL,+BAA+B,EAC/B,qBAAqB,GAEtB;OACM,EACL,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,cAAc,EACd,mBAAmB,GACpB;OAEM,EACL,0BAA0B,EAC1B,+BAA+B,GAEhC;OACM,EACL,gCAAgC,GAIjC"}
|
|
1
|
+
{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"OAAO,EAAE,cAAc,EAAE;OAClB,EACL,6BAA6B,GAG9B;OACM,EACL,oBAAoB,EACpB,sBAAsB,GACvB;OACM,EAAE,0BAA0B,EAAE;OAC9B,EACL,oCAAoC,EACpC,0CAA0C,EAC1C,uCAAuC,EACvC,8CAA8C,GAC/C;OAMM,EACL,sBAAsB,EACtB,YAAY,EACZ,2BAA2B,EAC3B,mBAAmB,EACnB,sBAAsB,GACvB;OACM,EACL,+BAA+B,EAC/B,qBAAqB,GAEtB;OACM,EACL,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,cAAc,EACd,mBAAmB,GACpB;OAEM,EACL,0BAA0B,EAC1B,+BAA+B,GAEhC;OACM,EACL,gCAAgC,GAIjC"}
|
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-openai",
|
|
7
|
-
"version": "0.
|
|
7
|
+
"version": "0.7.1",
|
|
8
8
|
"versions": {
|
|
9
|
-
"@openai/agents-openai": "0.
|
|
9
|
+
"@openai/agents-openai": "0.7.1",
|
|
10
10
|
"@openai/agents-core": "workspace:*",
|
|
11
11
|
"openai": "^6.26.0"
|
|
12
12
|
}
|
package/dist/metadata.mjs
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// This file is automatically generated
|
|
2
2
|
export const METADATA = {
|
|
3
3
|
"name": "@openai/agents-openai",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.7.1",
|
|
5
5
|
"versions": {
|
|
6
|
-
"@openai/agents-openai": "0.
|
|
6
|
+
"@openai/agents-openai": "0.7.1",
|
|
7
7
|
"@openai/agents-core": "workspace:*",
|
|
8
8
|
"openai": "^6.26.0"
|
|
9
9
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Model } from '@openai/agents-core';
|
|
2
|
-
import type { ModelRequest, ModelResponse, ResponseStreamEvent } from '@openai/agents-core';
|
|
2
|
+
import type { ModelRetryAdvice, ModelRetryAdviceRequest, ModelRequest, ModelResponse, ResponseStreamEvent } from '@openai/agents-core';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
export declare const FAKE_ID = "FAKE_ID";
|
|
5
5
|
/**
|
|
@@ -8,6 +8,7 @@ export declare const FAKE_ID = "FAKE_ID";
|
|
|
8
8
|
export declare class OpenAIChatCompletionsModel implements Model {
|
|
9
9
|
#private;
|
|
10
10
|
constructor(client: OpenAI, model: string);
|
|
11
|
+
getRetryAdvice(args: ModelRetryAdviceRequest): ModelRetryAdvice | undefined;
|
|
11
12
|
getResponse(request: ModelRequest): Promise<ModelResponse>;
|
|
12
13
|
getStreamedResponse(request: ModelRequest): AsyncIterable<ResponseStreamEvent>;
|
|
13
14
|
}
|
|
@@ -9,6 +9,7 @@ const logger_1 = __importDefault(require("./logger.js"));
|
|
|
9
9
|
const defaults_1 = require("./defaults.js");
|
|
10
10
|
const openaiChatCompletionsStreaming_1 = require("./openaiChatCompletionsStreaming.js");
|
|
11
11
|
const openaiChatCompletionsConverter_1 = require("./openaiChatCompletionsConverter.js");
|
|
12
|
+
const retryAdvice_1 = require("./retryAdvice.js");
|
|
12
13
|
exports.FAKE_ID = 'FAKE_ID';
|
|
13
14
|
function hasReasoningContent(message) {
|
|
14
15
|
return ('reasoning' in message &&
|
|
@@ -25,6 +26,9 @@ class OpenAIChatCompletionsModel {
|
|
|
25
26
|
this.#client = client;
|
|
26
27
|
this.#model = model;
|
|
27
28
|
}
|
|
29
|
+
getRetryAdvice(args) {
|
|
30
|
+
return (0, retryAdvice_1.getOpenAIRetryAdvice)(args);
|
|
31
|
+
}
|
|
28
32
|
async getResponse(request) {
|
|
29
33
|
const response = await (0, agents_core_1.withGenerationSpan)(async (span) => {
|
|
30
34
|
span.spanData.model = this.#model;
|
|
@@ -281,10 +285,14 @@ class OpenAIChatCompletionsModel {
|
|
|
281
285
|
else {
|
|
282
286
|
logger_1.default.debug(`Calling LLM. Request data: ${JSON.stringify(requestData, null, 2)}`);
|
|
283
287
|
}
|
|
284
|
-
const
|
|
288
|
+
const requestOptions = {
|
|
285
289
|
headers: defaults_1.HEADERS,
|
|
286
290
|
signal: request.signal,
|
|
287
|
-
}
|
|
291
|
+
};
|
|
292
|
+
if (request._internal?.runnerManagedRetry === true) {
|
|
293
|
+
requestOptions.maxRetries = 0;
|
|
294
|
+
}
|
|
295
|
+
const completion = await this.#client.chat.completions.create(requestData, requestOptions);
|
|
288
296
|
if (logger_1.default.dontLogModelData) {
|
|
289
297
|
logger_1.default.debug('Response received');
|
|
290
298
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsModel.js","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsModel.js","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import logger from "./logger.mjs";
|
|
|
3
3
|
import { HEADERS } from "./defaults.mjs";
|
|
4
4
|
import { convertChatCompletionsStreamToResponses } from "./openaiChatCompletionsStreaming.mjs";
|
|
5
5
|
import { getCompatibleToolChoice, toolToOpenAI, convertHandoffTool, itemsToMessages, } from "./openaiChatCompletionsConverter.mjs";
|
|
6
|
+
import { getOpenAIRetryAdvice } from "./retryAdvice.mjs";
|
|
6
7
|
export const FAKE_ID = 'FAKE_ID';
|
|
7
8
|
function hasReasoningContent(message) {
|
|
8
9
|
return ('reasoning' in message &&
|
|
@@ -19,6 +20,9 @@ export class OpenAIChatCompletionsModel {
|
|
|
19
20
|
this.#client = client;
|
|
20
21
|
this.#model = model;
|
|
21
22
|
}
|
|
23
|
+
getRetryAdvice(args) {
|
|
24
|
+
return getOpenAIRetryAdvice(args);
|
|
25
|
+
}
|
|
22
26
|
async getResponse(request) {
|
|
23
27
|
const response = await withGenerationSpan(async (span) => {
|
|
24
28
|
span.spanData.model = this.#model;
|
|
@@ -275,10 +279,14 @@ export class OpenAIChatCompletionsModel {
|
|
|
275
279
|
else {
|
|
276
280
|
logger.debug(`Calling LLM. Request data: ${JSON.stringify(requestData, null, 2)}`);
|
|
277
281
|
}
|
|
278
|
-
const
|
|
282
|
+
const requestOptions = {
|
|
279
283
|
headers: HEADERS,
|
|
280
284
|
signal: request.signal,
|
|
281
|
-
}
|
|
285
|
+
};
|
|
286
|
+
if (request._internal?.runnerManagedRetry === true) {
|
|
287
|
+
requestOptions.maxRetries = 0;
|
|
288
|
+
}
|
|
289
|
+
const completion = await this.#client.chat.completions.create(requestData, requestOptions);
|
|
282
290
|
if (logger.dontLogModelData) {
|
|
283
291
|
logger.debug('Response received');
|
|
284
292
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsModel.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsModel.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertChatCompletionsStreamToResponses = convertChatCompletionsStreamToResponses;
|
|
4
4
|
const openaiChatCompletionsModel_1 = require("./openaiChatCompletionsModel.js");
|
|
5
|
+
const rawModelEvents_1 = require("./rawModelEvents.js");
|
|
5
6
|
async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
6
7
|
let usage = undefined;
|
|
7
8
|
const state = {
|
|
@@ -29,6 +30,9 @@ async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
|
29
30
|
yield {
|
|
30
31
|
type: 'model',
|
|
31
32
|
event: chunk,
|
|
33
|
+
providerData: {
|
|
34
|
+
rawModelEventSource: rawModelEvents_1.OPENAI_CHAT_COMPLETIONS_RAW_MODEL_EVENT_SOURCE,
|
|
35
|
+
},
|
|
32
36
|
};
|
|
33
37
|
// This is always set by the OpenAI API, but not by others e.g. LiteLLM
|
|
34
38
|
usage = chunk.usage || undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsStreaming.js","sourceRoot":"","sources":["../src/openaiChatCompletionsStreaming.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsStreaming.js","sourceRoot":"","sources":["../src/openaiChatCompletionsStreaming.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { FAKE_ID } from "./openaiChatCompletionsModel.mjs";
|
|
2
|
+
import { OPENAI_CHAT_COMPLETIONS_RAW_MODEL_EVENT_SOURCE } from "./rawModelEvents.mjs";
|
|
2
3
|
export async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
3
4
|
let usage = undefined;
|
|
4
5
|
const state = {
|
|
@@ -26,6 +27,9 @@ export async function* convertChatCompletionsStreamToResponses(response, stream)
|
|
|
26
27
|
yield {
|
|
27
28
|
type: 'model',
|
|
28
29
|
event: chunk,
|
|
30
|
+
providerData: {
|
|
31
|
+
rawModelEventSource: OPENAI_CHAT_COMPLETIONS_RAW_MODEL_EVENT_SOURCE,
|
|
32
|
+
},
|
|
29
33
|
};
|
|
30
34
|
// This is always set by the OpenAI API, but not by others e.g. LiteLLM
|
|
31
35
|
usage = chunk.usage || undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsStreaming.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsStreaming.ts"],"names":[],"mappings":"OAIO,EAAE,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsStreaming.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsStreaming.ts"],"names":[],"mappings":"OAIO,EAAE,OAAO,EAAE;OACX,EAAE,8CAA8C,EAAE;AAWzD,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,uCAAuC,CAC5D,QAAwB,EACxB,MAAmC;IAEnC,IAAI,KAAK,GAAgC,SAAS,CAAC;IACnD,MAAM,KAAK,GAAmB;QAC5B,OAAO,EAAE,KAAK;QACd,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,IAAI;QACrB,cAAc,EAAE,EAAE;QAClB,SAAS,EAAE,EAAE;QACb,YAAY,EAAE,IAAI;KACnB,CAAC;IAEF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YAC1D,QAAQ,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;YACrB,MAAM;gBACJ,IAAI,EAAE,kBAAkB;gBACxB,YAAY,EAAE;oBACZ,GAAG,KAAK;iBACT;aACF,CAAC;QACJ,CAAC;QAED,6BAA6B;QAC7B,MAAM;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,KAAK;YACZ,YAAY,EAAE;gBACZ,mBAAmB,EAAE,8CAA8C;aACpE;SACF,CAAC;QAEF,uEAAuE;QACvE,KAAK,GAAI,KAAa,CAAC,KAAK,IAAI,SAAS,CAAC;QAE1C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa;YAAE,SAAS;QAC7B,IAAI,aAAa,CAAC,aAAa,EAAE,CAAC;YAChC,KAAK,CAAC,YAAY,GAAG,aAAa,CAAC,aAAa,CAAC;QACnD,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,KAAK;YAAE,SAAS;QACnC,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;QAElC,cAAc;QACd,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBACxB,KAAK,CAAC,YAAY,GAAG;oBACnB,IAAI,EAAE,EAAE;oBACR,IAAI,EAAE,aAAa;oBACnB,YAAY,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;iBAClC,CAAC;YACJ,CAAC;YACD,MAAM;gBACJ,IAAI,EAAE,mBAAmB;gBACzB,KAAK,EAAE,KAAK,CAAC,OAAO;gBACpB,YAAY,EAAE;oBACZ,GAAG,KAAK;iBACT;aACF,CAAC;YACF,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC;QAC3C,CAAC;QAED,IACE,WAAW,IAAI,KAAK;YACpB,KAAK,CAAC,SAAS;YACf,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,EACnC,CAAC;YACD,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC;QACrC,CAAC;QAED,kBAAkB;QAClB,IAAI,SAAS,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC3B,KAAK,CAAC,eAAe,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAC3D,CAAC;YACD,KAAK,CAAC,eAAe,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;QACjD,CAAC;QAED,oBAAoB;QACpB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACxC,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oBAC9C,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG;wBACrC,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,OAAO;wBAC1B,SAAS,EAAE,EAAE;wBACb,IAAI,EAAE,EAAE;wBACR,IAAI,EAAE,eAAe;wBACrB,MAAM,EAAE,EAAE;qBACX,CAAC;gBACJ,CAAC;gBACD,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBACtC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS;oBAC5C,WAAW,EAAE,SAAS,IAAI,EAAE,CAAC;gBAC/B,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC;gBACrE,IAAI,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;oBAChE,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC;gBAC5D,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,MAAM,OAAO,GAA+B,EAAE,CAAC;IAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,EAAE,IAAI,OAAO,CAAC;IAE5C,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;SAChE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QAChD,MAAM,OAAO,GAAgC,EAAE,CAAC;QAChD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,CAAC,IAAI,CAAC;YACX,EAAE,EAAE,YAAY;YAChB,OAAO;YACP,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,WAAW;SACpB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QAChE,aAAa,CAAC,EAAE,GAAG,YAAY,CAAC;QAChC,uDAAuD;QACvD,yDAAyD;QACzD,mDAAmD;QACnD,IAAI,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9C,aAAa,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,QAAQ,CAAC,KAAK,GAAG;QACf,aAAa,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC;QACxC,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,IAAI,CAAC;QAChD,YAAY,EAAE,KAAK,EAAE,YAAY,IAAI,CAAC;QACtC,qBAAqB,EAAE,KAAK,EAAE,qBAAqB;QACnD,yBAAyB,EAAE,KAAK,EAAE,yBAAyB;KAC5D,CAAC;IAEF,yBAAyB;IACzB,MAAM,UAAU,GAA0C;QACxD,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE;YACR,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,KAAK,EAAE;gBACL,WAAW,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC;gBACtC,YAAY,EAAE,KAAK,EAAE,iBAAiB,IAAI,CAAC;gBAC3C,WAAW,EAAE,KAAK,EAAE,YAAY,IAAI,CAAC;gBACrC,kBAAkB,EAAE;oBAClB,aAAa,EAAE,KAAK,EAAE,qBAAqB,EAAE,aAAa,IAAI,CAAC;iBAChE;gBACD,mBAAmB,EAAE;oBACnB,gBAAgB,EACb,KAAa,EAAE,yBAAyB,EAAE,gBAAgB,IAAI,CAAC;iBACnE;aACF;YACD,MAAM,EAAE,OAAO;SAChB;KACF,CAAC;IAEF,MAAM,UAAU,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CACvB,KAAqB;IAErB,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC;SACnD,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;SACvD,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1B,EAAE,EAAE,YAAY,CAAC,MAAM;QACvB,IAAI,EAAE,UAAmB;QACzB,QAAQ,EAAE;YACR,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,SAAS,EAAE,YAAY,CAAC,SAAS;SAClC;KACF,CAAC,CAAC,CAAC;IAEN,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,EAAE,IAAI,IAAI,IAAI,CAAC;IACjD,MAAM,OAAO,GAAG,KAAK,CAAC,eAAe,EAAE,OAAO,IAAI,IAAI,CAAC;IAEvD,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,KAAK,EAAE,CAAC;QACR,QAAQ,EAAE,IAAI;QACd,aAAa,EACX,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC;QACtE,OAAO,EAAE;YACP,IAAI,EAAE,WAAW;YACjB,OAAO;YACP,OAAO;YACP,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3D;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Model, protocol } from '@openai/agents-core';
|
|
2
|
-
import type { SerializedTool, ModelRequest, ModelResponse, ModelSettingsToolChoice, ResponseStreamEvent } from '@openai/agents-core';
|
|
2
|
+
import type { ModelRetryAdvice, ModelRetryAdviceRequest, SerializedTool, ModelRequest, ModelResponse, ModelSettingsToolChoice, ResponseStreamEvent } from '@openai/agents-core';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
import { ToolChoiceFunction, ToolChoiceOptions, ToolChoiceTypes } from 'openai/resources/responses/responses';
|
|
5
5
|
import { headerAccumulatorToSDKHeaders } from './responsesTransportUtils';
|
|
@@ -45,6 +45,7 @@ export declare class OpenAIResponsesModel implements Model {
|
|
|
45
45
|
protected readonly _client: OpenAI;
|
|
46
46
|
protected readonly _model: string;
|
|
47
47
|
constructor(client: OpenAI, model: string);
|
|
48
|
+
getRetryAdvice(args: ModelRetryAdviceRequest): ModelRetryAdvice | undefined;
|
|
48
49
|
protected _fetchResponse(request: ModelRequest, stream: false): Promise<OpenAI.Responses.Response>;
|
|
49
50
|
protected _buildResponsesCreateRequest(request: ModelRequest, stream: boolean): BuiltResponsesCreateRequest;
|
|
50
51
|
/**
|
|
@@ -72,6 +73,7 @@ export type OpenAIResponsesWSModelOptions = {
|
|
|
72
73
|
export declare class OpenAIResponsesWSModel extends OpenAIResponsesModel {
|
|
73
74
|
#private;
|
|
74
75
|
constructor(client: OpenAI, model: string, options?: OpenAIResponsesWSModelOptions);
|
|
76
|
+
getRetryAdvice(args: ModelRetryAdviceRequest): ModelRetryAdvice | undefined;
|
|
75
77
|
protected _fetchResponse(request: ModelRequest, stream: false): Promise<OpenAI.Responses.Response>;
|
|
76
78
|
close(): Promise<void>;
|
|
77
79
|
}
|
|
@@ -11,6 +11,8 @@ exports.convertToOutputItem = convertToOutputItem;
|
|
|
11
11
|
const agents_core_1 = require("@openai/agents-core");
|
|
12
12
|
const openai_1 = __importDefault(require("openai"));
|
|
13
13
|
const logger_1 = __importDefault(require("./logger.js"));
|
|
14
|
+
const rawModelEvents_1 = require("./rawModelEvents.js");
|
|
15
|
+
const retryAdvice_1 = require("./retryAdvice.js");
|
|
14
16
|
const zod_1 = require("zod");
|
|
15
17
|
const defaults_1 = require("./defaults.js");
|
|
16
18
|
const responsesWebSocketConnection_1 = require("./responsesWebSocketConnection.js");
|
|
@@ -84,6 +86,34 @@ function fromOpenAIToolSearchOutputToolPayload(tool, _withinNamespace = false) {
|
|
|
84
86
|
}
|
|
85
87
|
return tool;
|
|
86
88
|
}
|
|
89
|
+
function isNeverSentWebSocketError(error) {
|
|
90
|
+
if ((0, responsesWebSocketConnection_1.isWebSocketNotOpenError)(error)) {
|
|
91
|
+
return true;
|
|
92
|
+
}
|
|
93
|
+
const errorCause = error instanceof Error
|
|
94
|
+
? error.cause
|
|
95
|
+
: undefined;
|
|
96
|
+
if (error instanceof responsesWebSocketConnection_1.ResponsesWebSocketInternalError &&
|
|
97
|
+
error.code === 'connection_closed_before_opening') {
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
if (errorCause instanceof responsesWebSocketConnection_1.ResponsesWebSocketInternalError &&
|
|
101
|
+
errorCause.code === 'connection_closed_before_opening') {
|
|
102
|
+
return true;
|
|
103
|
+
}
|
|
104
|
+
return false;
|
|
105
|
+
}
|
|
106
|
+
function isAmbiguousWebSocketReplayError(error) {
|
|
107
|
+
if (error instanceof responsesWebSocketConnection_1.ResponsesWebSocketInternalError &&
|
|
108
|
+
error.code === 'connection_closed_before_terminal_response_event') {
|
|
109
|
+
return true;
|
|
110
|
+
}
|
|
111
|
+
const errorCause = error instanceof Error
|
|
112
|
+
? error.cause
|
|
113
|
+
: undefined;
|
|
114
|
+
return (errorCause instanceof responsesWebSocketConnection_1.ResponsesWebSocketInternalError &&
|
|
115
|
+
errorCause.code === 'connection_closed_before_terminal_response_event');
|
|
116
|
+
}
|
|
87
117
|
function hasSerializedComputerDisplayMetadata(tool) {
|
|
88
118
|
return (typeof tool.environment === 'string' &&
|
|
89
119
|
Array.isArray(tool.dimensions) &&
|
|
@@ -2032,15 +2062,22 @@ class OpenAIResponsesModel {
|
|
|
2032
2062
|
this._client = client;
|
|
2033
2063
|
this._model = model;
|
|
2034
2064
|
}
|
|
2065
|
+
getRetryAdvice(args) {
|
|
2066
|
+
return (0, retryAdvice_1.getOpenAIRetryAdvice)(args);
|
|
2067
|
+
}
|
|
2035
2068
|
async _fetchResponse(request, stream) {
|
|
2036
2069
|
const builtRequest = this._buildResponsesCreateRequest(request, stream);
|
|
2037
|
-
const
|
|
2070
|
+
const requestOptions = {
|
|
2038
2071
|
headers: builtRequest.sdkRequestHeaders,
|
|
2039
2072
|
signal: builtRequest.signal,
|
|
2040
2073
|
...(builtRequest.transportExtraQuery
|
|
2041
2074
|
? { query: builtRequest.transportExtraQuery }
|
|
2042
2075
|
: {}),
|
|
2043
|
-
}
|
|
2076
|
+
};
|
|
2077
|
+
if (request._internal?.runnerManagedRetry === true) {
|
|
2078
|
+
requestOptions.maxRetries = 0;
|
|
2079
|
+
}
|
|
2080
|
+
const responsePromise = this._client.responses.create(builtRequest.requestData, requestOptions);
|
|
2044
2081
|
let response;
|
|
2045
2082
|
if (stream) {
|
|
2046
2083
|
const withResponse = responsePromise
|
|
@@ -2265,6 +2302,9 @@ class OpenAIResponsesModel {
|
|
|
2265
2302
|
yield {
|
|
2266
2303
|
type: 'model',
|
|
2267
2304
|
event: event,
|
|
2305
|
+
providerData: {
|
|
2306
|
+
rawModelEventSource: rawModelEvents_1.OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE,
|
|
2307
|
+
},
|
|
2268
2308
|
};
|
|
2269
2309
|
}
|
|
2270
2310
|
}
|
|
@@ -2279,6 +2319,9 @@ class OpenAIResponsesModel {
|
|
|
2279
2319
|
yield {
|
|
2280
2320
|
type: 'model',
|
|
2281
2321
|
event: event,
|
|
2322
|
+
providerData: {
|
|
2323
|
+
rawModelEventSource: rawModelEvents_1.OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE,
|
|
2324
|
+
},
|
|
2282
2325
|
};
|
|
2283
2326
|
}
|
|
2284
2327
|
if (request.tracing && span && finalResponse) {
|
|
@@ -2326,6 +2369,23 @@ class OpenAIResponsesWSModel extends OpenAIResponsesModel {
|
|
|
2326
2369
|
this.#websocketBaseURL = options.websocketBaseURL;
|
|
2327
2370
|
this.#reuseConnection = options.reuseConnection ?? true;
|
|
2328
2371
|
}
|
|
2372
|
+
getRetryAdvice(args) {
|
|
2373
|
+
if (isNeverSentWebSocketError(args.error)) {
|
|
2374
|
+
return {
|
|
2375
|
+
suggested: true,
|
|
2376
|
+
replaySafety: 'safe',
|
|
2377
|
+
reason: args.error instanceof Error ? args.error.message : undefined,
|
|
2378
|
+
};
|
|
2379
|
+
}
|
|
2380
|
+
if (isAmbiguousWebSocketReplayError(args.error)) {
|
|
2381
|
+
return {
|
|
2382
|
+
suggested: false,
|
|
2383
|
+
replaySafety: 'unsafe',
|
|
2384
|
+
reason: args.error instanceof Error ? args.error.message : undefined,
|
|
2385
|
+
};
|
|
2386
|
+
}
|
|
2387
|
+
return super.getRetryAdvice(args);
|
|
2388
|
+
}
|
|
2329
2389
|
async _fetchResponse(request, stream) {
|
|
2330
2390
|
// The websocket transport always uses streamed Responses events, then callers either
|
|
2331
2391
|
// consume the stream directly or collapse it into the final terminal response.
|
|
@@ -2334,13 +2394,23 @@ class OpenAIResponsesWSModel extends OpenAIResponsesModel {
|
|
|
2334
2394
|
return this.#iterWebSocketResponseEvents(builtRequest);
|
|
2335
2395
|
}
|
|
2336
2396
|
let finalResponse;
|
|
2337
|
-
|
|
2338
|
-
|
|
2339
|
-
|
|
2340
|
-
|
|
2341
|
-
|
|
2397
|
+
let receivedAnyEvent = false;
|
|
2398
|
+
try {
|
|
2399
|
+
for await (const event of this.#iterWebSocketResponseEvents(builtRequest)) {
|
|
2400
|
+
receivedAnyEvent = true;
|
|
2401
|
+
const eventType = event.type;
|
|
2402
|
+
if (isTerminalResponsesStreamEventType(eventType)) {
|
|
2403
|
+
finalResponse = event
|
|
2404
|
+
.response;
|
|
2405
|
+
}
|
|
2342
2406
|
}
|
|
2343
2407
|
}
|
|
2408
|
+
catch (error) {
|
|
2409
|
+
if (receivedAnyEvent && error instanceof Error) {
|
|
2410
|
+
error.unsafeToReplay = true;
|
|
2411
|
+
}
|
|
2412
|
+
throw error;
|
|
2413
|
+
}
|
|
2344
2414
|
if (!finalResponse) {
|
|
2345
2415
|
throw new Error('Responses websocket stream ended without a terminal response event.');
|
|
2346
2416
|
}
|