4.6.4 (#588)

projects/app/src/pages/api/core/app/form2Modules/fastgpt-simple.ts

@@ -379,14 +379,14 @@ function datasetTemplate({
         },
         {
           key: 'similarity',
-          value: 0.4,
+          value: 0.1,
           type: FlowNodeInputTypeEnum.slider,
           label: '相关度',
           connected: true
         },
         {
           key: 'limit',
-          value: 8,
+          value: 2000,
           type: FlowNodeInputTypeEnum.slider,
           label: '单次搜索上限',
           connected: true

projects/app/src/pages/api/core/app/getChatLogs.ts

@@ -60,12 +60,30 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         },
         {
           $addFields: {
-            feedbackCount: {
+            userGoodFeedbackCount: {
               $size: {
                 $filter: {
                   input: '$chatitems',
                   as: 'item',
-                  cond: { $ifNull: ['$$item.userFeedback', false] }
+                  cond: { $ifNull: ['$$item.userGoodFeedback', false] }
+                }
+              }
+            },
+            userBadFeedbackCount: {
+              $size: {
+                $filter: {
+                  input: '$chatitems',
+                  as: 'item',
+                  cond: { $ifNull: ['$$item.userBadFeedback', false] }
+                }
+              }
+            },
+            robotBadFeedbackCount: {
+              $size: {
+                $filter: {
+                  input: '$chatitems',
+                  as: 'item',
+                  cond: { $ifNull: ['$$item.robotBadFeedback', false] }
                 }
               }
             },
@@ -80,7 +98,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
             }
           }
         },
-        { $sort: { feedbackCount: -1, updateTime: -1 } },
+        {
+          $sort: {
+            userBadFeedbackCount: -1,
+            userGoodFeedbackCount: -1,
+            robotBadFeedbackCount: -1,
+            updateTime: -1
+          }
+        },
         { $skip: (pageNum - 1) * pageSize },
         { $limit: pageSize },
         {
@@ -91,7 +116,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
             source: 1,
             time: '$updateTime',
             messageCount: { $size: '$chatitems' },
-            feedbackCount: 1,
+            userGoodFeedbackCount: 1,
+            userBadFeedbackCount: 1,
+            robotBadFeedbackCount: 1,
             markCount: 1
           }
         }

projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts

@@ -0,0 +1,52 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
+import { UpdateChatFeedbackProps } from '@fastgpt/global/core/chat/api';
+import { autChatCrud } from '@/service/support/permission/auth/chat';
+
+/* 初始化我的聊天框，需要身份验证 */
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const { chatId, chatItemId, shareId, outLinkUid, userBadFeedback, userGoodFeedback } =
+    req.body as UpdateChatFeedbackProps;
+
+  try {
+    await connectToDatabase();
+
+    await autChatCrud({
+      req,
+      authToken: true,
+      chatId,
+      shareId,
+      outLinkUid,
+      per: 'r'
+    });
+
+    if (!chatItemId) {
+      throw new Error('chatItemId is required');
+    }
+
+    await MongoChatItem.findOneAndUpdate(
+      {
+        dataId: chatItemId
+      },
+      {
+        $unset: {
+          ...(userBadFeedback === undefined && { userBadFeedback: '' }),
+          ...(userGoodFeedback === undefined && { userGoodFeedback: '' })
+        },
+        $set: {
+          ...(userBadFeedback !== undefined && { userBadFeedback }),
+          ...(userGoodFeedback !== undefined && { userGoodFeedback })
+        }
+      }
+    );
+
+    jsonRes(res);
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}

projects/app/src/pages/api/core/chat/feedback/userUpdate.ts

@@ -1,35 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
-import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
-
-/* 初始化我的聊天框，需要身份验证 */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
-    const { chatItemId, userFeedback = undefined } = req.body as {
-      chatItemId: string;
-      userFeedback?: string;
-    };
-
-    if (!chatItemId) {
-      throw new Error('chatItemId is required');
-    }
-
-    await MongoChatItem.findOneAndUpdate(
-      {
-        dataId: chatItemId
-      },
-      {
-        ...(userFeedback ? { userFeedback } : { $unset: { userFeedback: '' } })
-      }
-    );
-
-    jsonRes(res);
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}

projects/app/src/pages/api/core/chat/init.ts

@@ -43,7 +43,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const { history } = await getChatItems({
       chatId,
       limit: 30,
-      field: `dataId obj value adminFeedback userFeedback ${ModuleOutputKeyEnum.responseData}`
+      field: `dataId obj value adminFeedback userBadFeedback userGoodFeedback robotBadFeedback ${ModuleOutputKeyEnum.responseData}`
     });
 
     jsonRes<InitChatResponse>(res, {

projects/app/src/pages/api/core/chat/outLink/init.ts

@@ -42,7 +42,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const { history } = await getChatItems({
       chatId,
       limit: 30,
-      field: `dataId obj value userFeedback ${
+      field: `dataId obj value userGoodFeedback userBadFeedback ${
         shareChat.responseDetail ? `adminFeedback ${ModuleOutputKeyEnum.responseData}` : ''
       } `
     });

projects/app/src/pages/api/core/dataset/checkExportLimit.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoUser } from '@fastgpt/service/support/user/schema';
-import { addLog } from '@fastgpt/service/common/mongo/controller';
+import { addLog } from '@fastgpt/service/common/system/log';
 import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
 import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
 import { findDatasetIdTreeByTopDatasetId } from '@fastgpt/service/core/dataset/controller';

projects/app/src/pages/api/core/dataset/collection/delete.ts

@@ -33,11 +33,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       fileIds: collections.map((item) => item?.fileId || '').filter(Boolean)
     });
 
-    // delete collection
-    await MongoDatasetCollection.deleteMany({
-      _id: { $in: delIdList }
-    });
-
     jsonRes(res);
   } catch (err) {
     jsonRes(res, {

projects/app/src/pages/api/core/dataset/collection/sync/link.ts

@@ -68,13 +68,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     });
 
     // delete old collection
-    await Promise.all([
-      delCollectionRelevantData({
-        collectionIds: [collection._id],
-        fileIds: collection.fileId ? [collection.fileId] : []
-      }),
-      MongoDatasetCollection.findByIdAndRemove(collection._id)
-    ]);
+    await delCollectionRelevantData({
+      collectionIds: [collection._id],
+      fileIds: collection.fileId ? [collection.fileId] : []
+    });
 
     jsonRes(res);
   } catch (err) {

projects/app/src/pages/api/core/dataset/data/pushData.ts

@@ -136,7 +136,7 @@ export async function pushDataToDatasetCollection({
       model,
       q: item.q,
       a: item.a,
-      chunkIndex: i,
+      chunkIndex: item.chunkIndex ?? i,
       indexes: item.indexes
     }))
   );

projects/app/src/pages/api/core/dataset/exportAll.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes, responseWriteController } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoUser } from '@fastgpt/service/support/user/schema';
-import { addLog } from '@fastgpt/service/common/mongo/controller';
+import { addLog } from '@fastgpt/service/common/system/log';
 import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
 import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
 import { findDatasetIdTreeByTopDatasetId } from '@fastgpt/service/core/dataset/controller';

projects/app/src/pages/api/core/dataset/searchTest.ts

@@ -6,10 +6,8 @@ import { connectToDatabase } from '@/service/mongo';
 import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
 import { authTeamBalance } from '@/service/support/permission/auth/bill';
 import { pushGenerateVectorBill } from '@/service/support/wallet/bill/push';
-import { countModelPrice } from '@/service/support/wallet/bill/utils';
 import { searchDatasetData } from '@/service/core/dataset/data/pg';
 import { updateApiKeyUsage } from '@fastgpt/service/support/openapi/tools';
-import { ModelTypeEnum } from '@/service/core/ai/model';
 import { BillSourceEnum } from '@fastgpt/global/support/wallet/bill/constants';
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
@@ -38,7 +36,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     const { searchRes, tokenLen } = await searchDatasetData({
       text,
       model: dataset.vectorModel,
-      limit: Math.min(limit, 50),
+      limit: Math.min(limit * 800, 30000),
       datasetIds: [datasetId],
       searchMode
     });