@futdevpro/nts-dynamo 1.10.71 → 1.10.73
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/_modules/open-ai/_services/vector-data.service.d.ts +49 -0
- package/build/_modules/open-ai/_services/vector-data.service.d.ts.map +1 -1
- package/build/_modules/open-ai/_services/vector-data.service.js +56 -6
- package/build/_modules/open-ai/_services/vector-data.service.js.map +1 -1
- package/build/_services/core/email.service.d.ts.map +1 -1
- package/build/_services/core/email.service.js +9 -9
- package/build/_services/core/email.service.js.map +1 -1
- package/package.json +3 -3
- package/src/_modules/open-ai/_services/vector-data.service.ts +63 -8
- package/src/_services/core/email.service.ts +11 -14
|
@@ -1,6 +1,28 @@
|
|
|
1
1
|
import { DyFM_DataModel_Params, DyFM_DataProperty_Params, DyFM_Metadata } from '@futdevpro/fsm-dynamo';
|
|
2
2
|
import { DyFM_OpenAI_Settings, DyFM_OpenAIModel } from '@futdevpro/fsm-dynamo/open-ai';
|
|
3
3
|
import { DyNTS_DataService } from '../../../_services/base/data.service';
|
|
4
|
+
/**
|
|
5
|
+
* Vector Data Service that is connected to the relevant DBServices
|
|
6
|
+
* extends {@link DyNTS_DataService}
|
|
7
|
+
*
|
|
8
|
+
* @example
|
|
9
|
+
* export class UserMatchStatisticsService extends DyNTS_DataService<UserMatchStatistics> {
|
|
10
|
+
* constructor(
|
|
11
|
+
* set: {
|
|
12
|
+
* data?: UserMatchStatistics,
|
|
13
|
+
* openAISettings?: DyFM_OpenAI_Settings,
|
|
14
|
+
* issuer: string,
|
|
15
|
+
* }
|
|
16
|
+
* ) {
|
|
17
|
+
* super(
|
|
18
|
+
* new UserMatchStatistics(set?.data),
|
|
19
|
+
* userMatchStatisticsModelParams,
|
|
20
|
+
* set?.openAISettings ?? defaultOpenAISettings,
|
|
21
|
+
* set.issuer,
|
|
22
|
+
* );
|
|
23
|
+
* }
|
|
24
|
+
* }
|
|
25
|
+
*/
|
|
4
26
|
export declare class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_DataService<T> {
|
|
5
27
|
/**
|
|
6
28
|
* OpenAI settings
|
|
@@ -24,9 +46,36 @@ export declare class DyNTS_VectorDataService<T extends DyFM_Metadata> extends Dy
|
|
|
24
46
|
* Initial set for issuer to be able to follow the issuer's activity
|
|
25
47
|
*/
|
|
26
48
|
issuer: string);
|
|
49
|
+
/**
|
|
50
|
+
* Vectorizes the properties of the data
|
|
51
|
+
* (That are marked with vectorizeFrom if the specific property is not defined)
|
|
52
|
+
*
|
|
53
|
+
* @example
|
|
54
|
+
* const data = await vectorizeDataProperties(data);
|
|
55
|
+
*
|
|
56
|
+
* @returns The vectorized data
|
|
57
|
+
*/
|
|
27
58
|
vectorizeDataProperties(data?: T): Promise<T>;
|
|
59
|
+
/**
|
|
60
|
+
* Vectorizes the input
|
|
61
|
+
*
|
|
62
|
+
* @example
|
|
63
|
+
* const vector = await vectorize(input);
|
|
64
|
+
*/
|
|
28
65
|
vectorize(input: string, useModel?: DyFM_OpenAIModel | string): Promise<number[]>;
|
|
66
|
+
/**
|
|
67
|
+
* Vectorizes the input and searches for the most similar data
|
|
68
|
+
* (the default limit is 3)
|
|
69
|
+
*
|
|
70
|
+
* @example
|
|
71
|
+
* const result = await vectorSearch(input, searchInKey);
|
|
72
|
+
*/
|
|
29
73
|
vectorSearch(input: string, searchInKey: string, limit?: number, useModel?: DyFM_OpenAIModel | string): Promise<any>;
|
|
74
|
+
/**
|
|
75
|
+
* VectorDataService overrides the saveData function to vectorize the data properties
|
|
76
|
+
*
|
|
77
|
+
* {@link DyNTS_DataService.saveData}
|
|
78
|
+
*/
|
|
30
79
|
saveData(data?: T, dontSetToService?: boolean): Promise<T>;
|
|
31
80
|
}
|
|
32
81
|
//# sourceMappingURL=vector-data.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-data.service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/vector-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,qBAAqB,EACrB,wBAAwB,EAExB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAGzE,qBAAa,uBAAuB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IActF;;OAEG;aACa,cAAc,EAAE,oBAAoB;IAftD,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;;IAI5D;;OAEG;IACH,IAAI,EAAE,CAAC;IACP;;OAEG;IACH,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACpC;;OAEG;IACa,cAAc,EAAE,oBAAoB;IACpD;;OAEG;IACH,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"vector-data.service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/vector-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,qBAAqB,EACrB,wBAAwB,EAExB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAGzE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,uBAAuB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IActF;;OAEG;aACa,cAAc,EAAE,oBAAoB;IAftD,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;;IAI5D;;OAEG;IACH,IAAI,EAAE,CAAC;IACP;;OAEG;IACH,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACpC;;OAEG;IACa,cAAc,EAAE,oBAAoB;IACpD;;OAEG;IACH,MAAM,EAAE,MAAM;IA0BhB;;;;;;;;OAQG;IACG,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAyBnD;;;;;OAKG;IACG,SAAS,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,gBAAgB,GAAG,MAAqD,GACjF,OAAO,CAAC,MAAM,EAAE,CAAC;IA4BpB;;;;;;OAMG;IACG,YAAY,CAChB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAEnB,KAAK,GAAE,MAAU,EACjB,QAAQ,CAAC,EAAE,gBAAgB,GAAG,MAAM,GACnC,OAAO,CAAC,GAAG,CAAC;IAoEf;;;;OAIG;IACY,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;CAkB1E"}
|
|
@@ -5,6 +5,28 @@ const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
|
5
5
|
const global_settings_const_1 = require("../../../_collections/global-settings.const");
|
|
6
6
|
const data_service_1 = require("../../../_services/base/data.service");
|
|
7
7
|
const embedding_control_service_1 = require("./embedding.control-service");
|
|
8
|
+
/**
|
|
9
|
+
* Vector Data Service that is connected to the relevant DBServices
|
|
10
|
+
* extends {@link DyNTS_DataService}
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* export class UserMatchStatisticsService extends DyNTS_DataService<UserMatchStatistics> {
|
|
14
|
+
* constructor(
|
|
15
|
+
* set: {
|
|
16
|
+
* data?: UserMatchStatistics,
|
|
17
|
+
* openAISettings?: DyFM_OpenAI_Settings,
|
|
18
|
+
* issuer: string,
|
|
19
|
+
* }
|
|
20
|
+
* ) {
|
|
21
|
+
* super(
|
|
22
|
+
* new UserMatchStatistics(set?.data),
|
|
23
|
+
* userMatchStatisticsModelParams,
|
|
24
|
+
* set?.openAISettings ?? defaultOpenAISettings,
|
|
25
|
+
* set.issuer,
|
|
26
|
+
* );
|
|
27
|
+
* }
|
|
28
|
+
* }
|
|
29
|
+
*/
|
|
8
30
|
class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
9
31
|
openAISettings;
|
|
10
32
|
vectorizeProperties;
|
|
@@ -28,19 +50,29 @@ class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
28
50
|
issuer) {
|
|
29
51
|
super(data, dataParams, issuer);
|
|
30
52
|
this.openAISettings = openAISettings;
|
|
31
|
-
const vectorizePropertyKeys = Object.keys(dataParams.properties).filter((key) => dataParams.properties[key].
|
|
32
|
-
dataParams.properties[key].
|
|
53
|
+
const vectorizePropertyKeys = Object.keys(dataParams.properties).filter((key) => dataParams.properties[key].vectorizedFrom &&
|
|
54
|
+
dataParams.properties[key].vectorizedFrom !== key);
|
|
33
55
|
if (!vectorizePropertyKeys.length) {
|
|
34
56
|
throw new Error('vectorizedPropertyKeys is missing! ' +
|
|
35
|
-
`\nkeys with vectorizeFrom: ${Object.keys(dataParams.properties).filter((key) => dataParams.properties[key].
|
|
57
|
+
`\nkeys with vectorizeFrom: ${Object.keys(dataParams.properties).filter((key) => Boolean(dataParams.properties[key].vectorizedFrom)).map(key => `"${key}"`).join(', ')}`);
|
|
36
58
|
}
|
|
37
59
|
this.vectorizeProperties = vectorizePropertyKeys.map((key) => dataParams.properties[key]);
|
|
38
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Vectorizes the properties of the data
|
|
63
|
+
* (That are marked with vectorizeFrom if the specific property is not defined)
|
|
64
|
+
*
|
|
65
|
+
* @example
|
|
66
|
+
* const data = await vectorizeDataProperties(data);
|
|
67
|
+
*
|
|
68
|
+
* @returns The vectorized data
|
|
69
|
+
*/
|
|
39
70
|
async vectorizeDataProperties(data) {
|
|
40
71
|
try {
|
|
41
72
|
await fsm_dynamo_1.DyFM_Array.asyncForEachAllAtOnce(this.vectorizeProperties, async (property) => {
|
|
42
|
-
if (
|
|
43
|
-
data[property.key]
|
|
73
|
+
if (data[property.vectorizedFrom] &&
|
|
74
|
+
(!data[property.key] || property.vectorizeAlways)) {
|
|
75
|
+
data[property.key] = await this.vectorize(data[property.vectorizedFrom], property.embeddingModel);
|
|
44
76
|
}
|
|
45
77
|
});
|
|
46
78
|
return data;
|
|
@@ -51,6 +83,12 @@ class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
51
83
|
});
|
|
52
84
|
}
|
|
53
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* Vectorizes the input
|
|
88
|
+
*
|
|
89
|
+
* @example
|
|
90
|
+
* const vector = await vectorize(input);
|
|
91
|
+
*/
|
|
54
92
|
async vectorize(input, useModel = this.openAISettings.defaultSettings.useModel) {
|
|
55
93
|
try {
|
|
56
94
|
if (!input) {
|
|
@@ -69,9 +107,16 @@ class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
69
107
|
});
|
|
70
108
|
}
|
|
71
109
|
}
|
|
110
|
+
/**
|
|
111
|
+
* Vectorizes the input and searches for the most similar data
|
|
112
|
+
* (the default limit is 3)
|
|
113
|
+
*
|
|
114
|
+
* @example
|
|
115
|
+
* const result = await vectorSearch(input, searchInKey);
|
|
116
|
+
*/
|
|
72
117
|
async vectorSearch(input, searchInKey,
|
|
73
118
|
/* useIndex: string, */
|
|
74
|
-
limit =
|
|
119
|
+
limit = 3, useModel) {
|
|
75
120
|
try {
|
|
76
121
|
if (!input) {
|
|
77
122
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
@@ -120,6 +165,11 @@ class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
120
165
|
});
|
|
121
166
|
}
|
|
122
167
|
}
|
|
168
|
+
/**
|
|
169
|
+
* VectorDataService overrides the saveData function to vectorize the data properties
|
|
170
|
+
*
|
|
171
|
+
* {@link DyNTS_DataService.saveData}
|
|
172
|
+
*/
|
|
123
173
|
async saveData(data, dontSetToService) {
|
|
124
174
|
try {
|
|
125
175
|
data = this.ensureData(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-data.service.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/vector-data.service.ts"],"names":[],"mappings":";;;AACA,sDAM+B;AAG/B,uFAAoF;AACpF,uEAAyE;AACzE,2EAAuE;AAEvE,MAAa,uBAAiD,SAAQ,gCAAoB;IAiBtE;IAfT,mBAAmB,CAAkC;IAC9D,mEAAmE;IAEnE;IACE;;OAEG;IACH,IAAO;IACP;;OAEG;IACH,UAAoC;IACpC;;OAEG;IACa,cAAoC;IACpD;;OAEG;IACH,MAAc;QAEd,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QANhB,mBAAc,GAAd,cAAc,CAAsB;QAQpD,MAAM,qBAAqB,GAAa,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CAC/E,CAAC,GAAW,EAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"vector-data.service.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/vector-data.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/email.service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAA0B,MAAM,uBAAuB,CAAC;AAE3E,OAAO,EACL,aAAa,EAA0B,mBAAmB,EAC3D,MAAM,uBAAuB,CAAC;AAG/B,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,4BAA4B,EAAE,CAAC;CACrD;AAED,qBAAa,4BAA4B;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,WAAW,CAAC,EAAE,MAAM,CAAM;IAE1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAM;IAC3B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAM;gBAGpC,GAAG,CAAC,EAAE,4BAA4B;CAMrC;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,GAAG;IAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAAE;IAC9E,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,CAAC,CAAC;IAEvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IAEtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsC;IACjE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAE9B;IACP,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAE1B;IAEP,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAc;IAEhD,QAAQ,CAAC,mBAAmB,SAE2B;gBAGrD,GAAG,EAAE,2BAA2B;IAiB5B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBzC;;;OAGG;IACU,SAAS,CAAC,CAAC,EACtB,GAAG,EAAE,wBAAwB,CAAC,CAAC,CAAC,EAChC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;YAmFF,wBAAwB;IAwDtC,OAAO,CAAC,oBAAoB;IAqD5B,6DAA6D;IAC7D,OAAO,CAAC,SAAS;IAajB,4BAA4B;IAC5B,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,eAAe;YAMT,0BAA0B;YAwC1B,mBAAmB;YAkEnB,0BAA0B;
|
|
1
|
+
{"version":3,"file":"email.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/email.service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAA0B,MAAM,uBAAuB,CAAC;AAE3E,OAAO,EACL,aAAa,EAA0B,mBAAmB,EAC3D,MAAM,uBAAuB,CAAC;AAG/B,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,4BAA4B,EAAE,CAAC;CACrD;AAED,qBAAa,4BAA4B;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,WAAW,CAAC,EAAE,MAAM,CAAM;IAE1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAM;IAC3B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAM;gBAGpC,GAAG,CAAC,EAAE,4BAA4B;CAMrC;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,GAAG;IAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAAE;IAC9E,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,CAAC,CAAC;IAEvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IAEtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsC;IACjE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAE9B;IACP,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAE1B;IAEP,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAc;IAEhD,QAAQ,CAAC,mBAAmB,SAE2B;gBAGrD,GAAG,EAAE,2BAA2B;IAiB5B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBzC;;;OAGG;IACU,SAAS,CAAC,CAAC,EACtB,GAAG,EAAE,wBAAwB,CAAC,CAAC,CAAC,EAChC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;YAmFF,wBAAwB;IAwDtC,OAAO,CAAC,oBAAoB;IAqD5B,6DAA6D;IAC7D,OAAO,CAAC,SAAS;IAajB,4BAA4B;IAC5B,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,eAAe;YAMT,0BAA0B;YAwC1B,mBAAmB;YAkEnB,0BAA0B;YAmH1B,QAAQ;IAyBtB,OAAO,CAAC,iBAAiB;IAkDzB;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IA8C/B,OAAO,CAAC,wBAAwB;IAkBhC,SAAS,CAAC,uBAAuB,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,GACb,mBAAmB;CAavB"}
|
|
@@ -309,18 +309,18 @@ class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
|
|
|
309
309
|
}
|
|
310
310
|
if (!component.template) {
|
|
311
311
|
component.template = await this.readFile(component.templatePath, component.name).catch(async (error) => {
|
|
312
|
-
fsm_dynamo_1.DyFM_Log.error(`\nDynamoNTS EmailService ERROR, couldn't load email component's template; ` +
|
|
313
|
-
`(${component.name} from ${component.templatePath})`);
|
|
314
312
|
if (global_settings_const_1.DyNTS_global_settings.autoResearchIssues) {
|
|
315
313
|
// read folder contents, read parent folder contents
|
|
316
314
|
const folderContents = FileSystem.readdirSync(component.templatePath.split('/').slice(0, -1).join('/'));
|
|
317
|
-
fsm_dynamo_1.DyFM_Log.testWarn(`DynamoNTS EmailService WARNING, couldn't load email component's template; ` +
|
|
318
|
-
`(${component.name} from ${component.templatePath})` +
|
|
319
|
-
`\nfolder contents: ${folderContents}`);
|
|
320
315
|
const parentFolderContents = FileSystem.readdirSync(component.templatePath.split('/').slice(0, -2).join('/'));
|
|
321
316
|
fsm_dynamo_1.DyFM_Log.testWarn(`DynamoNTS EmailService WARNING, couldn't load email component's template; ` +
|
|
322
|
-
|
|
323
|
-
`\
|
|
317
|
+
`\n(${component.name} from ${component.templatePath})` +
|
|
318
|
+
`\n folder contents: \n ${folderContents.join(', \n ')}` +
|
|
319
|
+
`\n parent folder contents: \n ${parentFolderContents.join(', \n ')}`);
|
|
320
|
+
}
|
|
321
|
+
else {
|
|
322
|
+
fsm_dynamo_1.DyFM_Log.error(`\nDynamoNTS EmailService ERROR, couldn't load email component's template; ` +
|
|
323
|
+
`\n(${component.name} from ${component.templatePath})`);
|
|
324
324
|
}
|
|
325
325
|
throw error;
|
|
326
326
|
});
|
|
@@ -369,8 +369,8 @@ class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
|
|
|
369
369
|
return await new Promise((resolve, reject) => {
|
|
370
370
|
FileSystem.readFile(path, 'utf8', (err, template) => {
|
|
371
371
|
if (err || !template) {
|
|
372
|
-
err ??= new Error(`Couldn't load email component's template; ${nameOfTarget} ` +
|
|
373
|
-
|
|
372
|
+
err ??= new Error(`Couldn't load email component's template; \n ${nameOfTarget} ` +
|
|
373
|
+
`\n from ${path}`);
|
|
374
374
|
reject(new fsm_dynamo_1.DyFM_Error({
|
|
375
375
|
...this._getDefaultErrorSettings('loadTemplate', err, 'SYSTEM'),
|
|
376
376
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-ES0-LC3`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../src/_services/core/email.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../src/_services/core/email.service.ts"],"names":[],"mappings":";;;;AACA,uDAAiC;AACjC,+DAAyC;AAIzC,sDAE+B;AAC/B,oFAAiF;AAYjF,MAAa,4BAA4B;IACvC,IAAI,CAAS;IACb,QAAQ,CAAS;IAEjB,YAAY,CAAU;IACtB,QAAQ,CAAU;IAElB,SAAS,CAAU;IACnB,MAAM,CAAU;IAEhB,WAAW,GAAY,EAAE,CAAC;IAE1B,UAAU,GAAc,EAAE,CAAC;IAC3B,qBAAqB,GAAc,EAAE,CAAC;IAEtC,YACE,GAAkC;QAElC,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;CACF;AAtBD,oEAsBC;AAcD;;GAEG;AACH,MAAa,kBAAkB,CAAC,oCAAoC;IAClE,WAAW,CAAS;IAEH,aAAa,CAAyB;IACtC,UAAU,CAAS;IACnB,YAAY,CAAS;IAErB,UAAU,GAAmC,EAAE,CAAC;IAChD,oBAAoB,GAEjC,EAAE,CAAC;IACU,gBAAgB,GAE7B,EAAE,CAAC;IAEU,iBAAiB,GAAW,EAAE,CAAC;IAEvC,mBAAmB,GAC1B,kDAAkD;QAClD,oDAAoD,CAAC;IAEvD,YACE,GAAgC;QAEhC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,GAAG,GAAG,CAAC,UAAU,KAAK,GAAG,CAAC,KAAK,GAAG,CAAC;QACvD,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,eAAe,CAAC;YAC9C,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE;gBACJ,IAAI,EAAE,GAAG,CAAC,KAAK;gBACf,IAAI,EAAE,GAAG,CAAC,IAAI;aACf;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,MAAM,uBAAU,CAAC,YAAY,CAC3B,IAAI,CAAC,UAAU,EACf,KAAK,EAAE,SAAuC,EAAiB,EAAE;oBAC/D,MAAM,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;gBACnD,CAAC,CACF,CAAC;gBAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC;YAED,qBAAQ,CAAC,OAAO,CAAC,gCAAgC,IAAI,CAAC,UAAU,aAAa,CAAC,CAAC;QACjF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,oBAAoB,EAAE,KAAK,EAAE,QAAQ,CAAC;gBAEvE,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,iBAAiB;aACzE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,SAAS,CACpB,GAAgC,EAChC,MAAc;QAEd,IAAI,CAAC;YACH,IAAI,OAAe,CAAC;YAEpB,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAChB,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAExB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;oBAC/B,MAAM,IAAI,uBAAU,CAAC;wBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,WAAW,EACX,IAAI,KAAK,CAAC,uCAAuC,CAAC,EAClD,MAAM,CACP;wBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;qBACxE,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,CAAC;oBACtD,MAAM,IAAI,uBAAU,CAAC;wBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,WAAW,EACX,IAAI,KAAK,CACP,sDAAsD,GAAG,CAAC,qBAAqB,GAAG,CACnF,EACD,MAAM,CACP;wBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;wBACvE,iBAAiB,EAAE;4BACjB,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;yBACzD;qBACF,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAC3C,GAAG,CAAC,qBAAqB,EACzB,GAAG,CAAC,kBAAkB,EACtB,MAAM,CACP,CAAC;YACJ,CAAC;YAED,MAAM,WAAW,GAAgB;gBAC/B,IAAI,EAAE,IAAI,CAAC,YAAY;gBACvB,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,GAAG,CAAC,WAAW;aAC7B,CAAC;YAEF,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;gBAChD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAQ,EAAE;oBACvD,IAAI,KAAK,EAAE,CAAC;wBACV,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC;yBAAM,CAAC;wBACN,OAAO,EAAE,CAAC;oBACZ,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAK,KAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,8BAA8B,CAAC,EAAE,CAAC;gBACzE,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC;oBAE5D,cAAc,EAAE,KAAK;oBACrB,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;oBACvE,WAAW,EAAE,sBAAsB,GAAG,CAAC,EAAE,GAAG;oBAC5C,OAAO,EAAE,uBAAuB,GAAG,CAAC,EAAE,EAAE;iBACzC,CAAC,CAAC;YAEL,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC;oBAE5D,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;oBACvE,OAAO,EAAE,uBAAuB,GAAG,CAAC,EAAE,EAAE;iBACzC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACpC,aAAqB,EACrB,mBAAqB,EACrB,MAAc;QAEd,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,gBAAgB,EAChB,IAAI,KAAK,CAAC,6CAA6C,aAAa,GAAG,CAAC,EACxE,MAAM,CACP;oBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;oBACvE,iBAAiB,EAAE;wBACjB,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;qBACxD;iBACF,CAAC,CAAC;YACL,CAAC;YAED,MAAM,SAAS,GAAiC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YACrF,IAAI,QAAQ,GAAW,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAE5D,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YACjD,QAAQ,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAC9C,SAAS,EACT,mBAAmB,EACnB,QAAQ,EACR,MAAM,CACP,CAAC;YAEF,MAAM,uBAAU,CAAC,YAAY,CAC3B,SAAS,CAAC,qBAAqB,EAC/B,KAAK,EAAE,oBAA4B,EAAiB,EAAE;gBACpD,OAAO,QAAQ,CAAC,QAAQ,CAAC,QAAQ,oBAAoB,EAAE,CAAC,EAAE,CAAC;oBACzD,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CACvC,oBAAoB,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,CAC5D,CAAC;gBACJ,CAAC;YACH,CAAC,CACF,CAAC;YAEF,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,CAAC;gBAEjE,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EAAE,2BAA2B,aAAa,GAAG;aACrD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,SAAuC;QAClE,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAa,EAAE,CAAC;QAE/B,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YAC1B,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,SAAS,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,oBAA4B,EAAQ,EAAE;YAC7E,MAAM,YAAY,GAChB,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;YAElD,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;gBAC7B,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YACjD,CAAC;YAED,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBACxB,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAE/C,IAAI,IAAI,CAAC,iBAAiB,GAAG,SAAS,EAAE,CAAC;YACvC,qBAAQ,CAAC,IAAI,CACX,qCAAqC,IAAI,CAAC,WAAW,KAAK;gBAC1D,yCAAyC,SAAS,KAAK;gBACvD,gBAAgB,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,QAAQ,GAAG;gBACxD,4CAA4C;gBAC5C,kBAAkB,IAAI,CAAC,iBAAiB,KAAK,CAC9C,CAAC;QACJ,CAAC;QAED,OAAQ,mBAAmB;YACnB,UAAU;YACV,YAAY;YACZ,SAAS,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YAC5B,IAAI;YACJ,eAAe;YACf,WAAW,MAAM,EAAE;YACnB,gBAAgB;YAChB,aAAa;YACb,YAAY;YACZ,SAAS,SAAS,CAAC,QAAQ,EAAE;YAC7B,aAAa;YACb,YAAY,CAAC;IACvB,CAAC;IAED,6DAA6D;IACrD,SAAS,CAAC,KAAa;QAC7B,IAAI,MAAM,GAAW,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE1F,OAAO,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YAE5C,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,4BAA4B;IACpB,YAAY,CAAC,QAAgB;QACnC,IAAI,MAAM,GAAW,QAAQ,CAAC;QAE9B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YAE7C,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAGO,eAAe,CAAC,GAAW;QACjC,MAAM,CAAC,GAAW,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QAEjC,OAAO,CAAC,GAAG,IAAI,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACtC,SAAuC,EACvC,mBAAsB,EACtB,QAAgB,EAChB,MAAc;QAEd,IAAI,CAAC;YACH,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,WAAmB,EAAQ,EAAE;gBACzD,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC;oBACtC,MAAM,IAAI,uBAAU,CAAC;wBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,gBAAgB,EAChB,IAAI,KAAK,CACP,0CAA0C,WAAW,UAAU,SAAS,CAAC,IAAI,GAAG,CACjF,EACD,MAAM,CACP;wBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;wBACvE,iBAAiB,EAAE;4BACjB,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC;yBACtD;qBACF,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,KAAK,WAAW,IAAI,EAAE,GAAG,CAAC,CAAC;gBAEtD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC;YACzE,CAAC,CAAC,CAAC;YAEH,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,CAAC;gBAEjE,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;aACxE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,oBAA4B,EAC5B,mBAAsB,EACtB,QAAgB,EAChB,MAAc;QAGd,MAAM,YAAY,GAChB,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;QAElD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,gBAAgB,EAChB,IAAI,KAAK,CAAC,0CAA0C,oBAAoB,GAAG,CAAC,EAC5E,MAAM,CACP;gBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,iBAAiB,EAAE,IAAI,CAAC,oBAAoB;aAC7C,CAAC,CAAC;QACL,CAAC;QAED,IAAI,oBAAoB,GAAW,YAAY,CAAC,QAAQ,CAAC;QACzD,MAAM,QAAQ,GAAG,QAAQ,YAAY,CAAC,QAAQ,EAAE,CAAC;QACjD,MAAM,MAAM,GAAG,SAAS,YAAY,CAAC,QAAQ,GAAG,CAAC;QACjD,MAAM,iBAAiB,GACrB,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,gBAAwB,CAAC;QAE7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACN,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;QAEpD,oBAAoB,GAAG,oBAAoB,CAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAClF,oBAAoB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAC1D,YAAY,EACZ,mBAAmB,EACnB,oBAAoB,EACpB,MAAM,CACP,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAE1C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACjD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;QACpE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEjD;;;;;;;;YAQI;QAEJ,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,SAAuC;QAC9E,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAClD,qBAAQ,CAAC,IAAI,CACX,yDAAyD,SAAS,CAAC,QAAQ,GAAG,CAC/E,CAAC;gBAEF,OAAO;YACT,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACnD,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,eAAe,EACf,IAAI,KAAK,CAAC,iDAAiD,SAAS,CAAC,IAAI,GAAG,CAAC,EAC7E,QAAQ,CACT;oBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;oBACvE,iBAAiB,EAAE;wBACjB,SAAS,EAAE,SAAS;qBACrB;iBACF,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACxB,SAAS,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CACpF,KAAK,EAAE,KAAiB,EAAmB,EAAE;oBAE3C,IAAI,6CAAqB,CAAC,kBAAkB,EAAE,CAAC;wBAC7C,oDAAoD;wBACpD,MAAM,cAAc,GAAG,UAAU,CAAC,WAAW,CAC3C,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACzD,CAAC;wBACF,MAAM,oBAAoB,GAAG,UAAU,CAAC,WAAW,CACjD,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACzD,CAAC;wBAEF,qBAAQ,CAAC,QAAQ,CACf,4EAA4E;4BAC5E,MAAM,SAAS,CAAC,IAAI,SAAS,SAAS,CAAC,YAAY,GAAG;4BACtD,8BAA8B,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;4BAC/D,qCAAqC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAC5E,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,qBAAQ,CAAC,KAAK,CACZ,4EAA4E;4BAC5E,MAAM,SAAS,CAAC,IAAI,SAAS,SAAS,CAAC,YAAY,GAAG,CACvD,CAAC;oBACJ,CAAC;oBAED,MAAM,KAAK,CAAC;gBACd,CAAC,CACF,CAAC;YACJ,CAAC;YAED,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;gBACxB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;oBAChD,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAG,CAAC,GAAG,EAAE,MAAM,EAAQ,EAAE;wBACtE,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;4BACnB,IAAI,CAAC,GAAG,EAAE,CAAC;gCACT,GAAG,GAAG,IAAI,KAAK,CACb,2CAA2C,SAAS,CAAC,IAAI,GAAG;oCAC5D,QAAQ,SAAS,CAAC,SAAS,EAAE,CAC9B,CAAC;4BACJ,CAAC;4BAED,MAAM,CACJ,IAAI,uBAAU,CAAC;gCACb,GAAG,IAAI,CAAC,wBAAwB,CAAC,cAAc,EAAE,GAAG,EAAE,QAAQ,CAAC;gCAE/D,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;6BACxE,CAAC,CACH,CAAC;4BAEF,OAAO;wBACT,CAAC;wBAED,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC;wBAE1B,OAAO,EAAE,CAAC;oBACZ,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;YAED,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACxE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;YAC1D,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YAElD,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,WAAmB,EAAQ,EAAE;gBACzD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,WAAW,IAAI,CAAC,EAAE,CAAC;oBACvD,MAAM,IAAI,uBAAU,CAAC;wBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,eAAe,EACf,IAAI,KAAK,CACP,4CAA4C,WAAW,QAAQ,SAAS,CAAC,IAAI,GAAG,CACjF,EACD,QAAQ,CACT;wBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;wBACvE,iBAAiB,EAAE,SAAS,CAAC,QAAQ;qBACtC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,eAAe,EAAE,KAAK,EAAE,QAAQ,CAAC;gBAElE,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EAAE,0BAA0B,SAAS,CAAC,IAAI,GAAG;aACrD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,YAAoB;QACvD,OAAO,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;YACzD,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAG,CAAC,GAAG,EAAE,QAAQ,EAAQ,EAAE;gBACzD,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACrB,GAAG,KAAK,IAAI,KAAK,CACf,iDAAiD,YAAY,GAAG;wBAChE,YAAY,IAAI,EAAE,CACnB,CAAC;oBAEF,MAAM,CACJ,IAAI,uBAAU,CAAC;wBACb,GAAG,IAAI,CAAC,wBAAwB,CAAC,cAAc,EAAE,GAAG,EAAE,QAAQ,CAAC;wBAE/D,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;qBACxE,CAAC,CACH,CAAC;oBAEF,OAAO;gBACT,CAAC;gBAED,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB;QACvB,IAAI,CAAC;YACH,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1D,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,qBAAqB,GAAG,EAAE,CAAC;gBAExE,MAAM,SAAS,GACb,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAEvE,SAAS,CAAC,KAAK,EAAE,CAAC;gBAClB,SAAS,CAAC,OAAO,CACf,CAAC,aAAqB,EAAQ,EAAE;oBAC9B,MAAM,oBAAoB,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEvE,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;wBACvC,MAAM,YAAY,GAAG,MAAM,GAAG,oBAAoB,CAAC;wBAEnD,IAAI,YAAY,EAAE,CAAC;4BACjB,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,EAAE,CAAC;gCACrD,MAAM,IAAI,uBAAU,CAAC;oCACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,mBAAmB,EACnB,IAAI,KAAK,CAAC,0CAA0C,YAAY,GAAG,CAAC,EACpE,QAAQ,CACT;oCAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;oCACvE,iBAAiB,EAAE;wCACjB,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC;qCAC7D;iCACF,CAAC,CAAC;4BACL,CAAC;4BAED,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,qBAAqB,CAAC,IAAI,CACrE,oBAAoB,CACrB,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,EAAE,KAAK,EAAE,QAAQ,CAAC;gBAEtE,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EAAE,2BAA2B;aACrC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,uBAAuB,CAAC,QAAgB;QAC9C,IAAI,CAAC;YACH,MAAM,YAAY,GAAa,EAAE,CAAC;YAClC,IAAI,oBAAoB,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClD,IAAI,qBAAqB,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAC;YAE7E,OAAO,oBAAoB,IAAI,CAAC,EAAE,CAAC;gBACjC,IAAI,qBAAqB,KAAK,CAAC,CAAC,EAAE,CAAC;oBACjC,qBAAQ,CAAC,KAAK,CACZ,yEAAyE;wBACzE,IAAI,oBAAoB,KAAK,EAC7B,YAAY,CACb,CAAC;oBAEF,MAAM,IAAI,uBAAU,CAAC;wBACnB,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;wBACvE,cAAc,EAAE,IAAI;wBACpB,OAAO,EAAE,oDAAoD,oBAAoB,KAAK;wBACtF,WAAW,EAAE,IAAI,CAAC,mBAAmB;qBACtC,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,MAAM,GAAW,QAAQ,CAAC,SAAS,CAAC,oBAAoB,GAAG,CAAC,EAAE,qBAAqB,CAAC,CAAC;gBAE3F,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACnC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC;gBAED,aAAa;gBACb,oBAAoB,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAC;gBACxE,qBAAqB,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAC;YAC3E,CAAC;YACD,0DAA0D;YAE1D,OAAO,YAAY,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,yBAAyB,EAAE,KAAK,EAAE,QAAQ,CAAC;gBAE5E,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,kBAAkB;gBACzE,OAAO,EAAE,iCAAiC;gBAC1C,iBAAiB,EAAE,QAAQ;aAC5B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,wBAAwB,CAC9B,MAAc,EACd,KAAoB,EACpB,MAAc;QAEd,OAAO;YACL,MAAM,EAAG,KAAoB,EAAE,SAAS,IAAI,GAAG;YAC/C,OAAO,EAAG,KAAe,EAAE,OAAO;gBAC/B,KAAoB,EAAE,QAAQ;gBAC/B,GAAG,MAAM,2BAA2B,IAAI,CAAC,WAAW,GAAG;YACzD,cAAc,EAAE,CAAE,KAAoB,EAAE,aAAa;YACrD,WAAW,EAAG,KAAoB,EAAE,aAAa,IAAI,IAAI,CAAC,mBAAmB;YAC7E,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,IAAI,CAAC,WAAW;YAC/B,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;IAES,uBAAuB,CAC/B,MAAc,EACd,KAAoB,EACpB,MAAc;QAEd,OAAO;YACL,MAAM,EAAG,KAAoB,EAAE,SAAS,IAAI,GAAG;YAC/C,OAAO,EAAG,KAAe,EAAE,OAAO;gBAC/B,KAAoB,EAAE,QAAQ;gBAC/B,GAAG,MAAM,sBAAsB,6CAAqB,CAAC,mBAAmB,GAAG;YAC7E,cAAc,EAAE,CAAE,KAAoB,EAAE,aAAa;YACrD,WAAW,EAAG,KAAoB,EAAE,aAAa,IAAI,IAAI,CAAC,mBAAmB;YAC7E,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI;YACrC,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;CACF;AAtqBD,gDAsqBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/nts-dynamo",
|
|
3
|
-
"version": "01.10.
|
|
3
|
+
"version": "01.10.73",
|
|
4
4
|
"description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
|
|
5
5
|
"DyBu_settings": {
|
|
6
6
|
"packageType": "server-package",
|
|
@@ -136,12 +136,12 @@
|
|
|
136
136
|
},
|
|
137
137
|
"homepage": "https:/futdevpro.hu/projects/dynamo",
|
|
138
138
|
"DISABLED": {
|
|
139
|
-
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.10.
|
|
139
|
+
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.10.54.tgz",
|
|
140
140
|
|
|
141
141
|
"empty": ""
|
|
142
142
|
},
|
|
143
143
|
"peerDependencies": {
|
|
144
|
-
"@futdevpro/fsm-dynamo": "1.10.
|
|
144
|
+
"@futdevpro/fsm-dynamo": "1.10.54",
|
|
145
145
|
|
|
146
146
|
"@types/express": "4.17.21",
|
|
147
147
|
"@types/geoip-lite": "~1.4.1",
|
|
@@ -12,6 +12,28 @@ import { DyNTS_global_settings } from '../../../_collections/global-settings.con
|
|
|
12
12
|
import { DyNTS_DataService } from '../../../_services/base/data.service';
|
|
13
13
|
import { Embedding_ControlService } from './embedding.control-service';
|
|
14
14
|
|
|
15
|
+
/**
|
|
16
|
+
* Vector Data Service that is connected to the relevant DBServices
|
|
17
|
+
* extends {@link DyNTS_DataService}
|
|
18
|
+
*
|
|
19
|
+
* @example
|
|
20
|
+
* export class UserMatchStatisticsService extends DyNTS_DataService<UserMatchStatistics> {
|
|
21
|
+
* constructor(
|
|
22
|
+
* set: {
|
|
23
|
+
* data?: UserMatchStatistics,
|
|
24
|
+
* openAISettings?: DyFM_OpenAI_Settings,
|
|
25
|
+
* issuer: string,
|
|
26
|
+
* }
|
|
27
|
+
* ) {
|
|
28
|
+
* super(
|
|
29
|
+
* new UserMatchStatistics(set?.data),
|
|
30
|
+
* userMatchStatisticsModelParams,
|
|
31
|
+
* set?.openAISettings ?? defaultOpenAISettings,
|
|
32
|
+
* set.issuer,
|
|
33
|
+
* );
|
|
34
|
+
* }
|
|
35
|
+
* }
|
|
36
|
+
*/
|
|
15
37
|
export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_DataService<T> {
|
|
16
38
|
|
|
17
39
|
readonly vectorizeProperties: DyFM_DataProperty_Params<any>[];
|
|
@@ -38,32 +60,47 @@ export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_Data
|
|
|
38
60
|
super(data, dataParams, issuer);
|
|
39
61
|
|
|
40
62
|
const vectorizePropertyKeys: string[] = Object.keys(dataParams.properties).filter(
|
|
41
|
-
(key: string): boolean => dataParams.properties[key].
|
|
42
|
-
dataParams.properties[key].
|
|
63
|
+
(key: string): boolean => (dataParams.properties[key] as DyFM_DataProperty_Params<any>).vectorizedFrom &&
|
|
64
|
+
(dataParams.properties[key] as DyFM_DataProperty_Params<any>).vectorizedFrom !== key
|
|
43
65
|
);
|
|
44
66
|
|
|
45
67
|
if (!vectorizePropertyKeys.length) {
|
|
46
68
|
throw new Error(
|
|
47
69
|
'vectorizedPropertyKeys is missing! ' +
|
|
48
70
|
`\nkeys with vectorizeFrom: ${Object.keys(dataParams.properties).filter(
|
|
49
|
-
(key: string): boolean =>
|
|
50
|
-
|
|
71
|
+
(key: string): boolean => Boolean(
|
|
72
|
+
(dataParams.properties[key] as DyFM_DataProperty_Params<any>).vectorizedFrom
|
|
73
|
+
)
|
|
74
|
+
).map(key => `"${key}"`).join(', ')}`
|
|
51
75
|
);
|
|
52
76
|
}
|
|
53
77
|
|
|
54
78
|
this.vectorizeProperties = vectorizePropertyKeys.map(
|
|
55
|
-
(key: string): DyFM_DataProperty_Params<any> =>
|
|
79
|
+
(key: string): DyFM_DataProperty_Params<any> =>
|
|
80
|
+
dataParams.properties[key] as DyFM_DataProperty_Params<any>
|
|
56
81
|
);
|
|
57
82
|
}
|
|
58
83
|
|
|
84
|
+
/**
|
|
85
|
+
* Vectorizes the properties of the data
|
|
86
|
+
* (That are marked with vectorizeFrom if the specific property is not defined)
|
|
87
|
+
*
|
|
88
|
+
* @example
|
|
89
|
+
* const data = await vectorizeDataProperties(data);
|
|
90
|
+
*
|
|
91
|
+
* @returns The vectorized data
|
|
92
|
+
*/
|
|
59
93
|
async vectorizeDataProperties(data?: T): Promise<T> {
|
|
60
94
|
try {
|
|
61
95
|
await DyFM_Array.asyncForEachAllAtOnce(
|
|
62
96
|
this.vectorizeProperties,
|
|
63
97
|
async (property: DyFM_DataProperty_Params<any>) => {
|
|
64
|
-
if (
|
|
98
|
+
if (
|
|
99
|
+
data[property.vectorizedFrom] &&
|
|
100
|
+
(!data[property.key] || property.vectorizeAlways)
|
|
101
|
+
) {
|
|
65
102
|
data[property.key] = await this.vectorize(
|
|
66
|
-
data[property.
|
|
103
|
+
data[property.vectorizedFrom],
|
|
67
104
|
property.embeddingModel
|
|
68
105
|
);
|
|
69
106
|
}
|
|
@@ -78,6 +115,12 @@ export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_Data
|
|
|
78
115
|
}
|
|
79
116
|
}
|
|
80
117
|
|
|
118
|
+
/**
|
|
119
|
+
* Vectorizes the input
|
|
120
|
+
*
|
|
121
|
+
* @example
|
|
122
|
+
* const vector = await vectorize(input);
|
|
123
|
+
*/
|
|
81
124
|
async vectorize(
|
|
82
125
|
input: string,
|
|
83
126
|
useModel: DyFM_OpenAIModel | string = this.openAISettings.defaultSettings.useModel
|
|
@@ -109,11 +152,18 @@ export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_Data
|
|
|
109
152
|
}
|
|
110
153
|
}
|
|
111
154
|
|
|
155
|
+
/**
|
|
156
|
+
* Vectorizes the input and searches for the most similar data
|
|
157
|
+
* (the default limit is 3)
|
|
158
|
+
*
|
|
159
|
+
* @example
|
|
160
|
+
* const result = await vectorSearch(input, searchInKey);
|
|
161
|
+
*/
|
|
112
162
|
async vectorSearch(
|
|
113
163
|
input: string,
|
|
114
164
|
searchInKey: string,
|
|
115
165
|
/* useIndex: string, */
|
|
116
|
-
limit: number =
|
|
166
|
+
limit: number = 3,
|
|
117
167
|
useModel?: DyFM_OpenAIModel | string
|
|
118
168
|
): Promise<any> {
|
|
119
169
|
try {
|
|
@@ -183,6 +233,11 @@ export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_Data
|
|
|
183
233
|
}
|
|
184
234
|
}
|
|
185
235
|
|
|
236
|
+
/**
|
|
237
|
+
* VectorDataService overrides the saveData function to vectorize the data properties
|
|
238
|
+
*
|
|
239
|
+
* {@link DyNTS_DataService.saveData}
|
|
240
|
+
*/
|
|
186
241
|
override async saveData(data?: T, dontSetToService?: boolean): Promise<T> {
|
|
187
242
|
try {
|
|
188
243
|
data = this.ensureData(data);
|
|
@@ -488,29 +488,26 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
|
|
|
488
488
|
if (!component.template) {
|
|
489
489
|
component.template = await this.readFile(component.templatePath, component.name).catch(
|
|
490
490
|
async (error: DyFM_Error): Promise<string> => {
|
|
491
|
-
DyFM_Log.error(
|
|
492
|
-
`\nDynamoNTS EmailService ERROR, couldn't load email component's template; ` +
|
|
493
|
-
`(${component.name} from ${component.templatePath})`
|
|
494
|
-
);
|
|
495
491
|
|
|
496
492
|
if (DyNTS_global_settings.autoResearchIssues) {
|
|
497
493
|
// read folder contents, read parent folder contents
|
|
498
494
|
const folderContents = FileSystem.readdirSync(
|
|
499
495
|
component.templatePath.split('/').slice(0, -1).join('/')
|
|
500
496
|
);
|
|
501
|
-
DyFM_Log.testWarn(
|
|
502
|
-
`DynamoNTS EmailService WARNING, couldn't load email component's template; ` +
|
|
503
|
-
`(${component.name} from ${component.templatePath})` +
|
|
504
|
-
`\nfolder contents: ${folderContents}`
|
|
505
|
-
);
|
|
506
|
-
|
|
507
497
|
const parentFolderContents = FileSystem.readdirSync(
|
|
508
498
|
component.templatePath.split('/').slice(0, -2).join('/')
|
|
509
499
|
);
|
|
500
|
+
|
|
510
501
|
DyFM_Log.testWarn(
|
|
511
502
|
`DynamoNTS EmailService WARNING, couldn't load email component's template; ` +
|
|
512
|
-
|
|
513
|
-
`\
|
|
503
|
+
`\n(${component.name} from ${component.templatePath})` +
|
|
504
|
+
`\n folder contents: \n ${folderContents.join(', \n ')}` +
|
|
505
|
+
`\n parent folder contents: \n ${parentFolderContents.join(', \n ')}`
|
|
506
|
+
);
|
|
507
|
+
} else {
|
|
508
|
+
DyFM_Log.error(
|
|
509
|
+
`\nDynamoNTS EmailService ERROR, couldn't load email component's template; ` +
|
|
510
|
+
`\n(${component.name} from ${component.templatePath})`
|
|
514
511
|
);
|
|
515
512
|
}
|
|
516
513
|
|
|
@@ -583,8 +580,8 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
|
|
|
583
580
|
FileSystem.readFile(path, 'utf8' , (err, template): void => {
|
|
584
581
|
if (err || !template) {
|
|
585
582
|
err ??= new Error(
|
|
586
|
-
`Couldn't load email component's template; ${nameOfTarget} ` +
|
|
587
|
-
|
|
583
|
+
`Couldn't load email component's template; \n ${nameOfTarget} ` +
|
|
584
|
+
`\n from ${path}`
|
|
588
585
|
);
|
|
589
586
|
|
|
590
587
|
reject(
|