@futdevpro/fsm-dynamo 1.11.1 → 1.11.3
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/_collections/utils/shared.util.d.ts +19 -0
- package/build/_collections/utils/shared.util.d.ts.map +1 -1
- package/build/_collections/utils/shared.util.js +64 -0
- package/build/_collections/utils/shared.util.js.map +1 -1
- package/build/_models/control-models/data-model-params.control-model.d.ts.map +1 -1
- package/build/_models/control-models/data-model-params.control-model.js +12 -10
- package/build/_models/control-models/data-model-params.control-model.js.map +1 -1
- package/build/_models/control-models/data-property-params.control-model.d.ts +7 -1
- package/build/_models/control-models/data-property-params.control-model.d.ts.map +1 -1
- package/build/_models/control-models/data-property-params.control-model.js +6 -0
- package/build/_models/control-models/data-property-params.control-model.js.map +1 -1
- package/build/_models/types/db-filter.type.d.ts +4 -0
- package/build/_models/types/db-filter.type.d.ts.map +1 -1
- package/futdevpro-fsm-dynamo-01.11.03.tgz +0 -0
- package/package.json +1 -1
- package/src/_collections/utils/shared.util.ts +87 -0
- package/src/_models/control-models/data-model-params.control-model.ts +19 -15
- package/src/_models/control-models/data-property-params.control-model.ts +8 -1
- package/src/_models/types/db-filter.type.ts +4 -0
- package/futdevpro-fsm-dynamo-01.11.01.tgz +0 -0
|
@@ -100,6 +100,25 @@ export declare class DyFM_Shared {
|
|
|
100
100
|
static cleanObject(obj: any): void;
|
|
101
101
|
/** intertwine */
|
|
102
102
|
static mergeObjects(target: any, source: any): any;
|
|
103
|
+
/**
|
|
104
|
+
* parses the JSON list, if it fails, it returns the answer as a single item in an array
|
|
105
|
+
*
|
|
106
|
+
* (uses {@link DyFM_safeParseJSON})
|
|
107
|
+
*/
|
|
108
|
+
static safeParseList<T extends Array<any>>(textedJSON: string, disableErrorLog?: boolean): T;
|
|
109
|
+
/**
|
|
110
|
+
* parses the JSON, if it fails, it returns { unparsableResult: textedJSON }
|
|
111
|
+
*
|
|
112
|
+
* (uses {@link DyFM_failableSafeParseJSON})
|
|
113
|
+
*/
|
|
114
|
+
static safeParseJSON<T = any>(textedJSON: string, disableErrorLog?: boolean): T | {
|
|
115
|
+
unparsableResult: string;
|
|
116
|
+
};
|
|
117
|
+
/**
|
|
118
|
+
* parses the JSON, if it fails, it throws an error
|
|
119
|
+
* (also will extract the JSON from "```json ... ```" wrapper)
|
|
120
|
+
*/
|
|
121
|
+
static failableSafeParseJSON<T = any>(textedJSON: string): T;
|
|
103
122
|
}
|
|
104
123
|
export type DyFM_Object = DyFM_Shared;
|
|
105
124
|
//# sourceMappingURL=shared.util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.util.d.ts","sourceRoot":"","sources":["../../../src/_collections/utils/shared.util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shared.util.d.ts","sourceRoot":"","sources":["../../../src/_collections/utils/shared.util.ts"],"names":[],"mappings":"AAIA,qBAAa,WAAW;IAEtB;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE;IAgBjE;;;;;;OAMG;IACH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,GAAG;IAYtE;;;;;;OAMG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,MAAM;IAe9E;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,MAAM;IAerF;;;;;;OAMG;IACH,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,GAAG,GAAG,MAAM;IAmBvF;;;;;;;OAOG;IACH,MAAM,CAAC,uBAAuB,CAAC,CAAC,EAC9B,SAAS,EAAE,CAAC,EACZ,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EAAE,EACrB,SAAS,EAAE,GAAG,GACb,CAAC;IAiBJ,MAAM,CAAC,QAAQ,CAAC,iBAAiB,wCAA2B;IAC5D;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CAAC,CAAC,EACzB,IAAI,EAAE,CAAC,EACP,QAAQ,GAAE,MAAM,EAA4C,EAC5D,IAAI,GAAE,GAAG,EAAO,GAEf,GAAG;IA4BN;;;;;;;;;;OAUG;IACH,MAAM,CAAC,gBAAgB,CACrB,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE,MAAM,EAA4C,EAC5D,IAAI,GAAE,GAAG,EAAO,EAChB,YAAY,GAAE;QAAE,MAAM,EAAE,GAAG,CAAC;QAAC,sBAAsB,EAAE,MAAM,EAAE,CAAA;KAAE,EAAO,GACrE;QAAE,MAAM,EAAE,GAAG,CAAC;QAAC,sBAAsB,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE;IAsBtD;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAUlC,iBAAiB;IACjB,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;IA2B5C;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,EACvC,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,OAAO,GACxB,CAAC;IA+BJ;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,GAAG,EAC1B,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,OAAO,GACxB,CAAC,GAAG;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE;IAkBnC;;;OAGG;IACH,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;CAgB7D;AAED,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DyFM_Shared = void 0;
|
|
4
|
+
const log_util_1 = require("./log.util");
|
|
4
5
|
const utilities_util_1 = require("./utilities.util");
|
|
5
6
|
class DyFM_Shared {
|
|
6
7
|
/**
|
|
@@ -229,6 +230,69 @@ class DyFM_Shared {
|
|
|
229
230
|
}
|
|
230
231
|
return target;
|
|
231
232
|
}
|
|
233
|
+
/**
|
|
234
|
+
* parses the JSON list, if it fails, it returns the answer as a single item in an array
|
|
235
|
+
*
|
|
236
|
+
* (uses {@link DyFM_safeParseJSON})
|
|
237
|
+
*/
|
|
238
|
+
static safeParseList(textedJSON, disableErrorLog) {
|
|
239
|
+
const parsed = this.safeParseJSON(textedJSON, true);
|
|
240
|
+
if (Array.isArray(parsed)) {
|
|
241
|
+
return parsed;
|
|
242
|
+
}
|
|
243
|
+
else if (typeof parsed === 'object') {
|
|
244
|
+
if (!disableErrorLog) {
|
|
245
|
+
log_util_1.DyFM_Log.warn('DyFM_safeParseList result is an object, returning its values', {
|
|
246
|
+
parsed: parsed,
|
|
247
|
+
});
|
|
248
|
+
}
|
|
249
|
+
return Object.values(parsed);
|
|
250
|
+
}
|
|
251
|
+
else {
|
|
252
|
+
if (!disableErrorLog) {
|
|
253
|
+
log_util_1.DyFM_Log.warn('DyFM_safeParseList result is not an array or object, returning it as a single item', {
|
|
254
|
+
parsed: parsed,
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
return [parsed];
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
/**
|
|
261
|
+
* parses the JSON, if it fails, it returns { unparsableResult: textedJSON }
|
|
262
|
+
*
|
|
263
|
+
* (uses {@link DyFM_failableSafeParseJSON})
|
|
264
|
+
*/
|
|
265
|
+
static safeParseJSON(textedJSON, disableErrorLog) {
|
|
266
|
+
try {
|
|
267
|
+
return this.failableSafeParseJSON(textedJSON);
|
|
268
|
+
}
|
|
269
|
+
catch (error) {
|
|
270
|
+
if (!disableErrorLog) {
|
|
271
|
+
log_util_1.DyFM_Log.error('Unable to parse JSON answer:', {
|
|
272
|
+
unparsedJSON: textedJSON,
|
|
273
|
+
error: error,
|
|
274
|
+
});
|
|
275
|
+
}
|
|
276
|
+
return { unparsableResult: textedJSON };
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
/**
|
|
280
|
+
* parses the JSON, if it fails, it throws an error
|
|
281
|
+
* (also will extract the JSON from "```json ... ```" wrapper)
|
|
282
|
+
*/
|
|
283
|
+
static failableSafeParseJSON(textedJSON) {
|
|
284
|
+
if (!textedJSON) {
|
|
285
|
+
throw new Error(`No content provided to JSON parse ("${textedJSON}")`);
|
|
286
|
+
}
|
|
287
|
+
const match = textedJSON.match(/```json(.*)```/s);
|
|
288
|
+
textedJSON = textedJSON.replaceAll('\n', '');
|
|
289
|
+
if (match) {
|
|
290
|
+
return JSON.parse(match[1].replaceAll('\n', ''));
|
|
291
|
+
}
|
|
292
|
+
else {
|
|
293
|
+
return JSON.parse(textedJSON.replaceAll('```json', '').replaceAll('```', ''));
|
|
294
|
+
}
|
|
295
|
+
}
|
|
232
296
|
}
|
|
233
297
|
exports.DyFM_Shared = DyFM_Shared;
|
|
234
298
|
//# sourceMappingURL=shared.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/shared.util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shared.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/shared.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-model-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErG,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,aAAa,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAAC;AAC9E,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,aAAa,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAAC;AACrF,qBAAa,uBAAuB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,aAAa;IACjF;;OAEG;IACH,QAAQ,EAAG,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAEhC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,UAAU,EAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;CACrC;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,aAAa,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAC5E,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,aAAa,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AACjF,qBAAa,qBAAqB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,uBAAuB,CAAC,CAAC,CAAC;IAG5F,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;gBAG9B,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"data-model-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErG,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,aAAa,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAAC;AAC9E,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,aAAa,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAAC;AACrF,qBAAa,uBAAuB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,aAAa;IACjF;;OAEG;IACH,QAAQ,EAAG,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAEhC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,UAAU,EAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;CACrC;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,aAAa,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAC5E,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,aAAa,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AACjF,qBAAa,qBAAqB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,uBAAuB,CAAC,CAAC,CAAC;IAG5F,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;gBAG9B,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAwJjC,WAAW,CAAC,IAAI,OAAO;IAIvB,yBAAyB,CAAC,CAAC,QAAQ,EAAE,wBAAwB,CAAC,GAAG,CAAC,GAAG,IAAI;CAmB1E"}
|
|
@@ -73,22 +73,24 @@ class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
|
|
|
73
73
|
this.properties[property.vectorizeTo].vectorizeFrom ??= key;
|
|
74
74
|
} */
|
|
75
75
|
if (property.vectorizedFrom) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
`"${
|
|
79
|
-
|
|
80
|
-
|
|
76
|
+
property.vectorizedFrom.forEach((fromKey) => {
|
|
77
|
+
if (!this.properties[fromKey]) {
|
|
78
|
+
throw new Error(`Vectorized from property "${property.vectorizedFrom}" is not found in ` +
|
|
79
|
+
`"${this.dataName}" model.` +
|
|
80
|
+
`\nstackLocation: ${this.stackLocation}\n`);
|
|
81
|
+
}
|
|
82
|
+
if (this.properties[fromKey].type !== basic_property_type_enum_1.DyFM_BasicProperty_Type.string) {
|
|
83
|
+
throw new Error(`Vectorized from property "${property.vectorizedFrom}" is not a string property in ` +
|
|
84
|
+
`"${this.dataName}" model.` +
|
|
85
|
+
`\nstackLocation: ${this.stackLocation}\n`);
|
|
86
|
+
}
|
|
87
|
+
});
|
|
81
88
|
/* this.properties[property.vectorizedFrom].vectorizeTo ??= key; */
|
|
82
89
|
if (property.type !== 'number[]') {
|
|
83
90
|
throw new Error(`Vectorized from property "${property.vectorizedFrom}" is not a number[] property in ` +
|
|
84
91
|
`"${this.dataName}" model.` +
|
|
85
92
|
`\nstackLocation: ${this.stackLocation}\n`);
|
|
86
93
|
}
|
|
87
|
-
if (this.properties[property.vectorizedFrom].type !== basic_property_type_enum_1.DyFM_BasicProperty_Type.string) {
|
|
88
|
-
throw new Error(`Vectorized from property "${property.vectorizedFrom}" is not a string property in ` +
|
|
89
|
-
`"${this.dataName}" model.` +
|
|
90
|
-
`\nstackLocation: ${this.stackLocation}\n`);
|
|
91
|
-
}
|
|
92
94
|
if (!property.vectorizeUseIndex) {
|
|
93
95
|
throw new Error('vectorizeUseIndex is required if vectorizedFrom is set. ' +
|
|
94
96
|
`"${this.dataName}" model.` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-model-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAC7D,oEAAwF;AACxF,oFAAgF;AAChF,4EAAwE;AACxE,4EAAmE;AACnE,6FAAqG;AAIrG,MAAa,uBAAiD,SAAQ,mCAAa;IACjF;;OAEG;IACH,QAAQ,CAAU;IAClB,SAAS,CAAuB;IAEhC,UAAU,CAAW;IAErB;;;;OAIG;IACH,YAAY,CAAW;IAEvB;;;;OAIG;IACH,YAAY,CAAW;IAEvB,UAAU,CAA0B;CACrC;AAxBD,0DAwBC;AAID,MAAa,qBAA+C,SAAQ,uBAA0B;IAE5F,mDAAmD;IAC1C,aAAa,CAAU;IAEhC,YACE,GAA+B;QAE/B,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,aAAa,GAAG,IAAA,8CAAiC,GAAE,CAAC;QAEzD,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5D,mBAAQ,CAAC,KAAK,CACZ,qCAAqC;gBACrC,8BAA8B,IAAI,CAAC,QAAQ,UAAU;gBACrD,oBAAoB,IAAI,CAAC,aAAa,IAAI,CAC3C,CAAC;YAEF,IAAI,CAAC,UAAU,GAAG,EAA4B,CAAC;QACjD,CAAC;QAED,MAAM,IAAI,GAAa,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAW,EAAQ,EAAE;YACjC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,mBAAQ,CAAC,KAAK,CACZ,qCAAqC;oBACrC,iCAAiC,IAAI,CAAC,QAAQ,UAAU;oBACxD,oBAAoB,IAAI,CAAC,aAAa,IAAI,CAC3C,CAAC;YACJ,CAAC;YAED,MAAM,QAAQ,GAAkC,IAAI,6DAAwB,CAAC;gBAC3E,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACvB,GAAG,EAAE,GAAG;aACT,CAAC,CAAC;YACH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;YAEhC,IAAI,QAAQ,CAAC,eAAe,EAAE,CAAC;gBAC7B,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,CAAC,GAAW,EAAQ,EAAE;YACjC,MAAM,QAAQ,GAAkC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACrE;;;;;;;;;gBASI;YAEJ,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAC5B,
|
|
1
|
+
{"version":3,"file":"data-model-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,13 @@ export declare class DyFM_DataProperty_Settings<T> {
|
|
|
23
23
|
dependencyDataName?: string;
|
|
24
24
|
archiveable?: boolean;
|
|
25
25
|
archiveListAfter?: number;
|
|
26
|
-
|
|
26
|
+
/**
|
|
27
|
+
* If only one property is set, it will be vectorized from that property directly.
|
|
28
|
+
*
|
|
29
|
+
* If multiple properties are set, they will be merged into a stringified JSON object,
|
|
30
|
+
* with the given properties.
|
|
31
|
+
*/
|
|
32
|
+
vectorizedFrom?: string[];
|
|
27
33
|
embeddingModel?: DyFM_OpenAIEmbeddingModel;
|
|
28
34
|
/**
|
|
29
35
|
* If true, the property will be vectorized always, even if the property is already vectorized.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-property-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAE7F,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/C,CAAA;AAED,MAAM,MAAM,yBAAyB,CAAC,CAAC,GAAG,GAAG,IAAI,0BAA0B,CAAC,CAAC,CAAC,CAAC;AAE/E,qBAAa,0BAA0B,CAAC,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAG,uBAAuB,GAAG,MAAM,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAGhB;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"data-property-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAE7F,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/C,CAAA;AAED,MAAM,MAAM,yBAAyB,CAAC,CAAC,GAAG,GAAG,IAAI,0BAA0B,CAAC,CAAC,CAAC,CAAC;AAE/E,qBAAa,0BAA0B,CAAC,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAG,uBAAuB,GAAG,MAAM,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAGhB;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,yBAAyB,CAAC;IAC3C;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,eAAe,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAE3C,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAiB,IAAI,CAAC,EAAE,CAAC;CAC5D;AAGD,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC;AACrE,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC;AAC1D;;;GAGG;AACH,qBAAa,wBAAwB,CAAC,CAAC,CAAE,SAAQ,0BAA0B,CAAC,CAAC,CAAC;IAKnE,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,EAAE,CAAM;gBAG3D,GAAG,EAAE,0BAA0B,CAAC,CAAC,CAAC;IAmEpC,WAAW,CAAC,IAAI,OAAO;IAKvB,SAAS,CAAC,IAAI,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI;CAyBhF"}
|
|
@@ -24,6 +24,12 @@ class DyFM_DataProperty_Settings {
|
|
|
24
24
|
dependencyDataName;
|
|
25
25
|
archiveable;
|
|
26
26
|
archiveListAfter;
|
|
27
|
+
/**
|
|
28
|
+
* If only one property is set, it will be vectorized from that property directly.
|
|
29
|
+
*
|
|
30
|
+
* If multiple properties are set, they will be merged into a stringified JSON object,
|
|
31
|
+
* with the given properties.
|
|
32
|
+
*/
|
|
27
33
|
vectorizedFrom;
|
|
28
34
|
/* vectorizeTo?: string; */
|
|
29
35
|
embeddingModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-property-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAC7D,oEAAwF;AACxF,oFAAgF;AAShF,MAAa,0BAA0B;IACrC,GAAG,CAAU;IACb,IAAI,CAAoC;IACxC,OAAO,CAAK;IAEZ,MAAM,CAAW;IACjB,QAAQ,CAAW;IACnB,QAAQ,CAAW;IACnB,KAAK,CAAW;IAEhB,iCAAiC;IACjC;;;;;;;OAOG;IACH,kBAAkB,CAAU;IAC5B,WAAW,CAAW;IACtB,gBAAgB,CAAU;IAE1B,cAAc,
|
|
1
|
+
{"version":3,"file":"data-property-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAC7D,oEAAwF;AACxF,oFAAgF;AAShF,MAAa,0BAA0B;IACrC,GAAG,CAAU;IACb,IAAI,CAAoC;IACxC,OAAO,CAAK;IAEZ,MAAM,CAAW;IACjB,QAAQ,CAAW;IACnB,QAAQ,CAAW;IACnB,KAAK,CAAW;IAEhB,iCAAiC;IACjC;;;;;;;OAOG;IACH,kBAAkB,CAAU;IAC5B,WAAW,CAAW;IACtB,gBAAgB,CAAU;IAE1B;;;;;OAKG;IACH,cAAc,CAAY;IAC1B,2BAA2B;IAC3B,cAAc,CAA6B;IAC3C;;OAEG;IACH,eAAe,CAAW;IAC1B;;OAEG;IACH,iBAAiB,CAAU;IAE3B,SAAS,CAAU;IACnB,SAAS,CAAU;IAEnB,eAAe,CAA4B;IAE3C,oBAAoB,CAAuC;CAC5D;AA/CD,gEA+CC;AAKD;;;GAGG;AACH,MAAa,wBAA4B,SAAQ,0BAA6B;IAE5E,mEAAmE;IACnE,0DAA0D;IAEjD,oBAAoB,GAA6B,EAAE,CAAC;IAE7D,YACE,GAAkC;QAElC,KAAK,EAAE,CAAC;QAER,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACd,mBAAQ,CAAC,KAAK,CACZ,gBAAgB,EAChB,qDAAqD;oBACrD,SAAS,GAAG,CAAC,GAAG,GAAG;oBACnB,qBAAqB,IAAA,8CAAiC,EAAC,CAAC,CAAC,EAAE,CAC5D,CAAC;YACJ,CAAC;YAED,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBAC3B,IAAI,GAAG,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;oBAC3B,mBAAQ,CAAC,IAAI,CACX,kBAAkB,EAClB,kEAAkE;wBAClE,SAAS,GAAG,CAAC,GAAG,GAAG;wBACnB,qBAAqB,IAAA,8CAAiC,EAAC,CAAC,CAAC,EAAE,CAC5D,CAAC;gBACJ,CAAC;qBAAM,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;oBACtC,mBAAQ,CAAC,IAAI,CACX,kBAAkB,EAClB,6DAA6D;wBAC7D,0DAA0D;wBAC1D,SAAS,GAAG,CAAC,GAAG,GAAG;wBACnB,qBAAqB,IAAA,8CAAiC,EAAC,CAAC,CAAC,EAAE,CAC5D,CAAC;oBACF,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACtB,CAAC;YACH,CAAC;YAED,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;gBACvB,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBACd,mBAAQ,CAAC,IAAI,CACX,kBAAkB,EAClB,8EAA8E;wBAC9E,2DAA2D;wBAC3D,SAAS,GAAG,CAAC,GAAG,GAAG;wBACnB,qBAAqB,IAAA,8CAAiC,EAAC,CAAC,CAAC,EAAE,CAC5D,CAAC;oBAEF,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC;gBACpB,CAAC;gBAED;;;;;;oBAMI;YACN,CAAC;YAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,mBAAQ,CAAC,KAAK,CACZ,gBAAgB,EAChB,yDAAyD;gBACzD,SAAS,IAAI,CAAC,GAAG,GAAG;gBACpB,qBAAqB,IAAA,8CAAiC,EAAC,CAAC,CAAC,EAAE,CAC5D,CAAC;QACJ,CAAC;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sCAAsC;IACtC,SAAS;QACP,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,kDAAuB,CAAC,MAAM;gBACjC,OAAO,MAAM,CAAC;YAEhB,KAAK,kDAAuB,CAAC,MAAM;gBACjC,OAAO,MAAM,CAAC;YAEhB,KAAK,kDAAuB,CAAC,OAAO;gBAClC,OAAO,OAAO,CAAC;YAEjB,KAAK,kDAAuB,CAAC,IAAI;gBAC/B,OAAO,IAAI,CAAC;YAEd,KAAK,kDAAuB,CAAC,MAAM,CAAC;YACpC;gBACE,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,OAAO,KAAK,CAAC;gBACf,CAAC;qBAAM,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACxE,OAAO,QAAQ,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACN,OAAO,MAAM,CAAC;gBAChB,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAzGD,4DAyGC"}
|
|
@@ -8,6 +8,10 @@
|
|
|
8
8
|
* { userIds: { $in: this.userId } }
|
|
9
9
|
* //
|
|
10
10
|
* @example
|
|
11
|
+
* // or by userIds:
|
|
12
|
+
* { userId: { $in: userIds } }
|
|
13
|
+
* //
|
|
14
|
+
* @example
|
|
11
15
|
* // or by number or Date that is Greater Than AND Less Than:
|
|
12
16
|
* { points: { $gt: 2, $lt: 14 } }
|
|
13
17
|
* // further tools (syntax matches with $gt):
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-filter.type.d.ts","sourceRoot":"","sources":["../../../src/_models/types/db-filter.type.ts"],"names":[],"mappings":"AACA
|
|
1
|
+
{"version":3,"file":"db-filter.type.d.ts","sourceRoot":"","sources":["../../../src/_models/types/db-filter.type.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IACzB,mBAAmB,CAAC,CAAC,CAAC,GACtB,eAAe,CAAC,CAAC,CAAC,GAClB,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAEtB;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;KAClC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CACjE,GAAG;IACF,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAAC,CAAC,IAAI;IACxC;;OAEG;IACH,GAAG,CAAC,EAAE,GAAG,CAAC;IACV;;OAEG;IACH,GAAG,CAAC,EAAE,CAAC,CAAC;IACR;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;OAEG;IACH,GAAG,CAAC,EAAE,CAAC,CAAC;IACR;;OAEG;IACH,IAAI,CAAC,EAAE,CAAC,CAAC;IACT;;OAEG;IACH,IAAI,CAAC,EAAE,CAAC,GAAG;QACT,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAC1B,CAAC;IACF;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAChC;;OAEG;IACH,IAAI,EAAE,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;CAChC,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC/B;;OAEG;IACH,GAAG,EAAE,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;CAC/B,CAAA"}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/fsm-dynamo",
|
|
3
|
-
"version": "01.11.
|
|
3
|
+
"version": "01.11.03",
|
|
4
4
|
"description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
|
|
5
5
|
"DyBu_settings": {
|
|
6
6
|
"packageType": "full-stack-package",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
|
|
2
|
+
import { DyFM_Log } from './log.util';
|
|
2
3
|
import { DyFM_clone, DyFM_sameObjects } from './utilities.util';
|
|
3
4
|
|
|
4
5
|
export class DyFM_Shared {
|
|
@@ -282,7 +283,93 @@ export class DyFM_Shared {
|
|
|
282
283
|
|
|
283
284
|
return target;
|
|
284
285
|
}
|
|
286
|
+
|
|
287
|
+
|
|
288
|
+
/**
|
|
289
|
+
* parses the JSON list, if it fails, it returns the answer as a single item in an array
|
|
290
|
+
*
|
|
291
|
+
* (uses {@link DyFM_safeParseJSON})
|
|
292
|
+
*/
|
|
293
|
+
static safeParseList<T extends Array<any>>(
|
|
294
|
+
textedJSON: string,
|
|
295
|
+
disableErrorLog?: boolean
|
|
296
|
+
): T {
|
|
297
|
+
const parsed = this.safeParseJSON<T>(textedJSON, true);
|
|
298
|
+
|
|
299
|
+
if (Array.isArray(parsed)) {
|
|
300
|
+
return parsed;
|
|
301
|
+
} else if (typeof parsed === 'object') {
|
|
302
|
+
if (!disableErrorLog) {
|
|
303
|
+
DyFM_Log.warn(
|
|
304
|
+
'DyFM_safeParseList result is an object, returning its values',
|
|
305
|
+
{
|
|
306
|
+
parsed: parsed,
|
|
307
|
+
}
|
|
308
|
+
);
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
return Object.values(parsed) as T;
|
|
312
|
+
} else {
|
|
313
|
+
|
|
314
|
+
if (!disableErrorLog) {
|
|
315
|
+
DyFM_Log.warn(
|
|
316
|
+
'DyFM_safeParseList result is not an array or object, returning it as a single item',
|
|
317
|
+
{
|
|
318
|
+
parsed: parsed,
|
|
319
|
+
}
|
|
320
|
+
);
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
return [ parsed ] as string[] as T;
|
|
324
|
+
}
|
|
325
|
+
}
|
|
285
326
|
|
|
327
|
+
/**
|
|
328
|
+
* parses the JSON, if it fails, it returns { unparsableResult: textedJSON }
|
|
329
|
+
*
|
|
330
|
+
* (uses {@link DyFM_failableSafeParseJSON})
|
|
331
|
+
*/
|
|
332
|
+
static safeParseJSON<T = any>(
|
|
333
|
+
textedJSON: string,
|
|
334
|
+
disableErrorLog?: boolean
|
|
335
|
+
): T | { unparsableResult: string } {
|
|
336
|
+
try {
|
|
337
|
+
return this.failableSafeParseJSON(textedJSON);
|
|
338
|
+
} catch (error) {
|
|
339
|
+
if (!disableErrorLog) {
|
|
340
|
+
DyFM_Log.error(
|
|
341
|
+
'Unable to parse JSON answer:',
|
|
342
|
+
{
|
|
343
|
+
unparsedJSON: textedJSON,
|
|
344
|
+
error: error,
|
|
345
|
+
}
|
|
346
|
+
);
|
|
347
|
+
}
|
|
348
|
+
|
|
349
|
+
return { unparsableResult: textedJSON };
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
|
|
353
|
+
/**
|
|
354
|
+
* parses the JSON, if it fails, it throws an error
|
|
355
|
+
* (also will extract the JSON from "```json ... ```" wrapper)
|
|
356
|
+
*/
|
|
357
|
+
static failableSafeParseJSON<T = any>(textedJSON: string): T {
|
|
358
|
+
if (!textedJSON) {
|
|
359
|
+
throw new Error(`No content provided to JSON parse ("${textedJSON}")`);
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
const match = textedJSON.match(/```json(.*)```/s);
|
|
363
|
+
textedJSON = textedJSON.replaceAll('\n', '');
|
|
364
|
+
|
|
365
|
+
if (match) {
|
|
366
|
+
return JSON.parse(match[1].replaceAll('\n', ''));
|
|
367
|
+
} else {
|
|
368
|
+
return JSON.parse(
|
|
369
|
+
textedJSON.replaceAll('```json', '').replaceAll('```', '')
|
|
370
|
+
);
|
|
371
|
+
}
|
|
372
|
+
}
|
|
286
373
|
}
|
|
287
374
|
|
|
288
375
|
export type DyFM_Object = DyFM_Shared;
|
|
@@ -96,13 +96,25 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
96
96
|
} */
|
|
97
97
|
|
|
98
98
|
if (property.vectorizedFrom) {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
99
|
+
property.vectorizedFrom.forEach((fromKey: string): void => {
|
|
100
|
+
if (!this.properties[fromKey]) {
|
|
101
|
+
throw new Error(
|
|
102
|
+
`Vectorized from property "${property.vectorizedFrom}" is not found in ` +
|
|
103
|
+
`"${this.dataName}" model.` +
|
|
104
|
+
`\nstackLocation: ${this.stackLocation}\n`
|
|
105
|
+
);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
if (
|
|
109
|
+
(this.properties[fromKey] as DyFM_DataProperty_Params<any>).type !== DyFM_BasicProperty_Type.string
|
|
110
|
+
) {
|
|
111
|
+
throw new Error(
|
|
112
|
+
`Vectorized from property "${property.vectorizedFrom}" is not a string property in ` +
|
|
113
|
+
`"${this.dataName}" model.` +
|
|
114
|
+
`\nstackLocation: ${this.stackLocation}\n`
|
|
115
|
+
);
|
|
116
|
+
}
|
|
117
|
+
});
|
|
106
118
|
|
|
107
119
|
/* this.properties[property.vectorizedFrom].vectorizeTo ??= key; */
|
|
108
120
|
|
|
@@ -114,14 +126,6 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
114
126
|
);
|
|
115
127
|
}
|
|
116
128
|
|
|
117
|
-
if ((this.properties[property.vectorizedFrom] as DyFM_DataProperty_Params<any>).type !== DyFM_BasicProperty_Type.string) {
|
|
118
|
-
throw new Error(
|
|
119
|
-
`Vectorized from property "${property.vectorizedFrom}" is not a string property in ` +
|
|
120
|
-
`"${this.dataName}" model.` +
|
|
121
|
-
`\nstackLocation: ${this.stackLocation}\n`
|
|
122
|
-
);
|
|
123
|
-
}
|
|
124
|
-
|
|
125
129
|
if (!property.vectorizeUseIndex) {
|
|
126
130
|
throw new Error(
|
|
127
131
|
'vectorizeUseIndex is required if vectorizedFrom is set. ' +
|
|
@@ -32,7 +32,13 @@ export class DyFM_DataProperty_Settings<T>{
|
|
|
32
32
|
archiveable?: boolean;
|
|
33
33
|
archiveListAfter?: number;
|
|
34
34
|
|
|
35
|
-
|
|
35
|
+
/**
|
|
36
|
+
* If only one property is set, it will be vectorized from that property directly.
|
|
37
|
+
*
|
|
38
|
+
* If multiple properties are set, they will be merged into a stringified JSON object,
|
|
39
|
+
* with the given properties.
|
|
40
|
+
*/
|
|
41
|
+
vectorizedFrom?: string[];
|
|
36
42
|
/* vectorizeTo?: string; */
|
|
37
43
|
embeddingModel?: DyFM_OpenAIEmbeddingModel;
|
|
38
44
|
/**
|
|
@@ -110,6 +116,7 @@ export class DyFM_DataProperty_Params<T> extends DyFM_DataProperty_Settings<T> {
|
|
|
110
116
|
`key: "${set.key}"` +
|
|
111
117
|
`\n stackLocation: ${DyFM_getConstructionStackLocation(2)}`
|
|
112
118
|
);
|
|
119
|
+
|
|
113
120
|
set.index = false;
|
|
114
121
|
}
|
|
115
122
|
|
|
@@ -9,6 +9,10 @@
|
|
|
9
9
|
* { userIds: { $in: this.userId } }
|
|
10
10
|
* //
|
|
11
11
|
* @example
|
|
12
|
+
* // or by userIds:
|
|
13
|
+
* { userId: { $in: userIds } }
|
|
14
|
+
* //
|
|
15
|
+
* @example
|
|
12
16
|
* // or by number or Date that is Greater Than AND Less Than:
|
|
13
17
|
* { points: { $gt: 2, $lt: 14 } }
|
|
14
18
|
* // further tools (syntax matches with $gt):
|
|
Binary file
|