@memberjunction/templates 2.112.0 → 2.113.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/README.md +2 -2
- package/dist/TemplateEngine.d.ts +2 -2
- package/dist/TemplateEngine.d.ts.map +1 -1
- package/dist/TemplateEngine.js +15 -19
- package/dist/TemplateEngine.js.map +1 -1
- package/dist/extensions/AIPrompt.extension.d.ts +3 -3
- package/dist/extensions/AIPrompt.extension.d.ts.map +1 -1
- package/dist/extensions/AIPrompt.extension.js +19 -17
- package/dist/extensions/AIPrompt.extension.js.map +1 -1
- package/dist/extensions/TemplateEmbed.extension.d.ts +2 -2
- package/dist/extensions/TemplateEmbed.extension.d.ts.map +1 -1
- package/dist/extensions/TemplateEmbed.extension.js +25 -25
- package/dist/extensions/TemplateEmbed.extension.js.map +1 -1
- package/dist/extensions/TemplateExtensionBase.d.ts +1 -1
- package/dist/extensions/TemplateExtensionBase.d.ts.map +1 -1
- package/dist/extensions/TemplateExtensionBase.js.map +1 -1
- package/package.json +8 -7
package/README.md
CHANGED
|
@@ -48,7 +48,7 @@ npm install @memberjunction/templates
|
|
|
48
48
|
|
|
49
49
|
```typescript
|
|
50
50
|
import { TemplateEngineServer } from '@memberjunction/templates';
|
|
51
|
-
import { UserInfo } from '@memberjunction/
|
|
51
|
+
import { UserInfo } from '@memberjunction/core';
|
|
52
52
|
|
|
53
53
|
// Get the template engine instance
|
|
54
54
|
const templateEngine = TemplateEngineServer.Instance;
|
|
@@ -370,4 +370,4 @@ ISC - See LICENSE file for details.
|
|
|
370
370
|
|
|
371
371
|
## Support
|
|
372
372
|
|
|
373
|
-
For issues, questions, or contributions, please visit [MemberJunction.com](https://memberjunction.com) or contact the development team.
|
|
373
|
+
For issues, questions, or contributions, please visit [MemberJunction.com](https://memberjunction.com) or contact the development team.
|
package/dist/TemplateEngine.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IMetadataProvider, UserInfo } from
|
|
2
|
-
import { TemplateContentEntity, TemplateEntityExtended } from
|
|
1
|
+
import { IMetadataProvider, UserInfo } from "@memberjunction/core";
|
|
2
|
+
import { TemplateContentEntity, TemplateEntityExtended } from "@memberjunction/core-entities";
|
|
3
3
|
import * as nunjucks from 'nunjucks';
|
|
4
4
|
import { TemplateRenderResult, TemplateEngineBase } from '@memberjunction/templates-base-types';
|
|
5
5
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateEngine.d.ts","sourceRoot":"","sources":["../src/TemplateEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAY,QAAQ,EAAuB,MAAM,
|
|
1
|
+
{"version":3,"file":"TemplateEngine.d.ts","sourceRoot":"","sources":["../src/TemplateEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAY,QAAQ,EAAuB,MAAM,sBAAsB,CAAC;AAClG,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AACnH,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAGrC,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAA;AAE/F;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,QAAQ,CAAC,MAAM;IAC9C,KAAK,EAAE,IAAI,CAAC;IAEnB,OAAO,CAAC,SAAS,CAAwD;IAEzE;;;;OAIG;IACI,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB;IAIvE;;;;OAIG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG;CAW/C;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,kBAAkB;IACxD,WAAkB,QAAQ,IAAI,oBAAoB,CAEjD;IAED,OAAO,CAAC,uBAAuB,CAAkB;IACxC,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;cAK5F,iBAAiB,CAAC,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BjE,aAAa,IAAI,IAAI;IAQ5B,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,eAAe,CAAuB;IAE9C;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA8BxB;;OAEG;IACH,OAAO,CAAC,cAAc,CAA4C;IAE3D,WAAW,CAAC,cAAc,EAAE,sBAAsB;IAKzD;;;;;OAKG;IACU,cAAc,CAAC,cAAc,EAAE,sBAAsB,EAAE,eAAe,EAAE,qBAAqB,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAoD/K;;;;;;;OAOG;IACU,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAoBjG;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,GAAG;IAgB3G;;;;OAIG;IACH,SAAS,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG;IAIpD,kBAAkB;IAIzB;;;;OAIG;cACa,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAY5F;;;;;;;;;;;;;OAaG;IACH,SAAS,CAAC,kBAAkB,CAAC,cAAc,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,GAAG;CAuD1G"}
|
package/dist/TemplateEngine.js
CHANGED
|
@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.TemplateEngineServer = exports.TemplateEntityLoader = void 0;
|
|
27
|
-
const
|
|
27
|
+
const core_1 = require("@memberjunction/core");
|
|
28
28
|
const nunjucks = __importStar(require("nunjucks"));
|
|
29
|
-
const
|
|
29
|
+
const global_1 = require("@memberjunction/global");
|
|
30
30
|
const TemplateExtensionBase_1 = require("./extensions/TemplateExtensionBase");
|
|
31
31
|
const templates_base_types_1 = require("@memberjunction/templates-base-types");
|
|
32
32
|
/**
|
|
@@ -57,7 +57,7 @@ class TemplateEntityLoader extends nunjucks.Loader {
|
|
|
57
57
|
callBack({
|
|
58
58
|
src: template.Get,
|
|
59
59
|
path: templateId,
|
|
60
|
-
noCache: true
|
|
60
|
+
noCache: true
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
63
|
}
|
|
@@ -97,7 +97,7 @@ class TemplateEngineServer extends templates_base_types_1.TemplateEngineBase {
|
|
|
97
97
|
// Add custom filters
|
|
98
98
|
this.addCustomFilters();
|
|
99
99
|
// get all of the extensions that are registered and register them with nunjucks
|
|
100
|
-
const extensions =
|
|
100
|
+
const extensions = global_1.MJGlobal.Instance.ClassFactory.GetAllRegistrations(TemplateExtensionBase_1.TemplateExtensionBase);
|
|
101
101
|
if (extensions && extensions.length > 0) {
|
|
102
102
|
for (const ext of extensions) {
|
|
103
103
|
const instance = new ext.SubClass(contextUser);
|
|
@@ -160,14 +160,14 @@ class TemplateEngineServer extends templates_base_types_1.TemplateEngineBase {
|
|
|
160
160
|
return {
|
|
161
161
|
Success: false,
|
|
162
162
|
Output: null,
|
|
163
|
-
Message: 'templateContent variable is required'
|
|
163
|
+
Message: 'templateContent variable is required'
|
|
164
164
|
};
|
|
165
165
|
}
|
|
166
166
|
if (!templateContent.TemplateText) {
|
|
167
167
|
return {
|
|
168
168
|
Success: false,
|
|
169
169
|
Output: null,
|
|
170
|
-
Message: 'TemplateContent.TemplateText variable is required'
|
|
170
|
+
Message: 'TemplateContent.TemplateText variable is required'
|
|
171
171
|
};
|
|
172
172
|
}
|
|
173
173
|
if (!SkipValidation) {
|
|
@@ -179,7 +179,7 @@ class TemplateEngineServer extends templates_base_types_1.TemplateEngineBase {
|
|
|
179
179
|
Output: null,
|
|
180
180
|
Message: valResult.Errors.map((error) => {
|
|
181
181
|
return error.Message;
|
|
182
|
-
}).join(', ')
|
|
182
|
+
}).join(', ')
|
|
183
183
|
};
|
|
184
184
|
}
|
|
185
185
|
}
|
|
@@ -190,14 +190,14 @@ class TemplateEngineServer extends templates_base_types_1.TemplateEngineBase {
|
|
|
190
190
|
return {
|
|
191
191
|
Success: true,
|
|
192
192
|
Output: result,
|
|
193
|
-
Message: undefined
|
|
193
|
+
Message: undefined
|
|
194
194
|
};
|
|
195
195
|
}
|
|
196
196
|
catch (e) {
|
|
197
197
|
return {
|
|
198
198
|
Success: false,
|
|
199
199
|
Output: null,
|
|
200
|
-
Message: e.message
|
|
200
|
+
Message: e.message
|
|
201
201
|
};
|
|
202
202
|
}
|
|
203
203
|
}
|
|
@@ -216,15 +216,15 @@ class TemplateEngineServer extends templates_base_types_1.TemplateEngineBase {
|
|
|
216
216
|
return {
|
|
217
217
|
Success: true,
|
|
218
218
|
Output: result,
|
|
219
|
-
Message: undefined
|
|
219
|
+
Message: undefined
|
|
220
220
|
};
|
|
221
221
|
}
|
|
222
222
|
catch (e) {
|
|
223
|
-
(0,
|
|
223
|
+
(0, core_1.LogError)(e);
|
|
224
224
|
return {
|
|
225
225
|
Success: false,
|
|
226
226
|
Output: null,
|
|
227
|
-
Message: e.message
|
|
227
|
+
Message: e.message
|
|
228
228
|
};
|
|
229
229
|
}
|
|
230
230
|
}
|
|
@@ -300,15 +300,11 @@ class TemplateEngineServer extends templates_base_types_1.TemplateEngineBase {
|
|
|
300
300
|
// Group parameters by name to handle precedence
|
|
301
301
|
const paramsByName = new Map();
|
|
302
302
|
// First add global parameters
|
|
303
|
-
params
|
|
304
|
-
.filter((p) => !p.TemplateContentID)
|
|
305
|
-
.forEach((p) => {
|
|
303
|
+
params.filter(p => !p.TemplateContentID).forEach(p => {
|
|
306
304
|
paramsByName.set(p.Name, p);
|
|
307
305
|
});
|
|
308
306
|
// Then add/override with content-specific parameters
|
|
309
|
-
params
|
|
310
|
-
.filter((p) => p.TemplateContentID === contentId)
|
|
311
|
-
.forEach((p) => {
|
|
307
|
+
params.filter(p => p.TemplateContentID === contentId).forEach(p => {
|
|
312
308
|
paramsByName.set(p.Name, p);
|
|
313
309
|
});
|
|
314
310
|
// Apply default values for missing parameters
|
|
@@ -340,7 +336,7 @@ class TemplateEngineServer extends templates_base_types_1.TemplateEngineBase {
|
|
|
340
336
|
}
|
|
341
337
|
catch (error) {
|
|
342
338
|
// Log warning but continue - don't fail the entire render
|
|
343
|
-
(0,
|
|
339
|
+
(0, core_1.LogError)(`Failed to apply default value for parameter '${name}': ${error.message}`);
|
|
344
340
|
}
|
|
345
341
|
}
|
|
346
342
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateEngine.js","sourceRoot":"","sources":["../src/TemplateEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"TemplateEngine.js","sourceRoot":"","sources":["../src/TemplateEngine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { UserInfo } from
|
|
2
|
-
import { NunjucksCallback, TemplateExtensionBase } from
|
|
3
|
-
import { AIModelEntityExtended } from
|
|
1
|
+
import { UserInfo } from "@memberjunction/core";
|
|
2
|
+
import { NunjucksCallback, TemplateExtensionBase } from "./TemplateExtensionBase";
|
|
3
|
+
import { AIModelEntityExtended } from "@memberjunction/core-entities";
|
|
4
4
|
type Parser = any;
|
|
5
5
|
type Nodes = any;
|
|
6
6
|
type Lexer = any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AIPrompt.extension.d.ts","sourceRoot":"","sources":["../../src/extensions/AIPrompt.extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"AIPrompt.extension.d.ts","sourceRoot":"","sources":["../../src/extensions/AIPrompt.extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGlF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,KAAK,MAAM,GAAG,GAAG,CAAC;AAClB,KAAK,KAAK,GAAG,GAAG,CAAC;AACjB,KAAK,KAAK,GAAG,GAAG,CAAC;AACjB,KAAK,OAAO,GAAG,GAAG,CAAC;AAEnB;;GAEG;AACH,qBACa,iBAAkB,SAAQ,qBAAqB;IAExD,mBAAmB,EAAE,MAAM,CAAgE;gBAE/E,WAAW,EAAE,QAAQ;IAK1B,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;IAkCvD;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACI,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,gBAAgB;IAiF/E;;;OAGG;IACH,SAAS,KAAK,mBAAmB,IAAI,MAAM,CAE1C;IAED;;;OAGG;cACa,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAQxG;AAED,MAAM,MAAM,cAAc,GAAG;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAqGF,wBAAgB,qBAAqB,SAEpC"}
|
|
@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.LoadAIPromptExtension = exports.AIPromptExtension = void 0;
|
|
13
|
+
const core_1 = require("@memberjunction/core");
|
|
13
14
|
const global_1 = require("@memberjunction/global");
|
|
14
|
-
const global_2 = require("@memberjunction/global");
|
|
15
15
|
const TemplateExtensionBase_1 = require("./TemplateExtensionBase");
|
|
16
16
|
const aiengine_1 = require("@memberjunction/aiengine");
|
|
17
17
|
const ai_1 = require("@memberjunction/ai");
|
|
@@ -21,7 +21,7 @@ const ai_1 = require("@memberjunction/ai");
|
|
|
21
21
|
let AIPromptExtension = class AIPromptExtension extends TemplateExtensionBase_1.TemplateExtensionBase {
|
|
22
22
|
constructor(contextUser) {
|
|
23
23
|
super(contextUser);
|
|
24
|
-
this.AllowFormattingText =
|
|
24
|
+
this.AllowFormattingText = "Do not use markdown, HTML, or any other special formatting.";
|
|
25
25
|
this.tags = ['AIPrompt'];
|
|
26
26
|
}
|
|
27
27
|
parse(parser, nodes, lexer) {
|
|
@@ -110,7 +110,8 @@ let AIPromptExtension = class AIPromptExtension extends TemplateExtensionBase_1.
|
|
|
110
110
|
try {
|
|
111
111
|
let model = null;
|
|
112
112
|
if (config.AIModel) {
|
|
113
|
-
model = aiengine_1.AIEngine.Instance.Models.find(
|
|
113
|
+
model = aiengine_1.AIEngine.Instance.Models.find(m => m.Name.toLowerCase() === config.AIModel.toLowerCase() ||
|
|
114
|
+
m.APIName?.toLowerCase() === config.AIModel.toLowerCase());
|
|
114
115
|
if (!model) {
|
|
115
116
|
throw new Error(`AI model '${config.AIModel}' not found.`);
|
|
116
117
|
}
|
|
@@ -121,30 +122,30 @@ let AIPromptExtension = class AIPromptExtension extends TemplateExtensionBase_1.
|
|
|
121
122
|
throw new Error(`No AI model found for the vendor 'Groq' and type 'llm'.`);
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
|
-
const llm =
|
|
125
|
+
const llm = global_1.MJGlobal.Instance.ClassFactory.CreateInstance(ai_1.BaseLLM, model.DriverClass, (0, ai_1.GetAIAPIKey)(model.DriverClass));
|
|
125
126
|
const llmResult = await llm.ChatCompletion({
|
|
126
127
|
messages: [
|
|
127
128
|
{
|
|
128
129
|
role: 'system',
|
|
129
130
|
content: `Background: The output from this will be DIRECTLY inserted into a messaging template going to a recipient. For this reason whenever
|
|
130
|
-
you are prompted to provide a result, do not preface it with any text, just provide the result itself. ${config.AllowFormatting ?
|
|
131
|
+
you are prompted to provide a result, do not preface it with any text, just provide the result itself. ${config.AllowFormatting ? "" : this.AllowFormattingText} Assume that the text you are generating will go directly into a message.
|
|
131
132
|
<IMPORTANT>ONLY PROVIDE THE RESPONSE REQUESTED FOR THE MESSAGE - **** DO NOT ADD ANYTHING ELSE ****</IMPORTANT>`,
|
|
132
133
|
},
|
|
133
134
|
{
|
|
134
135
|
role: 'user',
|
|
135
136
|
content: `${prompt}`,
|
|
136
|
-
}
|
|
137
|
+
}
|
|
137
138
|
],
|
|
138
|
-
model: model.APINameOrName
|
|
139
|
+
model: model.APINameOrName
|
|
139
140
|
});
|
|
140
141
|
if (llmResult && llmResult.success) {
|
|
141
142
|
let response = llmResult.data.choices[0].message.content;
|
|
142
|
-
response = response.replace(/</g,
|
|
143
|
+
response = response.replace(/</g, "<").replace(/>/g, ">").replace(/&/g, "&");
|
|
143
144
|
callBack(null, response);
|
|
144
145
|
}
|
|
145
146
|
}
|
|
146
147
|
catch (e) {
|
|
147
|
-
(0,
|
|
148
|
+
(0, core_1.LogError)(e);
|
|
148
149
|
callBack(null, e);
|
|
149
150
|
}
|
|
150
151
|
});
|
|
@@ -162,7 +163,8 @@ let AIPromptExtension = class AIPromptExtension extends TemplateExtensionBase_1.
|
|
|
162
163
|
*/
|
|
163
164
|
async GetAIModel(vendorName, contextUser) {
|
|
164
165
|
await aiengine_1.AIEngine.Instance.Config(false, contextUser); // most of the time this is already loaded, but just in case it isn't we will load it here
|
|
165
|
-
const models = aiengine_1.AIEngine.Instance.Models.filter(
|
|
166
|
+
const models = aiengine_1.AIEngine.Instance.Models.filter(m => m.AIModelType.trim().toLowerCase() === 'llm' &&
|
|
167
|
+
m.Vendor.trim().toLowerCase() === vendorName.trim().toLowerCase());
|
|
166
168
|
// next, sort the models by the PowerRank field so that the highest power rank model is the first array element
|
|
167
169
|
models.sort((a, b) => b.PowerRank - a.PowerRank); // highest power rank first
|
|
168
170
|
return models[0];
|
|
@@ -170,8 +172,8 @@ let AIPromptExtension = class AIPromptExtension extends TemplateExtensionBase_1.
|
|
|
170
172
|
};
|
|
171
173
|
exports.AIPromptExtension = AIPromptExtension;
|
|
172
174
|
exports.AIPromptExtension = AIPromptExtension = __decorate([
|
|
173
|
-
(0,
|
|
174
|
-
__metadata("design:paramtypes", [
|
|
175
|
+
(0, global_1.RegisterClass)(TemplateExtensionBase_1.TemplateExtensionBase, 'AIPrompt'),
|
|
176
|
+
__metadata("design:paramtypes", [core_1.UserInfo])
|
|
175
177
|
], AIPromptExtension);
|
|
176
178
|
// function AIPromptExtension() {
|
|
177
179
|
// this.tags = ['AIPrompt'];
|
|
@@ -209,7 +211,7 @@ exports.AIPromptExtension = AIPromptExtension = __decorate([
|
|
|
209
211
|
// // then we will create an instance of the LLM class
|
|
210
212
|
// AIEngine.Instance.LoadAIMetadata(this._contextUser).then(async () => {
|
|
211
213
|
// try {
|
|
212
|
-
// const model = await AIEngine.Instance.GetHighestPowerModel('Groq','llm', this._contextUser)
|
|
214
|
+
// const model = await AIEngine.Instance.GetHighestPowerModel('Groq','llm', this._contextUser)
|
|
213
215
|
// const llm = MJGlobal.Instance.ClassFactory.CreateInstance<BaseLLM>(BaseLLM, model.DriverClass, GetAIAPIKey(model.DriverClass))
|
|
214
216
|
// const llmResult = await llm.ChatCompletion({
|
|
215
217
|
// messages: [
|
|
@@ -239,19 +241,19 @@ exports.AIPromptExtension = AIPromptExtension = __decorate([
|
|
|
239
241
|
// }
|
|
240
242
|
// /**
|
|
241
243
|
// * Default implementation simply returns 'OpenAI' - override this in your subclass if you are using a different AI vendor.
|
|
242
|
-
// * @returns
|
|
244
|
+
// * @returns
|
|
243
245
|
// */
|
|
244
246
|
// function AIVendorName(): string {
|
|
245
247
|
// return 'OpenAI';
|
|
246
248
|
// }
|
|
247
249
|
// /**
|
|
248
250
|
// * Default implementation simply grabs the first AI model that matches GetAIModelName().
|
|
249
|
-
// * @returns
|
|
251
|
+
// * @returns
|
|
250
252
|
// */
|
|
251
253
|
// async function GetAIModel(vendorName: string, contextUser: UserInfo): Promise<AIModelEntityExtended> {
|
|
252
254
|
// await AIEngine.LoadAIMetadata(contextUser); // most of the time this is already loaded, but just in case it isn't we will load it here
|
|
253
|
-
// const models = AIEngine.Models.filter(m => m.AIModelType.trim().toLowerCase() === 'llm' &&
|
|
254
|
-
// m.Vendor.trim().toLowerCase() === vendorName.trim().toLowerCase())
|
|
255
|
+
// const models = AIEngine.Models.filter(m => m.AIModelType.trim().toLowerCase() === 'llm' &&
|
|
256
|
+
// m.Vendor.trim().toLowerCase() === vendorName.trim().toLowerCase())
|
|
255
257
|
// // next, sort the models by the PowerRank field so that the highest power rank model is the first array element
|
|
256
258
|
// models.sort((a, b) => b.PowerRank - a.PowerRank); // highest power rank first
|
|
257
259
|
// return models[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AIPrompt.extension.js","sourceRoot":"","sources":["../../src/extensions/AIPrompt.extension.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"AIPrompt.extension.js","sourceRoot":"","sources":["../../src/extensions/AIPrompt.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { UserInfo } from
|
|
2
|
-
import { NunjucksCallback, TemplateExtensionBase } from
|
|
1
|
+
import { UserInfo } from "@memberjunction/core";
|
|
2
|
+
import { NunjucksCallback, TemplateExtensionBase } from "./TemplateExtensionBase";
|
|
3
3
|
type Parser = any;
|
|
4
4
|
type Nodes = any;
|
|
5
5
|
type Lexer = any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateEmbed.extension.d.ts","sourceRoot":"","sources":["../../src/extensions/TemplateEmbed.extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"TemplateEmbed.extension.d.ts","sourceRoot":"","sources":["../../src/extensions/TemplateEmbed.extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAKlF,KAAK,MAAM,GAAG,GAAG,CAAC;AAClB,KAAK,KAAK,GAAG,GAAG,CAAC;AACjB,KAAK,KAAK,GAAG,GAAG,CAAC;AACjB,KAAK,OAAO,GAAG,GAAG,CAAC;AAEnB;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAC9B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAiBF;;;;;;;;;;;;;;GAcG;AACH,qBACa,sBAAuB,SAAQ,qBAAqB;gBAEjD,WAAW,EAAE,QAAQ;IAK1B,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;IAavD;;;;;;;;;;;;;;;;;;;;;OAqBG;IACI,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,gBAAgB;IAyHlE;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAwB1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAY1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAU1B;;OAEG;YACW,sBAAsB;CAUvC;AAED,wBAAgB,0BAA0B,SAEzC"}
|
|
@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.LoadTemplateEmbedExtension = exports.TemplateEmbedExtension = void 0;
|
|
13
|
+
const core_1 = require("@memberjunction/core");
|
|
13
14
|
const global_1 = require("@memberjunction/global");
|
|
14
|
-
const global_2 = require("@memberjunction/global");
|
|
15
15
|
const TemplateExtensionBase_1 = require("./TemplateExtensionBase");
|
|
16
16
|
const TemplateEngine_1 = require("../TemplateEngine");
|
|
17
17
|
/**
|
|
@@ -72,24 +72,24 @@ let TemplateEmbedExtension = class TemplateEmbedExtension extends TemplateExtens
|
|
|
72
72
|
const bodyString = body ? body : '';
|
|
73
73
|
const params = bodyString.split(',');
|
|
74
74
|
/*
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
const parsedParams = params.map(
|
|
75
|
+
Possible Formats for the body of the template tag:
|
|
76
|
+
|
|
77
|
+
Basic Usage:
|
|
78
|
+
|
|
79
|
+
{% template "TemplateName" %}
|
|
80
|
+
|
|
81
|
+
With Optional Parameters:
|
|
82
|
+
|
|
83
|
+
{% template "TemplateName", type="HTML" %}
|
|
84
|
+
{% template "TemplateName", data={key: "value"} %}
|
|
85
|
+
{% template "TemplateName", type="PlainText", data={extra: "data"} %}
|
|
86
|
+
|
|
87
|
+
|
|
88
|
+
So we need to take the params array we have above and each item is either just a string
|
|
89
|
+
' e.g. the TemplateName, or a key-value pair like 'type="HTML"' or 'data={key: "value"}'
|
|
90
|
+
We will parse these into a structured object for easier handling.
|
|
91
|
+
*/
|
|
92
|
+
const parsedParams = params.map(param => {
|
|
93
93
|
// Split by the first '=' to separate property name and value
|
|
94
94
|
const [propertyName, ...valueParts] = param.split('=');
|
|
95
95
|
const value = valueParts.join('=').trim().replace(/^"|"$/g, ''); // Remove surrounding quotes if any
|
|
@@ -103,7 +103,7 @@ let TemplateEmbedExtension = class TemplateEmbedExtension extends TemplateExtens
|
|
|
103
103
|
if (!parsedParams || parsedParams.length === 0) {
|
|
104
104
|
throw new Error('Template name is required for template embedding');
|
|
105
105
|
}
|
|
106
|
-
const templateName = parsedParams.find(
|
|
106
|
+
const templateName = parsedParams.find(param => param.propertyName === 'template')?.value || parsedParams[0].value;
|
|
107
107
|
if (!templateName || typeof templateName !== 'string') {
|
|
108
108
|
throw new Error('Template name must be a non-empty string');
|
|
109
109
|
}
|
|
@@ -126,7 +126,7 @@ let TemplateEmbedExtension = class TemplateEmbedExtension extends TemplateExtens
|
|
|
126
126
|
if (!renderContext) {
|
|
127
127
|
renderContext = {
|
|
128
128
|
templateStack: [],
|
|
129
|
-
currentContentType: undefined
|
|
129
|
+
currentContentType: undefined
|
|
130
130
|
};
|
|
131
131
|
context.ctx._mjRenderContext = renderContext;
|
|
132
132
|
}
|
|
@@ -164,12 +164,12 @@ let TemplateEmbedExtension = class TemplateEmbedExtension extends TemplateExtens
|
|
|
164
164
|
// Remove template from stack on error as well
|
|
165
165
|
renderContext.templateStack.pop();
|
|
166
166
|
renderContext.currentContentType = originalContentType;
|
|
167
|
-
(0,
|
|
167
|
+
(0, core_1.LogError)(error);
|
|
168
168
|
callBack(error);
|
|
169
169
|
});
|
|
170
170
|
}
|
|
171
171
|
catch (error) {
|
|
172
|
-
(0,
|
|
172
|
+
(0, core_1.LogError)(error);
|
|
173
173
|
callBack(error);
|
|
174
174
|
}
|
|
175
175
|
}
|
|
@@ -238,8 +238,8 @@ let TemplateEmbedExtension = class TemplateEmbedExtension extends TemplateExtens
|
|
|
238
238
|
};
|
|
239
239
|
exports.TemplateEmbedExtension = TemplateEmbedExtension;
|
|
240
240
|
exports.TemplateEmbedExtension = TemplateEmbedExtension = __decorate([
|
|
241
|
-
(0,
|
|
242
|
-
__metadata("design:paramtypes", [
|
|
241
|
+
(0, global_1.RegisterClass)(TemplateExtensionBase_1.TemplateExtensionBase, 'TemplateEmbed'),
|
|
242
|
+
__metadata("design:paramtypes", [core_1.UserInfo])
|
|
243
243
|
], TemplateEmbedExtension);
|
|
244
244
|
function LoadTemplateEmbedExtension() {
|
|
245
245
|
// This function ensures the extension class isn't tree-shaken
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateEmbed.extension.js","sourceRoot":"","sources":["../../src/extensions/TemplateEmbed.extension.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"TemplateEmbed.extension.js","sourceRoot":"","sources":["../../src/extensions/TemplateEmbed.extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateExtensionBase.d.ts","sourceRoot":"","sources":["../../src/extensions/TemplateExtensionBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"TemplateExtensionBase.d.ts","sourceRoot":"","sources":["../../src/extensions/TemplateExtensionBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,KAAK,MAAM,GAAG,GAAG,CAAC;AAClB,KAAK,KAAK,GAAG,GAAG,CAAC;AACjB,KAAK,KAAK,GAAG,GAAG,CAAC;AACjB,KAAK,OAAO,GAAG,GAAG,CAAC;AAInB,MAAM,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;AAEzE;;GAEG;AACH,8BAAsB,qBAAqB;IACvC;;OAEG;IACI,IAAI,EAAE,MAAM,EAAE,CAAM;IAE3B,IAAW,WAAW,IAAI,QAAQ,CAEjC;IACD,OAAO,CAAC,YAAY,CAAW;gBAEnB,WAAW,EAAE,QAAQ;IAIjC;;;;;OAKG;aACa,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,GAAG;IACtE;;;;;;;;;;;;;;;;;OAiBG;aACa,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;CACvD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateExtensionBase.js","sourceRoot":"","sources":["../../src/extensions/TemplateExtensionBase.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"TemplateExtensionBase.js","sourceRoot":"","sources":["../../src/extensions/TemplateExtensionBase.ts"],"names":[],"mappings":";;;AAWA;;GAEG;AACH,MAAsB,qBAAqB;IAMvC,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAGD,YAAY,WAAqB;QAVjC;;WAEG;QACI,SAAI,GAAa,EAAE,CAAC;QAQvB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IACpC,CAAC;CA4BJ;AAzCD,sDAyCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/templates",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.113.0",
|
|
4
4
|
"description": "MemberJunction Templating Engine and Utilities - Used for any application that requires templating utility functionality. NOTE: this package does use Angular Universal for compilation but is not marked with the usual ng prefix because it is a server-side library and not used within Angular apps.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,12 +18,13 @@
|
|
|
18
18
|
"typescript": "^5.4.5"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@memberjunction/
|
|
22
|
-
"@memberjunction/
|
|
23
|
-
"@memberjunction/
|
|
24
|
-
"@memberjunction/
|
|
25
|
-
"@memberjunction/
|
|
26
|
-
"@memberjunction/
|
|
21
|
+
"@memberjunction/core": "2.113.0",
|
|
22
|
+
"@memberjunction/templates-base-types": "2.113.0",
|
|
23
|
+
"@memberjunction/ai": "2.113.0",
|
|
24
|
+
"@memberjunction/aiengine": "2.113.0",
|
|
25
|
+
"@memberjunction/ai-provider-bundle": "2.113.0",
|
|
26
|
+
"@memberjunction/core-entities": "2.113.0",
|
|
27
|
+
"@memberjunction/global": "2.113.0",
|
|
27
28
|
"nunjucks": "3.2.4"
|
|
28
29
|
},
|
|
29
30
|
"repository": {
|