@futdevpro/nts-dynamo 1.11.12 → 1.11.14
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/oai-vector-data.service.d.ts +1 -0
- package/build/_modules/open-ai/_services/oai-vector-data.service.d.ts.map +1 -1
- package/build/_modules/open-ai/_services/oai-vector-data.service.js +17 -1
- package/build/_modules/open-ai/_services/oai-vector-data.service.js.map +1 -1
- package/package.json +3 -3
- package/src/_modules/open-ai/_services/oai-vector-data.service.ts +25 -2
|
@@ -51,6 +51,7 @@ export declare class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extend
|
|
|
51
51
|
readonly vectorizeProperties: DyFM_DataProperty_Params<any>[];
|
|
52
52
|
readonly vectorizedProperties: DyFM_DataProperty_Params<any>[];
|
|
53
53
|
debugLog: boolean;
|
|
54
|
+
swallowVectorizedProperties: boolean;
|
|
54
55
|
embedding_CS: DyNTS_OAI_Embedding_ControlService;
|
|
55
56
|
constructor(
|
|
56
57
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-vector-data.service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-vector-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,qBAAqB,EACrB,wBAAwB,EACxB,aAAa,EAEb,aAAa,
|
|
1
|
+
{"version":3,"file":"oai-vector-data.service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-vector-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,qBAAqB,EACrB,wBAAwB,EACxB,aAAa,EAEb,aAAa,EAGd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAA6B,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGlH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,kCAAkC,EAAE,MAAM,iCAAiC,CAAC;AAGrF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,qBAAa,2BAA2B,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAwB1F;;OAEG;aACa,cAAc,EAAE,oBAAoB;IAzBtD;;;OAGG;IACH,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;IAC9D,QAAQ,CAAC,oBAAoB,EAAE,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;IAG/D,QAAQ,EAAE,OAAO,CAAQ;IACzB,2BAA2B,EAAE,OAAO,CAAQ;IAE5C,YAAY,EAAE,kCAAkC,CAAC;;IAG/C;;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;IA6FhB;;;;;;;;;OASG;IACG,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;YAuBlE,+BAA+B;YA+C/B,uCAAuC;IA8BrD;;;;;OAKG;IACG,SAAS,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,gBAAgB,GAAG,MAAqD,GACjF,OAAO,CAAC,MAAM,EAAE,CAAC;IA4BpB;;;;;;OAMG;IACG,YAAY,CAChB,GAAG,EAAE;QACH,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf;;WAEG;QACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;KAC7B,GACA,OAAO,CAAC,GAAG,CAAC;IAyFf;;;;OAIG;IACY,QAAQ,CACrB,IAAI,CAAC,EAAE,CAAC,EACR,gBAAgB,CAAC,EAAE,OAAO,EAC1B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,CAAC,CAAC;CA4Bd"}
|
|
@@ -53,6 +53,7 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
53
53
|
vectorizedProperties;
|
|
54
54
|
/* readonly vectorizeProperties: { from: string, to: string }[]; */
|
|
55
55
|
debugLog = true;
|
|
56
|
+
swallowVectorizedProperties = true;
|
|
56
57
|
embedding_CS;
|
|
57
58
|
constructor(
|
|
58
59
|
/**
|
|
@@ -174,6 +175,9 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
174
175
|
}
|
|
175
176
|
newData[vectorizedProperty.key] = await this.vectorize(newValue, vectorizedProperty.embeddingModel);
|
|
176
177
|
}
|
|
178
|
+
else if (existingData?.[vectorizedProperty.key] && !newData?.[vectorizedProperty.key]) {
|
|
179
|
+
newData[vectorizedProperty.key] = existingData[vectorizedProperty.key];
|
|
180
|
+
}
|
|
177
181
|
}
|
|
178
182
|
async getVectorizingDataForVectorizedProperty(vectorizedProperty, data) {
|
|
179
183
|
if (vectorizedProperty.vectorizedFrom.length === 1) {
|
|
@@ -254,6 +258,11 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
254
258
|
__localStack: this.dataParams.stackLocation,
|
|
255
259
|
});
|
|
256
260
|
}
|
|
261
|
+
if (!property.vectorizeUseIndex) {
|
|
262
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
263
|
+
...this.getDefaultErrorSettings('vectorSearch', new Error(`Property "${searchInKey}" has no vectorizeUseIndex!`)),
|
|
264
|
+
});
|
|
265
|
+
}
|
|
257
266
|
const embeddedInput = await this.embedding_CS.createEmbedding(input, property.embeddingModel, this.issuer);
|
|
258
267
|
/* const vectorSearchFilter = */
|
|
259
268
|
const vectorSearchFilter = {
|
|
@@ -296,7 +305,14 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
296
305
|
try {
|
|
297
306
|
data = this.ensureData(data);
|
|
298
307
|
data = await this.vectorizeDataProperties(data, forceVectorize);
|
|
299
|
-
|
|
308
|
+
data = await super.saveData(data, dontSetToService);
|
|
309
|
+
if (this.swallowVectorizedProperties) {
|
|
310
|
+
this.vectorizedProperties.forEach((property) => {
|
|
311
|
+
delete data[property.key];
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
fsm_dynamo_1.DyFM_Shared.cleanObject(data);
|
|
315
|
+
return data;
|
|
300
316
|
}
|
|
301
317
|
catch (error) {
|
|
302
318
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-vector-data.service.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-vector-data.service.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"oai-vector-data.service.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-vector-data.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.11.
|
|
3
|
+
"version": "01.11.14",
|
|
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",
|
|
@@ -164,12 +164,12 @@
|
|
|
164
164
|
},
|
|
165
165
|
"homepage": "https:/futdevpro.hu/projects/dynamo",
|
|
166
166
|
"DISABLED": {
|
|
167
|
-
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.11.
|
|
167
|
+
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.11.16.tgz",
|
|
168
168
|
|
|
169
169
|
"empty": ""
|
|
170
170
|
},
|
|
171
171
|
"peerDependencies": {
|
|
172
|
-
"@futdevpro/fsm-dynamo": "1.11.
|
|
172
|
+
"@futdevpro/fsm-dynamo": "1.11.16",
|
|
173
173
|
|
|
174
174
|
"@types/express": "4.17.21",
|
|
175
175
|
"@types/geoip-lite": "~1.4.1",
|
|
@@ -6,7 +6,8 @@ import {
|
|
|
6
6
|
DyFM_DBFilter,
|
|
7
7
|
DyFM_Error,
|
|
8
8
|
DyFM_Metadata,
|
|
9
|
-
DyFM_sameObjects
|
|
9
|
+
DyFM_sameObjects,
|
|
10
|
+
DyFM_Shared
|
|
10
11
|
} from '@futdevpro/fsm-dynamo';
|
|
11
12
|
import { DyFM_OpenAI_Settings, DyFM_OpenAIEmbeddingModel, DyFM_OpenAIModel } from '@futdevpro/fsm-dynamo/open-ai';
|
|
12
13
|
|
|
@@ -63,6 +64,7 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
63
64
|
/* readonly vectorizeProperties: { from: string, to: string }[]; */
|
|
64
65
|
|
|
65
66
|
debugLog: boolean = true;
|
|
67
|
+
swallowVectorizedProperties: boolean = true;
|
|
66
68
|
|
|
67
69
|
embedding_CS: DyNTS_OAI_Embedding_ControlService;
|
|
68
70
|
|
|
@@ -250,6 +252,8 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
250
252
|
newValue,
|
|
251
253
|
vectorizedProperty.embeddingModel
|
|
252
254
|
);
|
|
255
|
+
} else if (existingData?.[vectorizedProperty.key] && !newData?.[vectorizedProperty.key]) {
|
|
256
|
+
newData[vectorizedProperty.key] = existingData[vectorizedProperty.key];
|
|
253
257
|
}
|
|
254
258
|
}
|
|
255
259
|
|
|
@@ -375,6 +379,15 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
375
379
|
});
|
|
376
380
|
}
|
|
377
381
|
|
|
382
|
+
if (!property.vectorizeUseIndex) {
|
|
383
|
+
throw new DyFM_Error({
|
|
384
|
+
...this.getDefaultErrorSettings(
|
|
385
|
+
'vectorSearch',
|
|
386
|
+
new Error(`Property "${searchInKey}" has no vectorizeUseIndex!`)
|
|
387
|
+
),
|
|
388
|
+
});
|
|
389
|
+
}
|
|
390
|
+
|
|
378
391
|
const embeddedInput: number[] = await this.embedding_CS.createEmbedding(
|
|
379
392
|
input,
|
|
380
393
|
property.embeddingModel,
|
|
@@ -433,7 +446,17 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
433
446
|
|
|
434
447
|
data = await this.vectorizeDataProperties(data, forceVectorize);
|
|
435
448
|
|
|
436
|
-
|
|
449
|
+
data = await super.saveData(data, dontSetToService);
|
|
450
|
+
|
|
451
|
+
if (this.swallowVectorizedProperties) {
|
|
452
|
+
this.vectorizedProperties.forEach((property: DyFM_DataProperty_Params<any>): void => {
|
|
453
|
+
delete data[property.key];
|
|
454
|
+
});
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
DyFM_Shared.cleanObject(data);
|
|
458
|
+
|
|
459
|
+
return data;
|
|
437
460
|
} catch (error) {
|
|
438
461
|
throw new DyFM_Error({
|
|
439
462
|
...this.getDefaultErrorSettings(
|