@celljs/ai-core 3.5.6 → 3.5.7

package/lib/common/chat/prompt/el-prompt-template.d.ts

@@ -0,0 +1,9 @@
+import { ExpressionHandler } from '@celljs/core';
+import { Prompt, PromptTemplate, PromptTemplateContext } from './prompt-protocol';
+import { Message } from '../message';
+export declare class ELPromptTemplate implements PromptTemplate {
+    protected readonly expressionHandler: ExpressionHandler;
+    render(template: string, ctx?: PromptTemplateContext): Promise<string>;
+    create(template: string | Message[], ctx?: PromptTemplateContext): Promise<Prompt>;
+}
+//# sourceMappingURL=el-prompt-template.d.ts.map

package/lib/common/chat/prompt/el-prompt-template.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"el-prompt-template.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/el-prompt-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,iBAAiB,EAAwB,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAE,OAAO,EAA8B,MAAM,YAAY,CAAC;AAEjE,qBACa,gBAAiB,YAAW,cAAc;IAGnD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAElD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAMtE,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAiB3F"}

package/lib/common/chat/prompt/el-prompt-template.js

@@ -0,0 +1,43 @@
+"use strict";
+var ELPromptTemplate_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ELPromptTemplate = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@celljs/core");
+const prompt_1 = require("./prompt");
+const message_1 = require("../message");
+let ELPromptTemplate = ELPromptTemplate_1 = class ELPromptTemplate {
+    async render(template, ctx) {
+        if (ctx === null || ctx === void 0 ? void 0 : ctx.variables) {
+            return this.expressionHandler.handle(template, ctx.variables, { ignoreSpecialChar: true, bracketBegin: '{', bracketEnd: '}', ignoreContextExpression: true });
+        }
+        return template;
+    }
+    async create(template, ctx) {
+        if (Array.isArray(template)
+            && template.some(message => message_1.Message.isMessage(message))) {
+            for (const message of template) {
+                message.content = await this.render(message.content, ctx);
+            }
+            return new prompt_1.PromptImpl(template, ctx === null || ctx === void 0 ? void 0 : ctx.chatOptions);
+        }
+        else if (typeof template === 'string') {
+            if (!(ctx === null || ctx === void 0 ? void 0 : ctx.messageType) || (ctx === null || ctx === void 0 ? void 0 : ctx.messageType) === message_1.MessageType.USER) {
+                return new prompt_1.PromptImpl(await this.render(template, ctx), ctx === null || ctx === void 0 ? void 0 : ctx.chatOptions);
+            }
+            else if ((ctx === null || ctx === void 0 ? void 0 : ctx.messageType) === message_1.MessageType.SYSTEM) {
+                return new prompt_1.PromptImpl(new message_1.SystemMessage(await this.render(template, ctx)), ctx === null || ctx === void 0 ? void 0 : ctx.chatOptions);
+            }
+        }
+        throw new core_1.IllegalArgumentError(`Invalid message type: ${ctx === null || ctx === void 0 ? void 0 : ctx.messageType}`);
+    }
+};
+tslib_1.__decorate([
+    (0, core_1.Autowired)(core_1.ExpressionHandler),
+    tslib_1.__metadata("design:type", Object)
+], ELPromptTemplate.prototype, "expressionHandler", void 0);
+ELPromptTemplate = ELPromptTemplate_1 = tslib_1.__decorate([
+    (0, core_1.Component)(ELPromptTemplate_1)
+], ELPromptTemplate);
+exports.ELPromptTemplate = ELPromptTemplate;
+//# sourceMappingURL=el-prompt-template.js.map

package/lib/common/chat/prompt/el-prompt-template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"el-prompt-template.js","sourceRoot":"","sources":["../../../../src/common/chat/prompt/el-prompt-template.ts"],"names":[],"mappings":";;;;;AAAA,uCAA6F;AAE7F,qCAAsC;AACtC,wCAAiE;AAG1D,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAKzB,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,GAA2B;QACtD,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS,EAAE;YAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;SACjK;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,QAA4B,EAAE,GAA2B;QAClE,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;eACpB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,iBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EACzD;YACE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC5B,OAAO,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aAC7D;YACD,OAAO,IAAI,mBAAU,CAAC,QAAQ,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;SACrD;aAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACrC,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAA,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,MAAK,qBAAW,CAAC,IAAI,EAAE;gBAC5D,OAAO,IAAI,mBAAU,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;aAC7E;iBAAM,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,MAAK,qBAAW,CAAC,MAAM,EAAE;gBAChD,OAAO,IAAI,mBAAU,CAAC,IAAI,uBAAa,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;aAChG;SACJ;QACD,MAAM,IAAI,2BAAoB,CAAC,yBAAyB,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,EAAE,CAAC,CAAC;IAChF,CAAC;CACJ,CAAA;AA1BG;IAAC,IAAA,gBAAS,EAAC,wBAAiB,CAAC;;2DAC2B;AAH/C,gBAAgB;IAD5B,IAAA,gBAAS,EAAC,kBAAgB,CAAC;GACf,gBAAgB,CA4B5B;AA5BY,4CAAgB"}

package/lib/common/chat/prompt/index.d.ts

@@ -1,4 +1,5 @@
 export * from './prompt-protocol';
 export * from './prompt';
 export * from './prompt-template';
+export * from './el-prompt-template';
 //# sourceMappingURL=index.d.ts.map

package/lib/common/chat/prompt/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC"}

package/lib/common/chat/prompt/index.js

@@ -4,4 +4,5 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./prompt-protocol"), exports);
 tslib_1.__exportStar(require("./prompt"), exports);
 tslib_1.__exportStar(require("./prompt-template"), exports);
+tslib_1.__exportStar(require("./el-prompt-template"), exports);
 //# sourceMappingURL=index.js.map

package/lib/common/chat/prompt/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/chat/prompt/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC;AAClC,mDAAyB;AACzB,4DAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/chat/prompt/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC;AAClC,mDAAyB;AACzB,4DAAkC;AAClC,+DAAqC"}

package/lib/common/chat/prompt/prompt-template.d.ts

@@ -1,8 +1,6 @@
-import { ExpressionHandler } from '@celljs/core';
 import { Prompt, PromptTemplate, PromptTemplateContext } from './prompt-protocol';
 import { Message } from '../message';
-export declare class PromptTemplateImpl implements PromptTemplate {
-    protected readonly expressionHandler: ExpressionHandler;
+export declare class SamplePromptTemplate implements PromptTemplate {
     render(template: string, ctx?: PromptTemplateContext): Promise<string>;
     create(template: string | Message[], ctx?: PromptTemplateContext): Promise<Prompt>;
 }

package/lib/common/chat/prompt/prompt-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-template.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/prompt-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,iBAAiB,EAAwB,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAE,OAAO,EAA8B,MAAM,YAAY,CAAC;AAEjE,qBACa,kBAAmB,YAAW,cAAc;IAGrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAElD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAMtE,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAiB3F"}
+{"version":3,"file":"prompt-template.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/prompt-template.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAE,OAAO,EAA8B,MAAM,YAAY,CAAC;AAEjE,qBACa,oBAAqB,YAAW,cAAc;IAEjD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAStE,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAiB3F"}

package/lib/common/chat/prompt/prompt-template.js

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PromptTemplateImpl = void 0;
+exports.SamplePromptTemplate = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@celljs/core");
 const prompt_protocol_1 = require("./prompt-protocol");
 const prompt_1 = require("./prompt");
 const message_1 = require("../message");
-let PromptTemplateImpl = class PromptTemplateImpl {
+let SamplePromptTemplate = class SamplePromptTemplate {
     async render(template, ctx) {
+        let newTemplate = template;
         if (ctx === null || ctx === void 0 ? void 0 : ctx.variables) {
-            return this.expressionHandler.handle(template, ctx.variables, { ignoreSpecialChar: true, bracketBegin: '{', bracketEnd: '}', ignoreContextExpression: true });
+            for (const key of Object.keys(ctx.variables)) {
+                newTemplate = newTemplate.replace(new RegExp(`{${key}}`, 'g'), ctx.variables[key]);
+            }
         }
-        return template;
+        return newTemplate;
     }
     async create(template, ctx) {
         if (Array.isArray(template)
@@ -32,12 +35,8 @@ let PromptTemplateImpl = class PromptTemplateImpl {
         throw new core_1.IllegalArgumentError(`Invalid message type: ${ctx === null || ctx === void 0 ? void 0 : ctx.messageType}`);
     }
 };
-tslib_1.__decorate([
-    (0, core_1.Autowired)(core_1.ExpressionHandler),
-    tslib_1.__metadata("design:type", Object)
-], PromptTemplateImpl.prototype, "expressionHandler", void 0);
-PromptTemplateImpl = tslib_1.__decorate([
+SamplePromptTemplate = tslib_1.__decorate([
     (0, core_1.Component)(prompt_protocol_1.PromptTemplate)
-], PromptTemplateImpl);
-exports.PromptTemplateImpl = PromptTemplateImpl;
+], SamplePromptTemplate);
+exports.SamplePromptTemplate = SamplePromptTemplate;
 //# sourceMappingURL=prompt-template.js.map

package/lib/common/chat/prompt/prompt-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-template.js","sourceRoot":"","sources":["../../../../src/common/chat/prompt/prompt-template.ts"],"names":[],"mappings":";;;;AAAA,uCAA6F;AAC7F,uDAAkF;AAClF,qCAAsC;AACtC,wCAAiE;AAG1D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAK3B,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,GAA2B;QACtD,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS,EAAE;YAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;SACjK;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,QAA4B,EAAE,GAA2B;QAClE,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;eACpB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,iBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EACzD;YACE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC5B,OAAO,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aAC7D;YACD,OAAO,IAAI,mBAAU,CAAC,QAAQ,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;SACrD;aAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACrC,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAA,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,MAAK,qBAAW,CAAC,IAAI,EAAE;gBAC5D,OAAO,IAAI,mBAAU,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;aAC7E;iBAAM,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,MAAK,qBAAW,CAAC,MAAM,EAAE;gBAChD,OAAO,IAAI,mBAAU,CAAC,IAAI,uBAAa,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;aAChG;SACJ;QACD,MAAM,IAAI,2BAAoB,CAAC,yBAAyB,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,EAAE,CAAC,CAAC;IAChF,CAAC;CACJ,CAAA;AA1BG;IAAC,IAAA,gBAAS,EAAC,wBAAiB,CAAC;;6DAC2B;AAH/C,kBAAkB;IAD9B,IAAA,gBAAS,EAAC,gCAAc,CAAC;GACb,kBAAkB,CA4B9B;AA5BY,gDAAkB"}
+{"version":3,"file":"prompt-template.js","sourceRoot":"","sources":["../../../../src/common/chat/prompt/prompt-template.ts"],"names":[],"mappings":";;;;AAAA,uCAA+D;AAC/D,uDAAkF;AAClF,qCAAsC;AACtC,wCAAiE;AAG1D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAE7B,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,GAA2B;QACtD,IAAI,WAAW,GAAG,QAAQ,CAAC;QAC3B,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS,EAAE;YAChB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBAC1C,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;aACtF;SACJ;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,QAA4B,EAAE,GAA2B;QAClE,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;eACpB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,iBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EACzD;YACE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC5B,OAAO,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aAC7D;YACD,OAAO,IAAI,mBAAU,CAAC,QAAQ,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;SACrD;aAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACrC,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAA,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,MAAK,qBAAW,CAAC,IAAI,EAAE;gBAC5D,OAAO,IAAI,mBAAU,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;aAC7E;iBAAM,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,MAAK,qBAAW,CAAC,MAAM,EAAE;gBAChD,OAAO,IAAI,mBAAU,CAAC,IAAI,uBAAa,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC;aAChG;SACJ;QACD,MAAM,IAAI,2BAAoB,CAAC,yBAAyB,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,EAAE,CAAC,CAAC;IAChF,CAAC;CACJ,CAAA;AA5BY,oBAAoB;IADhC,IAAA,gBAAS,EAAC,gCAAc,CAAC;GACb,oBAAoB,CA4BhC;AA5BY,oDAAoB"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@celljs/ai-core",
-  "version": "3.5.6",
+  "version": "3.5.7",
   "description": "Core domain for AI programming",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@celljs/core": "3.5.6",
-    "@celljs/http": "3.5.6",
+    "@celljs/core": "3.5.7",
+    "@celljs/http": "3.5.7",
     "rxjs": "^6.6.0",
     "tslib": "^2.8.0"
   },
@@ -38,7 +38,7 @@
     "test": "cell-component test:js"
   },
   "devDependencies": {
-    "@celljs/component": "3.5.6"
+    "@celljs/component": "3.5.7"
   },
-  "gitHead": "0846bb0df3a8622813290987bc97d3c9486eab7e"
+  "gitHead": "9ca650780b716b38272e6507ffb6fe49f79084ab"
 }

package/src/common/chat/prompt/el-prompt-template.ts

@@ -0,0 +1,35 @@
+import { Autowired, Component, ExpressionHandler, IllegalArgumentError } from '@celljs/core';
+import { Prompt, PromptTemplate, PromptTemplateContext } from './prompt-protocol';
+import { PromptImpl } from './prompt';
+import { Message, MessageType, SystemMessage } from '../message';
+
+@Component(ELPromptTemplate)
+export class ELPromptTemplate implements PromptTemplate {
+
+    @Autowired(ExpressionHandler)
+    protected readonly expressionHandler: ExpressionHandler;
+
+    async render(template: string, ctx?: PromptTemplateContext): Promise<string> {
+        if (ctx?.variables) {
+            return this.expressionHandler.handle(template, ctx.variables, { ignoreSpecialChar: true, bracketBegin: '{', bracketEnd: '}', ignoreContextExpression: true });
+        }
+        return template;
+    }
+    async create(template: string | Message[], ctx?: PromptTemplateContext): Promise<Prompt> {
+        if (Array.isArray(template)
+            && template.some(message => Message.isMessage(message))
+        ) {
+            for (const message of template) {
+                message.content = await this.render(message.content, ctx);
+            }
+            return new PromptImpl(template, ctx?.chatOptions);
+        } else if (typeof template === 'string') {
+            if (!ctx?.messageType || ctx?.messageType === MessageType.USER) {
+                return new PromptImpl(await this.render(template, ctx), ctx?.chatOptions);
+            } else if (ctx?.messageType === MessageType.SYSTEM) {
+                return new PromptImpl(new SystemMessage(await this.render(template, ctx)), ctx?.chatOptions);
+            }
+        }
+        throw new IllegalArgumentError(`Invalid message type: ${ctx?.messageType}`);
+    }
+}

package/src/common/chat/prompt/index.ts

@@ -1,3 +1,4 @@
 export * from './prompt-protocol';
 export * from './prompt';
 export * from './prompt-template';
+export * from './el-prompt-template';

package/src/common/chat/prompt/prompt-template.ts

@@ -1,19 +1,19 @@
-import { Autowired, Component, ExpressionHandler, IllegalArgumentError } from '@celljs/core';
+import { Component, IllegalArgumentError } from '@celljs/core';
 import { Prompt, PromptTemplate, PromptTemplateContext } from './prompt-protocol';
 import { PromptImpl } from './prompt';
 import { Message, MessageType, SystemMessage } from '../message';
 
 @Component(PromptTemplate)
-export class PromptTemplateImpl implements PromptTemplate {
-
-    @Autowired(ExpressionHandler)
-    protected readonly expressionHandler: ExpressionHandler;
+export class SamplePromptTemplate implements PromptTemplate {
 
     async render(template: string, ctx?: PromptTemplateContext): Promise<string> {
+        let newTemplate = template;
         if (ctx?.variables) {
-            return this.expressionHandler.handle(template, ctx.variables, { ignoreSpecialChar: true, bracketBegin: '{', bracketEnd: '}', ignoreContextExpression: true });
+            for (const key of Object.keys(ctx.variables)) {
+                newTemplate = newTemplate.replace(new RegExp(`{${key}}`, 'g'), ctx.variables[key]);
+            }
         }
-        return template;
+        return newTemplate;
     }
     async create(template: string | Message[], ctx?: PromptTemplateContext): Promise<Prompt> {
         if (Array.isArray(template)