@proteinjs/conversation 1.6.1 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/dist/src/Conversation.d.ts +1 -1
- package/dist/src/Conversation.d.ts.map +1 -1
- package/dist/src/Conversation.js +2 -2
- package/dist/src/Conversation.js.map +1 -1
- package/dist/src/OpenAi.d.ts +2 -2
- package/dist/src/OpenAi.d.ts.map +1 -1
- package/dist/src/OpenAi.js +15 -13
- package/dist/src/OpenAi.js.map +1 -1
- package/dist/src/OpenAiStreamProcessor.d.ts +2 -1
- package/dist/src/OpenAiStreamProcessor.d.ts.map +1 -1
- package/dist/src/OpenAiStreamProcessor.js +14 -10
- package/dist/src/OpenAiStreamProcessor.js.map +1 -1
- package/package.json +2 -2
- package/src/Conversation.ts +6 -1
- package/src/OpenAi.ts +28 -14
- package/src/OpenAiStreamProcessor.ts +6 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.7.0](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.6.1...@proteinjs/conversation@1.7.0) (2024-08-05)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* added optional `AbortSignal` to `generateStreamingResponse` ([a02eb64](https://github.com/proteinjs/conversation/commit/a02eb64444629bc4ec97f7336322fdfcec97d41b))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [1.6.1](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.6.0...@proteinjs/conversation@1.6.1) (2024-07-28)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -35,7 +35,7 @@ export declare class Conversation {
|
|
|
35
35
|
addUserMessagesToHistory(messages: string[], unshift?: boolean): void;
|
|
36
36
|
addMessagesToHistory(messages: ChatCompletionMessageParam[], unshift?: boolean): void;
|
|
37
37
|
generateResponse(messages: (string | ChatCompletionMessageParam)[], model?: TiktokenModel): Promise<string>;
|
|
38
|
-
generateStreamingResponse(messages: (string | ChatCompletionMessageParam)[], model?: TiktokenModel): Promise<import("stream").Readable>;
|
|
38
|
+
generateStreamingResponse(messages: (string | ChatCompletionMessageParam)[], model?: TiktokenModel, abortSignal?: AbortSignal): Promise<import("stream").Readable>;
|
|
39
39
|
generateCode(description: string[], model?: TiktokenModel): Promise<string>;
|
|
40
40
|
updateCodeFromFile(codeToUpdateFilePath: string, dependencyCodeFilePaths: string[], description: string, model?: TiktokenModel): Promise<string>;
|
|
41
41
|
updateCode(code: string, description: string, model?: TiktokenModel): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Conversation.d.ts","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAInE,OAAO,EAAU,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,UAAU,CAAC;AAG7D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAEF,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,OAAO,CAAC;IAChB,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAqB;gBAEvB,MAAM,EAAE,kBAAkB;IAqBtC,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,YAAY;IAuBpB,OAAO,CAAC,oBAAoB;YAId,iBAAiB;IAwD/B,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAK5C,OAAO,CAAC,YAAY;IAKpB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAO9D,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAOjE,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAO5D,oBAAoB,CAAC,QAAQ,EAAE,0BAA0B,EAAE,EAAE,OAAO,UAAQ;IAYtE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,0BAA0B,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,aAAa;IAYzF,yBAAyB,
|
|
1
|
+
{"version":3,"file":"Conversation.d.ts","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAInE,OAAO,EAAU,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,UAAU,CAAC;AAG7D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAEF,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,OAAO,CAAC;IAChB,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAqB;gBAEvB,MAAM,EAAE,kBAAkB;IAqBtC,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,YAAY;IAuBpB,OAAO,CAAC,oBAAoB;YAId,iBAAiB;IAwD/B,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAK5C,OAAO,CAAC,YAAY;IAKpB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAO9D,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAOjE,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAO5D,oBAAoB,CAAC,QAAQ,EAAE,0BAA0B,EAAE,EAAE,OAAO,UAAQ;IAYtE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,0BAA0B,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,aAAa;IAYzF,yBAAyB,CAC7B,QAAQ,EAAE,CAAC,MAAM,GAAG,0BAA0B,CAAC,EAAE,EACjD,KAAK,CAAC,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,WAAW;IAcrB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,aAAa;IAgBzD,kBAAkB,CACtB,oBAAoB,EAAE,MAAM,EAC5B,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,aAAa;IAajB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,aAAa;IAmBnE,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,aAAa;CAahE;AAED,eAAO,MAAM,wCAAwC,iCAAiC,CAAC;AACvF,eAAO,MAAM,oCAAoC,iBAAkB,YAAY;;;;;;;;;;;;;;;mBAgBtD;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;CAE3C,CAAC"}
|
package/dist/src/Conversation.js
CHANGED
|
@@ -221,14 +221,14 @@ var Conversation = /** @class */ (function () {
|
|
|
221
221
|
});
|
|
222
222
|
});
|
|
223
223
|
};
|
|
224
|
-
Conversation.prototype.generateStreamingResponse = function (messages, model) {
|
|
224
|
+
Conversation.prototype.generateStreamingResponse = function (messages, model, abortSignal) {
|
|
225
225
|
return __awaiter(this, void 0, void 0, function () {
|
|
226
226
|
return __generator(this, function (_a) {
|
|
227
227
|
switch (_a.label) {
|
|
228
228
|
case 0: return [4 /*yield*/, this.enforceTokenLimit(messages, model)];
|
|
229
229
|
case 1:
|
|
230
230
|
_a.sent();
|
|
231
|
-
return [4 /*yield*/, OpenAi_1.OpenAi.generateStreamingResponse(messages, model, this.history, this.functions, this.messageModerators, this.params.logLevel)];
|
|
231
|
+
return [4 /*yield*/, OpenAi_1.OpenAi.generateStreamingResponse(messages, model, this.history, this.functions, this.messageModerators, abortSignal, this.params.logLevel)];
|
|
232
232
|
case 2: return [2 /*return*/, _a.sent()];
|
|
233
233
|
}
|
|
234
234
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Conversation.js","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Conversation.js","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":"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"}
|
package/dist/src/OpenAi.d.ts
CHANGED
|
@@ -9,8 +9,8 @@ import { Readable } from 'stream';
|
|
|
9
9
|
export declare const DEFAULT_MODEL: TiktokenModel;
|
|
10
10
|
export declare class OpenAi {
|
|
11
11
|
static generateResponse(messages: (string | ChatCompletionMessageParam)[], model?: string, history?: MessageHistory, functions?: Omit<Function, 'instructions'>[], messageModerators?: MessageModerator[], logLevel?: LogLevel, maxFunctionCalls?: number): Promise<string>;
|
|
12
|
-
static generateStreamingResponse(messages: (string | ChatCompletionMessageParam)[], model?: string, history?: MessageHistory, functions?: Omit<Function, 'instructions'>[], messageModerators?: MessageModerator[], logLevel?: LogLevel, maxFunctionCalls?: number): Promise<Readable>;
|
|
13
|
-
static generateResponseHelper(messages: (string | ChatCompletionMessageParam)[], stream: boolean, currentFunctionCalls: number, model?: string, history?: MessageHistory, functions?: Omit<Function, 'instructions'>[], messageModerators?: MessageModerator[], logLevel?: LogLevel, maxFunctionCalls?: number): Promise<string | Readable>;
|
|
12
|
+
static generateStreamingResponse(messages: (string | ChatCompletionMessageParam)[], model?: string, history?: MessageHistory, functions?: Omit<Function, 'instructions'>[], messageModerators?: MessageModerator[], abortSignal?: AbortSignal, logLevel?: LogLevel, maxFunctionCalls?: number): Promise<Readable>;
|
|
13
|
+
static generateResponseHelper(messages: (string | ChatCompletionMessageParam)[], stream: boolean, currentFunctionCalls: number, model?: string, history?: MessageHistory, functions?: Omit<Function, 'instructions'>[], messageModerators?: MessageModerator[], abortSignal?: AbortSignal, logLevel?: LogLevel, maxFunctionCalls?: number): Promise<string | Readable>;
|
|
14
14
|
private static getUpdatedMessageHistory;
|
|
15
15
|
private static moderateHistory;
|
|
16
16
|
private static executeRequest;
|
package/dist/src/OpenAi.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAi.d.ts","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":";AACA,OAAO,EACL,0BAA0B,EAI3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAwB,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOlC,eAAO,MAAM,aAAa,EAAE,aAA+B,CAAC;AAC5D,qBAAa,MAAM;WACJ,gBAAgB,CAC3B,QAAQ,EAAE,CAAC,MAAM,GAAG,0BAA0B,CAAC,EAAE,EACjD,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,cAAc,EACxB,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,EAC5C,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,EACtC,QAAQ,GAAE,QAAiB,EAC3B,gBAAgB,GAAE,MAAW,GAC5B,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"OpenAi.d.ts","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":"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"}
|
package/dist/src/OpenAi.js
CHANGED
|
@@ -65,25 +65,25 @@ var OpenAi = /** @class */ (function () {
|
|
|
65
65
|
return __awaiter(this, void 0, void 0, function () {
|
|
66
66
|
return __generator(this, function (_a) {
|
|
67
67
|
switch (_a.label) {
|
|
68
|
-
case 0: return [4 /*yield*/, this.generateResponseHelper(messages, false, 0, model, history, functions, messageModerators, logLevel, maxFunctionCalls)];
|
|
68
|
+
case 0: return [4 /*yield*/, this.generateResponseHelper(messages, false, 0, model, history, functions, messageModerators, undefined, logLevel, maxFunctionCalls)];
|
|
69
69
|
case 1: return [2 /*return*/, (_a.sent())];
|
|
70
70
|
}
|
|
71
71
|
});
|
|
72
72
|
});
|
|
73
73
|
};
|
|
74
|
-
OpenAi.generateStreamingResponse = function (messages, model, history, functions, messageModerators, logLevel, maxFunctionCalls) {
|
|
74
|
+
OpenAi.generateStreamingResponse = function (messages, model, history, functions, messageModerators, abortSignal, logLevel, maxFunctionCalls) {
|
|
75
75
|
if (logLevel === void 0) { logLevel = 'info'; }
|
|
76
76
|
if (maxFunctionCalls === void 0) { maxFunctionCalls = 50; }
|
|
77
77
|
return __awaiter(this, void 0, void 0, function () {
|
|
78
78
|
return __generator(this, function (_a) {
|
|
79
79
|
switch (_a.label) {
|
|
80
|
-
case 0: return [4 /*yield*/, this.generateResponseHelper(messages, true, 0, model, history, functions, messageModerators, logLevel, maxFunctionCalls)];
|
|
80
|
+
case 0: return [4 /*yield*/, this.generateResponseHelper(messages, true, 0, model, history, functions, messageModerators, abortSignal, logLevel, maxFunctionCalls)];
|
|
81
81
|
case 1: return [2 /*return*/, (_a.sent())];
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
84
|
});
|
|
85
85
|
};
|
|
86
|
-
OpenAi.generateResponseHelper = function (messages, stream, currentFunctionCalls, model, history, functions, messageModerators, logLevel, maxFunctionCalls) {
|
|
86
|
+
OpenAi.generateResponseHelper = function (messages, stream, currentFunctionCalls, model, history, functions, messageModerators, abortSignal, logLevel, maxFunctionCalls) {
|
|
87
87
|
if (logLevel === void 0) { logLevel = 'info'; }
|
|
88
88
|
if (maxFunctionCalls === void 0) { maxFunctionCalls = 50; }
|
|
89
89
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -93,7 +93,7 @@ var OpenAi = /** @class */ (function () {
|
|
|
93
93
|
case 0:
|
|
94
94
|
logger = new util_1.Logger('OpenAi.generateResponseHelper', logLevel);
|
|
95
95
|
updatedHistory = OpenAi.getUpdatedMessageHistory(messages, history, messageModerators);
|
|
96
|
-
return [4 /*yield*/, OpenAi.executeRequest(updatedHistory, stream, logLevel, functions, model)];
|
|
96
|
+
return [4 /*yield*/, OpenAi.executeRequest(updatedHistory, stream, logLevel, functions, model, abortSignal)];
|
|
97
97
|
case 1:
|
|
98
98
|
response = _a.sent();
|
|
99
99
|
if (stream) {
|
|
@@ -104,14 +104,14 @@ var OpenAi = /** @class */ (function () {
|
|
|
104
104
|
return [2 /*return*/, stream_1.Readable.from(inputStream)];
|
|
105
105
|
}
|
|
106
106
|
onToolCalls = (function (toolCalls, currentFunctionCalls) {
|
|
107
|
-
return OpenAi.handleToolCalls(toolCalls, true, currentFunctionCalls, updatedHistory, model, functions, messageModerators, logLevel, maxFunctionCalls);
|
|
107
|
+
return OpenAi.handleToolCalls(toolCalls, true, currentFunctionCalls, updatedHistory, model, functions, messageModerators, abortSignal, logLevel, maxFunctionCalls);
|
|
108
108
|
});
|
|
109
|
-
streamProcessor = new OpenAiStreamProcessor_1.OpenAiStreamProcessor(inputStream, onToolCalls, logLevel);
|
|
109
|
+
streamProcessor = new OpenAiStreamProcessor_1.OpenAiStreamProcessor(inputStream, onToolCalls, logLevel, abortSignal);
|
|
110
110
|
return [2 /*return*/, streamProcessor.getOutputStream()];
|
|
111
111
|
}
|
|
112
112
|
responseMessage = response.choices[0].message;
|
|
113
113
|
if (!responseMessage.tool_calls) return [3 /*break*/, 3];
|
|
114
|
-
return [4 /*yield*/, OpenAi.handleToolCalls(responseMessage.tool_calls, stream, currentFunctionCalls, updatedHistory, model, functions, messageModerators, logLevel, maxFunctionCalls)];
|
|
114
|
+
return [4 /*yield*/, OpenAi.handleToolCalls(responseMessage.tool_calls, stream, currentFunctionCalls, updatedHistory, model, functions, messageModerators, abortSignal, logLevel, maxFunctionCalls)];
|
|
115
115
|
case 2: return [2 /*return*/, _a.sent()];
|
|
116
116
|
case 3:
|
|
117
117
|
responseText = responseMessage.content;
|
|
@@ -147,7 +147,7 @@ var OpenAi = /** @class */ (function () {
|
|
|
147
147
|
}
|
|
148
148
|
return history;
|
|
149
149
|
};
|
|
150
|
-
OpenAi.executeRequest = function (messageParamsWithHistory, stream, logLevel, functions, model) {
|
|
150
|
+
OpenAi.executeRequest = function (messageParamsWithHistory, stream, logLevel, functions, model, abortSignal) {
|
|
151
151
|
return __awaiter(this, void 0, void 0, function () {
|
|
152
152
|
var logger, openaiApi, latestMessage, response, error_1;
|
|
153
153
|
return __generator(this, function (_a) {
|
|
@@ -169,7 +169,7 @@ var OpenAi = /** @class */ (function () {
|
|
|
169
169
|
function: f.definition,
|
|
170
170
|
}); }),
|
|
171
171
|
stream: stream,
|
|
172
|
-
})];
|
|
172
|
+
}, { signal: abortSignal })];
|
|
173
173
|
case 2:
|
|
174
174
|
response = _a.sent();
|
|
175
175
|
if (!stream) {
|
|
@@ -227,7 +227,9 @@ var OpenAi = /** @class */ (function () {
|
|
|
227
227
|
return __generator(this, function (_a) {
|
|
228
228
|
switch (_a.label) {
|
|
229
229
|
case 0:
|
|
230
|
-
|
|
230
|
+
if (error.type) {
|
|
231
|
+
logger.info("Received error response, error type: ".concat(error.type));
|
|
232
|
+
}
|
|
231
233
|
if (!(typeof error.status !== 'undefined' && error.status == 429)) return [3 /*break*/, 3];
|
|
232
234
|
if (!(error.type == 'tokens' && typeof error.headers['x-ratelimit-reset-tokens'] === 'string')) return [3 /*break*/, 3];
|
|
233
235
|
waitTime = parseInt(error.headers['x-ratelimit-reset-tokens']);
|
|
@@ -244,7 +246,7 @@ var OpenAi = /** @class */ (function () {
|
|
|
244
246
|
});
|
|
245
247
|
});
|
|
246
248
|
};
|
|
247
|
-
OpenAi.handleToolCalls = function (toolCalls, stream, currentFunctionCalls, history, model, functions, messageModerators, logLevel, maxFunctionCalls) {
|
|
249
|
+
OpenAi.handleToolCalls = function (toolCalls, stream, currentFunctionCalls, history, model, functions, messageModerators, abortSignal, logLevel, maxFunctionCalls) {
|
|
248
250
|
if (logLevel === void 0) { logLevel = 'info'; }
|
|
249
251
|
if (maxFunctionCalls === void 0) { maxFunctionCalls = 50; }
|
|
250
252
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -268,7 +270,7 @@ var OpenAi = /** @class */ (function () {
|
|
|
268
270
|
// Add the tool responses to the history
|
|
269
271
|
history.push(toolMessageParams);
|
|
270
272
|
// Generate the next response
|
|
271
|
-
return [2 /*return*/, this.generateResponseHelper([], stream, currentFunctionCalls + toolCalls.length, model, history, functions, messageModerators, logLevel, maxFunctionCalls)];
|
|
273
|
+
return [2 /*return*/, this.generateResponseHelper([], stream, currentFunctionCalls + toolCalls.length, model, history, functions, messageModerators, abortSignal, logLevel, maxFunctionCalls)];
|
|
272
274
|
}
|
|
273
275
|
});
|
|
274
276
|
});
|
package/dist/src/OpenAi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAi.js","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA6C;AAO7C,wCAAiE;AAGjE,2DAA0D;AAE1D,yFAAwF;AAExF,iCAAkC;AAClC,iEAAgE;AAEhE,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,IAAK,OAAA,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,EAAvB,CAAuB,CAAC,CAAC;AAC3D,CAAC;AAEY,QAAA,aAAa,GAAkB,eAAe,CAAC;AAC5D;IAAA;IAyeA,CAAC;IAxec,uBAAgB,GAA7B,UACE,QAAiD,EACjD,KAAc,EACd,OAAwB,EACxB,SAA4C,EAC5C,iBAAsC,EACtC,QAA2B,EAC3B,gBAA6B;QAD7B,yBAAA,EAAA,iBAA2B;QAC3B,iCAAA,EAAA,qBAA6B;;;;4BAErB,qBAAM,IAAI,CAAC,sBAAsB,CACvC,QAAQ,EACR,KAAK,EACL,CAAC,EACD,KAAK,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,QAAQ,EACR,gBAAgB,CACjB,EAAA;4BAVD,sBAAO,CAAC,SAUP,CAAW,EAAC;;;;KACd;IAEY,gCAAyB,GAAtC,UACE,QAAiD,EACjD,KAAc,EACd,OAAwB,EACxB,SAA4C,EAC5C,iBAAsC,EACtC,QAA2B,EAC3B,gBAA6B;QAD7B,yBAAA,EAAA,iBAA2B;QAC3B,iCAAA,EAAA,qBAA6B;;;;4BAErB,qBAAM,IAAI,CAAC,sBAAsB,CACvC,QAAQ,EACR,IAAI,EACJ,CAAC,EACD,KAAK,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,QAAQ,EACR,gBAAgB,CACjB,EAAA;4BAVD,sBAAO,CAAC,SAUP,CAAa,EAAC;;;;KAChB;IAEY,6BAAsB,GAAnC,UACE,QAAiD,EACjD,MAAe,EACf,oBAA4B,EAC5B,KAAc,EACd,OAAwB,EACxB,SAA4C,EAC5C,iBAAsC,EACtC,QAA2B,EAC3B,gBAA6B;QAD7B,yBAAA,EAAA,iBAA2B;QAC3B,iCAAA,EAAA,qBAA6B;;;;;;wBAEvB,MAAM,GAAG,IAAI,aAAM,CAAC,+BAA+B,EAAE,QAAQ,CAAC,CAAC;wBAC/D,cAAc,GAAG,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;wBAC5E,qBAAM,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EAAA;;wBAA1F,QAAQ,GAAG,SAA+E;wBAChG,IAAI,MAAM,EAAE;4BACV,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;4BACpC,WAAW,GAAG,QAAuC,CAAC;4BAE5D,qFAAqF;4BACrF,IAAI,oBAAoB,GAAG,CAAC,EAAE;gCAC5B,sBAAO,iBAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAC;6BACnC;4BAGK,WAAW,GAAG,CAAC,UAAC,SAAS,EAAE,oBAAoB;gCACnD,OAAA,MAAM,CAAC,eAAe,CACpB,SAAS,EACT,IAAI,EACJ,oBAAoB,EACpB,cAAc,EACd,KAAK,EACL,SAAS,EACT,iBAAiB,EACjB,QAAQ,EACR,gBAAgB,CACjB;4BAVD,CAUC,CAAoG,CAAC;4BAClG,eAAe,GAAG,IAAI,6CAAqB,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;4BACtF,sBAAO,eAAe,CAAC,eAAe,EAAE,EAAC;yBAC1C;wBAEK,eAAe,GAAI,QAA2B,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;6BACpE,eAAe,CAAC,UAAU,EAA1B,wBAA0B;wBACrB,qBAAM,MAAM,CAAC,eAAe,CACjC,eAAe,CAAC,UAAU,EAC1B,MAAM,EACN,oBAAoB,EACpB,cAAc,EACd,KAAK,EACL,SAAS,EACT,iBAAiB,EACjB,QAAQ,EACR,gBAAgB,CACjB,EAAA;4BAVD,sBAAO,SAUN,EAAC;;wBAGE,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC;wBAC7C,IAAI,CAAC,YAAY,EAAE;4BACjB,MAAM,IAAI,KAAK,CAAC,2CAAoC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAE,CAAC,CAAC;yBAC5E;wBAED,cAAc,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;wBACvC,sBAAO,YAAY,EAAC;;;;KACrB;IAEc,+BAAwB,GAAvC,UACE,QAAiD,EACjD,OAAwB,EACxB,iBAAsC;QAEtC,IAAM,aAAa,GAAiC,QAAQ,CAAC,GAAG,CAAC,UAAC,OAAO;YACvE,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;aAC3C;YAED,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAC7B;QACD,IAAI,wBAAwB,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,+BAAc,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5F,IAAI,iBAAiB,EAAE;YACrB,wBAAwB,GAAG,MAAM,CAAC,eAAe,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAAC;SAChG;QAED,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAEc,sBAAe,GAA9B,UAA+B,OAAuB,EAAE,iBAAqC;QAC3F,KAA+B,UAAiB,EAAjB,uCAAiB,EAAjB,+BAAiB,EAAjB,IAAiB,EAAE;YAA7C,IAAM,gBAAgB,0BAAA;YACzB,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;SACtE;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEoB,qBAAc,GAAnC,UACE,wBAAwC,EACxC,MAAe,EACf,QAAkB,EAClB,SAA4C,EAC5C,KAAc;;;;;;wBAER,MAAM,GAAG,IAAI,aAAM,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAAC;wBACvD,SAAS,GAAG,IAAI,eAAS,EAAE,CAAC;;;;wBAE1B,aAAa,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAC,wBAAwB,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;wBAChH,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,wBAAwB,CAAC,CAAC;wBAEjE,qBAAM,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;gCACvD,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAa;gCACpC,WAAW,EAAE,CAAC;gCACd,QAAQ,EAAE,wBAAwB,CAAC,WAAW,EAAE;gCAChD,KAAK,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC;oCAC5B,IAAI,EAAE,UAAU;oCAChB,QAAQ,EAAE,CAAC,CAAC,UAAU;iCACvB,CAAC,EAH2B,CAG3B,CAAC;gCACH,MAAM,EAAE,MAAM;6BACf,CAAC,EAAA;;wBATI,QAAQ,GAAG,SASf;wBAEF,IAAI,CAAC,MAAM,EAAE;4BACX,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAA0B,CAAC,CAAC;yBAC7D;wBAED,sBAAO,QAAQ,EAAC;;;wBAEhB,sBAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAK,EAAE,wBAAwB,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EAAC;;;;;KAE/G;IAEc,wBAAiB,GAAhC,UACE,MAAc,EACd,QAAkB,EAClB,aAAyC,EACzC,wBAAwC;QAExC,IAAI,aAAa,CAAC,IAAI,IAAI,MAAM,EAAE;YAChC,MAAM,CAAC,IAAI,CAAC,0DAAmD,aAAa,CAAC,YAAY,MAAG,CAAC,CAAC;SAC/F;aAAM,IAAI,aAAa,CAAC,OAAO,EAAE;YAChC,IAAM,cAAc,GAClB,OAAO,aAAa,CAAC,OAAO,KAAK,QAAQ;gBACvC,CAAC,CAAC,aAAa,CAAC,OAAO;gBACvB,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM;oBACxC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC/B,CAAC,CAAC,OAAO,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC,2BAAoB,cAAc,CAAE,CAAC,CAAC;SACnD;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAChC;QAED,IAAI,QAAQ,KAAK,OAAO,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,4BAAqB,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,CAAC;SAC5G;IACH,CAAC;IAEc,yBAAkB,GAAjC,UAAkC,MAAc,EAAE,QAAwB;QACxE,IAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACpD,IAAI,eAAe,CAAC,OAAO,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,6BAAsB,eAAe,CAAC,OAAO,CAAE,CAAC,CAAC;SAC9D;aAAM,IAAI,eAAe,CAAC,UAAU,EAAE;YACrC,MAAM,CAAC,IAAI,CACT,6CAAsC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,QAAQ,IAAK,OAAA,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAtB,CAAsB,CAAC,CAAC,CAAE,CAC7H,CAAC;SACH;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAClC;QACD,IAAI,QAAQ,CAAC,KAAK,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7C;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC;SACnD;IACH,CAAC;IAEoB,yBAAkB,GAAvC,UACE,MAAc,EACd,KAAU,EACV,wBAAwC,EACxC,MAAe,EACf,QAAkB,EAClB,SAA4C,EAC5C,KAAc;;;;;;wBAEd,MAAM,CAAC,IAAI,CAAC,+CAAwC,KAAK,CAAC,IAAI,CAAE,CAAC,CAAC;6BAC9D,CAAA,OAAO,KAAK,CAAC,MAAM,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,CAAA,EAA1D,wBAA0D;6BACxD,CAAA,KAAK,CAAC,IAAI,IAAI,QAAQ,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,0BAA0B,CAAC,KAAK,QAAQ,CAAA,EAAvF,wBAAuF;wBACnF,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC;wBAC/D,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;wBAChE,OAAO,GAAG,KAAK,CAAC;wBACtB,MAAM,CAAC,IAAI,CACT,8BAAuB,OAAO,GAAG,IAAI,gCAAsB,QAAQ,kCAAwB,eAAe,CAAE,CAC7G,CAAC;wBACF,qBAAM,KAAK,CAAC,OAAO,CAAC,EAAA;;wBAApB,SAAoB,CAAC;wBACd,qBAAM,MAAM,CAAC,cAAc,CAAC,wBAAwB,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EAAA;4BAAhG,sBAAO,SAAyF,EAAC;4BAGrG,MAAM,KAAK,CAAC;;;;KACb;IAEoB,sBAAe,GAApC,UACE,SAA0C,EAC1C,MAAe,EACf,oBAA4B,EAC5B,OAAuB,EACvB,KAAc,EACd,SAA4C,EAC5C,iBAAsC,EACtC,QAA2B,EAC3B,gBAA6B;QAD7B,yBAAA,EAAA,iBAA2B;QAC3B,iCAAA,EAAA,qBAA6B;;;;;;wBAE7B,IAAI,oBAAoB,IAAI,gBAAgB,EAAE;4BAC5C,MAAM,IAAI,KAAK,CAAC,8BAAuB,gBAAgB,mCAAgC,CAAC,CAAC;yBAC1F;wBAGK,eAAe,GAA+B;4BAClD,IAAI,EAAE,WAAW;4BACjB,OAAO,EAAE,IAAI;4BACb,UAAU,EAAE,SAAS;yBACtB,CAAC;wBAEF,2CAA2C;wBAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;wBAGN,qBAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,EAAA;;wBAAxE,iBAAiB,GAAG,SAAoD;wBAE9E,wCAAwC;wBACxC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;wBAEhC,6BAA6B;wBAC7B,sBAAO,IAAI,CAAC,sBAAsB,CAChC,EAAE,EACF,MAAM,EACN,oBAAoB,GAAG,SAAS,CAAC,MAAM,EACvC,KAAK,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,QAAQ,EACR,gBAAgB,CACjB,EAAC;;;;KACH;IAEoB,gBAAS,GAA9B,UACE,QAAkB,EAClB,SAA0C,EAC1C,SAA4C;;;;;;4BAG1C,qBAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CACX,UAAO,QAAQ;;wCAAK,qBAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,EAAA;wCAA9E,sBAAA,SAA8E,EAAA;;iCAAA,CACnG,CACF,EAAA;;wBALG,iBAAiB,GAAiC,CACtD,SAIC,CACF,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,GAAG,IAAK,OAAA,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAf,CAAe,EAAE,EAAE,CAAC;wBAE3C,sBAAO,iBAAiB,EAAC;;;;KAC1B;IAEoB,mBAAY,GAAjC,UACE,QAAkB,EAClB,YAAoD,EACpD,UAAkB,EAClB,SAA4C;;;;;;wBAEtC,MAAM,GAAG,IAAI,aAAM,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;wBAC3D,IAAI,CAAC,SAAS,EAAE;4BACR,KAAK,GAAG,wEAAwE,CAAC;4BACvF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;4BACpB,sBAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,OAAA,EAAE,CAAC,EAAE,CAAC,EAAC;yBACzF;wBAED,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAY,CAAC;wBAC3D,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,EAAvC,CAAuC,CAAC,CAAC;wBACzE,IAAI,CAAC,CAAC,EAAE;4BACA,KAAK,GAAG,4DAAqD,YAAY,CAAC,IAAI,CAAE,CAAC;4BACvF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;4BACpB,sBAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,OAAA,EAAE,CAAC,EAAE,CAAC,EAAC;yBACzF;;;;wBAGO,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;wBAC3D,MAAM,CAAC,IAAI,CACT,uCAAgC,UAAU,eAAK,CAAC,CAAC,UAAU,CAAC,IAAI,cAAI,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,MAAG,EAC/G,IAAI,CACL,CAAC;wBACmB,qBAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,EAAA;;wBAA5C,YAAY,GAAG,SAA6B;wBAE5C,4BAA4B,GAAiC,EAAE,CAAC;6BAClE,IAAA,mBAAY,EAAC,YAAY,EAAE,qEAAiC,CAAC,EAA7D,wBAA6D;wBAEzD,iCAAiC,GAAG,YAAiD,CAAC;wBACtE,qBAAM,iCAAiC,CAAC,MAAM,EAAE,EAAA;;wBAAhE,aAAa,GAAG,SAAgD;wBAChE,uBAAuB,GAA+B;4BAC1D,IAAI,EAAE,MAAM;4BACZ,YAAY,EAAE,UAAU;4BACxB,OAAO,EAAE,8EAA8E;yBACxF,CAAC;wBACF,4BAA4B,CAAC,IAAI,OAAjC,4BAA4B,iBAAM,uBAAuB,GAAK,aAAa,UAAE;wBAC7E,MAAM,CAAC,IAAI,CACT,sCAA+B,UAAU,eAAK,CAAC,CAAC,UAAU,CAAC,IAAI,iBAAO,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAE,EAC9G,GAAG,CACJ,CAAC;;;wBAGI,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;wBAC5D,4BAA4B,CAAC,IAAI,CAAC;4BAChC,IAAI,EAAE,MAAM;4BACZ,YAAY,EAAE,UAAU;4BACxB,OAAO,EAAE,sBAAsB;yBAChC,CAAC,CAAC;wBACH,MAAM,CAAC,IAAI,CACT,sCAA+B,UAAU,eAAK,CAAC,CAAC,UAAU,CAAC,IAAI,iBAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAE,EAC7G,IAAI,CACL,CAAC;;;wBAGJ,IAAI,OAAO,YAAY,KAAK,WAAW,EAAE;4BACvC,sBAAO;oCACL;wCACE,IAAI,EAAE,MAAM;wCACZ,YAAY,EAAE,UAAU;wCACxB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,qDAAqD,EAAE,CAAC;qCAC3F;iCACF,EAAC;yBACH;wBAED,sBAAO,4BAA4B,EAAC;;;wBAE9B,YAAY,GAAG,kDAA2C,CAAC,CAAC,UAAU,CAAC,IAAI,gBAAM,UAAU,eAAK,OAAK,CAAC,OAAO,CAAE,CAAC;wBACtH,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;wBAC3B,MAAM,OAAK,CAAC;;;;;KAEf;IAEY,mBAAY,GAAzB,UACE,QAAiD,EACjD,KAAc,EACd,OAAwB,EACxB,SAA4C,EAC5C,iBAAsC,EACtC,qBAAqC,EACrC,QAA2B;QAD3B,sCAAA,EAAA,4BAAqC;QACrC,yBAAA,EAAA,iBAA2B;;;;;;wBAErB,cAAc,GAAiC;4BACnD;gCACE,IAAI,EAAE,QAAQ;gCACd,OAAO,EAAE,6FAA6F;6BACvG;4BACD,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,2BAA2B,EAAE;4BACxD,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qDAAqD,EAAE;4BAClF,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,6CAA6C,EAAE;4BAC1E,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,uCAAuC,EAAE;yBACrE,CAAC;wBACI,eAAe,GAAG,OAAO;4BAC7B,CAAC,CAAC,qBAAqB;gCACrB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC;gCAC9B,CAAC,CAAC,OAAO;4BACX,CAAC,CAAC,qBAAqB;gCACrB,CAAC,CAAC,IAAI,+BAAc,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC;gCAC3C,CAAC,CAAC,SAAS,CAAC;wBACH,qBAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAA;;wBAA5G,IAAI,GAAG,SAAqG;wBAClH,sBAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAC;;;;KACzC;IAEY,iBAAU,GAAvB,UACE,IAAY,EACZ,WAAmB,EACnB,KAAc,EACd,OAAwB,EACxB,SAA4C,EAC5C,iBAAsC,EACtC,qBAAqC,EACrC,QAA2B;QAD3B,sCAAA,EAAA,4BAAqC;QACrC,yBAAA,EAAA,iBAA2B;;;;4BAEpB,qBAAM,IAAI,CAAC,YAAY,CAC5B,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,EAC/C,KAAK,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,qBAAqB,EACrB,QAAQ,CACT,EAAA;4BARD,sBAAO,SAQN,EAAC;;;;KACH;IAEM,4BAAqB,GAA5B,UAA6B,IAAY,EAAE,WAAmB;QAC5D,OAAO,+BAAwB,IAAI,iBAAO,WAAW,CAAE,CAAC;IAC1D,CAAC;IAEM,4BAAqB,GAA5B,UAA6B,IAAY;QACvC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE;YACpC,OAAO,IAAI,CAAC;SACb;QAED,IAAM,aAAa,GAAa,EAAE,CAAC;QACnC,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,KAAmB,UAAgB,EAAhB,KAAA,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,EAAE;YAAhC,IAAM,IAAI,SAAA;YACb,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;gBAC1B,WAAW,GAAG,CAAC,WAAW,CAAC;gBAC3B,IAAI,CAAC,WAAW,EAAE;oBAChB,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACxB;gBAED,SAAS;aACV;YAED,IAAI,WAAW,EAAE;gBACf,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;SACF;QAED,2CAA2C;QAC3C,0CAA0C;QAC1C,aAAa,CAAC,GAAG,EAAE,CAAC;QAEpB,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAEY,mBAAY,GAAzB,UACE,QAAiD,EACjD,KAAc,EACd,OAAwB,EACxB,SAA4C,EAC5C,iBAAsC,EACtC,qBAAqC,EACrC,QAA2B;QAD3B,sCAAA,EAAA,4BAAqC;QACrC,yBAAA,EAAA,iBAA2B;;;;;;wBAErB,cAAc,GAAiC;4BACnD;gCACE,IAAI,EAAE,QAAQ;gCACd,OAAO,EAAE,oGAAoG;6BAC9G;4BACD,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,uCAAuC,EAAE;yBACrE,CAAC;wBACI,eAAe,GAAG,OAAO;4BAC7B,CAAC,CAAC,qBAAqB;gCACrB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC;gCAC9B,CAAC,CAAC,OAAO;4BACX,CAAC,CAAC,qBAAqB;gCACrB,CAAC,CAAC,IAAI,+BAAc,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC;gCAC3C,CAAC,CAAC,SAAS,CAAC;wBACH,qBAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAA;;wBAA5G,IAAI,GAAG,SAAqG;wBAClH,sBAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,IAAI,EAAE,EAAX,CAAW,CAAC,EAAC;;;;KACnD;IACH,aAAC;AAAD,CAAC,AAzeD,IAyeC;AAzeY,wBAAM"}
|
|
1
|
+
{"version":3,"file":"OpenAi.js","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { Readable } from 'stream';
|
|
|
10
10
|
*/
|
|
11
11
|
export declare class OpenAiStreamProcessor {
|
|
12
12
|
private onToolCalls;
|
|
13
|
+
private abortSignal?;
|
|
13
14
|
private logger;
|
|
14
15
|
private accumulatedToolCalls;
|
|
15
16
|
private toolCallsExecuted;
|
|
@@ -17,7 +18,7 @@ export declare class OpenAiStreamProcessor {
|
|
|
17
18
|
private inputStream;
|
|
18
19
|
private controlStream;
|
|
19
20
|
private outputStream;
|
|
20
|
-
constructor(inputStream: Stream<ChatCompletionChunk>, onToolCalls: (toolCalls: ChatCompletionMessageToolCall[], currentFunctionCalls: number) => Promise<Readable>, logLevel: LogLevel);
|
|
21
|
+
constructor(inputStream: Stream<ChatCompletionChunk>, onToolCalls: (toolCalls: ChatCompletionMessageToolCall[], currentFunctionCalls: number) => Promise<Readable>, logLevel: LogLevel, abortSignal?: AbortSignal | undefined);
|
|
21
22
|
/**
|
|
22
23
|
* @returns a `Readable` stream that will receive the assistant's text response to the user
|
|
23
24
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiStreamProcessor.d.ts","sourceRoot":"","sources":["../../src/OpenAiStreamProcessor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAU,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAA6C,MAAM,QAAQ,CAAC;AAE7E;;;;GAIG;AACH,qBAAa,qBAAqB;IAW9B,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"OpenAiStreamProcessor.d.ts","sourceRoot":"","sources":["../../src/OpenAiStreamProcessor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAU,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAA6C,MAAM,QAAQ,CAAC;AAE7E;;;;GAIG;AACH,qBAAa,qBAAqB;IAW9B,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,WAAW,CAAC;IAftB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,oBAAoB,CAAgD;IAC5E,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,eAAe,CAAuD;IAC9E,OAAO,CAAC,WAAW,CAAW;IAC9B,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,YAAY,CAAW;gBAG7B,WAAW,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAChC,WAAW,EAAE,CACnB,SAAS,EAAE,6BAA6B,EAAE,EAC1C,oBAAoB,EAAE,MAAM,KACzB,OAAO,CAAC,QAAQ,CAAC,EACtB,QAAQ,EAAE,QAAQ,EACV,WAAW,CAAC,yBAAa;IASnC;;OAEG;IACH,eAAe,IAAI,QAAQ;IAI3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAsC3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA2B3B;;;;OAIG;YACW,eAAe;CA4B9B"}
|
|
@@ -45,8 +45,9 @@ var stream_1 = require("stream");
|
|
|
45
45
|
* - When a response to the user is received, it writes to `outputStream`
|
|
46
46
|
*/
|
|
47
47
|
var OpenAiStreamProcessor = /** @class */ (function () {
|
|
48
|
-
function OpenAiStreamProcessor(inputStream, onToolCalls, logLevel) {
|
|
48
|
+
function OpenAiStreamProcessor(inputStream, onToolCalls, logLevel, abortSignal) {
|
|
49
49
|
this.onToolCalls = onToolCalls;
|
|
50
|
+
this.abortSignal = abortSignal;
|
|
50
51
|
this.accumulatedToolCalls = [];
|
|
51
52
|
this.toolCallsExecuted = 0;
|
|
52
53
|
this.currentToolCall = null;
|
|
@@ -158,11 +159,12 @@ var OpenAiStreamProcessor = /** @class */ (function () {
|
|
|
158
159
|
* - Manages tool call state (such as keeping track of the number of tool calls made)
|
|
159
160
|
*/
|
|
160
161
|
OpenAiStreamProcessor.prototype.handleToolCalls = function () {
|
|
162
|
+
var _a;
|
|
161
163
|
return __awaiter(this, void 0, void 0, function () {
|
|
162
|
-
var completedToolCalls,
|
|
164
|
+
var completedToolCalls, _b, error_1;
|
|
163
165
|
var _this = this;
|
|
164
|
-
return __generator(this, function (
|
|
165
|
-
switch (
|
|
166
|
+
return __generator(this, function (_c) {
|
|
167
|
+
switch (_c.label) {
|
|
166
168
|
case 0:
|
|
167
169
|
if (this.currentToolCall) {
|
|
168
170
|
this.accumulatedToolCalls.push(this.currentToolCall);
|
|
@@ -175,20 +177,22 @@ var OpenAiStreamProcessor = /** @class */ (function () {
|
|
|
175
177
|
this.inputStream.destroy();
|
|
176
178
|
this.controlStream.destroy();
|
|
177
179
|
this.controlStream = this.createControlStream();
|
|
178
|
-
|
|
180
|
+
_c.label = 1;
|
|
179
181
|
case 1:
|
|
180
|
-
|
|
181
|
-
|
|
182
|
+
_c.trys.push([1, 3, , 4]);
|
|
183
|
+
_b = this;
|
|
182
184
|
return [4 /*yield*/, this.onToolCalls(completedToolCalls, this.toolCallsExecuted)];
|
|
183
185
|
case 2:
|
|
184
|
-
|
|
186
|
+
_b.inputStream = _c.sent();
|
|
185
187
|
this.inputStream.on('error', function (error) { return _this.destroyStreams(error); });
|
|
186
188
|
this.inputStream.pipe(this.controlStream);
|
|
187
189
|
this.toolCallsExecuted += completedToolCalls.length;
|
|
188
190
|
return [3 /*break*/, 4];
|
|
189
191
|
case 3:
|
|
190
|
-
error_1 =
|
|
191
|
-
this.
|
|
192
|
+
error_1 = _c.sent();
|
|
193
|
+
if (!((_a = this.abortSignal) === null || _a === void 0 ? void 0 : _a.aborted)) {
|
|
194
|
+
this.logger.error('Error processing tool calls:', error_1);
|
|
195
|
+
}
|
|
192
196
|
this.destroyStreams(error_1);
|
|
193
197
|
return [3 /*break*/, 4];
|
|
194
198
|
case 4: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiStreamProcessor.js","sourceRoot":"","sources":["../../src/OpenAiStreamProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wCAAmD;AAEnD,iCAA6E;AAE7E;;;;GAIG;AACH;IASE,+BACE,WAAwC,EAChC,WAGc,EACtB,QAAkB;
|
|
1
|
+
{"version":3,"file":"OpenAiStreamProcessor.js","sourceRoot":"","sources":["../../src/OpenAiStreamProcessor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@proteinjs/conversation",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"publishConfig": {
|
|
@@ -36,5 +36,5 @@
|
|
|
36
36
|
"tiktoken": "1.0.15",
|
|
37
37
|
"typescript": "5.2.2"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "6ebb0790e4b75b6b3b736b6dc42e45aa29e4ea30"
|
|
40
40
|
}
|
package/src/Conversation.ts
CHANGED
|
@@ -209,7 +209,11 @@ export class Conversation {
|
|
|
209
209
|
);
|
|
210
210
|
}
|
|
211
211
|
|
|
212
|
-
async generateStreamingResponse(
|
|
212
|
+
async generateStreamingResponse(
|
|
213
|
+
messages: (string | ChatCompletionMessageParam)[],
|
|
214
|
+
model?: TiktokenModel,
|
|
215
|
+
abortSignal?: AbortSignal
|
|
216
|
+
) {
|
|
213
217
|
await this.enforceTokenLimit(messages, model);
|
|
214
218
|
return await OpenAi.generateStreamingResponse(
|
|
215
219
|
messages,
|
|
@@ -217,6 +221,7 @@ export class Conversation {
|
|
|
217
221
|
this.history,
|
|
218
222
|
this.functions,
|
|
219
223
|
this.messageModerators,
|
|
224
|
+
abortSignal,
|
|
220
225
|
this.params.logLevel
|
|
221
226
|
);
|
|
222
227
|
}
|
package/src/OpenAi.ts
CHANGED
|
@@ -38,6 +38,7 @@ export class OpenAi {
|
|
|
38
38
|
history,
|
|
39
39
|
functions,
|
|
40
40
|
messageModerators,
|
|
41
|
+
undefined,
|
|
41
42
|
logLevel,
|
|
42
43
|
maxFunctionCalls
|
|
43
44
|
)) as string;
|
|
@@ -49,6 +50,7 @@ export class OpenAi {
|
|
|
49
50
|
history?: MessageHistory,
|
|
50
51
|
functions?: Omit<Function, 'instructions'>[],
|
|
51
52
|
messageModerators?: MessageModerator[],
|
|
53
|
+
abortSignal?: AbortSignal,
|
|
52
54
|
logLevel: LogLevel = 'info',
|
|
53
55
|
maxFunctionCalls: number = 50
|
|
54
56
|
): Promise<Readable> {
|
|
@@ -60,6 +62,7 @@ export class OpenAi {
|
|
|
60
62
|
history,
|
|
61
63
|
functions,
|
|
62
64
|
messageModerators,
|
|
65
|
+
abortSignal,
|
|
63
66
|
logLevel,
|
|
64
67
|
maxFunctionCalls
|
|
65
68
|
)) as Readable;
|
|
@@ -73,12 +76,13 @@ export class OpenAi {
|
|
|
73
76
|
history?: MessageHistory,
|
|
74
77
|
functions?: Omit<Function, 'instructions'>[],
|
|
75
78
|
messageModerators?: MessageModerator[],
|
|
79
|
+
abortSignal?: AbortSignal,
|
|
76
80
|
logLevel: LogLevel = 'info',
|
|
77
81
|
maxFunctionCalls: number = 50
|
|
78
82
|
): Promise<string | Readable> {
|
|
79
83
|
const logger = new Logger('OpenAi.generateResponseHelper', logLevel);
|
|
80
84
|
const updatedHistory = OpenAi.getUpdatedMessageHistory(messages, history, messageModerators);
|
|
81
|
-
const response = await OpenAi.executeRequest(updatedHistory, stream, logLevel, functions, model);
|
|
85
|
+
const response = await OpenAi.executeRequest(updatedHistory, stream, logLevel, functions, model, abortSignal);
|
|
82
86
|
if (stream) {
|
|
83
87
|
logger.info(`Processing response stream`);
|
|
84
88
|
const inputStream = response as Stream<ChatCompletionChunk>;
|
|
@@ -98,10 +102,11 @@ export class OpenAi {
|
|
|
98
102
|
model,
|
|
99
103
|
functions,
|
|
100
104
|
messageModerators,
|
|
105
|
+
abortSignal,
|
|
101
106
|
logLevel,
|
|
102
107
|
maxFunctionCalls
|
|
103
108
|
)) as (toolCalls: ChatCompletionMessageToolCall[], currentFunctionCalls: number) => Promise<Readable>;
|
|
104
|
-
const streamProcessor = new OpenAiStreamProcessor(inputStream, onToolCalls, logLevel);
|
|
109
|
+
const streamProcessor = new OpenAiStreamProcessor(inputStream, onToolCalls, logLevel, abortSignal);
|
|
105
110
|
return streamProcessor.getOutputStream();
|
|
106
111
|
}
|
|
107
112
|
|
|
@@ -115,6 +120,7 @@ export class OpenAi {
|
|
|
115
120
|
model,
|
|
116
121
|
functions,
|
|
117
122
|
messageModerators,
|
|
123
|
+
abortSignal,
|
|
118
124
|
logLevel,
|
|
119
125
|
maxFunctionCalls
|
|
120
126
|
);
|
|
@@ -165,7 +171,8 @@ export class OpenAi {
|
|
|
165
171
|
stream: boolean,
|
|
166
172
|
logLevel: LogLevel,
|
|
167
173
|
functions?: Omit<Function, 'instructions'>[],
|
|
168
|
-
model?: string
|
|
174
|
+
model?: string,
|
|
175
|
+
abortSignal?: AbortSignal
|
|
169
176
|
): Promise<ChatCompletion | Stream<ChatCompletionChunk>> {
|
|
170
177
|
const logger = new Logger('OpenAi.executeRequest', logLevel);
|
|
171
178
|
const openaiApi = new OpenAIApi();
|
|
@@ -173,16 +180,19 @@ export class OpenAi {
|
|
|
173
180
|
const latestMessage = messageParamsWithHistory.getMessages()[messageParamsWithHistory.getMessages().length - 1];
|
|
174
181
|
this.logRequestDetails(logger, logLevel, latestMessage, messageParamsWithHistory);
|
|
175
182
|
|
|
176
|
-
const response = await openaiApi.chat.completions.create(
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
183
|
+
const response = await openaiApi.chat.completions.create(
|
|
184
|
+
{
|
|
185
|
+
model: model ? model : DEFAULT_MODEL,
|
|
186
|
+
temperature: 0,
|
|
187
|
+
messages: messageParamsWithHistory.getMessages(),
|
|
188
|
+
tools: functions?.map((f) => ({
|
|
189
|
+
type: 'function',
|
|
190
|
+
function: f.definition,
|
|
191
|
+
})),
|
|
192
|
+
stream: stream,
|
|
193
|
+
},
|
|
194
|
+
{ signal: abortSignal }
|
|
195
|
+
);
|
|
186
196
|
|
|
187
197
|
if (!stream) {
|
|
188
198
|
this.logResponseDetails(logger, response as ChatCompletion);
|
|
@@ -246,7 +256,9 @@ export class OpenAi {
|
|
|
246
256
|
functions?: Omit<Function, 'instructions'>[],
|
|
247
257
|
model?: string
|
|
248
258
|
): Promise<ChatCompletion | Stream<ChatCompletionChunk>> {
|
|
249
|
-
|
|
259
|
+
if (error.type) {
|
|
260
|
+
logger.info(`Received error response, error type: ${error.type}`);
|
|
261
|
+
}
|
|
250
262
|
if (typeof error.status !== 'undefined' && error.status == 429) {
|
|
251
263
|
if (error.type == 'tokens' && typeof error.headers['x-ratelimit-reset-tokens'] === 'string') {
|
|
252
264
|
const waitTime = parseInt(error.headers['x-ratelimit-reset-tokens']);
|
|
@@ -270,6 +282,7 @@ export class OpenAi {
|
|
|
270
282
|
model?: string,
|
|
271
283
|
functions?: Omit<Function, 'instructions'>[],
|
|
272
284
|
messageModerators?: MessageModerator[],
|
|
285
|
+
abortSignal?: AbortSignal,
|
|
273
286
|
logLevel: LogLevel = 'info',
|
|
274
287
|
maxFunctionCalls: number = 50
|
|
275
288
|
): Promise<string | Readable> {
|
|
@@ -302,6 +315,7 @@ export class OpenAi {
|
|
|
302
315
|
history,
|
|
303
316
|
functions,
|
|
304
317
|
messageModerators,
|
|
318
|
+
abortSignal,
|
|
305
319
|
logLevel,
|
|
306
320
|
maxFunctionCalls
|
|
307
321
|
);
|
|
@@ -23,7 +23,8 @@ export class OpenAiStreamProcessor {
|
|
|
23
23
|
toolCalls: ChatCompletionMessageToolCall[],
|
|
24
24
|
currentFunctionCalls: number
|
|
25
25
|
) => Promise<Readable>,
|
|
26
|
-
logLevel: LogLevel
|
|
26
|
+
logLevel: LogLevel,
|
|
27
|
+
private abortSignal?: AbortSignal
|
|
27
28
|
) {
|
|
28
29
|
this.logger = new Logger(this.constructor.name, logLevel);
|
|
29
30
|
this.inputStream = Readable.from(inputStream);
|
|
@@ -83,7 +84,7 @@ export class OpenAiStreamProcessor {
|
|
|
83
84
|
/**
|
|
84
85
|
* Destroy all streams used by `OpenAiStreamProcessor`
|
|
85
86
|
*/
|
|
86
|
-
private destroyStreams(error
|
|
87
|
+
private destroyStreams(error: Error) {
|
|
87
88
|
this.inputStream.destroy();
|
|
88
89
|
this.controlStream.destroy();
|
|
89
90
|
this.outputStream.emit('error', error);
|
|
@@ -148,7 +149,9 @@ export class OpenAiStreamProcessor {
|
|
|
148
149
|
this.inputStream.pipe(this.controlStream);
|
|
149
150
|
this.toolCallsExecuted += completedToolCalls.length;
|
|
150
151
|
} catch (error: any) {
|
|
151
|
-
this.
|
|
152
|
+
if (!this.abortSignal?.aborted) {
|
|
153
|
+
this.logger.error('Error processing tool calls:', error);
|
|
154
|
+
}
|
|
152
155
|
this.destroyStreams(error);
|
|
153
156
|
}
|
|
154
157
|
}
|