@futdevpro/nts-dynamo 1.11.6 → 1.11.7

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.
Files changed (18) hide show
  1. package/.github/workflows/main.yml +6 -0
  2. package/build/_collections/get-environment-settings.util.js +1 -1
  3. package/build/_collections/get-environment-settings.util.js.map +1 -1
  4. package/build/_modules/open-ai/_collections/oai-chunking.util.d.ts +1 -1
  5. package/build/_modules/open-ai/_collections/oai-chunking.util.d.ts.map +1 -1
  6. package/build/_modules/open-ai/_collections/oai-chunking.util.js +13 -13
  7. package/build/_modules/open-ai/_collections/oai-chunking.util.js.map +1 -1
  8. package/build/_modules/open-ai/_models/interfaces/oai-document-page.interface.d.ts +2 -1
  9. package/build/_modules/open-ai/_models/interfaces/oai-document-page.interface.d.ts.map +1 -1
  10. package/build/_modules/open-ai/_services/oai-vector-data.service.d.ts.map +1 -1
  11. package/build/_modules/open-ai/_services/oai-vector-data.service.js +7 -3
  12. package/build/_modules/open-ai/_services/oai-vector-data.service.js.map +1 -1
  13. package/package.json +2 -2
  14. package/src/_collections/get-environment-settings.util.ts +1 -1
  15. package/src/_collections/sample.env +1 -1
  16. package/src/_modules/open-ai/_collections/oai-chunking.util.ts +18 -17
  17. package/src/_modules/open-ai/_models/interfaces/oai-document-page.interface.ts +2 -1
  18. package/src/_modules/open-ai/_services/oai-vector-data.service.ts +9 -3
package/.github/workflows/main.yml CHANGED
@@ -20,6 +20,7 @@ jobs:
20
20
  notification0:
21
21
  name: Discord start Notification
22
22
  runs-on: ubuntu-latest
23
+ timeout-minutes: 20
23
24
  outputs:
24
25
  start: ${{ steps.mark_start.outputs.started }}
25
26
  steps:
@@ -42,6 +43,7 @@ jobs:
42
43
  check_on_ts_config_paths:
43
44
  name: Check Dev leftovers
44
45
  runs-on: ubuntu-latest
46
+ timeout-minutes: 20
45
47
  steps:
46
48
  - name: Checkout code
47
49
  uses: actions/checkout@v2
@@ -113,6 +115,7 @@ jobs:
113
115
  name: Test Build
114
116
  needs: [ check_on_ts_config_paths ]
115
117
  runs-on: ubuntu-latest
118
+ timeout-minutes: 20
116
119
  services:
117
120
  mongodb:
118
121
  image: mongo
@@ -155,6 +158,7 @@ jobs:
155
158
  name: Check Version
156
159
  needs: [ test ]
157
160
  runs-on: ubuntu-latest
161
+ timeout-minutes: 20
158
162
  outputs:
159
163
  version_published: ${{ steps.version_check_results.outputs.version_published }}
160
164
  steps:
@@ -206,6 +210,7 @@ jobs:
206
210
  needs: [ check_version ]
207
211
  if: ${{ needs.check_version.outputs.version_published != 'true' }}
208
212
  runs-on: ubuntu-latest
213
+ timeout-minutes: 20
209
214
  steps:
210
215
  - name: Checkout code
211
216
  uses: actions/checkout@v2
@@ -238,6 +243,7 @@ jobs:
238
243
  name: Discord Results
239
244
  needs: [ notification0, check_on_ts_config_paths, test, check_version, deploy ]
240
245
  runs-on: ubuntu-latest
246
+ timeout-minutes: 20
241
247
  if: always()
242
248
  steps:
243
249
  - name: Checkout code
package/build/_collections/get-environment-settings.util.js CHANGED
@@ -22,7 +22,7 @@ function DyNTS_getEnvironment_settings() {
22
22
  clientId: process.env.DISCORD_CLIENT_ID,
23
23
  oauth2Url: process.env.DISCORD_OAUTH2_URL,
24
24
  },
25
- mongoUri: process.env.MONGO_URI,
25
+ mongoUri: process.env.MONGO_URL || process.env.MONGO_URI,
26
26
  openAi: {
27
27
  apiKey: process.env.OPENAI_API_KEY,
28
28
  organization: process.env.OPENAI_ORGANIZATION,
package/build/_collections/get-environment-settings.util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-environment-settings.util.js","sourceRoot":"","sources":["../../src/_collections/get-environment-settings.util.ts"],"names":[],"mappings":";;;;AAAA,sDAAiG;AAEjG,4DAA4B;AAE5B,SAAgB,6BAA6B;IAC3C,gBAAM,CAAC,MAAM,EAAE,CAAA;IAEf,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,iCAAoB,CAAC,KAAK,CAAC;IAC3G,GAAG,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;IAE9B,IAAI,CAAC,qCAAwB,CAAC,QAAQ,CAAC,GAA2B,CAAC,EAAE,CAAC;QACpE,qBAAQ,CAAC,KAAK,CAAC,yBAAyB,GAAG,8BAA8B,CAAC,CAAC;QAC3E,GAAG,GAAG,iCAAoB,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,OAAO;QACL,WAAW,EAAE,qCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC;YACzC,iCAAoB,CAAC,KAAK;QAG5B,OAAO,EAAE;YACP,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YACrC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;YAChC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACvC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;SAC1C;QAED,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;QAE/B,MAAM,EAAE;YACN,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YAClC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC7C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YACnC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;SAC1C;QAED;;;;;;;;;aASK;KACN,CAAA;AACH,CAAC;AA5CD,sEA4CC"}
1
+ {"version":3,"file":"get-environment-settings.util.js","sourceRoot":"","sources":["../../src/_collections/get-environment-settings.util.ts"],"names":[],"mappings":";;;;AAAA,sDAAiG;AAEjG,4DAA4B;AAE5B,SAAgB,6BAA6B;IAC3C,gBAAM,CAAC,MAAM,EAAE,CAAA;IAEf,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,iCAAoB,CAAC,KAAK,CAAC;IAC3G,GAAG,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;IAE9B,IAAI,CAAC,qCAAwB,CAAC,QAAQ,CAAC,GAA2B,CAAC,EAAE,CAAC;QACpE,qBAAQ,CAAC,KAAK,CAAC,yBAAyB,GAAG,8BAA8B,CAAC,CAAC;QAC3E,GAAG,GAAG,iCAAoB,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,OAAO;QACL,WAAW,EAAE,qCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC;YACzC,iCAAoB,CAAC,KAAK;QAG5B,OAAO,EAAE;YACP,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YACrC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;YAChC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACvC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;SAC1C;QAED,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS;QAExD,MAAM,EAAE;YACN,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YAClC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC7C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YACnC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;SAC1C;QAED;;;;;;;;;aASK;KACN,CAAA;AACH,CAAC;AA5CD,sEA4CC"}
package/build/_modules/open-ai/_collections/oai-chunking.util.d.ts CHANGED
@@ -15,7 +15,7 @@ export declare class DyNTS_OAI_Chunking_Util {
15
15
  * @param issuer - Kérés kezdeményezője
16
16
  * @returns Promise<CU_DocChunk[]> - Létrehozott chunk-ok listája
17
17
  */
18
- static chunkMdContent<T_Chunk extends DyNTS_OAI_Chunk, T_Page extends DyNTS_OAI_DocumentPage<T_Chunk>>(page: T_Page, getPageLink: (page: T_Page, issuer: string) => string, issuer: string): Promise<T_Chunk[]>;
18
+ static chunkMdContent<T_Chunk extends DyNTS_OAI_Chunk, T_Page extends DyNTS_OAI_DocumentPage<T_Chunk>>(page: T_Page, getPageLink: (page: T_Page, issuer: string) => string, issuer: string, debugLog?: boolean): Promise<T_Chunk[]>;
19
19
  private static assembleChunkWithHeaders;
20
20
  static reassembleChunksToContent(chunks: DyNTS_OAI_Chunk[], issuer: string): string;
21
21
  /**
package/build/_modules/open-ai/_collections/oai-chunking.util.d.ts.map CHANGED
@@ -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,EAE9C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,EACrD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,EAAE,CAAC;IAsOrB,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"}
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;IAsOrB,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"}
package/build/_modules/open-ai/_collections/oai-chunking.util.js CHANGED
@@ -19,7 +19,7 @@ class DyNTS_OAI_Chunking_Util {
19
19
  * @param issuer - Kérés kezdeményezője
20
20
  * @returns Promise<CU_DocChunk[]> - Létrehozott chunk-ok listája
21
21
  */
22
- static async chunkMdContent(page, getPageLink, issuer) {
22
+ static async chunkMdContent(page, getPageLink, issuer, debugLog) {
23
23
  try {
24
24
  if (page.content.includes('#####')) {
25
25
  fsm_dynamo_1.DyFM_Log.warn('lvl5+ headers are not supported yet for page: ' + page.name);
@@ -51,10 +51,10 @@ class DyNTS_OAI_Chunking_Util {
51
51
  const headParents = this.getRelevantHeaders(headerHierarchy, currentPosition, currentPosition + leftovers.length, lastHeaders); // headerHierarchy.map(header => header.header);
52
52
  const allFlaggedParents = [...page.allFlaggedParents, ...headParents];
53
53
  const chunk = new oai_doc_chunk_data_model_1.DyNTS_OAI_Chunk({
54
- filePathParents: page.path,
54
+ filePathParents: page.parentedPath,
55
55
  chunkHeadParents: headParents,
56
56
  allFlaggedParents: [...page.allFlaggedParents, ...headParents],
57
- path: [...page.path, ...headParents].join('/'),
57
+ path: [...page.parentedPath, ...headParents].join('/'),
58
58
  documentName: page.documentId,
59
59
  pageName: page.name,
60
60
  pageLink: getPageLink(page, issuer),
@@ -62,11 +62,11 @@ class DyNTS_OAI_Chunking_Util {
62
62
  chunkOriginalContent: chunkContent,
63
63
  chunkContent: chunkWithHierarchy,
64
64
  });
65
- if (this.debugLog) {
65
+ if (this.debugLog || debugLog) {
66
66
  fsm_dynamo_1.DyFM_Log.H_info('Full content (before assembleChunkWithHeaders)', `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`, { chunk: chunk.chunkContent });
67
67
  }
68
68
  chunk.chunkContent = this.assembleChunkWithHeaders(chunk, issuer);
69
- if (this.debugLog) {
69
+ if (this.debugLog || debugLog) {
70
70
  fsm_dynamo_1.DyFM_Log.H_info('Full content (after assembleChunkWithHeaders)', `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`, {
71
71
  chunk: chunk.chunkContent,
72
72
  });
@@ -96,10 +96,10 @@ class DyNTS_OAI_Chunking_Util {
96
96
  /* console.log(`Chunk path:`, chunkPath);
97
97
  console.log(`Chunk with hierarchy preview:`, chunkWithHierarchy.substring(0, 100) + '...'); */
98
98
  const chunk = new oai_doc_chunk_data_model_1.DyNTS_OAI_Chunk({
99
- filePathParents: page.path,
99
+ filePathParents: page.parentedPath,
100
100
  chunkHeadParents: headParents,
101
101
  allFlaggedParents: [...page.allFlaggedParents, ...headParents],
102
- path: [...page.path, ...headParents].join('/'),
102
+ path: [...page.parentedPath, ...headParents].join('/'),
103
103
  documentName: page.documentId,
104
104
  pageName: page.name,
105
105
  pageLink: getPageLink(page, issuer),
@@ -107,11 +107,11 @@ class DyNTS_OAI_Chunking_Util {
107
107
  chunkOriginalContent: chunkContent,
108
108
  chunkContent: chunkWithHierarchy,
109
109
  });
110
- if (this.debugLog) {
110
+ if (this.debugLog || debugLog) {
111
111
  fsm_dynamo_1.DyFM_Log.H_info('Break point (before assembleChunkWithHeaders)', `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`, { chunk: chunk.chunkContent });
112
112
  }
113
113
  chunk.chunkContent = this.assembleChunkWithHeaders(chunk, issuer);
114
- if (this.debugLog) {
114
+ if (this.debugLog || debugLog) {
115
115
  fsm_dynamo_1.DyFM_Log.H_info('Break point (after assembleChunkWithHeaders)', `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`, {
116
116
  chunk: chunk.chunkContent,
117
117
  });
@@ -133,10 +133,10 @@ class DyNTS_OAI_Chunking_Util {
133
133
  const headParents = this.getRelevantHeaders(headerHierarchy, currentPosition, currentPosition + maxChunkSize, lastHeaders); // headerHierarchy.map(header => header.header);
134
134
  const allFlaggedParents = [...page.allFlaggedParents, ...headParents];
135
135
  const chunk = new oai_doc_chunk_data_model_1.DyNTS_OAI_Chunk({
136
- filePathParents: page.path,
136
+ filePathParents: page.parentedPath,
137
137
  chunkHeadParents: headParents,
138
138
  allFlaggedParents: [...page.allFlaggedParents, ...headParents],
139
- path: [...page.path, ...headParents].join('/'),
139
+ path: [...page.parentedPath, ...headParents].join('/'),
140
140
  documentName: page.documentId,
141
141
  pageName: page.name,
142
142
  pageLink: getPageLink(page, issuer),
@@ -144,11 +144,11 @@ class DyNTS_OAI_Chunking_Util {
144
144
  chunkOriginalContent: chunkContent,
145
145
  chunkContent: chunkWithHierarchy,
146
146
  });
147
- if (this.debugLog) {
147
+ if (this.debugLog || debugLog) {
148
148
  fsm_dynamo_1.DyFM_Log.H_info('Max chunk size', `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`, { chunk: chunk.chunkContent });
149
149
  }
150
150
  chunk.chunkContent = this.assembleChunkWithHeaders(chunk, issuer);
151
- if (this.debugLog) {
151
+ if (this.debugLog || debugLog) {
152
152
  fsm_dynamo_1.DyFM_Log.H_info(`Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`, {
153
153
  chunk: chunk.chunkContent,
154
154
  });
package/build/_modules/open-ai/_collections/oai-chunking.util.js.map CHANGED
@@ -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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"}
package/build/_modules/open-ai/_models/interfaces/oai-document-page.interface.d.ts CHANGED
@@ -5,8 +5,9 @@ export interface DyNTS_OAI_DocumentPage<T_Chunk extends DyNTS_OAI_Chunk = DyNTS_
5
5
  name: string;
6
6
  allFlaggedParents: string[];
7
7
  allFlaggedParentsMerged: string;
8
+ filePath: string;
8
9
  /** Path to the page in the document, starting with the document name */
9
- path: string[];
10
+ parentedPath: string[];
10
11
  chunks: T_Chunk[];
11
12
  content: string;
12
13
  pages?: DyNTS_OAI_DocumentPage<T_Chunk>[];
package/build/_modules/open-ai/_models/interfaces/oai-document-page.interface.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oai-document-page.interface.d.ts","sourceRoot":"","sources":["../../../../../src/_modules/open-ai/_models/interfaces/oai-document-page.interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAK9D,MAAM,WAAW,sBAAsB,CACrC,OAAO,SAAS,eAAe,GAAG,eAAe;IAEjD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;IAEhC,wEAAwE;IACxE,IAAI,EAAE,MAAM,EAAE,CAAC;IAEf,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,CAAC,EAAE,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;CAC3C"}
1
+ {"version":3,"file":"oai-document-page.interface.d.ts","sourceRoot":"","sources":["../../../../../src/_modules/open-ai/_models/interfaces/oai-document-page.interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAK9D,MAAM,WAAW,sBAAsB,CACrC,OAAO,SAAS,eAAe,GAAG,eAAe;IAEjD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;IAEhC,QAAQ,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,CAAC,EAAE,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;CAC3C"}
package/build/_modules/open-ai/_services/oai-vector-data.service.d.ts.map CHANGED
@@ -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,EAExB,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;IAqB1F;;OAEG;aACa,cAAc,EAAE,oBAAoB;IAtBtD;;;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,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;YAwC/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,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,KAAK,GAAE,MAAU;IACjB;;OAEG;IACH,kBAAkB,GAAE,MAAY,GAC/B,OAAO,CAAC,GAAG,CAAC;IAuEf;;;;OAIG;IACY,QAAQ,CACrB,IAAI,CAAC,EAAE,CAAC,EACR,gBAAgB,CAAC,EAAE,OAAO,EAC1B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,CAAC,CAAC;CAkBd"}
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,EAExB,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;IAqB1F;;OAEG;aACa,cAAc,EAAE,oBAAoB;IAtBtD;;;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,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;YAyC/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,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,KAAK,GAAE,MAAU;IACjB;;OAEG;IACH,kBAAkB,GAAE,MAAY,GAC/B,OAAO,CAAC,GAAG,CAAC;IA4Ef;;;;OAIG;IACY,QAAQ,CACrB,IAAI,CAAC,EAAE,CAAC,EACR,gBAAgB,CAAC,EAAE,OAAO,EAC1B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,CAAC,CAAC;CAkBd"}
package/build/_modules/open-ai/_services/oai-vector-data.service.js CHANGED
@@ -118,7 +118,7 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
118
118
  /* vectorizePropertyKeys.forEach((key: string): void => {
119
119
  dataParams.properties[key].embeddingModel ??= model;
120
120
  }); */
121
- this.vectorizeProperties.forEach((property) => {
121
+ this.vectorizedProperties.forEach((property) => {
122
122
  property.embeddingModel ??= model;
123
123
  });
124
124
  /* this.vectorizeProperties = vectorizePropertyKeys.map(
@@ -139,7 +139,7 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
139
139
  async vectorizeDataProperties(newData, forceVectorize) {
140
140
  try {
141
141
  let existingData;
142
- if (!forceVectorize) {
142
+ if (!forceVectorize && newData?._id) {
143
143
  const existingData = await this.getDataById(newData._id, true, true);
144
144
  }
145
145
  await fsm_dynamo_1.DyFM_Array.asyncForEachAllAtOnce(this.vectorizedProperties, async (property) => {
@@ -165,6 +165,7 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
165
165
  throw new fsm_dynamo_1.DyFM_Error({
166
166
  ...this.getDefaultErrorSettings('vectorizeDataProperties', new Error(`Property "${vectorizedProperty.key}" has no embedding model!`)),
167
167
  errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-VDB-VDB1`,
168
+ __localStack: this.dataParams.stackLocation,
168
169
  });
169
170
  }
170
171
  newData[vectorizedProperty.key] = await this.vectorize(newValue, vectorizedProperty.embeddingModel);
@@ -243,8 +244,11 @@ class DyNTS_OAI_VectorDataService extends data_service_1.DyNTS_DataService {
243
244
  const property = this.dataParams.properties[searchInKey];
244
245
  if (!property) {
245
246
  throw new fsm_dynamo_1.DyFM_Error({
246
- ...this.getDefaultErrorSettings('vectorSearch', new Error(`Property "${searchInKey}" not found!`)),
247
+ ...this.getDefaultErrorSettings('vectorSearch', new Error(`Property "${searchInKey}" not found! ` +
248
+ `while searching "${this.dataParams.dataName}" ` +
249
+ `(The searchable properties are: ${this.vectorizedProperties.map(p => `"${p.key}"`).join(', ')})`)),
247
250
  errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-VDB-VS2`,
251
+ __localStack: this.dataParams.stackLocation,
248
252
  });
249
253
  }
250
254
  const embeddedInput = await this.embedding_CS.createEmbedding(input, property.embeddingModel, this.issuer);
package/build/_modules/open-ai/_services/oai-vector-data.service.js.map CHANGED
@@ -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,sDAO+B;AAC/B,2DAAkH;AAElH,uFAAoF;AACpF,uEAAyE;AACzE,mFAAqF;AAGrF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAa,2BAAqD,SAAQ,gCAAoB;IAwB1E;IAtBlB;;;OAGG;IACM,mBAAmB,CAAkC;IACrD,oBAAoB,CAAkC;IAC/D,mEAAmE;IAEnE,YAAY,CAAqC;IAEjD;IACE;;OAEG;IACH,IAAO;IACP;;OAEG;IACH,UAAoC;IACpC;;OAEG;IACa,cAAoC;IACpD;;OAEG;IACH,MAAc;QAEd,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QANhB,mBAAc,GAAd,cAAc,CAAsB;QAQpD,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CACrE,CAAC,QAAuC,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,CACrE,CAAC;QAEF,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CAClE,CAAC,GAAW,EAAW,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CACtD,CAAC,QAAuC,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CACnF,CACF,CAAC,GAAG,CACH,CAAC,GAAW,EAAiC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAkC,CAC5G,CAAC;QAEF;;;;;aAKK;QAEL,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,aAAa,EACb,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAC7C;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,KAAK,GAA8B,cAAc,CAAC,eAAe,CAAC,QAAqC;YAC3G,0BAAgB,CAAC,oBAAoB,CAAC;QAExC;;;;;;;;;YASI;QAEJ,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CACb,mCAAmC;gBACnC,+BAA+B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CACtE,CAAC,GAAW,EAAW,EAAE,CAAC,OAAO,CAC9B,UAAU,CAAC,UAAU,CAAC,GAAG,CAAmC,CAAC,cAAc,CAC7E,CACF,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CACb,kCAAkC;gBAClC,8BAA8B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CACrE,CAAC,GAAW,EAAW,EAAE,CAAC,OAAO,CAC9B,UAAU,CAAC,UAAU,CAAC,GAAG,CAAmC,CAAC,cAAc,CAC7E,CACF,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtC,CAAC;QACJ,CAAC;QAED;;;;;;;;;YASI;QAEJ;;cAEM;QAEN,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAuC,EAAQ,EAAE;YACjF,QAAQ,CAAC,cAAc,KAAK,KAAK,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH;;;aAGK;IACP,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,uBAAuB,CAAC,OAAW,EAAE,cAAwB;QACjE,IAAI,CAAC;YACH,IAAI,YAAe,CAAC;YAEpB,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,YAAY,GAAM,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1E,CAAC;YAED,MAAM,uBAAU,CAAC,qBAAqB,CACpC,IAAI,CAAC,oBAAoB,EACzB,KAAK,EAAE,QAAuC,EAAE,EAAE;gBAChD,MAAM,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;YAC9F,CAAC,CACF,CAAC;YAEF,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,yBAAyB,EAAE,KAAK,CAAC;aAClE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAC3C,kBAAiD,EACjD,OAAU,EACV,YAAe,EACf,cAAwB;QAExB,MAAM,QAAQ,GAAW,MAAM,IAAI,CAAC,uCAAuC,CACzE,kBAAkB,EAClB,OAAO,CACR,CAAC;QACF,MAAM,aAAa,GAAW,MAAM,IAAI,CAAC,uCAAuC,CAC9E,kBAAkB,EAClB,YAAY,CACb,CAAC;QAEF,MAAM,cAAc,GAAW,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,4BAA4B,GAAY,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/E,MAAM,mBAAmB,GACvB,CAAC,CAAC,aAAa,IAAI,4BAA4B,CAAC;YAChD,CAAC,IAAA,6BAAgB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAE7C,IAAI,cAAc,IAAI,CAAC,4BAA4B,IAAI,mBAAmB,CAAC,EAAE,CAAC;YAC5E,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,CAAC;gBACvC,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,yBAAyB,EACzB,IAAI,KAAK,CAAC,aAAa,kBAAkB,CAAC,GAAG,2BAA2B,CAAC,CAC1E;oBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,iBAAiB;iBACzE,CAAC,CAAC;YACL,CAAC;YAED,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CACpD,QAAQ,EACR,kBAAkB,CAAC,cAAc,CAClC,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,uCAAuC,CACnD,kBAAiD,EACjD,IAAO;QAGP,IAAI,kBAAkB,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,MAAM,KAAK,GAAY,IAAI,EAAE,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YAEpE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,OAAO,SAAS,CAAC;YACnB,CAAC;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACrC,OAAO,KAAK,CAAC;YACf,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC7D,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,KAAK,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAQ,EAAE,CAAC;YAEvB,kBAAkB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,GAAW,EAAQ,EAAE;gBAC9D,IAAI,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC1B,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CACb,KAAa,EACb,WAAsC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ;QAElF,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;oBAE5E,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,eAAe;iBACvE,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,YAAY,KAAK,IAAI,kEAAkC,CAC1D,IAAI,CAAC,cAAc,CACpB,CAAC;YAEF,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAC5C,KAAK,EACL,QAAQ,EACR,IAAI,CAAC,MAAM,CACZ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,KAAK,CAAC;gBAEnD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,eAAe;aACvE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,YAAY,CAChB,KAAa,EACb,WAAmB,EACnB,QAAgB,CAAC;IACjB;;OAEG;IACH,qBAA6B,GAAG;QAEhC,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;oBAE/E,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;iBACxE,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,YAAY,KAAK,IAAI,kEAAkC,CAC1D,IAAI,CAAC,cAAc,CACpB,CAAC;YAEF,MAAM,QAAQ,GAAkC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAExF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,cAAc,EACd,IAAI,KAAK,CAAC,aAAa,WAAW,cAAc,CAAC,CAClD;oBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;iBACxE,CAAC,CAAC;YACL,CAAC;YAED,MAAM,aAAa,GAAa,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CACrE,KAAK,EACL,QAAQ,CAAC,cAAc,EACvB,IAAI,CAAC,MAAM,CACZ,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAC/C;gBACE;oBACE,aAAa,EAAE;wBACb;iGACyE;wBACzE,KAAK,EAAE,QAAQ,CAAC,iBAAiB;wBACjC,WAAW,EAAE,aAAa;wBAC1B,qEAAqE;wBACrE,IAAI,EAAE,WAAW;wBACjB,aAAa,EAAE,kBAAkB;wBACjC,KAAK,EAAE,KAAK;qBACb;iBACF;aACF;YACD;;;;;;;;;;gBAUI;aACL,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,KAAK,CAAC;gBAEtD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;aACxE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;OAIG;IACM,KAAK,CAAC,QAAQ,CACrB,IAAQ,EACR,gBAA0B,EAC1B,cAAwB;QAExB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAE7B,IAAI,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAEhE,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,UAAU,EACV,KAAK,CACN;gBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;aACxE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAtXD,kEAsXC"}
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.6",
3
+ "version": "01.11.7",
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",
@@ -169,7 +169,7 @@
169
169
  "empty": ""
170
170
  },
171
171
  "peerDependencies": {
172
- "@futdevpro/fsm-dynamo": "1.11.7",
172
+ "@futdevpro/fsm-dynamo": "1.11.8",
173
173
 
174
174
  "@types/express": "4.17.21",
175
175
  "@types/geoip-lite": "~1.4.1",
package/src/_collections/get-environment-settings.util.ts CHANGED
@@ -26,7 +26,7 @@ export function DyNTS_getEnvironment_settings(): DyNTS_Environment_Settings {
26
26
  oauth2Url: process.env.DISCORD_OAUTH2_URL,
27
27
  },
28
28
 
29
- mongoUri: process.env.MONGO_URI,
29
+ mongoUri: process.env.MONGO_URL || process.env.MONGO_URI,
30
30
 
31
31
  openAi: {
32
32
  apiKey: process.env.OPENAI_API_KEY,
package/src/_collections/sample.env CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  ENV={REPLACE_ENV}
4
4
 
5
- MONGO_URI={REPLACE_ATLASDB_URI}
5
+ MONGO_URL={REPLACE_ATLASDB_URI}
6
6
 
7
7
  DISCORD_TOKEN={REPLACE_DISCORD_TOKEN}
8
8
  DISCORD_CLIENT_ID={REPLACE_DISCORD_CLIENT_ID}
package/src/_modules/open-ai/_collections/oai-chunking.util.ts CHANGED
@@ -24,11 +24,12 @@ export class DyNTS_OAI_Chunking_Util {
24
24
  */
25
25
  static async chunkMdContent<
26
26
  T_Chunk extends DyNTS_OAI_Chunk,
27
- T_Page extends DyNTS_OAI_DocumentPage<T_Chunk>
28
- >(
29
- page: T_Page,
30
- getPageLink: (page: T_Page, issuer: string) => string,
31
- issuer: string
27
+ T_Page extends DyNTS_OAI_DocumentPage<T_Chunk>,
28
+ >(
29
+ page: T_Page,
30
+ getPageLink: (page: T_Page, issuer: string) => string,
31
+ issuer: string,
32
+ debugLog?: boolean
32
33
  ): Promise<T_Chunk[]> {
33
34
  try {
34
35
  if (page.content.includes('#####')) {
@@ -68,11 +69,11 @@ export class DyNTS_OAI_Chunking_Util {
68
69
  const allFlaggedParents = [ ...page.allFlaggedParents, ...headParents ];
69
70
 
70
71
  const chunk: T_Chunk = new DyNTS_OAI_Chunk({
71
- filePathParents: page.path,
72
+ filePathParents: page.parentedPath,
72
73
  chunkHeadParents: headParents,
73
74
 
74
75
  allFlaggedParents: [ ...page.allFlaggedParents, ...headParents ],
75
- path: [ ...page.path, ...headParents ].join('/'),
76
+ path: [ ...page.parentedPath, ...headParents ].join('/'),
76
77
 
77
78
  documentName: page.documentId,
78
79
  pageName: page.name,
@@ -83,7 +84,7 @@ export class DyNTS_OAI_Chunking_Util {
83
84
 
84
85
  chunkContent: chunkWithHierarchy,
85
86
  }) as T_Chunk;
86
- if (this.debugLog) {
87
+ if (this.debugLog || debugLog) {
87
88
  DyFM_Log.H_info(
88
89
  'Full content (before assembleChunkWithHeaders)',
89
90
  `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`,
@@ -91,7 +92,7 @@ export class DyNTS_OAI_Chunking_Util {
91
92
  );
92
93
  }
93
94
  chunk.chunkContent = this.assembleChunkWithHeaders(chunk, issuer);
94
- if (this.debugLog) {
95
+ if (this.debugLog || debugLog) {
95
96
  DyFM_Log.H_info(
96
97
  'Full content (after assembleChunkWithHeaders)',
97
98
  `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`,
@@ -134,11 +135,11 @@ export class DyNTS_OAI_Chunking_Util {
134
135
  console.log(`Chunk with hierarchy preview:`, chunkWithHierarchy.substring(0, 100) + '...'); */
135
136
 
136
137
  const chunk: T_Chunk = new DyNTS_OAI_Chunk({
137
- filePathParents: page.path,
138
+ filePathParents: page.parentedPath,
138
139
  chunkHeadParents: headParents,
139
140
 
140
141
  allFlaggedParents: [ ...page.allFlaggedParents, ...headParents ],
141
- path: [ ...page.path, ...headParents ].join('/'),
142
+ path: [ ...page.parentedPath, ...headParents ].join('/'),
142
143
 
143
144
  documentName: page.documentId,
144
145
  pageName: page.name,
@@ -149,7 +150,7 @@ export class DyNTS_OAI_Chunking_Util {
149
150
 
150
151
  chunkContent: chunkWithHierarchy,
151
152
  }) as T_Chunk;
152
- if (this.debugLog) {
153
+ if (this.debugLog || debugLog) {
153
154
  DyFM_Log.H_info(
154
155
  'Break point (before assembleChunkWithHeaders)',
155
156
  `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`,
@@ -157,7 +158,7 @@ export class DyNTS_OAI_Chunking_Util {
157
158
  );
158
159
  }
159
160
  chunk.chunkContent = this.assembleChunkWithHeaders(chunk, issuer);
160
- if (this.debugLog) {
161
+ if (this.debugLog || debugLog) {
161
162
  DyFM_Log.H_info(
162
163
  'Break point (after assembleChunkWithHeaders)',
163
164
  `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`,
@@ -185,11 +186,11 @@ export class DyNTS_OAI_Chunking_Util {
185
186
  const allFlaggedParents = [ ...page.allFlaggedParents, ...headParents ];
186
187
 
187
188
  const chunk: T_Chunk = new DyNTS_OAI_Chunk({
188
- filePathParents: page.path,
189
+ filePathParents: page.parentedPath,
189
190
  chunkHeadParents: headParents,
190
191
 
191
192
  allFlaggedParents: [ ...page.allFlaggedParents, ...headParents ],
192
- path: [ ...page.path, ...headParents ].join('/'),
193
+ path: [ ...page.parentedPath, ...headParents ].join('/'),
193
194
 
194
195
  documentName: page.documentId,
195
196
  pageName: page.name,
@@ -200,7 +201,7 @@ export class DyNTS_OAI_Chunking_Util {
200
201
 
201
202
  chunkContent: chunkWithHierarchy,
202
203
  }) as T_Chunk;
203
- if (this.debugLog) {
204
+ if (this.debugLog || debugLog) {
204
205
  DyFM_Log.H_info(
205
206
  'Max chunk size',
206
207
  `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`,
@@ -208,7 +209,7 @@ export class DyNTS_OAI_Chunking_Util {
208
209
  );
209
210
  }
210
211
  chunk.chunkContent = this.assembleChunkWithHeaders(chunk, issuer);
211
- if (this.debugLog) {
212
+ if (this.debugLog || debugLog) {
212
213
  DyFM_Log.H_info(
213
214
  `Chunk ${chunkIndex}: ${chunk.path.replaceAll('/', '/\n').split('/')}`,
214
215
  {
package/src/_modules/open-ai/_models/interfaces/oai-document-page.interface.ts CHANGED
@@ -15,8 +15,9 @@ export interface DyNTS_OAI_DocumentPage<
15
15
  allFlaggedParents: string[];
16
16
  allFlaggedParentsMerged: string;
17
17
 
18
+ filePath: string;
18
19
  /** Path to the page in the document, starting with the document name */
19
- path: string[];
20
+ parentedPath: string[];
20
21
 
21
22
  chunks: T_Chunk[];
22
23
  content: string;
package/src/_modules/open-ai/_services/oai-vector-data.service.ts CHANGED
@@ -162,7 +162,7 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
162
162
  dataParams.properties[key].embeddingModel ??= model;
163
163
  }); */
164
164
 
165
- this.vectorizeProperties.forEach((property: DyFM_DataProperty_Params<any>): void => {
165
+ this.vectorizedProperties.forEach((property: DyFM_DataProperty_Params<any>): void => {
166
166
  property.embeddingModel ??= model;
167
167
  });
168
168
 
@@ -186,7 +186,7 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
186
186
  try {
187
187
  let existingData: T;
188
188
 
189
- if (!forceVectorize) {
189
+ if (!forceVectorize && newData?._id) {
190
190
  const existingData: T = await this.getDataById(newData._id, true, true);
191
191
  }
192
192
 
@@ -235,6 +235,7 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
235
235
  ),
236
236
 
237
237
  errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-VDB-VDB1`,
238
+ __localStack: this.dataParams.stackLocation,
238
239
  });
239
240
  }
240
241
 
@@ -347,10 +348,15 @@ export class DyNTS_OAI_VectorDataService<T extends DyFM_Metadata> extends DyNTS_
347
348
  throw new DyFM_Error({
348
349
  ...this.getDefaultErrorSettings(
349
350
  'vectorSearch',
350
- new Error(`Property "${searchInKey}" not found!`)
351
+ new Error(
352
+ `Property "${searchInKey}" not found! ` +
353
+ `while searching "${this.dataParams.dataName}" ` +
354
+ `(The searchable properties are: ${this.vectorizedProperties.map(p => `"${p.key}"`).join(', ')})`
355
+ )
351
356
  ),
352
357
 
353
358
  errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-VDB-VS2`,
359
+ __localStack: this.dataParams.stackLocation,
354
360
  });
355
361
  }
356
362