4.6.4-alpha (#569)

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

@@ -189,15 +189,6 @@ export async function searchDatasetData(props: SearchProps) {
     })
   ).filter((item) => item.score > similarity);
 
-  // (It's possible that rerank failed) concat rerank results and search results
-  set = new Set<string>(reRankResults.map((item) => item.id));
-  embeddingRecallResults.forEach((item) => {
-    if (!set.has(item.id) && item.score >= similarity) {
-      reRankResults.push(item);
-      set.add(item.id);
-    }
-  });
-
   return {
     searchRes: reRankResults.slice(0, limit),
     tokenLen
@@ -382,7 +373,7 @@ export async function reRankSearchResult({
   } catch (error) {
     console.log(error);
 
-    return [];
+    return data;
   }
 }
 // ------------------ search end ------------------

projects/app/src/service/moduleDispatch/index.ts

@@ -3,7 +3,7 @@ import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
 import { ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
 import { RunningModuleItemType } from '@/types/app';
 import { ModuleDispatchProps } from '@/types/core/chat/type';
-import { ChatHistoryItemResType } from '@fastgpt/global/core/chat/api';
+import type { ChatHistoryItemResType } from '@fastgpt/global/core/chat/type.d';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { ModuleItemType } from '@fastgpt/global/core/module/type';
 import { UserType } from '@fastgpt/global/support/user/type';

projects/app/src/service/moduleDispatch/plugin/run.ts

@@ -48,7 +48,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
     answerText,
     responseData: {
       moduleLogo: plugin.avatar,
-      price: responseData.reduce((sum, item) => sum + item.price, 0),
+      price: responseData.reduce((sum, item) => sum + (item.price || 0), 0),
       runningTime: responseData.reduce((sum, item) => sum + (item.runningTime || 0), 0),
       pluginOutput: output?.pluginOutput
     },

projects/app/src/service/support/outLink/auth.ts

@@ -1,14 +0,0 @@
-import { POST } from '@fastgpt/service/common/api/plusRequest';
-import type {
-  AuthLinkLimitProps,
-  AuthShareChatInitProps
-} from '@fastgpt/global/support/outLink/api.d';
-
-export function authOutLinkLimit(data: AuthLinkLimitProps) {
-  return POST('/support/outLink/authLimit', data);
-}
-
-export function authShareChatInit(data: AuthShareChatInitProps) {
-  if (!global.feConfigs?.isPlus) return;
-  return POST('/support/outLink/authShareChatInit', data);
-}

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

@@ -0,0 +1,59 @@
+import { ChatSchema } from '@fastgpt/global/core/chat/type';
+import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
+import { AuthModeType } from '@fastgpt/service/support/permission/type';
+import { authOutLink } from './outLink';
+import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
+import { authUserRole } from '@fastgpt/service/support/permission/auth/user';
+import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant';
+
+/* 
+  outLink: Must be the owner
+  token: team owner and chat owner have all permissions
+*/
+export async function autChatCrud({
+  chatId,
+  shareId,
+  outLinkUid,
+  per = 'owner',
+  ...props
+}: AuthModeType & {
+  chatId?: string;
+  shareId?: string;
+  outLinkUid?: string;
+}): Promise<{
+  chat?: ChatSchema;
+  isOutLink: boolean;
+  uid?: string;
+}> {
+  const isOutLink = Boolean(shareId && outLinkUid);
+  if (!chatId) return { isOutLink, uid: outLinkUid };
+
+  const chat = await MongoChat.findOne({ chatId }).lean();
+
+  if (!chat) return { isOutLink, uid: outLinkUid };
+
+  const { uid } = await (async () => {
+    // outLink Auth
+    if (shareId && outLinkUid) {
+      const { uid } = await authOutLink({ shareId, outLinkUid });
+
+      // auth outLinkUid
+      if (chat.shareId === shareId && chat.outLinkUid === uid) {
+        return { uid };
+      }
+      return Promise.reject(ChatErrEnum.unAuthChat);
+    }
+
+    // req auth
+    const { tmbId, role } = await authUserRole(props);
+    if (role === TeamMemberRoleEnum.owner) return { uid: outLinkUid };
+    if (String(tmbId) === String(chat.tmbId)) return { uid: outLinkUid };
+    return Promise.reject(ChatErrEnum.unAuthChat);
+  })();
+
+  return {
+    chat,
+    isOutLink,
+    uid
+  };
+}

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

@@ -1,31 +1,74 @@
-import { authOutLinkLimit } from '@/service/support/outLink/auth';
-import { AuthLinkChatProps } from '@fastgpt/global/support/outLink/api.d';
-import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
-import { getUserAndAuthBalance } from './user';
+import { POST } from '@fastgpt/service/common/api/plusRequest';
+import type {
+  AuthOutLinkChatProps,
+  AuthOutLinkLimitProps,
+  AuthOutLinkInitProps,
+  AuthOutLinkResponse
+} from '@fastgpt/global/support/outLink/api.d';
 import { authOutLinkValid } from '@fastgpt/service/support/permission/auth/outLink';
+import { getUserAndAuthBalance } from '@fastgpt/service/support/user/controller';
+import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
+import { OutLinkErrEnum } from '@fastgpt/global/common/error/code/outLink';
+import { OutLinkSchema } from '@fastgpt/global/support/outLink/type';
 
-export async function authOutLinkChat({
+export function authOutLinkInit(data: AuthOutLinkInitProps): Promise<AuthOutLinkResponse> {
+  if (!global.feConfigs?.isPlus) return Promise.resolve({ uid: data.outLinkUid });
+  return POST<AuthOutLinkResponse>('/support/outLink/authInit', data);
+}
+export function authOutLinkChatLimit(data: AuthOutLinkLimitProps): Promise<AuthOutLinkResponse> {
+  if (!global.feConfigs?.isPlus) return Promise.resolve({ uid: data.outLinkUid });
+  return POST<AuthOutLinkResponse>('/support/outLink/authChatStart', data);
+}
+
+export const authOutLink = async ({
+  shareId,
+  outLinkUid
+}: {
+  shareId?: string;
+  outLinkUid?: string;
+}): Promise<{
+  uid: string;
+  appId: string;
+  shareChat: OutLinkSchema;
+}> => {
+  if (!outLinkUid) {
+    return Promise.reject(OutLinkErrEnum.linkUnInvalid);
+  }
+  const result = await authOutLinkValid({ shareId });
+
+  const { uid } = await authOutLinkInit({
+    outLinkUid,
+    tokenUrl: result.shareChat.limit?.hookUrl
+  });
+
+  return {
+    ...result,
+    uid
+  };
+};
+
+export async function authOutLinkChatStart({
   shareId,
   ip,
-  authToken,
+  outLinkUid,
   question
-}: AuthLinkChatProps & {
+}: AuthOutLinkChatProps & {
   shareId: string;
 }) {
-  // get outLink
-  const { shareChat, app } = await authOutLinkValid({ shareId });
+  // get outLink and app
+  const { shareChat, appId } = await authOutLinkValid({ shareId });
 
-  const [user] = await Promise.all([
+  // check balance and chat limit
+  const [user, { uid }] = await Promise.all([
     getUserAndAuthBalance({ tmbId: shareChat.tmbId, minBalance: 0 }),
-    global.feConfigs?.isPlus
-      ? authOutLinkLimit({ outLink: shareChat, ip, authToken, question })
-      : undefined
+    authOutLinkChatLimit({ outLink: shareChat, ip, outLinkUid, question })
   ]);
 
   return {
     authType: AuthUserTypeEnum.token,
     responseDetail: shareChat.responseDetail,
     user,
-    app
+    appId,
+    uid
   };
 }

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

@@ -1,46 +0,0 @@
-import { AuthResponseType } from '@fastgpt/global/support/permission/type';
-import { parseHeaderCert } from '@fastgpt/service/support/permission/controller';
-import { AuthModeType } from '@fastgpt/service/support/permission/type';
-import { UserErrEnum } from '@fastgpt/global/common/error/code/user';
-import { UserType } from '@fastgpt/global/support/user/type';
-import { getUserDetail } from '@/service/support/user/controller';
-
-export async function getUserAndAuthBalance({
-  tmbId,
-  minBalance
-}: {
-  tmbId: string;
-  minBalance?: number;
-}) {
-  const user = await getUserDetail({ tmbId });
-
-  if (!user) {
-    return Promise.reject(UserErrEnum.unAuthUser);
-  }
-  if (minBalance !== undefined && global.feConfigs.isPlus && user.team.balance < minBalance) {
-    return Promise.reject(UserErrEnum.balanceNotEnough);
-  }
-
-  return user;
-}
-
-/* get user */
-export async function authUser({
-  minBalance,
-  ...props
-}: AuthModeType & {
-  minBalance?: number;
-}): Promise<
-  AuthResponseType & {
-    user: UserType;
-  }
-> {
-  const result = await parseHeaderCert(props);
-
-  return {
-    ...result,
-    user: await getUserAndAuthBalance({ tmbId: result.tmbId, minBalance }),
-    isOwner: true,
-    canWrite: true
-  };
-}

projects/app/src/service/support/user/controller.ts

@@ -1,41 +0,0 @@
-import { ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
-import { MongoUser } from '@fastgpt/service/support/user/schema';
-import { UserType } from '@fastgpt/global/support/user/type';
-import {
-  getTeamInfoByTmbId,
-  getUserDefaultTeam
-} from '@fastgpt/service/support/user/team/controller';
-
-export async function getUserDetail({
-  tmbId,
-  userId
-}: {
-  tmbId?: string;
-  userId?: string;
-}): Promise<UserType> {
-  const team = await (async () => {
-    if (tmbId) {
-      return getTeamInfoByTmbId({ tmbId });
-    }
-    if (userId) {
-      return getUserDefaultTeam({ userId });
-    }
-    return Promise.reject(ERROR_ENUM.unAuthorization);
-  })();
-  const user = await MongoUser.findById(team.userId);
-
-  if (!user) {
-    return Promise.reject(ERROR_ENUM.unAuthorization);
-  }
-
-  return {
-    _id: user._id,
-    username: user.username,
-    avatar: user.avatar,
-    balance: user.balance,
-    timezone: user.timezone,
-    promotionRate: user.promotionRate,
-    openaiAccount: user.openaiAccount,
-    team
-  };
-}

projects/app/src/service/support/wallet/bill/push.ts

@@ -1,6 +1,6 @@
 import { BillSourceEnum, PRICE_SCALE } from '@fastgpt/global/support/wallet/bill/constants';
 import { getAudioSpeechModel, getQAModel } from '@/service/core/ai/model';
-import type { ChatHistoryItemResType } from '@fastgpt/global/core/chat/api.d';
+import type { ChatHistoryItemResType } from '@fastgpt/global/core/chat/type.d';
 import { formatPrice } from '@fastgpt/global/support/wallet/bill/tools';
 import { addLog } from '@fastgpt/service/common/mongo/controller';
 import type { ConcatBillProps, CreateBillProps } from '@fastgpt/global/support/wallet/bill/api.d';
@@ -41,7 +41,7 @@ export const pushChatBill = ({
   source: `${BillSourceEnum}`;
   response: ChatHistoryItemResType[];
 }) => {
-  const total = response.reduce((sum, item) => sum + item.price, 0);
+  const total = response.reduce((sum, item) => sum + (item.price || 0), 0);
 
   createBill({
     teamId,

projects/app/src/service/utils/chat/saveChat.ts

@@ -15,6 +15,7 @@ type Props = {
   updateUseTime: boolean;
   source: `${ChatSourceEnum}`;
   shareId?: string;
+  outLinkUid?: string;
   content: [ChatItemType, ChatItemType];
 };
 
@@ -27,10 +28,11 @@ export async function saveChat({
   updateUseTime,
   source,
   shareId,
+  outLinkUid,
   content
 }: Props) {
   try {
-    const chatHistory = await MongoChat.findOne(
+    const chat = await MongoChat.findOne(
       {
         chatId,
         teamId,
@@ -57,7 +59,7 @@ export async function saveChat({
       content[1]?.value?.slice(0, 20) ||
       'Chat';
 
-    if (chatHistory) {
+    if (chat) {
       promise.push(
         MongoChat.updateOne(
           { chatId },
@@ -77,7 +79,8 @@ export async function saveChat({
           variables,
           title,
           source,
-          shareId
+          shareId,
+          outLinkUid
         })
       );
     }