@memberjunction/server 1.0.1 → 1.0.4
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/build.log.json +6 -0
- package/dist/entitySubclasses/userViewEntity.server.d.ts +3 -2
- package/dist/entitySubclasses/userViewEntity.server.d.ts.map +1 -1
- package/dist/entitySubclasses/userViewEntity.server.js +17 -6
- package/dist/entitySubclasses/userViewEntity.server.js.map +1 -1
- package/dist/generated/generated.d.ts +11 -2
- package/dist/generated/generated.d.ts.map +1 -1
- package/dist/generated/generated.js +48 -6
- package/dist/generated/generated.js.map +1 -1
- package/package.json +13 -12
- package/src/entitySubclasses/userViewEntity.server.ts +27 -9
- package/src/generated/generated.ts +38 -5
package/build.log.json
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { EntityInfo } from "@memberjunction/core";
|
|
2
|
-
import {
|
|
2
|
+
import { AIModelEntityExtended, UserViewEntityExtended } from '@memberjunction/core-entities';
|
|
3
3
|
export declare class UserViewEntity_Server extends UserViewEntityExtended {
|
|
4
4
|
protected get SmartFilterImplemented(): boolean;
|
|
5
|
-
protected
|
|
5
|
+
protected get AIVendorName(): string;
|
|
6
|
+
protected GetAIModel(): Promise<AIModelEntityExtended>;
|
|
6
7
|
GenerateSmartFilterWhereClause(prompt: string, entityInfo: EntityInfo): Promise<{
|
|
7
8
|
whereClause: string;
|
|
8
9
|
userExplanation: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userViewEntity.server.d.ts","sourceRoot":"","sources":["../../src/entitySubclasses/userViewEntity.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAsB,MAAM,sBAAsB,CAAC;AAClF,OAAO,
|
|
1
|
+
{"version":3,"file":"userViewEntity.server.d.ts","sourceRoot":"","sources":["../../src/entitySubclasses/userViewEntity.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAsB,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAiB,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAM5G,qBACa,qBAAsB,SAAQ,sBAAsB;IAI7D,cAAuB,sBAAsB,IAAI,OAAO,CAEvD;IAMD,SAAS,KAAK,YAAY,IAAI,MAAM,CAEnC;cAMe,UAAU,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAc/C,8BAA8B,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAC,CAAC;IAuErI,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;CAwE3D"}
|
|
@@ -12,20 +12,28 @@ const core_1 = require("@memberjunction/core");
|
|
|
12
12
|
const core_entities_1 = require("@memberjunction/core-entities");
|
|
13
13
|
const ai_1 = require("@memberjunction/ai");
|
|
14
14
|
const aiengine_1 = require("@memberjunction/aiengine");
|
|
15
|
+
const ai_openai_1 = require("@memberjunction/ai-openai");
|
|
16
|
+
(0, ai_openai_1.LoadOpenAILLM)();
|
|
15
17
|
let UserViewEntity_Server = class UserViewEntity_Server extends core_entities_1.UserViewEntityExtended {
|
|
16
18
|
get SmartFilterImplemented() {
|
|
17
19
|
return true;
|
|
18
20
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
get AIVendorName() {
|
|
22
|
+
return 'OpenAI';
|
|
23
|
+
}
|
|
24
|
+
async GetAIModel() {
|
|
25
|
+
await aiengine_1.AIEngine.LoadAIMetadata(this.ContextCurrentUser);
|
|
26
|
+
const models = aiengine_1.AIEngine.Models.filter(m => m.AIModelType.trim().toLowerCase() === 'llm' &&
|
|
27
|
+
m.Vendor.trim().toLowerCase() === this.AIVendorName.trim().toLowerCase());
|
|
28
|
+
models.sort((a, b) => b.PowerRank - a.PowerRank);
|
|
29
|
+
return models[0];
|
|
22
30
|
}
|
|
23
31
|
async GenerateSmartFilterWhereClause(prompt, entityInfo) {
|
|
24
32
|
try {
|
|
25
|
-
const model = this.GetAIModel();
|
|
33
|
+
const model = await this.GetAIModel();
|
|
26
34
|
const llm = global_1.MJGlobal.Instance.ClassFactory.CreateInstance(ai_1.BaseLLM, model.DriverClass, (0, ai_1.GetAIAPIKey)(model.DriverClass));
|
|
27
35
|
const chatParams = {
|
|
28
|
-
model:
|
|
36
|
+
model: model.APINameOrName,
|
|
29
37
|
messages: [
|
|
30
38
|
{
|
|
31
39
|
role: 'system',
|
|
@@ -42,7 +50,10 @@ let UserViewEntity_Server = class UserViewEntity_Server extends core_entities_1.
|
|
|
42
50
|
const llmResponse = result.data.choices[0].message.content;
|
|
43
51
|
if (llmResponse) {
|
|
44
52
|
try {
|
|
45
|
-
const
|
|
53
|
+
const cleansed = (0, global_1.CleanJSON)(llmResponse);
|
|
54
|
+
if (!cleansed)
|
|
55
|
+
throw new Error('Invalid JSON response from AI: ' + llmResponse);
|
|
56
|
+
const parsed = JSON.parse(cleansed);
|
|
46
57
|
if (parsed.whereClause && parsed.whereClause.length > 0) {
|
|
47
58
|
const trimmed = parsed.whereClause.trim();
|
|
48
59
|
let ret = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userViewEntity.server.js","sourceRoot":"","sources":["../../src/entitySubclasses/userViewEntity.server.ts"],"names":[],"mappings":";;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"userViewEntity.server.js","sourceRoot":"","sources":["../../src/entitySubclasses/userViewEntity.server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1660,6 +1660,7 @@ export declare class ListDetail_ {
|
|
|
1660
1660
|
ListID: number;
|
|
1661
1661
|
RecordID: string;
|
|
1662
1662
|
Sequence: number;
|
|
1663
|
+
List: string;
|
|
1663
1664
|
}
|
|
1664
1665
|
export declare class CreateListDetailInput {
|
|
1665
1666
|
ListID: number;
|
|
@@ -2067,6 +2068,7 @@ export declare class Authorization_ {
|
|
|
2067
2068
|
Description?: string;
|
|
2068
2069
|
CreatedAt: Date;
|
|
2069
2070
|
UpdatedAt: Date;
|
|
2071
|
+
Parent?: string;
|
|
2070
2072
|
AuthorizationRolesArray: mj_core_schema_server_object_types.AuthorizationRole_[];
|
|
2071
2073
|
AuthorizationsArray: mj_core_schema_server_object_types.Authorization_[];
|
|
2072
2074
|
AuditLogTypesArray: mj_core_schema_server_object_types.AuditLogType_[];
|
|
@@ -2180,12 +2182,15 @@ export declare class AIModel_ {
|
|
|
2180
2182
|
Name: string;
|
|
2181
2183
|
Vendor?: string;
|
|
2182
2184
|
AIModelTypeID: number;
|
|
2185
|
+
IsActive: boolean;
|
|
2183
2186
|
Description?: string;
|
|
2184
2187
|
DriverClass?: string;
|
|
2185
2188
|
DriverImportPath?: string;
|
|
2186
|
-
|
|
2189
|
+
APIName?: string;
|
|
2190
|
+
PowerRank?: number;
|
|
2187
2191
|
CreatedAt: Date;
|
|
2188
2192
|
UpdatedAt: Date;
|
|
2193
|
+
AIModelType: string;
|
|
2189
2194
|
AIActionsArray: mj_core_schema_server_object_types.AIAction_[];
|
|
2190
2195
|
AIModelActionsArray: mj_core_schema_server_object_types.AIModelAction_[];
|
|
2191
2196
|
EntityAIActionsArray: mj_core_schema_server_object_types.EntityAIAction_[];
|
|
@@ -2196,10 +2201,12 @@ export declare class UpdateAIModelInput {
|
|
|
2196
2201
|
Name: string;
|
|
2197
2202
|
Vendor: string;
|
|
2198
2203
|
AIModelTypeID: number;
|
|
2204
|
+
IsActive: boolean;
|
|
2199
2205
|
Description: string;
|
|
2200
2206
|
DriverClass: string;
|
|
2201
2207
|
DriverImportPath: string;
|
|
2202
|
-
|
|
2208
|
+
APIName: string;
|
|
2209
|
+
PowerRank: number;
|
|
2203
2210
|
}
|
|
2204
2211
|
export declare class RunAIModelViewResult {
|
|
2205
2212
|
Results: AIModel_[];
|
|
@@ -2503,6 +2510,7 @@ export declare class QueueTask_ {
|
|
|
2503
2510
|
Output?: string;
|
|
2504
2511
|
ErrorMessage?: string;
|
|
2505
2512
|
Comments?: string;
|
|
2513
|
+
Queue: string;
|
|
2506
2514
|
}
|
|
2507
2515
|
export declare class CreateQueueTaskInput {
|
|
2508
2516
|
QueueID: number;
|
|
@@ -2692,6 +2700,7 @@ export declare class Report_ {
|
|
|
2692
2700
|
OutputFormatType?: string;
|
|
2693
2701
|
OutputDeliveryType?: string;
|
|
2694
2702
|
OutputEvent?: string;
|
|
2703
|
+
OutputWorkflow?: string;
|
|
2695
2704
|
ReportSnapshotsArray: mj_core_schema_server_object_types.ReportSnapshot_[];
|
|
2696
2705
|
}
|
|
2697
2706
|
export declare class CreateReportInput {
|