v4.6.5 (#620)

packages/service/core/chat/chatItemSchema.ts

@@ -61,8 +61,8 @@ const ChatItemSchema = new Schema({
   userBadFeedback: {
     type: String
   },
-  robotBadFeedback: {
-    type: String
+  customFeedbacks: {
+    type: [String]
   },
   adminFeedback: {
     type: {
@@ -86,7 +86,7 @@ try {
   ChatItemSchema.index({ chatId: 1 });
   ChatItemSchema.index({ userGoodFeedback: 1 });
   ChatItemSchema.index({ userBadFeedback: 1 });
-  ChatItemSchema.index({ robotBadFeedback: 1 });
+  ChatItemSchema.index({ customFeedbacks: 1 });
   ChatItemSchema.index({ adminFeedback: 1 });
 } catch (error) {
   console.log(error);

packages/service/core/chat/controller.ts

@@ -1,5 +1,6 @@
 import type { ChatItemType } from '@fastgpt/global/core/chat/type';
 import { MongoChatItem } from './chatItemSchema';
+import { addLog } from '../../common/system/log';
 
 export async function getChatItems({
   chatId,
@@ -20,3 +21,29 @@ export async function getChatItems({
 
   return { history };
 }
+
+export const addCustomFeedbacks = async ({
+  chatId,
+  chatItemId,
+  feedbacks
+}: {
+  chatId?: string;
+  chatItemId?: string;
+  feedbacks: string[];
+}) => {
+  if (!chatId || !chatItemId) return;
+
+  try {
+    await MongoChatItem.findOneAndUpdate(
+      {
+        chatId,
+        dataId: chatItemId
+      },
+      {
+        $push: { customFeedbacks: { $each: feedbacks } }
+      }
+    );
+  } catch (error) {
+    addLog.error('addCustomFeedbacks error', error);
+  }
+};

packages/service/core/dataset/collection/utils.ts

@@ -4,7 +4,7 @@ import type { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder
 import { DatasetErrEnum } from '@fastgpt/global/common/error/code/dataset';
 import { splitText2Chunks } from '@fastgpt/global/common/string/textSplitter';
 import { MongoDatasetTraining } from '../training/schema';
-import { urlsFetch } from '@fastgpt/global/common/file/tools';
+import { urlsFetch } from '../../../common/string/cheerio';
 import { DatasetCollectionTypeEnum } from '@fastgpt/global/core/dataset/constant';
 
 /**
@@ -105,7 +105,8 @@ export const loadingOneChunkCollection = async ({
   // split data
   const { chunks } = splitText2Chunks({
     text: newRawText,
-    chunkLen: collection.chunkSize || 512
+    chunkLen: collection.chunkSize || 512,
+    countTokens: false
   });
 
   // insert to training queue

packages/service/core/plugin/controller.ts

@@ -44,6 +44,7 @@ const getPluginTemplateById = async (id: string): Promise<PluginTemplateType> =>
       name: item.name,
       avatar: item.avatar,
       intro: item.intro,
+      showStatus: true,
       source: PluginSourceEnum.personal,
       modules: item.modules,
       templateType: ModuleTemplateTypeEnum.personalPlugin
@@ -67,7 +68,7 @@ export async function getPluginPreviewModule({
     avatar: plugin.avatar,
     name: plugin.name,
     intro: plugin.intro,
-    showStatus: true,
+    showStatus: plugin.showStatus,
     ...plugin2ModuleIO(plugin.id, plugin.modules)
   };
 }