4.6.3-alpha1 (#529)

projects/app/src/service/core/dataset/data/controller.ts

@@ -22,6 +22,7 @@ export async function insertData2Dataset({
   collectionId,
   q,
   a = '',
+  chunkIndex = 0,
   indexes,
   model
 }: CreateDatasetDataProps & {
@@ -73,6 +74,7 @@ export async function insertData2Dataset({
     q,
     a,
     fullTextToken: jiebaSplit({ text: qaStr }),
+    chunkIndex,
     indexes: indexes.map((item, i) => ({
       ...item,
       dataId: result[i].insertId

projects/app/src/service/core/dataset/data/pg.ts

@@ -270,7 +270,7 @@ export async function embeddingRecall({
       {
         _id: { $in: filterRows.map((item) => item.collection_id) }
       },
-      'name metadata'
+      'name fileId rawLink'
     ).lean(),
     MongoDatasetData.find(
       {
@@ -297,7 +297,7 @@ export async function embeddingRecall({
         datasetId: String(data.datasetId),
         collectionId: String(data.collectionId),
         sourceName: collection.name || '',
-        sourceId: collection.metadata?.fileId || collection.metadata?.rawLink,
+        sourceId: collection?.fileId || collection?.rawLink,
         score: item.score
       };
     })
@@ -352,7 +352,7 @@ export async function fullTextRecall({ text, limit, datasetIds = [] }: SearchPro
     {
       _id: { $in: searchResults.map((item) => item.collectionId) }
     },
-    '_id name metadata'
+    '_id name fileId rawLink'
   );
 
   return {
@@ -363,7 +363,7 @@ export async function fullTextRecall({ text, limit, datasetIds = [] }: SearchPro
         datasetId: String(item.datasetId),
         collectionId: String(item.collectionId),
         sourceName: collection?.name || '',
-        sourceId: collection?.metadata?.fileId || collection?.metadata?.rawLink,
+        sourceId: collection?.fileId || collection?.rawLink,
         q: item.q,
         a: item.a,
         indexes: item.indexes,

projects/app/src/service/events/generateVector.ts

@@ -50,6 +50,7 @@ export async function generateVector(): Promise<any> {
           collectionId: 1,
           q: 1,
           a: 1,
+          chunkIndex: 1,
           indexes: 1,
           model: 1,
           billId: 1
@@ -134,6 +135,7 @@ export async function generateVector(): Promise<any> {
       collectionId: data.collectionId,
       q: dataItem.q,
       a: dataItem.a,
+      chunkIndex: data.chunkIndex,
       indexes: dataItem.indexes,
       model: data.model
     });

projects/app/src/service/moduleDispatch/dataset/search.ts

@@ -65,7 +65,8 @@ export async function dispatchDatasetSearch(
       model: vectorModel.name,
       tokens: tokenLen,
       similarity,
-      limit
+      limit,
+      searchMode
     }
   };
 }

projects/app/src/service/support/permission/auth/dataset.ts

@@ -31,7 +31,7 @@ export async function authDatasetData({
     datasetId: String(datasetData.datasetId),
     collectionId: String(datasetData.collectionId),
     sourceName: result.collection.name || '',
-    sourceId: result.collection.metadata?.fileId || result.collection.metadata?.rawLink,
+    sourceId: result.collection?.fileId || result.collection?.rawLink,
     isOwner: String(datasetData.tmbId) === result.tmbId,
     canWrite: result.canWrite
   };