@proteinjs/conversation 1.7.3 → 1.7.5
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 +11 -7
- package/dist/src/Conversation.js.map +1 -1
- package/dist/src/OpenAi.d.ts +1 -1
- package/dist/src/OpenAi.d.ts.map +1 -1
- package/dist/src/OpenAi.js +51 -27
- package/dist/src/OpenAi.js.map +1 -1
- package/dist/src/OpenAiStreamProcessor.d.ts +1 -1
- package/dist/src/OpenAiStreamProcessor.d.ts.map +1 -1
- package/dist/src/OpenAiStreamProcessor.js +7 -7
- package/dist/src/OpenAiStreamProcessor.js.map +1 -1
- package/dist/src/code_template/CodeTemplate.d.ts +1 -1
- package/dist/src/code_template/CodeTemplate.d.ts.map +1 -1
- package/dist/src/code_template/CodeTemplate.js +4 -4
- package/dist/src/code_template/CodeTemplate.js.map +1 -1
- package/dist/src/code_template/Repo.d.ts.map +1 -1
- package/dist/src/code_template/Repo.js +8 -8
- package/dist/src/code_template/Repo.js.map +1 -1
- package/dist/src/fs/conversation_fs/ConversationFsModerator.d.ts +2 -1
- package/dist/src/fs/conversation_fs/ConversationFsModerator.d.ts.map +1 -1
- package/dist/src/fs/conversation_fs/ConversationFsModerator.js +6 -5
- package/dist/src/fs/conversation_fs/ConversationFsModerator.js.map +1 -1
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexModule.d.ts.map +1 -1
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexModule.js +7 -7
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexModule.js.map +1 -1
- package/dist/src/history/MessageHistory.d.ts.map +1 -1
- package/dist/src/history/MessageHistory.js +3 -3
- package/dist/src/history/MessageHistory.js.map +1 -1
- package/dist/src/template/ConversationTemplateModule.d.ts.map +1 -1
- package/dist/src/template/ConversationTemplateModule.js +3 -3
- package/dist/src/template/ConversationTemplateModule.js.map +1 -1
- package/package.json +5 -5
- package/src/Conversation.ts +11 -9
- package/src/OpenAi.ts +51 -40
- package/src/OpenAiStreamProcessor.ts +7 -7
- package/src/code_template/CodeTemplate.ts +5 -4
- package/src/code_template/Repo.ts +8 -8
- package/src/fs/conversation_fs/ConversationFsModerator.ts +7 -5
- package/src/fs/keyword_to_files_index/KeywordToFilesIndexModule.ts +7 -7
- package/src/history/MessageHistory.ts +3 -3
- package/src/template/ConversationTemplateModule.ts +4 -3
- package/LICENSE +0 -21
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.4](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.7.3...@proteinjs/conversation@1.7.4) (2024-08-16)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* refactored to implement new @proteinjs/logger/Logger api ([75f5744](https://github.com/proteinjs/conversation/commit/75f5744129c0798ef7a792b6bbe5463c4684e416))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [1.7.3](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.7.2...@proteinjs/conversation@1.7.3) (2024-08-07)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @proteinjs/conversation
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ChatCompletionMessageParam } from 'openai/resources/chat';
|
|
3
|
-
import { LogLevel } from '@proteinjs/
|
|
3
|
+
import { LogLevel } from '@proteinjs/logger';
|
|
4
4
|
import { ConversationModule } from './ConversationModule';
|
|
5
5
|
import { TiktokenModel } from 'tiktoken';
|
|
6
6
|
export type ConversationParams = {
|
|
@@ -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,
|
|
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,mBAAmB,CAAC;AAGrD,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;IAqBnE,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
|
@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.summarizeConversationHistoryFunction = exports.summarizeConversationHistoryFunctionName = exports.Conversation = void 0;
|
|
40
40
|
var OpenAi_1 = require("./OpenAi");
|
|
41
41
|
var MessageHistory_1 = require("./history/MessageHistory");
|
|
42
|
-
var
|
|
42
|
+
var logger_1 = require("@proteinjs/logger");
|
|
43
43
|
var util_node_1 = require("@proteinjs/util-node");
|
|
44
44
|
var tiktoken_1 = require("tiktoken");
|
|
45
45
|
var PackageFunctions_1 = require("./fs/package/PackageFunctions");
|
|
@@ -57,7 +57,7 @@ var Conversation = /** @class */ (function () {
|
|
|
57
57
|
maxMessages: (_a = params.limits) === null || _a === void 0 ? void 0 : _a.maxMessagesInHistory,
|
|
58
58
|
enforceMessageLimit: (_b = params.limits) === null || _b === void 0 ? void 0 : _b.enforceLimits,
|
|
59
59
|
});
|
|
60
|
-
this.logger = new
|
|
60
|
+
this.logger = new logger_1.Logger({ name: params.name, logLevel: params.logLevel });
|
|
61
61
|
if (params.modules) {
|
|
62
62
|
this.addModules(params.modules);
|
|
63
63
|
}
|
|
@@ -240,11 +240,11 @@ var Conversation = /** @class */ (function () {
|
|
|
240
240
|
return __generator(this, function (_a) {
|
|
241
241
|
switch (_a.label) {
|
|
242
242
|
case 0:
|
|
243
|
-
this.logger.info("Generating code for description:\n".concat(description.join('\n')));
|
|
243
|
+
this.logger.info({ message: "Generating code for description:\n".concat(description.join('\n')) });
|
|
244
244
|
return [4 /*yield*/, OpenAi_1.OpenAi.generateCode(description, model, this.history, this.functions, this.messageModerators, !this.generatedCode, this.params.logLevel)];
|
|
245
245
|
case 1:
|
|
246
246
|
code = _a.sent();
|
|
247
|
-
this.logger.info("Generated code:\n".concat(code.slice(0, 150)).concat(code.length > 150 ? '...' : ''));
|
|
247
|
+
this.logger.info({ message: "Generated code:\n".concat(code.slice(0, 150)).concat(code.length > 150 ? '...' : '') });
|
|
248
248
|
this.generatedCode = true;
|
|
249
249
|
return [2 /*return*/, code];
|
|
250
250
|
}
|
|
@@ -274,7 +274,7 @@ var Conversation = /** @class */ (function () {
|
|
|
274
274
|
_i++;
|
|
275
275
|
return [3 /*break*/, 2];
|
|
276
276
|
case 5:
|
|
277
|
-
this.logger.info("Updating code from file: ".concat(codeToUpdateFilePath));
|
|
277
|
+
this.logger.info({ message: "Updating code from file: ".concat(codeToUpdateFilePath) });
|
|
278
278
|
return [4 /*yield*/, this.updateCode(codeToUpdate, dependencyDescription + description, model)];
|
|
279
279
|
case 6: return [2 /*return*/, _a.sent()];
|
|
280
280
|
}
|
|
@@ -287,11 +287,15 @@ var Conversation = /** @class */ (function () {
|
|
|
287
287
|
return __generator(this, function (_a) {
|
|
288
288
|
switch (_a.label) {
|
|
289
289
|
case 0:
|
|
290
|
-
this.logger.info(
|
|
290
|
+
this.logger.info({
|
|
291
|
+
message: "Updating code:\n".concat(code.slice(0, 150)).concat(code.length > 150 ? '...' : '', "\nFrom description: ").concat(description),
|
|
292
|
+
});
|
|
291
293
|
return [4 /*yield*/, OpenAi_1.OpenAi.updateCode(code, description, model, this.history, this.functions, this.messageModerators, !this.generatedCode, this.params.logLevel)];
|
|
292
294
|
case 1:
|
|
293
295
|
updatedCode = _a.sent();
|
|
294
|
-
this.logger.info(
|
|
296
|
+
this.logger.info({
|
|
297
|
+
message: "Updated code:\n".concat(updatedCode.slice(0, 150)).concat(updatedCode.length > 150 ? '...' : ''),
|
|
298
|
+
});
|
|
295
299
|
this.generatedCode = true;
|
|
296
300
|
return [2 /*return*/, updatedCode];
|
|
297
301
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Conversation.js","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAiD;AACjD,2DAA0D;AAE1D,
|
|
1
|
+
{"version":3,"file":"Conversation.js","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":"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"}
|
package/dist/src/OpenAi.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ChatCompletionMessageParam } from 'openai/resources/chat';
|
|
3
|
-
import { LogLevel } from '@proteinjs/
|
|
3
|
+
import { LogLevel } from '@proteinjs/logger';
|
|
4
4
|
import { MessageModerator } from './history/MessageModerator';
|
|
5
5
|
import { Function } from './Function';
|
|
6
6
|
import { MessageHistory } from './history/MessageHistory';
|
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;
|
|
1
|
+
{"version":3,"file":"OpenAi.d.ts","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":"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"}
|
package/dist/src/OpenAi.js
CHANGED
|
@@ -48,6 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
48
48
|
exports.OpenAi = exports.DEFAULT_MODEL = void 0;
|
|
49
49
|
var openai_1 = require("openai");
|
|
50
50
|
var util_1 = require("@proteinjs/util");
|
|
51
|
+
var logger_1 = require("@proteinjs/logger");
|
|
51
52
|
var MessageHistory_1 = require("./history/MessageHistory");
|
|
52
53
|
var ChatCompletionMessageParamFactory_1 = require("./ChatCompletionMessageParamFactory");
|
|
53
54
|
var stream_1 = require("stream");
|
|
@@ -91,13 +92,13 @@ var OpenAi = /** @class */ (function () {
|
|
|
91
92
|
return __generator(this, function (_a) {
|
|
92
93
|
switch (_a.label) {
|
|
93
94
|
case 0:
|
|
94
|
-
logger = new
|
|
95
|
+
logger = new logger_1.Logger({ name: 'OpenAi.generateResponseHelper', logLevel: logLevel });
|
|
95
96
|
updatedHistory = OpenAi.getUpdatedMessageHistory(messages, history, messageModerators);
|
|
96
97
|
return [4 /*yield*/, OpenAi.executeRequest(updatedHistory, stream, logLevel, functions, model, abortSignal)];
|
|
97
98
|
case 1:
|
|
98
99
|
response = _a.sent();
|
|
99
100
|
if (stream) {
|
|
100
|
-
logger.info("Processing response stream");
|
|
101
|
+
logger.info({ message: "Processing response stream" });
|
|
101
102
|
inputStream = response;
|
|
102
103
|
// For subsequent tool calls, return the raw OpenAI stream to `OpenAiStreamProcessor`
|
|
103
104
|
if (currentFunctionCalls > 0) {
|
|
@@ -153,7 +154,7 @@ var OpenAi = /** @class */ (function () {
|
|
|
153
154
|
return __generator(this, function (_a) {
|
|
154
155
|
switch (_a.label) {
|
|
155
156
|
case 0:
|
|
156
|
-
logger = new
|
|
157
|
+
logger = new logger_1.Logger({ name: 'OpenAi.executeRequest', logLevel: logLevel });
|
|
157
158
|
openaiApi = new openai_1.OpenAI();
|
|
158
159
|
_a.label = 1;
|
|
159
160
|
case 1:
|
|
@@ -186,7 +187,7 @@ var OpenAi = /** @class */ (function () {
|
|
|
186
187
|
};
|
|
187
188
|
OpenAi.logRequestDetails = function (logger, logLevel, latestMessage, messageParamsWithHistory) {
|
|
188
189
|
if (latestMessage.role == 'tool') {
|
|
189
|
-
logger.info("Sending request: returning output of tool call (".concat(latestMessage.tool_call_id, ")"));
|
|
190
|
+
logger.info({ message: "Sending request: returning output of tool call (".concat(latestMessage.tool_call_id, ")") });
|
|
190
191
|
}
|
|
191
192
|
else if (latestMessage.content) {
|
|
192
193
|
var requestContent = typeof latestMessage.content === 'string'
|
|
@@ -194,31 +195,34 @@ var OpenAi = /** @class */ (function () {
|
|
|
194
195
|
: latestMessage.content[0].type === 'text'
|
|
195
196
|
? latestMessage.content[0].text
|
|
196
197
|
: 'image';
|
|
197
|
-
logger.info("Sending request:
|
|
198
|
+
logger.info({ message: "Sending request", obj: { requestContent: requestContent } });
|
|
198
199
|
}
|
|
199
200
|
else {
|
|
200
|
-
logger.info("Sending request");
|
|
201
|
+
logger.info({ message: "Sending request" });
|
|
201
202
|
}
|
|
202
203
|
if (logLevel === 'debug') {
|
|
203
|
-
logger.debug("Sending messages:
|
|
204
|
+
logger.debug({ message: "Sending messages:", obj: { messages: messageParamsWithHistory.getMessages() } });
|
|
204
205
|
}
|
|
205
206
|
};
|
|
206
207
|
OpenAi.logResponseDetails = function (logger, response) {
|
|
207
208
|
var responseMessage = response.choices[0].message;
|
|
208
209
|
if (responseMessage.content) {
|
|
209
|
-
logger.info("Received response:
|
|
210
|
+
logger.info({ message: "Received response", obj: { response: responseMessage.content } });
|
|
210
211
|
}
|
|
211
212
|
else if (responseMessage.tool_calls) {
|
|
212
|
-
logger.info(
|
|
213
|
+
logger.info({
|
|
214
|
+
message: "Received response: call functions",
|
|
215
|
+
obj: { functions: responseMessage.tool_calls.map(function (toolCall) { return toolCall.function.name; }) },
|
|
216
|
+
});
|
|
213
217
|
}
|
|
214
218
|
else {
|
|
215
|
-
logger.info("Received response");
|
|
219
|
+
logger.info({ message: "Received response" });
|
|
216
220
|
}
|
|
217
221
|
if (response.usage) {
|
|
218
|
-
logger.info(
|
|
222
|
+
logger.info({ message: "Usage data", obj: { usageData: response.usage } });
|
|
219
223
|
}
|
|
220
224
|
else {
|
|
221
|
-
logger.info(
|
|
225
|
+
logger.info({ message: "Usage data missing" });
|
|
222
226
|
}
|
|
223
227
|
};
|
|
224
228
|
OpenAi.handleRequestError = function (logger, error, messageParamsWithHistory, stream, logLevel, functions, model) {
|
|
@@ -228,14 +232,16 @@ var OpenAi = /** @class */ (function () {
|
|
|
228
232
|
switch (_a.label) {
|
|
229
233
|
case 0:
|
|
230
234
|
if (error.type) {
|
|
231
|
-
logger.info("Received error response, error type: ".concat(error.type));
|
|
235
|
+
logger.info({ message: "Received error response, error type: ".concat(error.type) });
|
|
232
236
|
}
|
|
233
237
|
if (!(typeof error.status !== 'undefined' && error.status == 429)) return [3 /*break*/, 3];
|
|
234
238
|
if (!(error.type == 'tokens' && typeof error.headers['x-ratelimit-reset-tokens'] === 'string')) return [3 /*break*/, 3];
|
|
235
239
|
waitTime = parseInt(error.headers['x-ratelimit-reset-tokens']);
|
|
236
240
|
remainingTokens = error.headers['x-ratelimit-remaining-tokens'];
|
|
237
241
|
delayMs = 15000;
|
|
238
|
-
logger.warn(
|
|
242
|
+
logger.warn({
|
|
243
|
+
message: "Waiting to retry in ".concat(delayMs / 1000, "s, token reset in: ").concat(waitTime, "s, remaining tokens: ").concat(remainingTokens),
|
|
244
|
+
});
|
|
239
245
|
return [4 /*yield*/, delay(delayMs)];
|
|
240
246
|
case 1:
|
|
241
247
|
_a.sent();
|
|
@@ -296,28 +302,37 @@ var OpenAi = /** @class */ (function () {
|
|
|
296
302
|
};
|
|
297
303
|
OpenAi.callFunction = function (logLevel, functionCall, toolCallId, functions) {
|
|
298
304
|
return __awaiter(this, void 0, void 0, function () {
|
|
299
|
-
var logger,
|
|
305
|
+
var logger, errorMessage, f, errorMessage, parsedArguments, returnObject, returnObjectCompletionParams, chatCompletionMessageParamFactory, messageParams, instructionMessageParam, serializedReturnObject, error_2;
|
|
300
306
|
return __generator(this, function (_a) {
|
|
301
307
|
switch (_a.label) {
|
|
302
308
|
case 0:
|
|
303
|
-
logger = new
|
|
309
|
+
logger = new logger_1.Logger({ name: 'OpenAi.callFunction', logLevel: logLevel });
|
|
304
310
|
if (!functions) {
|
|
305
|
-
|
|
306
|
-
logger.error(
|
|
307
|
-
return [2 /*return*/, [{ role: 'tool', tool_call_id: toolCallId, content: JSON.stringify({ error:
|
|
311
|
+
errorMessage = "Assistant attempted to call a function when no functions were provided";
|
|
312
|
+
logger.error({ message: errorMessage });
|
|
313
|
+
return [2 /*return*/, [{ role: 'tool', tool_call_id: toolCallId, content: JSON.stringify({ error: errorMessage }) }]];
|
|
308
314
|
}
|
|
309
315
|
functionCall.name = functionCall.name.split('.').pop();
|
|
310
316
|
f = functions.find(function (f) { return f.definition.name === functionCall.name; });
|
|
311
317
|
if (!f) {
|
|
312
|
-
|
|
313
|
-
logger.error(
|
|
314
|
-
return [2 /*return*/, [
|
|
318
|
+
errorMessage = "Assistant attempted to call nonexistent function";
|
|
319
|
+
logger.error({ message: errorMessage, obj: { functionName: functionCall.name } });
|
|
320
|
+
return [2 /*return*/, [
|
|
321
|
+
{
|
|
322
|
+
role: 'tool',
|
|
323
|
+
tool_call_id: toolCallId,
|
|
324
|
+
content: JSON.stringify({ error: errorMessage, functionName: functionCall.name }),
|
|
325
|
+
},
|
|
326
|
+
]];
|
|
315
327
|
}
|
|
316
328
|
_a.label = 1;
|
|
317
329
|
case 1:
|
|
318
330
|
_a.trys.push([1, 6, , 7]);
|
|
319
331
|
parsedArguments = JSON.parse(functionCall.arguments);
|
|
320
|
-
logger.info(
|
|
332
|
+
logger.info({
|
|
333
|
+
message: "Assistant calling function: (".concat(toolCallId, ") ").concat(f.definition.name),
|
|
334
|
+
obj: { toolCallId: toolCallId, functionName: f.definition.name, args: parsedArguments },
|
|
335
|
+
});
|
|
321
336
|
return [4 /*yield*/, f.call(parsedArguments)];
|
|
322
337
|
case 2:
|
|
323
338
|
returnObject = _a.sent();
|
|
@@ -333,7 +348,10 @@ var OpenAi = /** @class */ (function () {
|
|
|
333
348
|
content: "The the return data from this function is provided in the following messages",
|
|
334
349
|
};
|
|
335
350
|
returnObjectCompletionParams.push.apply(returnObjectCompletionParams, __spreadArray([instructionMessageParam], messageParams, false));
|
|
336
|
-
logger.info(
|
|
351
|
+
logger.info({
|
|
352
|
+
message: "Assistant called function: (".concat(toolCallId, ") ").concat(f.definition.name),
|
|
353
|
+
obj: { toolCallId: toolCallId, functionName: f.definition.name, return: messageParams },
|
|
354
|
+
});
|
|
337
355
|
return [3 /*break*/, 5];
|
|
338
356
|
case 4:
|
|
339
357
|
serializedReturnObject = JSON.stringify(returnObject);
|
|
@@ -342,7 +360,10 @@ var OpenAi = /** @class */ (function () {
|
|
|
342
360
|
tool_call_id: toolCallId,
|
|
343
361
|
content: serializedReturnObject,
|
|
344
362
|
});
|
|
345
|
-
logger.info(
|
|
363
|
+
logger.info({
|
|
364
|
+
message: "Assistant called function: (".concat(toolCallId, ") ").concat(f.definition.name),
|
|
365
|
+
obj: { toolCallId: toolCallId, functionName: f.definition.name, return: returnObject },
|
|
366
|
+
});
|
|
346
367
|
_a.label = 5;
|
|
347
368
|
case 5:
|
|
348
369
|
if (typeof returnObject === 'undefined') {
|
|
@@ -357,8 +378,11 @@ var OpenAi = /** @class */ (function () {
|
|
|
357
378
|
return [2 /*return*/, returnObjectCompletionParams];
|
|
358
379
|
case 6:
|
|
359
380
|
error_2 = _a.sent();
|
|
360
|
-
|
|
361
|
-
|
|
381
|
+
logger.error({
|
|
382
|
+
message: "An error occurred while executing function",
|
|
383
|
+
error: error_2,
|
|
384
|
+
obj: { toolCallId: toolCallId, functionName: f.definition.name },
|
|
385
|
+
});
|
|
362
386
|
throw error_2;
|
|
363
387
|
case 7: return [2 /*return*/];
|
|
364
388
|
}
|
package/dist/src/OpenAi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAi.js","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"OpenAi.js","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ChatCompletionMessageToolCall, ChatCompletionChunk } from 'openai/resources/chat';
|
|
3
|
-
import { LogLevel } from '@proteinjs/
|
|
3
|
+
import { LogLevel } from '@proteinjs/logger';
|
|
4
4
|
import { Stream } from 'openai/streaming';
|
|
5
5
|
import { Readable } from 'stream';
|
|
6
6
|
export interface AssistantResponseStreamChunk {
|
|
@@ -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,
|
|
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,mBAAmB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAA6C,MAAM,QAAQ,CAAC;AAE7E,MAAM,WAAW,4BAA4B;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;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;;;OAGG;IACH,eAAe,IAAI,QAAQ;IAI3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA4C3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAStB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA2B3B;;;;OAIG;YACW,eAAe;CA4B9B"}
|
|
@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.OpenAiStreamProcessor = void 0;
|
|
40
|
-
var
|
|
40
|
+
var logger_1 = require("@proteinjs/logger");
|
|
41
41
|
var stream_1 = require("stream");
|
|
42
42
|
/**
|
|
43
43
|
* Processes streaming responses from OpenAI's `ChatCompletions` api.
|
|
@@ -51,7 +51,7 @@ var OpenAiStreamProcessor = /** @class */ (function () {
|
|
|
51
51
|
this.accumulatedToolCalls = [];
|
|
52
52
|
this.toolCallsExecuted = 0;
|
|
53
53
|
this.currentToolCall = null;
|
|
54
|
-
this.logger = new
|
|
54
|
+
this.logger = new logger_1.Logger({ name: this.constructor.name, logLevel: logLevel });
|
|
55
55
|
this.inputStream = stream_1.Readable.from(inputStream);
|
|
56
56
|
this.controlStream = this.createControlStream();
|
|
57
57
|
this.outputStream = new stream_1.PassThrough({ objectMode: true });
|
|
@@ -75,7 +75,7 @@ var OpenAiStreamProcessor = /** @class */ (function () {
|
|
|
75
75
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
76
76
|
try {
|
|
77
77
|
if (_this.outputStream.destroyed) {
|
|
78
|
-
_this.logger.warn("Destroying input and control streams since output stream is destroyed");
|
|
78
|
+
_this.logger.warn({ message: "Destroying input and control streams since output stream is destroyed" });
|
|
79
79
|
_this.inputStream.destroy();
|
|
80
80
|
_this.controlStream.destroy();
|
|
81
81
|
return;
|
|
@@ -98,13 +98,13 @@ var OpenAiStreamProcessor = /** @class */ (function () {
|
|
|
98
98
|
_this.destroyStreams();
|
|
99
99
|
}
|
|
100
100
|
else if (((_g = chunk.choices[0]) === null || _g === void 0 ? void 0 : _g.finish_reason) === 'length') {
|
|
101
|
-
_this.logger.info("The maximum number of output tokens was reached");
|
|
101
|
+
_this.logger.info({ message: "The maximum number of output tokens was reached" });
|
|
102
102
|
_this.outputStream.push({ finishReason: 'length' });
|
|
103
103
|
_this.outputStream.push(null);
|
|
104
104
|
_this.destroyStreams();
|
|
105
105
|
}
|
|
106
106
|
else if (((_h = chunk.choices[0]) === null || _h === void 0 ? void 0 : _h.finish_reason) === 'content_filter') {
|
|
107
|
-
_this.logger.warn("Content was omitted due to a flag from OpenAI's content filters");
|
|
107
|
+
_this.logger.warn({ message: "Content was omitted due to a flag from OpenAI's content filters" });
|
|
108
108
|
_this.outputStream.push({ finishReason: 'content_filter' });
|
|
109
109
|
_this.outputStream.push(null);
|
|
110
110
|
_this.destroyStreams();
|
|
@@ -112,7 +112,7 @@ var OpenAiStreamProcessor = /** @class */ (function () {
|
|
|
112
112
|
callback();
|
|
113
113
|
}
|
|
114
114
|
catch (error) {
|
|
115
|
-
_this.logger.error('Error tranforming chunk', error);
|
|
115
|
+
_this.logger.error({ message: 'Error tranforming chunk', error: error });
|
|
116
116
|
_this.destroyStreams(error);
|
|
117
117
|
}
|
|
118
118
|
},
|
|
@@ -200,7 +200,7 @@ var OpenAiStreamProcessor = /** @class */ (function () {
|
|
|
200
200
|
case 3:
|
|
201
201
|
error_1 = _c.sent();
|
|
202
202
|
if (!((_a = this.abortSignal) === null || _a === void 0 ? void 0 : _a.aborted)) {
|
|
203
|
-
this.logger.error('Error processing tool calls
|
|
203
|
+
this.logger.error({ message: 'Error processing tool calls', error: error_1 });
|
|
204
204
|
}
|
|
205
205
|
this.destroyStreams(error_1);
|
|
206
206
|
return [3 /*break*/, 4];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiStreamProcessor.js","sourceRoot":"","sources":["../../src/OpenAiStreamProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"OpenAiStreamProcessor.js","sourceRoot":"","sources":["../../src/OpenAiStreamProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4CAAqD;AAErD,iCAA6E;AAO7E;;;;GAIG;AACH;IASE,+BACE,WAAwC,EAChC,WAGc,EACtB,QAAkB,EACV,WAAyB;QALzB,gBAAW,GAAX,WAAW,CAGG;QAEd,gBAAW,GAAX,WAAW,CAAc;QAd3B,yBAAoB,GAA6C,EAAE,CAAC;QACpE,sBAAiB,GAAG,CAAC,CAAC;QACtB,oBAAe,GAAkD,IAAI,CAAC;QAc5E,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,WAAW,GAAG,iBAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAChD,IAAI,CAAC,YAAY,GAAG,IAAI,oBAAW,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,+CAAe,GAAf;QACE,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;OAEG;IACK,mDAAmB,GAA3B;QAAA,iBA0CC;QAzCC,OAAO,IAAI,kBAAS,CAAC;YACnB,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,UAAC,KAA0B,EAAE,QAAgB,EAAE,QAA2B;;gBACnF,IAAI;oBACF,IAAI,KAAI,CAAC,YAAY,CAAC,SAAS,EAAE;wBAC/B,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uEAAuE,EAAE,CAAC,CAAC;wBACvG,KAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;wBAC3B,KAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;wBAC7B,OAAO;qBACR;oBAED,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;wBAC5B,MAAM,IAAI,KAAK,CAAC,mCAA4B,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC;qBAC/E;yBAAM,IAAI,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,KAAK,0CAAE,OAAO,EAAE;wBAC3C,KAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAkC,CAAC,CAAC;qBACrG;yBAAM,IAAI,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,KAAK,0CAAE,UAAU,EAAE;wBAC9C,KAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;qBAC7D;yBAAM,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,aAAa,MAAK,YAAY,EAAE;wBAC3D,KAAI,CAAC,eAAe,EAAE,CAAC;qBACxB;yBAAM,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,aAAa,MAAK,MAAM,EAAE;wBACrD,KAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,MAAM,EAAkC,CAAC,CAAC;wBACjF,KAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7B,KAAI,CAAC,cAAc,EAAE,CAAC;qBACvB;yBAAM,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,aAAa,MAAK,QAAQ,EAAE;wBACvD,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iDAAiD,EAAE,CAAC,CAAC;wBACjF,KAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAkC,CAAC,CAAC;wBACnF,KAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7B,KAAI,CAAC,cAAc,EAAE,CAAC;qBACvB;yBAAM,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,aAAa,MAAK,gBAAgB,EAAE;wBAC/D,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iEAAiE,EAAE,CAAC,CAAC;wBACjG,KAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,gBAAgB,EAAkC,CAAC,CAAC;wBAC3F,KAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7B,KAAI,CAAC,cAAc,EAAE,CAAC;qBACvB;oBACD,QAAQ,EAAE,CAAC;iBACZ;gBAAC,OAAO,KAAU,EAAE;oBACnB,KAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,KAAK,OAAA,EAAE,CAAC,CAAC;oBACjE,KAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;iBAC5B;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,8CAAc,GAAtB,UAAuB,KAAa;QAClC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC7B,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SACxC;QACD,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACK,mDAAmB,GAA3B,UAA4B,cAA2D;;QACrF,KAAoB,UAAc,EAAd,iCAAc,EAAd,4BAAc,EAAd,IAAc,EAAE;YAA/B,IAAM,KAAK,uBAAA;YACd,IAAI,KAAK,CAAC,EAAE,EAAE;gBACZ,2BAA2B;gBAC3B,IAAI,IAAI,CAAC,eAAe,EAAE;oBACxB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;iBACtD;gBACD,IAAI,CAAC,eAAe,GAAG;oBACrB,EAAE,EAAE,KAAK,CAAC,EAAE;oBACZ,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,UAAU;oBAC9B,QAAQ,EAAE;wBACR,IAAI,EAAE,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,KAAI,EAAE;wBAChC,SAAS,EAAE,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,SAAS,KAAI,EAAE;qBAC3C;iBACF,CAAC;aACH;iBAAM;gBACL,0CAA0C;gBAC1C,IAAI,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,EAAE;oBACxB,IAAI,CAAC,eAAgB,CAAC,QAAS,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;iBAC7D;gBACD,IAAI,MAAA,KAAK,CAAC,QAAQ,0CAAE,SAAS,EAAE;oBAC7B,IAAI,CAAC,eAAgB,CAAC,QAAS,CAAC,SAAS,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC;iBACvE;aACF;SACF;IACH,CAAC;IAED;;;;OAIG;IACW,+CAAe,GAA7B;;;;;;;;wBACE,IAAI,IAAI,CAAC,eAAe,EAAE;4BACxB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;4BACrD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;yBAC7B;wBAEK,kBAAkB,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CACzD,UAAC,EAAE;4BACD,OAAA,EAAE,CAAC,EAAE,KAAK,SAAS,IAAI,EAAE,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS;wBAAzE,CAAyE,CAC5E,CAAC;wBAEF,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;wBAC/B,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;wBAC3B,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;wBAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;;;;wBAG9C,KAAA,IAAI,CAAA;wBAAe,qBAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,iBAAiB,CAAC,EAAA;;wBAArF,GAAK,WAAW,GAAG,SAAkE,CAAC;wBACtF,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAK,IAAK,OAAA,KAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAA1B,CAA0B,CAAC,CAAC;wBACpE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC1C,IAAI,CAAC,iBAAiB,IAAI,kBAAkB,CAAC,MAAM,CAAC;;;;wBAEpD,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,OAAO,CAAA,EAAE;4BAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,6BAA6B,EAAE,KAAK,SAAA,EAAE,CAAC,CAAC;yBACtE;wBACD,IAAI,CAAC,cAAc,CAAC,OAAK,CAAC,CAAC;;;;;;KAE9B;IACH,4BAAC;AAAD,CAAC,AA5JD,IA4JC;AA5JY,sDAAqB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeTemplate.d.ts","sourceRoot":"","sources":["../../../src/code_template/CodeTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"CodeTemplate.d.ts","sourceRoot":"","sources":["../../../src/code_template/CodeTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAmB,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,8BAAsB,YAAY;IAChC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;gBAEzB,YAAY,EAAE,YAAY;IAKtC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,EAAE;IACxC,QAAQ,CAAC,WAAW,IAAI,UAAU,EAAE;IAE9B,QAAQ;IAWd,OAAO,CAAC,eAAe;CAOxB"}
|
|
@@ -37,11 +37,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.CodeTemplate = void 0;
|
|
40
|
-
var
|
|
40
|
+
var logger_1 = require("@proteinjs/logger");
|
|
41
41
|
var util_node_1 = require("@proteinjs/util-node");
|
|
42
42
|
var CodeTemplate = /** @class */ (function () {
|
|
43
43
|
function CodeTemplate(templateArgs) {
|
|
44
|
-
this.logger = new
|
|
44
|
+
this.logger = new logger_1.Logger({ name: this.constructor.name });
|
|
45
45
|
this.templateArgs = templateArgs;
|
|
46
46
|
}
|
|
47
47
|
CodeTemplate.prototype.generate = function () {
|
|
@@ -58,14 +58,14 @@ var CodeTemplate = /** @class */ (function () {
|
|
|
58
58
|
if (!(_i < _a.length)) return [3 /*break*/, 6];
|
|
59
59
|
sourceFile = _a[_i];
|
|
60
60
|
filePath = util_node_1.Fs.baseContainedJoin(this.templateArgs.srcPath, sourceFile.relativePath);
|
|
61
|
-
this.logger.info("Generating source file: ".concat(filePath));
|
|
61
|
+
this.logger.info({ message: "Generating source file: ".concat(filePath) });
|
|
62
62
|
return [4 /*yield*/, sourceFile.code.generate()];
|
|
63
63
|
case 3:
|
|
64
64
|
code = _b.sent();
|
|
65
65
|
return [4 /*yield*/, util_node_1.Fs.writeFiles([{ path: filePath, content: code }])];
|
|
66
66
|
case 4:
|
|
67
67
|
_b.sent();
|
|
68
|
-
this.logger.info("Generated source file: ".concat(filePath));
|
|
68
|
+
this.logger.info({ message: "Generated source file: ".concat(filePath) });
|
|
69
69
|
_b.label = 5;
|
|
70
70
|
case 5:
|
|
71
71
|
_i++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeTemplate.js","sourceRoot":"","sources":["../../../src/code_template/CodeTemplate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"CodeTemplate.js","sourceRoot":"","sources":["../../../src/code_template/CodeTemplate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA2C;AAC3C,kDAAgE;AAShE;IAIE,sBAAY,YAA0B;QACpC,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAKK,+BAAQ,GAAd;;;;;4BACE,qBAAM,uBAAW,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,EAAA;;wBAAzD,SAAyD,CAAC;8BACf,EAAlB,KAAA,IAAI,CAAC,WAAW,EAAE;;;6BAAlB,CAAA,cAAkB,CAAA;wBAAhC,UAAU;wBACb,QAAQ,GAAG,cAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;wBAC1F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,kCAA2B,QAAQ,CAAE,EAAE,CAAC,CAAC;wBACxD,qBAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAA;;wBAAvC,IAAI,GAAG,SAAgC;wBAC7C,qBAAM,cAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAA;;wBAAxD,SAAwD,CAAC;wBACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iCAA0B,QAAQ,CAAE,EAAE,CAAC,CAAC;;;wBAL7C,IAAkB,CAAA;;;;;;KAO5C;IAEO,sCAAe,GAAvB;QACE,IAAM,QAAQ,GAAc,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC/F,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;YACxC,QAAQ,CAAC,IAAI,OAAb,QAAQ,EAAS,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;SACxD;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACH,mBAAC;AAAD,CAAC,AA9BD,IA8BC;AA9BqB,oCAAY"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Repo.d.ts","sourceRoot":"","sources":["../../../src/code_template/Repo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAmB,MAAM,sBAAsB,CAAC;AAIvE,MAAM,WAAW,MAAO,SAAQ,cAAc;IAC5C,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC;AAED,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC,CAAC;AAE3E,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC9C,OAAO,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,iBAAiB,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA,CAAC,iBAAiB;KAAE,CAAC;CACtE,CAAC;AAEF,qBAAa,IAAI;IACf,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Repo.d.ts","sourceRoot":"","sources":["../../../src/code_template/Repo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAmB,MAAM,sBAAsB,CAAC;AAIvE,MAAM,WAAW,MAAO,SAAQ,cAAc;IAC5C,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC;AAED,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC,CAAC;AAE3E,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC9C,OAAO,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,iBAAiB,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA,CAAC,iBAAiB;KAAE,CAAC;CACtE,CAAC;AAEF,qBAAa,IAAI;IACf,OAAO,CAAC,MAAM,CAA+C;IAC7D,MAAM,EAAE,UAAU,CAAC;gBAEP,MAAM,EAAE,UAAU;IAI9B,QAAQ;IAIR,YAAY;IAIZ,OAAO;;;IAIP,iBAAiB;;;IAIjB,WAAW,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;IAMvC,eAAe,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE;;;CAQlD;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAuC;WAExC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;mBA4CrC,SAAS;CAiD/B"}
|