@memberjunction/ai-vectors 2.0.0 → 2.1.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/dist/generic/VectorCore.types.d.ts +7 -0
- package/dist/generic/VectorCore.types.d.ts.map +1 -0
- package/dist/generic/VectorCore.types.js +3 -0
- package/dist/generic/VectorCore.types.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/models/VectorBase.d.ts +7 -6
- package/dist/models/VectorBase.d.ts.map +1 -1
- package/dist/models/VectorBase.js +17 -18
- package/dist/models/VectorBase.js.map +1 -1
- package/package.json +7 -7
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VectorCore.types.d.ts","sourceRoot":"","sources":["../../src/generic/VectorCore.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,iBAAiB,GAAG;IAC5B,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,eAAe,GAAG,QAAQ,GAAG,YAAY,CAAA;CACxD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VectorCore.types.js","sourceRoot":"","sources":["../../src/generic/VectorCore.types.ts"],"names":[],"mappings":""}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -18,4 +18,5 @@ __exportStar(require("./generic/IVectorDatabase"), exports);
|
|
|
18
18
|
__exportStar(require("./generic/IVectorIndex"), exports);
|
|
19
19
|
__exportStar(require("./generic/IEmbedding"), exports);
|
|
20
20
|
__exportStar(require("./models/VectorBase"), exports);
|
|
21
|
+
__exportStar(require("./generic/VectorCore.types"), exports);
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,yDAAuC;AACvC,uDAAqC;AACrC,sDAAoC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,yDAAuC;AACvC,uDAAqC;AACrC,sDAAoC;AACpC,6DAA2C"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { BaseEntity, Metadata, CompositeKey, RunView, UserInfo } from "@memberjunction/core";
|
|
2
2
|
import { AIModelEntityExtended, VectorDatabaseEntity } from "@memberjunction/core-entities";
|
|
3
|
+
import { PageRecordsParams } from "../generic/VectorCore.types";
|
|
3
4
|
export declare class VectorBase {
|
|
4
5
|
_runView: RunView;
|
|
5
6
|
_metadata: Metadata;
|
|
@@ -9,12 +10,12 @@ export declare class VectorBase {
|
|
|
9
10
|
get RunView(): RunView;
|
|
10
11
|
get CurrentUser(): UserInfo;
|
|
11
12
|
set CurrentUser(user: UserInfo);
|
|
12
|
-
protected
|
|
13
|
-
protected
|
|
14
|
-
protected
|
|
15
|
-
protected
|
|
16
|
-
protected
|
|
17
|
-
protected
|
|
13
|
+
protected GetRecordsByEntityID(entityID: string, recordIDs?: CompositeKey[]): Promise<BaseEntity[]>;
|
|
14
|
+
protected PageRecordsByEntityID<T>(params: PageRecordsParams): Promise<T[]>;
|
|
15
|
+
protected BuildExtraFilter(CompositeKey: CompositeKey[]): string;
|
|
16
|
+
protected GetAIModel(id?: string): AIModelEntityExtended;
|
|
17
|
+
protected GetVectorDatabase(id?: string): VectorDatabaseEntity;
|
|
18
|
+
protected RunViewForSingleValue<T extends BaseEntity>(entityName: string, extraFilter: string): Promise<T | null>;
|
|
18
19
|
protected SaveEntity(entity: BaseEntity): Promise<boolean>;
|
|
19
20
|
}
|
|
20
21
|
//# sourceMappingURL=VectorBase.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorBase.d.ts","sourceRoot":"","sources":["../../src/models/VectorBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"VectorBase.d.ts","sourceRoot":"","sources":["../../src/models/VectorBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAuC,MAAM,sBAAsB,CAAC;AAClI,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,qBAAa,UAAU;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAE,QAAQ,CAAC;;IAQvB,IAAW,QAAQ,IAAI,QAAQ,CAA2B;IAC1D,IAAW,OAAO,IAAI,OAAO,CAA0B;IACvD,IAAW,WAAW,IAAI,QAAQ,CAA8B;IAChE,IAAW,WAAW,CAAC,IAAI,EAAE,QAAQ,EAA+B;cAEpD,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;cAqBzF,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAoBjF,SAAS,CAAC,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,MAAM;IAQhE,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,qBAAqB;IAexD,SAAS,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,oBAAoB;cAgB9C,qBAAqB,CAAC,CAAC,SAAS,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;cAoBvG,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;CAInE"}
|
|
@@ -13,7 +13,7 @@ class VectorBase {
|
|
|
13
13
|
get RunView() { return this._runView; }
|
|
14
14
|
get CurrentUser() { return this._currentUser; }
|
|
15
15
|
set CurrentUser(user) { this._currentUser = user; }
|
|
16
|
-
async
|
|
16
|
+
async GetRecordsByEntityID(entityID, recordIDs) {
|
|
17
17
|
const md = new core_1.Metadata();
|
|
18
18
|
const entity = md.Entities.find(e => e.ID === entityID);
|
|
19
19
|
if (!entity) {
|
|
@@ -21,7 +21,7 @@ class VectorBase {
|
|
|
21
21
|
}
|
|
22
22
|
const rvResult = await this._runView.RunView({
|
|
23
23
|
EntityName: entity.Name,
|
|
24
|
-
ExtraFilter: recordIDs ? this.
|
|
24
|
+
ExtraFilter: recordIDs ? this.BuildExtraFilter(recordIDs) : undefined,
|
|
25
25
|
ResultType: 'entity_object',
|
|
26
26
|
IgnoreMaxRows: true
|
|
27
27
|
}, this.CurrentUser);
|
|
@@ -30,58 +30,57 @@ class VectorBase {
|
|
|
30
30
|
}
|
|
31
31
|
return rvResult.Results;
|
|
32
32
|
}
|
|
33
|
-
async
|
|
34
|
-
const
|
|
35
|
-
const entity = md.Entities.find((e) => e.ID === entityID);
|
|
33
|
+
async PageRecordsByEntityID(params) {
|
|
34
|
+
const entity = this.Metadata.Entities.find((e) => e.ID === params.EntityID);
|
|
36
35
|
if (!entity) {
|
|
37
|
-
throw new Error(`Entity with ID ${
|
|
36
|
+
throw new Error(`Entity with ID ${params.EntityID} not found.`);
|
|
38
37
|
}
|
|
39
38
|
const rvResult = await this._runView.RunView({
|
|
40
39
|
EntityName: entity.Name,
|
|
41
|
-
ResultType:
|
|
42
|
-
MaxRows:
|
|
43
|
-
StartRow: Math.max(0, (
|
|
40
|
+
ResultType: params.ResultType,
|
|
41
|
+
MaxRows: params.PageSize,
|
|
42
|
+
StartRow: Math.max(0, (params.PageNumber - 1) * params.PageSize),
|
|
44
43
|
}, this.CurrentUser);
|
|
45
44
|
if (!rvResult.Success) {
|
|
46
45
|
throw new Error(rvResult.ErrorMessage);
|
|
47
46
|
}
|
|
48
47
|
return rvResult.Results;
|
|
49
48
|
}
|
|
50
|
-
|
|
49
|
+
BuildExtraFilter(CompositeKey) {
|
|
51
50
|
return CompositeKey.map((keyValue) => {
|
|
52
51
|
return keyValue.KeyValuePairs.map((keys) => {
|
|
53
52
|
return `${keys.FieldName} = '${keys.Value}'`;
|
|
54
53
|
}).join(" AND ");
|
|
55
54
|
}).join("\n OR ");
|
|
56
55
|
}
|
|
57
|
-
|
|
56
|
+
GetAIModel(id) {
|
|
58
57
|
let model;
|
|
59
58
|
if (id) {
|
|
60
|
-
model = aiengine_1.AIEngine.Models.find(m => m.AIModelType === "Embeddings" && m.ID === id);
|
|
59
|
+
model = aiengine_1.AIEngine.Instance.Models.find(m => m.AIModelType === "Embeddings" && m.ID === id);
|
|
61
60
|
}
|
|
62
61
|
else {
|
|
63
|
-
model = aiengine_1.AIEngine.Models.find(m => m.AIModelType === "Embeddings");
|
|
62
|
+
model = aiengine_1.AIEngine.Instance.Models.find(m => m.AIModelType === "Embeddings");
|
|
64
63
|
}
|
|
65
64
|
if (!model) {
|
|
66
65
|
throw new Error("No AI Model Entity found");
|
|
67
66
|
}
|
|
68
67
|
return model;
|
|
69
68
|
}
|
|
70
|
-
|
|
71
|
-
if (aiengine_1.AIEngine.VectorDatabases.length > 0) {
|
|
69
|
+
GetVectorDatabase(id) {
|
|
70
|
+
if (aiengine_1.AIEngine.Instance.VectorDatabases.length > 0) {
|
|
72
71
|
if (id) {
|
|
73
|
-
let vectorDB = aiengine_1.AIEngine.VectorDatabases.find(vd => vd.ID === id);
|
|
72
|
+
let vectorDB = aiengine_1.AIEngine.Instance.VectorDatabases.find(vd => vd.ID === id);
|
|
74
73
|
if (vectorDB) {
|
|
75
74
|
return vectorDB;
|
|
76
75
|
}
|
|
77
76
|
}
|
|
78
77
|
else {
|
|
79
|
-
return aiengine_1.AIEngine.VectorDatabases[0];
|
|
78
|
+
return aiengine_1.AIEngine.Instance.VectorDatabases[0];
|
|
80
79
|
}
|
|
81
80
|
}
|
|
82
81
|
throw new Error("No Vector Database Entity found");
|
|
83
82
|
}
|
|
84
|
-
async
|
|
83
|
+
async RunViewForSingleValue(entityName, extraFilter) {
|
|
85
84
|
const rvResult = await this._runView.RunView({
|
|
86
85
|
EntityName: entityName,
|
|
87
86
|
ExtraFilter: extraFilter,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorBase.js","sourceRoot":"","sources":["../../src/models/VectorBase.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,+CAAkI;
|
|
1
|
+
{"version":3,"file":"VectorBase.js","sourceRoot":"","sources":["../../src/models/VectorBase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/ai-vectors",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "MemberJunction: AI Vectors Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,12 +15,12 @@
|
|
|
15
15
|
"author": "MemberJunction.com",
|
|
16
16
|
"license": "ISC",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@memberjunction/core": "2.
|
|
19
|
-
"@memberjunction/global": "2.
|
|
20
|
-
"@memberjunction/core-entities": "2.
|
|
21
|
-
"@memberjunction/aiengine": "2.
|
|
22
|
-
"@memberjunction/ai": "2.
|
|
23
|
-
"@memberjunction/ai-vectordb": "2.
|
|
18
|
+
"@memberjunction/core": "2.1.0",
|
|
19
|
+
"@memberjunction/global": "2.1.0",
|
|
20
|
+
"@memberjunction/core-entities": "2.1.0",
|
|
21
|
+
"@memberjunction/aiengine": "2.1.0",
|
|
22
|
+
"@memberjunction/ai": "2.1.0",
|
|
23
|
+
"@memberjunction/ai-vectordb": "2.1.0",
|
|
24
24
|
"dotenv": "^16.4.1",
|
|
25
25
|
"openai": "^4.28.4"
|
|
26
26
|
},
|