v4.6.9-alpha (#918)

Co-authored-by: Mufei <327958099@qq.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/api/core/ai/agent/createQuestionGuide.ts

@@ -4,22 +4,21 @@ import { connectToDatabase } from '@/service/mongo';
 import type { CreateQuestionGuideParams } from '@/global/core/ai/api.d';
 import { pushQuestionGuideUsage } from '@/service/support/wallet/usage/push';
 import { createQuestionGuide } from '@fastgpt/service/core/ai/functions/createQuestionGuide';
-import { authCertOrShareId } from '@fastgpt/service/support/permission/auth/common';
+import { authChatCert } from '@/service/support/permission/auth/chat';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
     await connectToDatabase();
-    const { messages, shareId } = req.body as CreateQuestionGuideParams;
+    const { messages } = req.body as CreateQuestionGuideParams;
 
-    const { tmbId, teamId } = await authCertOrShareId({
+    const { tmbId, teamId } = await authChatCert({
       req,
-      authToken: true,
-      shareId
+      authToken: true
     });
 
     const qgModel = global.llmModels[0];
 
-    const { result, charsLength } = await createQuestionGuide({
+    const { result, tokens } = await createQuestionGuide({
       messages,
       model: qgModel.model
     });
@@ -29,7 +28,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     });
 
     pushQuestionGuideUsage({
-      charsLength,
+      tokens,
       teamId,
       tmbId
     });

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

@@ -7,12 +7,13 @@ import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
 import { ClearHistoriesProps } from '@/global/core/chat/api';
 import { authOutLink } from '@/service/support/permission/auth/outLink';
 import { ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
+import { authTeamSpaceToken } from '@/service/support/permission/auth/team';
 
 /* clear chat history */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
-    const { appId, shareId, outLinkUid } = req.query as ClearHistoriesProps;
+    const { appId, shareId, outLinkUid, teamId, teamToken } = req.query as ClearHistoriesProps;
 
     let chatAppId = appId;
 
@@ -26,6 +27,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
           outLinkUid: uid
         };
       }
+      if (teamId && teamToken) {
+        const { uid } = await authTeamSpaceToken({ teamId, teamToken });
+        return {
+          teamId,
+          appId,
+          outLinkUid: uid
+        };
+      }
       if (appId) {
         const { tmbId } = await authCert({ req, authToken: true });
 

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

@@ -4,14 +4,15 @@ import { connectToDatabase } from '@/service/mongo';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import type { ChatHistoryItemType } from '@fastgpt/global/core/chat/type.d';
 import { ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
-import { getHistoriesProps } from '@/global/core/chat/api';
+import { GetHistoriesProps } from '@/global/core/chat/api';
 import { authOutLink } from '@/service/support/permission/auth/outLink';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import { authTeamSpaceToken } from '@/service/support/permission/auth/team';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
-    const { appId, shareId, outLinkUid } = req.body as getHistoriesProps;
+    const { appId, shareId, outLinkUid, teamId, teamToken } = req.body as GetHistoriesProps;
 
     const limit = shareId && outLinkUid ? 20 : 30;
 
@@ -28,10 +29,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
           }
         };
       }
-      if (appId && outLinkUid) {
+      if (appId && teamId && teamToken) {
+        const { uid } = await authTeamSpaceToken({ teamId, teamToken });
         return {
-          shareId,
-          outLinkUid: outLinkUid,
+          teamId,
+          appId,
+          outLinkUid: uid,
           source: ChatSourceEnum.team
         };
       }

projects/app/src/pages/api/core/chat/item/getSpeech.ts

@@ -4,7 +4,7 @@ import { connectToDatabase } from '@/service/mongo';
 import { GetChatSpeechProps } from '@/global/core/chat/api.d';
 import { text2Speech } from '@fastgpt/service/core/ai/audio/speech';
 import { pushAudioSpeechUsage } from '@/service/support/wallet/usage/push';
-import { authCertOrShareId } from '@fastgpt/service/support/permission/auth/common';
+import { authChatCert } from '@/service/support/permission/auth/chat';
 import { authType2UsageSource } from '@/service/support/wallet/usage/utils';
 import { getAudioSpeechModel } from '@fastgpt/service/core/ai/model';
 import { MongoTTSBuffer } from '@fastgpt/service/common/buffer/tts/schema';
@@ -19,13 +19,13 @@ import { MongoTTSBuffer } from '@fastgpt/service/common/buffer/tts/schema';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
-    const { ttsConfig, input, shareId } = req.body as GetChatSpeechProps;
+    const { ttsConfig, input } = req.body as GetChatSpeechProps;
 
     if (!ttsConfig.model || !ttsConfig.voice) {
       throw new Error('model or voice not found');
     }
 
-    const { teamId, tmbId, authType } = await authCertOrShareId({ req, authToken: true, shareId });
+    const { teamId, tmbId, authType } = await authChatCert({ req, authToken: true });
 
     const ttsModel = getAudioSpeechModel(ttsConfig.model);
     const voiceData = ttsModel.voices?.find((item) => item.value === ttsConfig.voice);

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

@@ -1,37 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
-import type { chatByTeamProps } from '@/global/core/chat/api.d';
-import axios from 'axios';
-import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
-import { getChatItems } from '@fastgpt/service/core/chat/controller';
-import { selectShareResponse } from '@/utils/service/core/chat';
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
-
-    let { teamId, appId, outLinkUid } = req.query as chatByTeamProps;
-
-    const history = await MongoChatItem.find({
-      appId: appId,
-      outLinkUid: outLinkUid,
-      teamId: teamId
-    });
-
-    jsonRes(res, {
-      data: history
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      data: req.query,
-      error: err
-    });
-  }
-}
-
-export const config = {
-  api: {
-    responseLimit: '10mb'
-  }
-};

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

@@ -9,7 +9,7 @@ import { getChatItems } from '@fastgpt/service/core/chat/controller';
 import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
 import { authOutLink } from '@/service/support/permission/auth/outLink';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
-import { selectShareResponse } from '@/utils/service/core/chat';
+import { selectSimpleChatResponse } from '@/utils/service/core/chat';
 import { AppErrEnum } from '@fastgpt/global/common/error/code/app';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
@@ -50,7 +50,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     // pick share response field
     history.forEach((item) => {
-      item.responseData = selectShareResponse({ responseData: item.responseData });
+      item.responseData = selectSimpleChatResponse({ responseData: item.responseData });
     });
 
     jsonRes<InitChatResponse>(res, {

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

@@ -4,59 +4,57 @@ import { connectToDatabase } from '@/service/mongo';
 import { getGuideModule } from '@fastgpt/global/core/module/utils';
 import { getChatModelNameListByModules } from '@/service/core/app/module';
 import { ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
-import type { InitChatProps, InitChatResponse } from '@/global/core/chat/api.d';
+import type { InitChatResponse, InitTeamChatProps } from '@/global/core/chat/api.d';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
 import { getChatItems } from '@fastgpt/service/core/chat/controller';
 import { AppErrEnum } from '@fastgpt/global/common/error/code/app';
+import { authTeamSpaceToken } from '@/service/support/permission/auth/team';
+import { MongoTeam } from '@fastgpt/service/support/user/team/teamSchema';
+import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
+import { selectSimpleChatResponse } from '@/utils/service/core/chat';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
 
-    let { appId, chatId, outLinkUid } = req.query as {
-      chatId?: string;
-      appId?: string;
-      outLinkUid?: string;
-    };
+    let { teamId, appId, chatId, teamToken } = req.query as InitTeamChatProps;
 
-    if (!appId) {
-      return jsonRes(res, {
-        code: 501,
-        message: "You don't have an app yet"
-      });
+    if (!teamId || !appId || !teamToken) {
+      throw new Error('teamId, appId, teamToken are required');
     }
 
-    // auth app permission
-    const [chat, app] = await Promise.all([
-      //   authApp({
-      //     req,
-      //     authToken: false,
-      //     appId,
-      //     per: 'r'
-      //   }),
-      chatId ? MongoChat.findOne({ appId, chatId }) : undefined,
+    const { uid } = await authTeamSpaceToken({
+      teamId,
+      teamToken
+    });
+
+    const [team, chat, app] = await Promise.all([
+      MongoTeam.findById(teamId, 'name avatar').lean(),
+      MongoChat.findOne({ teamId, appId, chatId }).lean(),
       MongoApp.findById(appId).lean()
     ]);
+
     if (!app) {
       throw new Error(AppErrEnum.unExist);
     }
 
     // auth chat permission
-    // if (chat && chat.outLinkUid !== outLinkUid) {
-    //   throw new Error(ChatErrEnum.unAuthChat);
-    // }
-    // // auth chat permission
-    // if (chat && !app.canWrite && String(tmbId) !== String(chat?.tmbId)) {
-    //   throw new Error(ChatErrEnum.unAuthChat);
-    // }
+    if (chat && chat.outLinkUid !== uid) {
+      throw new Error(ChatErrEnum.unAuthChat);
+    }
 
     // get app and history
     const { history } = await getChatItems({
       appId,
       chatId,
       limit: 30,
-      field: `dataId obj value adminFeedback userBadFeedback userGoodFeedback ${ModuleOutputKeyEnum.responseData}`
+      field: `dataId obj value userGoodFeedback userBadFeedback adminFeedback ${ModuleOutputKeyEnum.responseData}`
+    });
+
+    // pick share response field
+    history.forEach((item) => {
+      item.responseData = selectSimpleChatResponse({ responseData: item.responseData });
     });
 
     jsonRes<InitChatResponse>(res, {
@@ -64,7 +62,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         chatId,
         appId,
         title: chat?.title || '新对话',
-        userAvatar: undefined,
+        userAvatar: team?.avatar,
         variables: chat?.variables || {},
         history,
         app: {

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

@@ -8,9 +8,9 @@ import type { GetDatasetCollectionsProps } from '@/global/core/api/datasetReq';
 import { PagingData } from '@/types';
 import { MongoDatasetCollection } from '@fastgpt/service/core/dataset/collection/schema';
 import { DatasetCollectionTypeEnum } from '@fastgpt/global/core/dataset/constants';
-import { startQueue } from '@/service/utils/tools';
 import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
 import { DatasetDataCollectionName } from '@fastgpt/service/core/dataset/data/schema';
+import { startTrainingQueue } from '@/service/core/dataset/training/utils';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -158,7 +158,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     );
 
     if (data.find((item) => item.trainingAmount > 0)) {
-      startQueue();
+      startTrainingQueue();
     }
 
     // count collections

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

@@ -75,7 +75,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       a: formatA
     });
 
-    const { insertId, charsLength } = await insertData2Dataset({
+    const { insertId, tokens } = await insertData2Dataset({
       teamId,
       tmbId,
       datasetId,
@@ -90,7 +90,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     pushGenerateVectorUsage({
       teamId,
       tmbId,
-      charsLength,
+      tokens,
       model: vectorModelData.model
     });
 

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

@@ -34,7 +34,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       insertLen: 1
     });
 
-    const { charsLength } = await updateData2Dataset({
+    const { tokens } = await updateData2Dataset({
       dataId: id,
       q,
       a,
@@ -45,7 +45,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     pushGenerateVectorUsage({
       teamId,
       tmbId,
-      charsLength,
+      tokens,
       model: vectorModel
     });
 

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

@@ -58,7 +58,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       extensionBg: datasetSearchExtensionBg
     });
 
-    const { searchRes, charsLength, ...result } = await searchDatasetData({
+    const { searchRes, tokens, ...result } = await searchDatasetData({
       teamId,
       reRankQuery: rewriteQuery,
       queries: concatQueries,
@@ -74,14 +74,14 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     const { totalPoints } = pushGenerateVectorUsage({
       teamId,
       tmbId,
-      charsLength,
+      tokens,
       model: dataset.vectorModel,
       source: apikey ? UsageSourceEnum.api : UsageSourceEnum.fastgpt,
 
       ...(aiExtensionResult &&
         extensionModel && {
           extensionModel: extensionModel.name,
-          extensionCharsLength: aiExtensionResult.charsLength
+          extensionTokens: aiExtensionResult.tokens
         })
     });
     if (apikey) {