@futdevpro/nts-dynamo 1.10.74 → 1.10.75
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 +7 -2
- package/build/_modules/open-ai/_services/vector-data.service.d.ts.map +1 -1
- package/build/_modules/open-ai/_services/vector-data.service.js +14 -4
- package/build/_modules/open-ai/_services/vector-data.service.js.map +1 -1
- package/build/_services/core/api.service.d.ts.map +1 -1
- package/build/_services/core/api.service.js +9 -0
- package/build/_services/core/api.service.js.map +1 -1
- package/package.json +3 -3
- package/src/_modules/open-ai/_services/vector-data.service.ts +24 -6
- package/src/_services/core/api.service.ts +9 -0
|
@@ -28,6 +28,10 @@ export declare class DyNTS_VectorDataService<T extends DyFM_Metadata> extends Dy
|
|
|
28
28
|
* OpenAI settings
|
|
29
29
|
*/
|
|
30
30
|
readonly openAISettings: DyFM_OpenAI_Settings;
|
|
31
|
+
/**
|
|
32
|
+
* Properties that are vectorized
|
|
33
|
+
* (properties that are marked with vectorizeFrom in other properties)
|
|
34
|
+
*/
|
|
31
35
|
readonly vectorizeProperties: DyFM_DataProperty_Params<any>[];
|
|
32
36
|
constructor(
|
|
33
37
|
/**
|
|
@@ -48,6 +52,7 @@ export declare class DyNTS_VectorDataService<T extends DyFM_Metadata> extends Dy
|
|
|
48
52
|
issuer: string);
|
|
49
53
|
/**
|
|
50
54
|
* Vectorizes the properties of the data
|
|
55
|
+
* IF they are not vectorized yet OR alwaysVectorize is true
|
|
51
56
|
* (That are marked with vectorizeFrom if the specific property is not defined)
|
|
52
57
|
*
|
|
53
58
|
* @example
|
|
@@ -55,7 +60,7 @@ export declare class DyNTS_VectorDataService<T extends DyFM_Metadata> extends Dy
|
|
|
55
60
|
*
|
|
56
61
|
* @returns The vectorized data
|
|
57
62
|
*/
|
|
58
|
-
vectorizeDataProperties(data?: T): Promise<T>;
|
|
63
|
+
vectorizeDataProperties(data?: T, alwaysVectorize?: boolean): Promise<T>;
|
|
59
64
|
/**
|
|
60
65
|
* Vectorizes the input
|
|
61
66
|
*
|
|
@@ -76,6 +81,6 @@ export declare class DyNTS_VectorDataService<T extends DyFM_Metadata> extends Dy
|
|
|
76
81
|
*
|
|
77
82
|
* {@link DyNTS_DataService.saveData}
|
|
78
83
|
*/
|
|
79
|
-
saveData(data?: T, dontSetToService?: boolean): Promise<T>;
|
|
84
|
+
saveData(data?: T, dontSetToService?: boolean, forceVectorize?: boolean): Promise<T>;
|
|
80
85
|
}
|
|
81
86
|
//# 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,
|
|
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,EAEd,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;IAkBtF;;OAEG;aACa,cAAc,EAAE,oBAAoB;IAnBtD;;;OAGG;IACH,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;;;;;;;;;OASG;IACG,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAiC9E;;;;;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,CACrB,IAAI,CAAC,EAAE,CAAC,EACR,gBAAgB,CAAC,EAAE,OAAO,EAC1B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,CAAC,CAAC;CAkBd"}
|
|
@@ -29,6 +29,10 @@ const embedding_control_service_1 = require("./embedding.control-service");
|
|
|
29
29
|
*/
|
|
30
30
|
class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
31
31
|
openAISettings;
|
|
32
|
+
/**
|
|
33
|
+
* Properties that are vectorized
|
|
34
|
+
* (properties that are marked with vectorizeFrom in other properties)
|
|
35
|
+
*/
|
|
32
36
|
vectorizeProperties;
|
|
33
37
|
/* readonly vectorizeProperties: { from: string, to: string }[]; */
|
|
34
38
|
constructor(
|
|
@@ -60,6 +64,7 @@ class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
60
64
|
}
|
|
61
65
|
/**
|
|
62
66
|
* Vectorizes the properties of the data
|
|
67
|
+
* IF they are not vectorized yet OR alwaysVectorize is true
|
|
63
68
|
* (That are marked with vectorizeFrom if the specific property is not defined)
|
|
64
69
|
*
|
|
65
70
|
* @example
|
|
@@ -67,11 +72,16 @@ class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
67
72
|
*
|
|
68
73
|
* @returns The vectorized data
|
|
69
74
|
*/
|
|
70
|
-
async vectorizeDataProperties(data) {
|
|
75
|
+
async vectorizeDataProperties(data, alwaysVectorize) {
|
|
71
76
|
try {
|
|
77
|
+
let existingData;
|
|
78
|
+
if (!alwaysVectorize) {
|
|
79
|
+
existingData = await this.getDataById(data._id, true, true);
|
|
80
|
+
}
|
|
72
81
|
await fsm_dynamo_1.DyFM_Array.asyncForEachAllAtOnce(this.vectorizeProperties, async (property) => {
|
|
73
82
|
if (data[property.vectorizedFrom] &&
|
|
74
|
-
(!data[property.key] || property.vectorizeAlways
|
|
83
|
+
(!data[property.key]?.length || alwaysVectorize || property.vectorizeAlways ||
|
|
84
|
+
!(0, fsm_dynamo_1.DyFM_sameObjects)(existingData[property.key], data[property.key]))) {
|
|
75
85
|
data[property.key] = await this.vectorize(data[property.vectorizedFrom], property.embeddingModel);
|
|
76
86
|
}
|
|
77
87
|
});
|
|
@@ -170,10 +180,10 @@ class DyNTS_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
170
180
|
*
|
|
171
181
|
* {@link DyNTS_DataService.saveData}
|
|
172
182
|
*/
|
|
173
|
-
async saveData(data, dontSetToService) {
|
|
183
|
+
async saveData(data, dontSetToService, forceVectorize) {
|
|
174
184
|
try {
|
|
175
185
|
data = this.ensureData(data);
|
|
176
|
-
data = await this.vectorizeDataProperties(data);
|
|
186
|
+
data = await this.vectorizeDataProperties(data, forceVectorize);
|
|
177
187
|
return await super.saveData(data, dontSetToService);
|
|
178
188
|
}
|
|
179
189
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-data.service.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/vector-data.service.ts"],"names":[],"mappings":";;;AACA,
|
|
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":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,oBAAoB,EACrB,MAAM,4DAA4D,CAAC;AAEpE,MAAM,WAAW,yBAAyB,CAAC,MAAM,GAAG,GAAG;IACrD,UAAU,CAAC,EAAE;QACX;;WAEG;QACH,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAGH;IAEhC;;;;;;;OAOG;WACiB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IACvD;;;OAGG;IACH,UAAU,EAAE,oBAAoB;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAC9C,OAAO,CAAC,UAAU,CAA6B;IAiJlD,OAAO,CAAC,MAAM,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,oBAAoB,EACrB,MAAM,4DAA4D,CAAC;AAEpE,MAAM,WAAW,yBAAyB,CAAC,MAAM,GAAG,GAAG;IACrD,UAAU,CAAC,EAAE;QACX;;WAEG;QACH,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAGH;IAEhC;;;;;;;OAOG;WACiB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IACvD;;;OAGG;IACH,UAAU,EAAE,oBAAoB;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAC9C,OAAO,CAAC,UAAU,CAA6B;IAiJlD,OAAO,CAAC,MAAM,CAAC,WAAW;mBA8JL,YAAY;mBA4BZ,MAAM;mBAsBN,GAAG;IAwBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAyBvB,OAAO,CAAC,MAAM,CAAC,YAAY;IAoB3B,OAAO,CAAC,MAAM,CAAC,eAAe;IA0D9B,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAexC"}
|
|
@@ -164,6 +164,15 @@ class DyNTS_ApiService {
|
|
|
164
164
|
else {
|
|
165
165
|
fsm_dynamo_1.DyFM_Log.error(msg);
|
|
166
166
|
}
|
|
167
|
+
try {
|
|
168
|
+
const strError = JSON.stringify(error);
|
|
169
|
+
if (strError.length < 1000) {
|
|
170
|
+
msg += `\nerrorObject: ${JSON.stringify(strError, null, 2)}`;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
catch {
|
|
174
|
+
fsm_dynamo_1.DyFM_Log.error(`error is not parsable`);
|
|
175
|
+
}
|
|
167
176
|
if (error &&
|
|
168
177
|
typeof error?.error === 'string' &&
|
|
169
178
|
callParams?.httpOptions?.responseType === fsm_dynamo_1.DyFM_HttpResponseType.text) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.service.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"api.service.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/nts-dynamo",
|
|
3
|
-
"version": "01.10.
|
|
3
|
+
"version": "01.10.75",
|
|
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.56.tgz",
|
|
140
140
|
|
|
141
141
|
"empty": ""
|
|
142
142
|
},
|
|
143
143
|
"peerDependencies": {
|
|
144
|
-
"@futdevpro/fsm-dynamo": "1.10.
|
|
144
|
+
"@futdevpro/fsm-dynamo": "1.10.56",
|
|
145
145
|
|
|
146
146
|
"@types/express": "4.17.21",
|
|
147
147
|
"@types/geoip-lite": "~1.4.1",
|
|
@@ -4,7 +4,8 @@ import {
|
|
|
4
4
|
DyFM_DataModel_Params,
|
|
5
5
|
DyFM_DataProperty_Params,
|
|
6
6
|
DyFM_Error,
|
|
7
|
-
DyFM_Metadata
|
|
7
|
+
DyFM_Metadata,
|
|
8
|
+
DyFM_sameObjects
|
|
8
9
|
} from '@futdevpro/fsm-dynamo';
|
|
9
10
|
import { DyFM_OpenAI_Settings, DyFM_OpenAIModel } from '@futdevpro/fsm-dynamo/open-ai';
|
|
10
11
|
|
|
@@ -36,6 +37,10 @@ import { Embedding_ControlService } from './embedding.control-service';
|
|
|
36
37
|
*/
|
|
37
38
|
export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_DataService<T> {
|
|
38
39
|
|
|
40
|
+
/**
|
|
41
|
+
* Properties that are vectorized
|
|
42
|
+
* (properties that are marked with vectorizeFrom in other properties)
|
|
43
|
+
*/
|
|
39
44
|
readonly vectorizeProperties: DyFM_DataProperty_Params<any>[];
|
|
40
45
|
/* readonly vectorizeProperties: { from: string, to: string }[]; */
|
|
41
46
|
|
|
@@ -83,6 +88,7 @@ export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_Data
|
|
|
83
88
|
|
|
84
89
|
/**
|
|
85
90
|
* Vectorizes the properties of the data
|
|
91
|
+
* IF they are not vectorized yet OR alwaysVectorize is true
|
|
86
92
|
* (That are marked with vectorizeFrom if the specific property is not defined)
|
|
87
93
|
*
|
|
88
94
|
* @example
|
|
@@ -90,14 +96,22 @@ export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_Data
|
|
|
90
96
|
*
|
|
91
97
|
* @returns The vectorized data
|
|
92
98
|
*/
|
|
93
|
-
async vectorizeDataProperties(data?: T): Promise<T> {
|
|
99
|
+
async vectorizeDataProperties(data?: T, alwaysVectorize?: boolean): Promise<T> {
|
|
94
100
|
try {
|
|
101
|
+
let existingData: T;
|
|
102
|
+
|
|
103
|
+
if (!alwaysVectorize) {
|
|
104
|
+
existingData = await this.getDataById(data._id, true, true);
|
|
105
|
+
}
|
|
106
|
+
|
|
95
107
|
await DyFM_Array.asyncForEachAllAtOnce(
|
|
96
108
|
this.vectorizeProperties,
|
|
97
109
|
async (property: DyFM_DataProperty_Params<any>) => {
|
|
98
110
|
if (
|
|
99
111
|
data[property.vectorizedFrom] &&
|
|
100
|
-
|
|
112
|
+
(!data[property.key]?.length || alwaysVectorize || property.vectorizeAlways ||
|
|
113
|
+
!DyFM_sameObjects(existingData[property.key], data[property.key])
|
|
114
|
+
)
|
|
101
115
|
) {
|
|
102
116
|
data[property.key] = await this.vectorize(
|
|
103
117
|
data[property.vectorizedFrom],
|
|
@@ -238,11 +252,15 @@ export class DyNTS_VectorDataService<T extends DyFM_Metadata> extends DyNTS_Data
|
|
|
238
252
|
*
|
|
239
253
|
* {@link DyNTS_DataService.saveData}
|
|
240
254
|
*/
|
|
241
|
-
override async saveData(
|
|
255
|
+
override async saveData(
|
|
256
|
+
data?: T,
|
|
257
|
+
dontSetToService?: boolean,
|
|
258
|
+
forceVectorize?: boolean
|
|
259
|
+
): Promise<T> {
|
|
242
260
|
try {
|
|
243
261
|
data = this.ensureData(data);
|
|
244
|
-
|
|
245
|
-
data = await this.vectorizeDataProperties(data);
|
|
262
|
+
|
|
263
|
+
data = await this.vectorizeDataProperties(data, forceVectorize);
|
|
246
264
|
|
|
247
265
|
return await super.saveData(data, dontSetToService);
|
|
248
266
|
} catch (error) {
|
|
@@ -229,6 +229,15 @@ export class DyNTS_ApiService {
|
|
|
229
229
|
DyFM_Log.error(msg);
|
|
230
230
|
}
|
|
231
231
|
|
|
232
|
+
try {
|
|
233
|
+
const strError = JSON.stringify(error);
|
|
234
|
+
if (strError.length < 1000) {
|
|
235
|
+
msg += `\nerrorObject: ${JSON.stringify(strError, null, 2)}`;
|
|
236
|
+
}
|
|
237
|
+
} catch {
|
|
238
|
+
DyFM_Log.error(`error is not parsable`);
|
|
239
|
+
}
|
|
240
|
+
|
|
232
241
|
if (
|
|
233
242
|
error &&
|
|
234
243
|
typeof (error as DyFM_Error)?.error === 'string' &&
|