@futdevpro/nts-dynamo 1.11.10 → 1.11.12
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/.eslintrc.json +0 -1
- package/.github/workflows/main.yml +5 -5
- package/build/_models/interfaces/global-log-settings.interface.d.ts +4 -0
- package/build/_models/interfaces/global-log-settings.interface.d.ts.map +1 -1
- package/build/_modules/discord-assistant/_services/dias-chunk.data-service.js +6 -1
- package/build/_modules/discord-assistant/_services/dias-chunk.data-service.js.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-main.control-service.d.ts.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-main.control-service.js +2 -1
- package/build/_modules/discord-bot/_services/dibo-main.control-service.js.map +1 -1
- package/build/_modules/open-ai/_collections/oai-chunking.util.d.ts.map +1 -1
- package/build/_modules/open-ai/_collections/oai-chunking.util.js +4 -1
- package/build/_modules/open-ai/_collections/oai-chunking.util.js.map +1 -1
- package/build/_modules/open-ai/_services/oai-chunk.service-base.d.ts.map +1 -1
- package/build/_modules/open-ai/_services/oai-chunk.service-base.js.map +1 -1
- package/build/_modules/open-ai/_services/oai-vector-data.service.d.ts +13 -7
- 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 +33 -33
- package/build/_modules/open-ai/_services/oai-vector-data.service.js.map +1 -1
- package/build/_modules/open-ai/index.d.ts.map +1 -1
- package/build/_modules/open-ai/index.js +1 -0
- package/build/_modules/open-ai/index.js.map +1 -1
- package/build/_services/core/global.service.d.ts.map +1 -1
- package/build/_services/core/global.service.js +17 -7
- package/build/_services/core/global.service.js.map +1 -1
- package/package.json +3 -3
- package/src/_models/interfaces/global-log-settings.interface.ts +5 -0
- package/src/_modules/discord-assistant/_services/dias-chunk.data-service.ts +6 -6
- package/src/_modules/discord-bot/_services/dibo-main.control-service.ts +2 -1
- package/src/_modules/open-ai/_collections/oai-chunking.util.ts +5 -1
- package/src/_modules/open-ai/_services/oai-chunk.service-base.ts +1 -1
- package/src/_modules/open-ai/_services/oai-vector-data.service.ts +51 -37
- package/src/_modules/open-ai/index.ts +7 -0
- package/src/_services/core/global.service.ts +12 -4
package/.eslintrc.json
CHANGED
|
@@ -19,8 +19,8 @@ env:
|
|
|
19
19
|
jobs:
|
|
20
20
|
notification0:
|
|
21
21
|
name: Discord start Notification
|
|
22
|
-
|
|
23
|
-
runs-on: plo-koon
|
|
22
|
+
runs-on: ubuntu-latest
|
|
23
|
+
#runs-on: plo-koon
|
|
24
24
|
timeout-minutes: 20
|
|
25
25
|
outputs:
|
|
26
26
|
start: ${{ steps.mark_start.outputs.started }}
|
|
@@ -379,8 +379,8 @@ jobs:
|
|
|
379
379
|
end:
|
|
380
380
|
name: Discord Results
|
|
381
381
|
needs: [ notification0, check_secrets, check_dev_leftovers, test, check_version, deploy, build_report ]
|
|
382
|
-
|
|
383
|
-
runs-on: plo-koon
|
|
382
|
+
runs-on: ubuntu-latest
|
|
383
|
+
#runs-on: plo-koon
|
|
384
384
|
timeout-minutes: 20
|
|
385
385
|
if: always()
|
|
386
386
|
steps:
|
|
@@ -421,7 +421,7 @@ jobs:
|
|
|
421
421
|
${{ needs.deploy.result == 'success' && ':rocket:' || '' }}\n\
|
|
422
422
|
- ${{ needs.build_report.result == 'failure' && ':cross_mark:' || needs.build_report.result == 'success' && ':white_check_mark:' || needs.build_report.result == 'skipped' && ':zzz:' || ':question:' }}
|
|
423
423
|
:bar_chart: Build Report: ${{ needs.build_report.result }}\n\
|
|
424
|
-
:stopwatch: Duration: ${{ steps.duration.outputs.human }}\n\
|
|
424
|
+
- :stopwatch: Duration: ${{ steps.duration.outputs.human }}\n\
|
|
425
425
|
:cd: (${{ github.run_number }}) [:link:](
|
|
426
426
|
https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})"
|
|
427
427
|
|
|
@@ -8,6 +8,10 @@ export interface DyNTS_GlobalLog_Settings {
|
|
|
8
8
|
* this setting will enable debug logs for setting up the application
|
|
9
9
|
*/
|
|
10
10
|
setup?: boolean;
|
|
11
|
+
/**
|
|
12
|
+
* this setting will enable debug logs for setting up the database
|
|
13
|
+
*/
|
|
14
|
+
dbSetup?: boolean;
|
|
11
15
|
/**
|
|
12
16
|
* this is an application wide default setting for route debug logs
|
|
13
17
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-log-settings.interface.d.ts","sourceRoot":"","sources":["../../../src/_models/interfaces/global-log-settings.interface.ts"],"names":[],"mappings":"AACA,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAG/B;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAG9B;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAGrB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
|
|
1
|
+
{"version":3,"file":"global-log-settings.interface.d.ts","sourceRoot":"","sources":["../../../src/_models/interfaces/global-log-settings.interface.ts"],"names":[],"mappings":"AACA,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAG/B;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAG9B;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAGrB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
|
|
@@ -85,7 +85,12 @@ class DyNTS_DiAs_Chunk_DataService extends oai_chunk_service_base_1.DyNTS_OAI_Ch
|
|
|
85
85
|
oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.vectorSearch.systemPrompt,
|
|
86
86
|
});
|
|
87
87
|
fsm_dynamo_1.DyFM_Log.testInfo('🔍 Document search question:', searchQuestion);
|
|
88
|
-
const searchResults = await this.vectorSearch(
|
|
88
|
+
const searchResults = await this.vectorSearch({
|
|
89
|
+
input: searchQuestion + ' ' + lastMessage.content,
|
|
90
|
+
searchInKey: 'chunkParentedContentVectorized',
|
|
91
|
+
limit: limit,
|
|
92
|
+
numberOfCandidates: numberOfCandidates,
|
|
93
|
+
});
|
|
89
94
|
return searchResults;
|
|
90
95
|
}
|
|
91
96
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias-chunk.data-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-chunk.data-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dias-chunk.data-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-chunk.data-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-main.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-main.control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,KAAK,EAA8C,IAAI,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE5H,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAE,kCAAkC,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAMzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,8BAAsB,8BAA+B,SAAQ,sBAAsB;IAMjF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,cAAc,CAAQ;IAC9B,IAAI,aAAa,IAAI,KAAK,CAEzB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IACD,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,SAAS,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,4BAA4B;IAEzE,SAAS,CAAC,WAAW,EAAE,kCAAkC,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,yBAAyB,IAAI,kCAAkC;IAElF,OAAO,CAAC,gBAAgB,CAEjB;IAEP,OAAO,CAAC,aAAa,CAEd;IAEP,SAAS,CAAC,QAAQ,UAAS;IAE3B,SAAS;IAwBH,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"dibo-main.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-main.control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,KAAK,EAA8C,IAAI,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE5H,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAE,kCAAkC,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAMzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,8BAAsB,8BAA+B,SAAQ,sBAAsB;IAMjF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,cAAc,CAAQ;IAC9B,IAAI,aAAa,IAAI,KAAK,CAEzB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IACD,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,SAAS,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,4BAA4B;IAEzE,SAAS,CAAC,WAAW,EAAE,kCAAkC,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,yBAAyB,IAAI,kCAAkC;IAElF,OAAO,CAAC,gBAAgB,CAEjB;IAEP,OAAO,CAAC,aAAa,CAEd;IAEP,SAAS,CAAC,QAAQ,UAAS;IAE3B,SAAS;IAwBH,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiIpC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAepC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMpD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ9D,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMrC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW;CAQnD;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG"}
|
|
@@ -115,7 +115,8 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
115
115
|
return new Promise((resolve, reject) => {
|
|
116
116
|
this.client.on('error', (error) => {
|
|
117
117
|
if (dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.debugLevel >= 1) {
|
|
118
|
-
|
|
118
|
+
/* DyFM_Log.error('Discord client error:', error); */
|
|
119
|
+
fsm_dynamo_1.DyFM_Error.logSimple('Discord client error:', error);
|
|
119
120
|
}
|
|
120
121
|
global_service_1.DyNTS_GlobalService.globalErrorHandler(error);
|
|
121
122
|
reject(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-main.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-main.control-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dibo-main.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-main.control-service.ts"],"names":[],"mappings":";;;AAAA,2CAA4H;AAE5H,iFAAmF;AACnF,sDAAyE;AACzE,uFAAoF;AAGpF,2FAAwF;AACxF,2EAA6E;AAC7E,+EAAkF;AAGlF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAsB,8BAA+B,SAAQ,0CAAsB;IAEjF;;QAEI;IAEK,MAAM,CAAS;IAEhB,cAAc,CAAQ;IAC9B,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,6CAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC;IACrF,CAAC;IACD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC;IACvC,CAAC;IAES,QAAQ,CAA+B;IAGvC,WAAW,CAAqC;IAGlD,gBAAgB,GAEpB,EAAE,CAAC;IAEC,aAAa,GAEjB,EAAE,CAAC;IAEG,QAAQ,GAAG,KAAK,CAAC;IAE3B;QACE,KAAK,EAAE,CAAC;QAER,6CAAqB,CAAC,YAAY,GAAG,uDAA0B,CAAC;QAEhE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,OAAO,EACP,IAAI,KAAK,CAAC,oCAAoC,CAAC,EAC/C,aAAa,CACd;gBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,sBAAsB;aAC9E,CAAC,CAAA;QACJ,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,mBAAM,CAAC;YACvB,OAAO,EAAE,6CAAqB,CAAC,YAAY,CAAC,OAAO;YACnD,QAAQ,EAAE,6CAAqB,CAAC,YAAY,CAAC,QAAQ;SACtD,CAAC,CAAA;QAEF,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc;QACxB,IAAI,CAAC;YACH,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;YAEtB,IAAI,CAAC,6CAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBACxD,MAAM,IAAI,KAAK,CACb,6BAA6B;oBAC7B,sDAAsD;oBACtD,uEAAuE;oBACvE,0FAA0F,CAC3F,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,6CAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACtD,MAAM,IAAI,KAAK,CACb,yBAAyB;oBACzB,mDAAmD;oBACnD,qEAAqE;oBACrE,6FAA6F,CAC9F,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,6CAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACzD,MAAM,IAAI,KAAK,CACb,6BAA6B;oBAC7B,uDAAuD;oBACvD,wEAAwE;oBACxE,yFAAyF,CAC1F,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,6CAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;gBAC1D,MAAM,IAAI,KAAK,CACb,8BAA8B;oBAC9B,wDAAwD;oBACxD,yEAAyE;oBACzE,wFAAwF,CACzF,CAAC;YACJ,CAAC;YAED,uDAA0B,CAAC,eAAe,CAAC,eAAe,CAAC,OAAO,CAChE,WAAW,CAAC,EAAE;gBACZ,IAAI,CAAC,uDAA0B,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACtF,uDAA0B,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC/E,CAAC;YACH,CAAC,CACF,CAAC;YACF,IAAI,CAAC,uDAA0B,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,CACtE,uDAA0B,CAAC,eAAe,CAAC,iBAAiB,CAC7D,EAAE,CAAC;gBACF,uDAA0B,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,CAC7D,uDAA0B,CAAC,eAAe,CAAC,iBAAiB,CAC7D,CAAC;YACJ,CAAC;YAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oBAChC,IAAI,uDAA0B,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;wBAC/C,qDAAqD;wBACrD,uBAAU,CAAC,SAAS,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;oBACvD,CAAC;oBACD,oCAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;oBAC9C,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;oBACjC,IAAI,uDAA0B,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;wBAC/C,qBAAQ,CAAC,OAAO,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;oBAC3D,CAAC;oBACD,oBAAoB;oBACpB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAChD,6CAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACnD,CAAA;oBAED,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;wBACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBAC7C,CAAC;oBAED,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAEzB,6DAA6D;oBAE7D,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,OAAgB,EAAE,EAAE;oBACnD,IAAI,CAAC;wBACH,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,SAAS,CAAC,CAAA;oBAC3E,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,qBAAQ,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;oBACvD,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBACtB,IAAI,CAAC;wBACH,qBAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;wBACxC,iDAA0B,CAAC,0BAA0B,CACnD,IAAI,CAAC,cAAc,EACnB,uDAA0B,CAAC,eAAe,CAAC,iBAAiB,EAC5D,yBAAyB,CAC1B,CAAA;oBACH,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,qBAAQ,CAAC,KAAK,CAAC,0CAA0C,EAAE,KAAK,CAAC,CAAC;oBACpE,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBAClF,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,iDAA0B,CAAC,0BAA0B,CACnD,IAAI,CAAC,aAAa,EAClB,uDAA0B,CAAC,eAAe,CAAC,iBAAiB,EAC5D,8BAA8B;wBAC9B,CAAE,KAAoB,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,CAC3D,CAAA;gBACH,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACZ,CAAC;YAED,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC;gBACvD,SAAS,EAAG,GAAG,6CAAqB,CAAC,mBAAmB,qBAAqB;aAC9E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc;QACxB,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAEpD,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC;gBACvD,SAAS,EAAG,GAAG,6CAAqB,CAAC,mBAAmB,qBAAqB;aAC9E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,QAAgB;QACtC,MAAM,IAAI,GAAS,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAEhD,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,SAAmB;QAC1C,MAAM,KAAK,GAAa,MAAM,OAAO,CAAC,GAAG,CACvC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAC5D,CAAC;QAEF,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,aAAa,CAAC,QAAgB;QAC5B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAE/F,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,gBAAgB,CAAC,WAAmB;QAClC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,iDAA0B,CAAC,qBAAqB,CACrF,IAAI,CAAC,aAAa,CAAC,QAAQ,EAC3B,WAAW,CACZ,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;CACF;AAxOD,wEAwOC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-chunking.util.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_collections/oai-chunking.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,mBAAmB,EAAuB,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAG3F;;;;GAIG;AACH,qBAAa,uBAAuB;IAElC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAEE;IAEvD,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAS;IAEpD;;;;;OAKG;WACU,cAAc,CACzB,OAAO,SAAS,eAAe,EAC/B,MAAM,SAAS,sBAAsB,CAAC,OAAO,CAAC,EAE5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,EACrD,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"oai-chunking.util.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_collections/oai-chunking.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,mBAAmB,EAAuB,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAG3F;;;;GAIG;AACH,qBAAa,uBAAuB;IAElC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAEE;IAEvD,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAS;IAEpD;;;;;OAKG;WACU,cAAc,CACzB,OAAO,SAAS,eAAe,EAC/B,MAAM,SAAS,sBAAsB,CAAC,OAAO,CAAC,EAE5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,EACrD,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,EAAE,CAAC;IA0OrB,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAiBvC,MAAM,CAAC,yBAAyB,CAC9B,MAAM,EAAE,eAAe,EAAE,EACzB,MAAM,EAAE,MAAM,GACb,MAAM;IAgCT;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CASjC;IAEF;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAajC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IA+BnC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAqBhC;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAmCjC;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAkD7B;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAcjC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAMjC,SAAS,CAAC,MAAM,CAAC,uBAAuB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,GAEb,mBAAmB;CAcvB"}
|
|
@@ -21,6 +21,9 @@ class DyNTS_OAI_Chunking_Util {
|
|
|
21
21
|
*/
|
|
22
22
|
static async chunkMdContent(page, getPageLink, issuer, debugLog) {
|
|
23
23
|
try {
|
|
24
|
+
if (debugLog) {
|
|
25
|
+
fsm_dynamo_1.DyFM_Log.info(`Chunking page "${page.name}"...`);
|
|
26
|
+
}
|
|
24
27
|
if (page.content.includes('#####')) {
|
|
25
28
|
fsm_dynamo_1.DyFM_Log.warn('lvl5+ headers are not supported yet for page: ' + page.name);
|
|
26
29
|
}
|
|
@@ -71,7 +74,7 @@ class DyNTS_OAI_Chunking_Util {
|
|
|
71
74
|
chunk: chunk.chunkContent,
|
|
72
75
|
});
|
|
73
76
|
}
|
|
74
|
-
await
|
|
77
|
+
/* await DyFM_wait(100_000); */
|
|
75
78
|
chunks.push(chunk);
|
|
76
79
|
}
|
|
77
80
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-chunking.util.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_collections/oai-chunking.util.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oai-chunking.util.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_collections/oai-chunking.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-chunk.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,qBAAqB,EAA4F,MAAM,uBAAuB,CAAC;AACpK,OAAO,EAAE,oBAAoB,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AAExG,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,2BAA2B,EAAE,MAAM,yDAAyD,CAAC;AAGtG,qBAAa,+BAA+B,CAC1C,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,sBAAsB,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAChF,SAAQ,2BAA2B,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"oai-chunk.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,qBAAqB,EAA4F,MAAM,uBAAuB,CAAC;AACpK,OAAO,EAAE,oBAAoB,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AAExG,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,2BAA2B,EAAE,MAAM,yDAAyD,CAAC;AAGtG,qBAAa,+BAA+B,CAC1C,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,sBAAsB,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAChF,SAAQ,2BAA2B,CAAC,OAAO,CAAC;IAEnC,QAAQ,EAAE,OAAO,CAAQ;gBAGhC,UAAU,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAC1C,cAAc,EAAE,oBAAoB,EACpC,MAAM,EAAE,MAAM;IAUV,UAAU,CACd,iBAAiB,EAAE,2BAA2B,CAAC,OAAO,EAAE,MAAM,CAAC,EAC/D,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAsDV,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IA2EhG,aAAa,CACjB,MAAM,EAAE,OAAO,EAAE,EACjB,SAAS,CAAC,EAAE,OAAO,EAAE,GACpB,OAAO,CAAC,4BAA4B,CAAC,OAAO,CAAC,EAAE,CAAC;IAkC7C,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;CA2ClD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-chunk.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":";;;AAAA,sDAAoK;AAEpK,uEAAwE;AACxE,yEAA4E;AAG5E,yFAAsF;AAKtF,MAAa,+BAGX,SAAQ,qDAAoC;
|
|
1
|
+
{"version":3,"file":"oai-chunk.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DyFM_DataModel_Params, DyFM_DataProperty_Params, DyFM_Metadata } from '@futdevpro/fsm-dynamo';
|
|
1
|
+
import { DyFM_DataModel_Params, DyFM_DataProperty_Params, DyFM_DBFilter, 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
4
|
import { DyNTS_OAI_Embedding_ControlService } from './oai-embedding.control-service';
|
|
@@ -50,6 +50,7 @@ export declare class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extend
|
|
|
50
50
|
*/
|
|
51
51
|
readonly vectorizeProperties: DyFM_DataProperty_Params<any>[];
|
|
52
52
|
readonly vectorizedProperties: DyFM_DataProperty_Params<any>[];
|
|
53
|
+
debugLog: boolean;
|
|
53
54
|
embedding_CS: DyNTS_OAI_Embedding_ControlService;
|
|
54
55
|
constructor(
|
|
55
56
|
/**
|
|
@@ -90,16 +91,21 @@ export declare class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extend
|
|
|
90
91
|
vectorize(input: string, useModel?: DyFM_OpenAIModel | string): Promise<number[]>;
|
|
91
92
|
/**
|
|
92
93
|
* Vectorizes the input and searches for the most similar data
|
|
93
|
-
* (the default limit is 3)
|
|
94
|
+
* (the default limit is 3, and the default numberOfCandidates is 100)
|
|
94
95
|
*
|
|
95
96
|
* @example
|
|
96
97
|
* const result = await vectorSearch(input, searchInKey);
|
|
97
98
|
*/
|
|
98
|
-
vectorSearch(
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
99
|
+
vectorSearch(set: {
|
|
100
|
+
input: string;
|
|
101
|
+
searchInKey: string;
|
|
102
|
+
limit?: number;
|
|
103
|
+
/**
|
|
104
|
+
* Number of candidates that are used to find the best match
|
|
105
|
+
*/
|
|
106
|
+
numberOfCandidates?: number;
|
|
107
|
+
filterBy?: DyFM_DBFilter<T>;
|
|
108
|
+
}): Promise<any>;
|
|
103
109
|
/**
|
|
104
110
|
* VectorDataService overrides the saveData function to vectorize the data properties
|
|
105
111
|
*
|
|
@@ -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,
|
|
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,EAEd,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;IAuB1F;;OAEG;aACa,cAAc,EAAE,oBAAoB;IAxBtD;;;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;IAEzB,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;YA6C/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;IAgFf;;;;OAIG;IACY,QAAQ,CACrB,IAAI,CAAC,EAAE,CAAC,EACR,gBAAgB,CAAC,EAAE,OAAO,EAC1B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,CAAC,CAAC;CAkBd"}
|
|
@@ -52,6 +52,7 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
52
52
|
vectorizeProperties;
|
|
53
53
|
vectorizedProperties;
|
|
54
54
|
/* readonly vectorizeProperties: { from: string, to: string }[]; */
|
|
55
|
+
debugLog = true;
|
|
55
56
|
embedding_CS;
|
|
56
57
|
constructor(
|
|
57
58
|
/**
|
|
@@ -140,7 +141,7 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
140
141
|
try {
|
|
141
142
|
let existingData;
|
|
142
143
|
if (!forceVectorize && newData?._id) {
|
|
143
|
-
|
|
144
|
+
existingData = await this.getDataById(newData._id, true, true);
|
|
144
145
|
}
|
|
145
146
|
await fsm_dynamo_1.DyFM_Array.asyncForEachAllAtOnce(this.vectorizedProperties, async (property) => {
|
|
146
147
|
await this.checkAndVectorizeSingleProperty(property, newData, existingData, forceVectorize);
|
|
@@ -168,6 +169,9 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
168
169
|
__localStack: this.dataParams.stackLocation,
|
|
169
170
|
});
|
|
170
171
|
}
|
|
172
|
+
if (this.debugLog) {
|
|
173
|
+
console.log(`vectorizing "${vectorizedProperty.key}" in new "${this.dataParams.dataName}"`);
|
|
174
|
+
}
|
|
171
175
|
newData[vectorizedProperty.key] = await this.vectorize(newValue, vectorizedProperty.embeddingModel);
|
|
172
176
|
}
|
|
173
177
|
}
|
|
@@ -223,23 +227,22 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
223
227
|
}
|
|
224
228
|
/**
|
|
225
229
|
* Vectorizes the input and searches for the most similar data
|
|
226
|
-
* (the default limit is 3)
|
|
230
|
+
* (the default limit is 3, and the default numberOfCandidates is 100)
|
|
227
231
|
*
|
|
228
232
|
* @example
|
|
229
233
|
* const result = await vectorSearch(input, searchInKey);
|
|
230
234
|
*/
|
|
231
|
-
async vectorSearch(
|
|
232
|
-
/**
|
|
233
|
-
* Number of candidates that are used to find the best match
|
|
234
|
-
*/
|
|
235
|
-
numberOfCandidates = 100) {
|
|
235
|
+
async vectorSearch(set) {
|
|
236
236
|
try {
|
|
237
|
-
if (!input) {
|
|
237
|
+
if (!set.input) {
|
|
238
238
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
239
239
|
...this.getDefaultErrorSettings('vectorSearch', new Error('input is required')),
|
|
240
240
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-VDB-VS1`,
|
|
241
241
|
});
|
|
242
242
|
}
|
|
243
|
+
set.limit ??= 3;
|
|
244
|
+
set.numberOfCandidates ??= 100;
|
|
245
|
+
const { input, searchInKey, limit, numberOfCandidates, filterBy } = set;
|
|
243
246
|
this.embedding_CS ??= new oai_embedding_control_service_1.DyNTS_OAI_Embedding_ControlService(this.openAISettings);
|
|
244
247
|
const property = this.dataParams.properties[searchInKey];
|
|
245
248
|
if (!property) {
|
|
@@ -252,32 +255,29 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
|
|
|
252
255
|
});
|
|
253
256
|
}
|
|
254
257
|
const embeddedInput = await this.embedding_CS.createEmbedding(input, property.embeddingModel, this.issuer);
|
|
255
|
-
const
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
}
|
|
258
|
+
/* const vectorSearchFilter = */
|
|
259
|
+
const vectorSearchFilter = {
|
|
260
|
+
$vectorSearch: {
|
|
261
|
+
/** this is the index name that is created in the DB (in the Atlas)
|
|
262
|
+
* also the same that is used in the {@link DyFM_DataProperty_Params} */
|
|
263
|
+
index: property.vectorizeUseIndex,
|
|
264
|
+
queryVector: embeddedInput,
|
|
265
|
+
/** this is the property key that is vectorized and used to search */
|
|
266
|
+
path: searchInKey,
|
|
267
|
+
numCandidates: numberOfCandidates,
|
|
268
|
+
limit: limit,
|
|
267
269
|
}
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
}
|
|
278
|
-
|
|
279
|
-
} */
|
|
280
|
-
);
|
|
270
|
+
};
|
|
271
|
+
if (filterBy) {
|
|
272
|
+
vectorSearchFilter.filter = filterBy;
|
|
273
|
+
}
|
|
274
|
+
if (this.debugLog) {
|
|
275
|
+
console.log(`vectorSearch...`);
|
|
276
|
+
}
|
|
277
|
+
const result = await this.dataDBService.aggregate([vectorSearchFilter]);
|
|
278
|
+
if (this.debugLog) {
|
|
279
|
+
console.log(`vectorSearch: ${result.length} results`);
|
|
280
|
+
}
|
|
281
281
|
return result;
|
|
282
282
|
}
|
|
283
283
|
catch (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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/_modules/open-ai/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/_modules/open-ai/index.ts"],"names":[],"mappings":"AAyBA,cAAc,+BAA+B,CAAC;AAG9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,0CAA0C,CAAC;AACzD,cAAc,kDAAkD,CAAC;AACjE,cAAc,qDAAqD,CAAC;AAGpE,cAAc,uCAAuC,CAAC;AACtD,cAAc,oCAAoC,CAAC;AAGnD,cAAc,oCAAoC,CAAC;AAEnD,cAAc,yDAAyD,CAAC;AACxE,cAAc,wDAAwD,CAAC;AACvE,cAAc,kDAAkD,CAAC;AACjE,cAAc,oDAAoD,CAAC;AACnE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,4DAA4D,CAAC;AAC3E,cAAc,wDAAwD,CAAC;AAGvE,cAAc,oCAAoC,CAAC;AACnD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,kCAAkC,CAAC;AACjD,cAAc,qCAAqC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/_modules/open-ai/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/_modules/open-ai/index.ts"],"names":[],"mappings":";;;AAQA,IAAI,CAAC;IACH,oCAAoC;IACpC,OAAO,CAAC,SAAS,CAAC,CAAC;AACrB,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACf,OAAO,CAAC,GAAG,CACT,sEAAsE,CACvE,CAAC;AACJ,CAAC;AAED,EAAE;AACF,gBAAgB;AAChB,EAAE;AACF,6DAA6D;AAC7D,+DAA+D;AAC/D,EAAE;AAGF,wEAA8C;AAE9C,cAAc;AACd,2EAAiD;AACjD,2EAAiD;AACjD,mFAAyD;AACzD,2FAAiE;AACjE,8FAAoE;AAEpE,QAAQ;AACR,gFAAsD;AACtD,6EAAmD;AAEnD,SAAS;AACT,6EAAmD;AACnD,oBAAoB;AACpB,kGAAwE;AACxE,iGAAuE;AACvE,2FAAiE;AACjE,6FAAmE;AACnE,yFAA+D;AAC/D,qGAA2E;AAC3E,iGAAuE;AAEvE,WAAW;AACX,6EAAmD;AACnD,oFAA0D;AAC1D,gFAAsD;AACtD,2EAAiD;AACjD,8EAAoD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAEb,qBAAqB,EAErB,mBAAmB,EAGnB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAEzF,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,4DAA4D,CAAC;AAEpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAInE;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,sBAAsB;IAE7D,MAAM,CAAC,WAAW,IAAI,mBAAmB;IAIzC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAmB;IACzC,MAAM,KAAK,MAAM,IAAI,gBAAgB,CAEpC;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IACpD,MAAM,KAAK,OAAO,IAAI,IAAI,CAEzB;IACD,MAAM,KAAK,MAAM,IAAI,MAAM,CAE1B;IAED,WAAW,EAAE,iBAAiB,CAAC;IAC/B,mBAAmB,EAAE,wBAAwB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IAEpE,sBAAsB,EAAE,wBAAwB,CAAC,kBAAkB,CAAC,CAAC;IAErE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAEY;IAEvD,MAAM,CAAC,kBAAkB,EAAE,0BAA0B,CAGlD;IAEH;;OAEG;WACU,WAAW,CAAC,GAAG,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC;mBAoBrD,aAAa;
|
|
1
|
+
{"version":3,"file":"global.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAEb,qBAAqB,EAErB,mBAAmB,EAGnB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAEzF,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,4DAA4D,CAAC;AAEpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAInE;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,sBAAsB;IAE7D,MAAM,CAAC,WAAW,IAAI,mBAAmB;IAIzC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAmB;IACzC,MAAM,KAAK,MAAM,IAAI,gBAAgB,CAEpC;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IACpD,MAAM,KAAK,OAAO,IAAI,IAAI,CAEzB;IACD,MAAM,KAAK,MAAM,IAAI,MAAM,CAE1B;IAED,WAAW,EAAE,iBAAiB,CAAC;IAC/B,mBAAmB,EAAE,wBAAwB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IAEpE,sBAAsB,EAAE,wBAAwB,CAAC,kBAAkB,CAAC,CAAC;IAErE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAEY;IAEvD,MAAM,CAAC,kBAAkB,EAAE,0BAA0B,CAGlD;IAEH;;OAEG;WACU,WAAW,CAAC,GAAG,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC;mBAoBrD,aAAa;mBAuFb,cAAc;mBAgBd,gBAAgB;mBAuBhB,eAAe;IAuDpC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAIhD;;;OAGG;IACH,MAAM,CAAC,cAAc,IAAI,iBAAiB;IAsB1C;;;OAGG;IACH,MAAM,CAAC,sBAAsB,IAAI,wBAAwB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IAe/E;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,aAAa,EACzC,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAC,GACnC,eAAe,CAAC,CAAC,CAAC;IAIrB;;;;OAIG;IACH,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC;IAiBlF;;;OAGG;IACH,MAAM,CAAC,yBAAyB,IAAI,wBAAwB,CAAC,kBAAkB,CAAC;IAiBhF;;;OAGG;IAaH;;;;OAIG;IAiCH,SAAS,CAAC,MAAM,CAAC,uBAAuB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,GACb,mBAAmB;CAavB"}
|
|
@@ -110,6 +110,9 @@ class DyNTS_GlobalService extends singleton_service_1.DyNTS_SingletonService {
|
|
|
110
110
|
});
|
|
111
111
|
}
|
|
112
112
|
});
|
|
113
|
+
if (fsm_dynamo_1.DyFM_global_settings.log_settings.dbSetup) {
|
|
114
|
+
fsm_dynamo_1.DyFM_Log.info(`DB Services setup complete. DB Models:`, `\n ${Object.keys(this.instance.dbServiceCollection).join('\n ')}`);
|
|
115
|
+
}
|
|
113
116
|
}
|
|
114
117
|
catch (error) {
|
|
115
118
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
@@ -158,13 +161,20 @@ class DyNTS_GlobalService extends singleton_service_1.DyNTS_SingletonService {
|
|
|
158
161
|
}
|
|
159
162
|
fsm_dynamo_1.DyFM_Log.warn(`globalErrorHandler not set! (set in app.getGlobalServiceCollection)`, '\nwill use default-logging', '\n(If you set the globalErrorHandler, ' +
|
|
160
163
|
'please check if it is using the same node_modules as the app)');
|
|
161
|
-
if (
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
164
|
+
/* if (
|
|
165
|
+
DyNTS_global_settings.log_settings.highDetailedLogs ||
|
|
166
|
+
!(error instanceof DyFM_Error)
|
|
167
|
+
) {
|
|
168
|
+
DyFM_Log.H_error(
|
|
169
|
+
`Error caught by globalErrorHandler.`,
|
|
170
|
+
`\n ERROR:`, error?.replaceAll?.('at', ' at') ?? error
|
|
171
|
+
);
|
|
172
|
+
} else {
|
|
173
|
+
error.logSimple(
|
|
174
|
+
`Error caught by globalErrorHandler.`
|
|
175
|
+
);
|
|
176
|
+
} */
|
|
177
|
+
fsm_dynamo_1.DyFM_Error.logSimple(`Error caught by globalErrorHandler.`, error);
|
|
168
178
|
}
|
|
169
179
|
catch (error) {
|
|
170
180
|
if (error instanceof fsm_dynamo_1.DyFM_Error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.service.js","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"global.service.js","sourceRoot":"","sources":["../../../src/_services/core/global.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.12",
|
|
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.13.tgz",
|
|
168
168
|
|
|
169
169
|
"empty": ""
|
|
170
170
|
},
|
|
171
171
|
"peerDependencies": {
|
|
172
|
-
"@futdevpro/fsm-dynamo": "1.11.
|
|
172
|
+
"@futdevpro/fsm-dynamo": "1.11.13",
|
|
173
173
|
|
|
174
174
|
"@types/express": "4.17.21",
|
|
175
175
|
"@types/geoip-lite": "~1.4.1",
|
|
@@ -12,6 +12,11 @@ export interface DyNTS_GlobalLog_Settings {
|
|
|
12
12
|
*/
|
|
13
13
|
setup?: boolean;
|
|
14
14
|
|
|
15
|
+
/**
|
|
16
|
+
* this setting will enable debug logs for setting up the database
|
|
17
|
+
*/
|
|
18
|
+
dbSetup?: boolean;
|
|
19
|
+
|
|
15
20
|
/**
|
|
16
21
|
* this is an application wide default setting for route debug logs
|
|
17
22
|
*/
|
|
@@ -151,12 +151,12 @@ export abstract class DyNTS_DiAs_Chunk_DataService<
|
|
|
151
151
|
|
|
152
152
|
DyFM_Log.testInfo('🔍 Document search question:', searchQuestion);
|
|
153
153
|
|
|
154
|
-
const searchResults: T_Chunk[] = await this.vectorSearch(
|
|
155
|
-
searchQuestion + ' ' + lastMessage.content,
|
|
156
|
-
'chunkParentedContentVectorized',
|
|
157
|
-
limit,
|
|
158
|
-
numberOfCandidates,
|
|
159
|
-
)
|
|
154
|
+
const searchResults: T_Chunk[] = await this.vectorSearch({
|
|
155
|
+
input: searchQuestion + ' ' + lastMessage.content,
|
|
156
|
+
searchInKey: 'chunkParentedContentVectorized',
|
|
157
|
+
limit: limit,
|
|
158
|
+
numberOfCandidates: numberOfCandidates,
|
|
159
|
+
});
|
|
160
160
|
|
|
161
161
|
return searchResults;
|
|
162
162
|
} catch (error) {
|
|
@@ -162,7 +162,8 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
|
|
|
162
162
|
return new Promise((resolve, reject) => {
|
|
163
163
|
this.client.on('error', (error) => {
|
|
164
164
|
if (DyNTS_DiBo_global_settings.debugLevel >= 1) {
|
|
165
|
-
DyFM_Log.error('Discord client error:', error);
|
|
165
|
+
/* DyFM_Log.error('Discord client error:', error); */
|
|
166
|
+
DyFM_Error.logSimple('Discord client error:', error);
|
|
166
167
|
}
|
|
167
168
|
DyNTS_GlobalService.globalErrorHandler(error);
|
|
168
169
|
reject(error);
|
|
@@ -32,6 +32,10 @@ export class DyNTS_OAI_Chunking_Util {
|
|
|
32
32
|
debugLog?: boolean
|
|
33
33
|
): Promise<T_Chunk[]> {
|
|
34
34
|
try {
|
|
35
|
+
if (debugLog) {
|
|
36
|
+
DyFM_Log.info(`Chunking page "${page.name}"...`);
|
|
37
|
+
}
|
|
38
|
+
|
|
35
39
|
if (page.content.includes('#####')) {
|
|
36
40
|
DyFM_Log.warn('lvl5+ headers are not supported yet for page: ' + page.name);
|
|
37
41
|
}
|
|
@@ -101,7 +105,7 @@ export class DyNTS_OAI_Chunking_Util {
|
|
|
101
105
|
}
|
|
102
106
|
);
|
|
103
107
|
}
|
|
104
|
-
await DyFM_wait(100_000);
|
|
108
|
+
/* await DyFM_wait(100_000); */
|
|
105
109
|
chunks.push(chunk);
|
|
106
110
|
}
|
|
107
111
|
break;
|
|
@@ -14,7 +14,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
|
|
|
14
14
|
T_Page extends DyNTS_OAI_DocumentPage<T_Chunk> = DyNTS_OAI_DocumentPage<T_Chunk>,
|
|
15
15
|
> extends DyNTS_OAI_VectorDataService<T_Chunk> {
|
|
16
16
|
|
|
17
|
-
debugLog: boolean = true;
|
|
17
|
+
override debugLog: boolean = true;
|
|
18
18
|
|
|
19
19
|
constructor(
|
|
20
20
|
dataParams: DyFM_DataModel_Params<T_Chunk>,
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
DyFM_Array,
|
|
4
4
|
DyFM_DataModel_Params,
|
|
5
5
|
DyFM_DataProperty_Params,
|
|
6
|
+
DyFM_DBFilter,
|
|
6
7
|
DyFM_Error,
|
|
7
8
|
DyFM_Metadata,
|
|
8
9
|
DyFM_sameObjects
|
|
@@ -61,6 +62,8 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
61
62
|
readonly vectorizedProperties: DyFM_DataProperty_Params<any>[];
|
|
62
63
|
/* readonly vectorizeProperties: { from: string, to: string }[]; */
|
|
63
64
|
|
|
65
|
+
debugLog: boolean = true;
|
|
66
|
+
|
|
64
67
|
embedding_CS: DyNTS_OAI_Embedding_ControlService;
|
|
65
68
|
|
|
66
69
|
constructor(
|
|
@@ -187,7 +190,7 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
187
190
|
let existingData: T;
|
|
188
191
|
|
|
189
192
|
if (!forceVectorize && newData?._id) {
|
|
190
|
-
|
|
193
|
+
existingData = await this.getDataById(newData._id, true, true);
|
|
191
194
|
}
|
|
192
195
|
|
|
193
196
|
await DyFM_Array.asyncForEachAllAtOnce(
|
|
@@ -239,6 +242,10 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
239
242
|
});
|
|
240
243
|
}
|
|
241
244
|
|
|
245
|
+
if (this.debugLog) {
|
|
246
|
+
console.log(`vectorizing "${vectorizedProperty.key}" in new "${this.dataParams.dataName}"`);
|
|
247
|
+
}
|
|
248
|
+
|
|
242
249
|
newData[vectorizedProperty.key] = await this.vectorize(
|
|
243
250
|
newValue,
|
|
244
251
|
vectorizedProperty.embeddingModel
|
|
@@ -315,22 +322,25 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
315
322
|
|
|
316
323
|
/**
|
|
317
324
|
* Vectorizes the input and searches for the most similar data
|
|
318
|
-
* (the default limit is 3)
|
|
325
|
+
* (the default limit is 3, and the default numberOfCandidates is 100)
|
|
319
326
|
*
|
|
320
327
|
* @example
|
|
321
328
|
* const result = await vectorSearch(input, searchInKey);
|
|
322
329
|
*/
|
|
323
330
|
async vectorSearch(
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
+
set: {
|
|
332
|
+
input: string,
|
|
333
|
+
searchInKey: string,
|
|
334
|
+
limit?: number,
|
|
335
|
+
/**
|
|
336
|
+
* Number of candidates that are used to find the best match
|
|
337
|
+
*/
|
|
338
|
+
numberOfCandidates?: number,
|
|
339
|
+
filterBy?: DyFM_DBFilter<T>,
|
|
340
|
+
},
|
|
331
341
|
): Promise<any> {
|
|
332
342
|
try {
|
|
333
|
-
if (!input) {
|
|
343
|
+
if (!set.input) {
|
|
334
344
|
throw new DyFM_Error({
|
|
335
345
|
...this.getDefaultErrorSettings('vectorSearch', new Error('input is required')),
|
|
336
346
|
|
|
@@ -338,6 +348,11 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
338
348
|
});
|
|
339
349
|
}
|
|
340
350
|
|
|
351
|
+
set.limit ??= 3;
|
|
352
|
+
set.numberOfCandidates ??= 100;
|
|
353
|
+
|
|
354
|
+
const { input, searchInKey, limit, numberOfCandidates, filterBy } = set;
|
|
355
|
+
|
|
341
356
|
this.embedding_CS ??= new DyNTS_OAI_Embedding_ControlService(
|
|
342
357
|
this.openAISettings
|
|
343
358
|
);
|
|
@@ -365,34 +380,33 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
|
|
|
365
380
|
property.embeddingModel,
|
|
366
381
|
this.issuer
|
|
367
382
|
);
|
|
383
|
+
/* const vectorSearchFilter = */
|
|
384
|
+
const vectorSearchFilter: any = {
|
|
385
|
+
$vectorSearch: {
|
|
386
|
+
/** this is the index name that is created in the DB (in the Atlas)
|
|
387
|
+
* also the same that is used in the {@link DyFM_DataProperty_Params} */
|
|
388
|
+
index: property.vectorizeUseIndex,
|
|
389
|
+
queryVector: embeddedInput,
|
|
390
|
+
/** this is the property key that is vectorized and used to search */
|
|
391
|
+
path: searchInKey,
|
|
392
|
+
numCandidates: numberOfCandidates,
|
|
393
|
+
limit: limit,
|
|
394
|
+
}
|
|
395
|
+
};
|
|
396
|
+
|
|
397
|
+
if (filterBy) {
|
|
398
|
+
vectorSearchFilter.filter = filterBy;
|
|
399
|
+
}
|
|
400
|
+
|
|
401
|
+
if (this.debugLog) {
|
|
402
|
+
console.log(`vectorSearch...`);
|
|
403
|
+
}
|
|
368
404
|
|
|
369
|
-
const result = await this.dataDBService.aggregate(
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
* also the same that is used in the {@link DyFM_DataProperty_Params} */
|
|
375
|
-
index: property.vectorizeUseIndex,
|
|
376
|
-
queryVector: embeddedInput,
|
|
377
|
-
/** this is the property key that is vectorized and used to search */
|
|
378
|
-
path: searchInKey,
|
|
379
|
-
numCandidates: numberOfCandidates,
|
|
380
|
-
limit: limit
|
|
381
|
-
}
|
|
382
|
-
}
|
|
383
|
-
]
|
|
384
|
-
/* {
|
|
385
|
-
$search: {
|
|
386
|
-
index: 'default',
|
|
387
|
-
knnBeta: {
|
|
388
|
-
vector: embeddedInput,
|
|
389
|
-
path: searchInKey,
|
|
390
|
-
numCandidates: 100,
|
|
391
|
-
limit: limit
|
|
392
|
-
}
|
|
393
|
-
}
|
|
394
|
-
} */
|
|
395
|
-
);
|
|
405
|
+
const result = await this.dataDBService.aggregate([ vectorSearchFilter ]);
|
|
406
|
+
|
|
407
|
+
if (this.debugLog) {
|
|
408
|
+
console.log(`vectorSearch: ${result.length} results`);
|
|
409
|
+
}
|
|
396
410
|
|
|
397
411
|
return result;
|
|
398
412
|
} catch (error) {
|
|
@@ -161,6 +161,13 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
|
|
|
161
161
|
});
|
|
162
162
|
}
|
|
163
163
|
});
|
|
164
|
+
|
|
165
|
+
if (DyFM_global_settings.log_settings.dbSetup) {
|
|
166
|
+
DyFM_Log.info(
|
|
167
|
+
`DB Services setup complete. DB Models:`,
|
|
168
|
+
`\n ${Object.keys(this.instance.dbServiceCollection).join('\n ')}`
|
|
169
|
+
);
|
|
170
|
+
}
|
|
164
171
|
} catch (error) {
|
|
165
172
|
throw new DyFM_Error({
|
|
166
173
|
...this.getDefaultErrorSettings('setDBServices', error, 'DyNTS_GlobalService'),
|
|
@@ -226,7 +233,7 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
|
|
|
226
233
|
'please check if it is using the same node_modules as the app)'
|
|
227
234
|
);
|
|
228
235
|
|
|
229
|
-
if (
|
|
236
|
+
/* if (
|
|
230
237
|
DyNTS_global_settings.log_settings.highDetailedLogs ||
|
|
231
238
|
!(error instanceof DyFM_Error)
|
|
232
239
|
) {
|
|
@@ -234,11 +241,12 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
|
|
|
234
241
|
`Error caught by globalErrorHandler.`,
|
|
235
242
|
`\n ERROR:`, error?.replaceAll?.('at', ' at') ?? error
|
|
236
243
|
);
|
|
237
|
-
} else
|
|
244
|
+
} else {
|
|
238
245
|
error.logSimple(
|
|
239
246
|
`Error caught by globalErrorHandler.`
|
|
240
247
|
);
|
|
241
|
-
}
|
|
248
|
+
} */
|
|
249
|
+
DyFM_Error.logSimple(`Error caught by globalErrorHandler.`, error);
|
|
242
250
|
} catch (error) {
|
|
243
251
|
if (error instanceof DyFM_Error) {
|
|
244
252
|
error.logSimple(
|
|
@@ -298,7 +306,7 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
|
|
|
298
306
|
* @returns
|
|
299
307
|
*/
|
|
300
308
|
static getDBServiceCollection(): DyNTS_Service_Collection<DyNTS_DBService<any>> {
|
|
301
|
-
if (!this.instance?.dbServiceCollection) {
|
|
309
|
+
if (!(this.instance as DyNTS_GlobalService)?.dbServiceCollection) {
|
|
302
310
|
throw new Error(
|
|
303
311
|
`\n Unique DataBase Service Collection missing!` +
|
|
304
312
|
`\n Please create a Unique DataBase Service Collection extending ` +
|