perf: quote auth

Author: c121914yu

packages/web/i18n/en/common.json

@@ -36,7 +36,7 @@
   "Warning": "Warning",
   "add_new": "Add New",
   "add_new_param": "Add new param",
-  "all_quotes": "Quote all",
+  "all_quotes": "All quotes",
   "app.templateMarket.templateTags.Image_generation": "Image generation",
   "app.templateMarket.templateTags.Office_services": "Office Services",
   "app.templateMarket.templateTags.Roleplay": "role play",

projects/app/src/components/Markdown/A.tsx

@@ -22,7 +22,7 @@ import { getCollectionSourceData } from '@fastgpt/global/core/dataset/collection
 import Markdown from '.';
 import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';
 
-const A = ({ children, ...props }: any) => {
+const A = ({ children, chatAuthData, ...props }: any) => {
   const { t } = useTranslation();
 
   const { isOpen, onOpen, onClose } = useDisclosure();
@@ -52,7 +52,7 @@ const A = ({ children, ...props }: any) => {
       data: quoteData,
       loading,
       runAsync: getQuoteDataById
-    } = useRequest2((id: string) => getQuoteData({ id, ...props.metadata }), {
+    } = useRequest2((id: string) => getQuoteData({ id, ...chatAuthData }), {
       manual: true
     });
     const sourceData = useMemo(
@@ -149,4 +149,4 @@ const A = ({ children, ...props }: any) => {
   return <Link {...props}>{children}</Link>;
 };
 
-export default A;
+export default React.memo(A);

projects/app/src/components/Markdown/index.tsx

@@ -12,6 +12,8 @@ import dynamic from 'next/dynamic';
 
 import { Box } from '@chakra-ui/react';
 import { CodeClassNameEnum, mdTextFormat } from './utils';
+import { useCreation } from 'ahooks';
+import { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat';
 
 const CodeLight = dynamic(() => import('./codeBlock/CodeLight'), { ssr: false });
 const MermaidCodeBlock = dynamic(() => import('./img/MermaidCodeBlock'), { ssr: false });
@@ -31,14 +33,11 @@ type Props = {
   showAnimation?: boolean;
   isDisabled?: boolean;
   forbidZhFormat?: boolean;
-  metadata?: {
+  chatAuthData?: {
     appId: string;
     chatId: string;
-    shareId?: string;
-    outLinkUid?: string;
-    teamId?: string;
-    teamToken?: string;
-  };
+    chatItemDataId: string;
+  } & OutLinkChatAuthProps;
 };
 const Markdown = (props: Props) => {
   const source = props.source || '';
@@ -54,17 +53,16 @@ const MarkdownRender = ({
   showAnimation,
   isDisabled,
   forbidZhFormat,
-  metadata
+  chatAuthData
 }: Props) => {
-  const components = useMemo<any>(
-    () => ({
+  const components = useCreation(() => {
+    return {
       img: Image,
       pre: RewritePre,
       code: Code,
-      a: (props: any) => <A {...props} metadata={metadata} />
-    }),
-    [metadata]
-  );
+      a: (props: any) => <A {...props} chatAuthData={chatAuthData} />
+    };
+  }, [chatAuthData]);
 
   const formatSource = useMemo(() => {
     if (showAnimation || forbidZhFormat) return source;

projects/app/src/components/Markdown/utils.ts

@@ -33,8 +33,7 @@ export const mdTextFormat = (text: string) => {
     //   /([\u4e00-\u9fa5\u3000-\u303f])([a-zA-Z0-9])|([a-zA-Z0-9])([\u4e00-\u9fa5\u3000-\u303f])/g,
     //   '$1$3 $2$4'
     // )
-    // 处理 [quote:id] 格式引用，将 [quote:675934a198f46329dfc6d05a] 转换为 [675934a198f46329dfc6d05a](QUOTE)
-    .replace(/\[quote:?\s*([a-f0-9]{24})\](?!\()/gi, '[$1](QUOTE)')
+    // 处理 格式引用，将 [675934a198f46329dfc6d05a] 转换为 [675934a198f46329dfc6d05a](QUOTE)
     .replace(/\[([a-f0-9]{24})\](?!\()/g, '[$1](QUOTE)');
 
   // 处理链接后的中文标点符号，增加空格

projects/app/src/components/core/chat/ChatContainer/ChatBox/Provider.tsx

@@ -22,6 +22,7 @@ import { VariableInputEnum } from '@fastgpt/global/core/workflow/constants';
 import { getChatResData } from '@/web/core/chat/api';
 import { ChatItemContext } from '@/web/core/chat/context/chatItemContext';
 import { ChatRecordContext } from '@/web/core/chat/context/chatRecordContext';
+import { useCreation } from 'ahooks';
 
 export type ChatProviderProps = {
   appId: string;
@@ -128,13 +129,17 @@ export const ChatBoxContext = createContext<useChatStoreType>({
 const Provider = ({
   appId,
   chatId,
-  outLinkAuthData = {},
+  outLinkAuthData,
   chatType = 'chat',
   children,
   ...props
 }: ChatProviderProps & {
   children: React.ReactNode;
 }) => {
+  const formatOutLinkAuth = useCreation(() => {
+    return outLinkAuthData || {};
+  }, [outLinkAuthData]);
+
   const welcomeText = useContextSelector(
     ChatItemContext,
     (v) => v.chatBoxData?.app?.chatConfig?.welcomeText ?? ''
@@ -187,7 +192,7 @@ const Provider = ({
   } = useAudioPlay({
     appId,
     ttsConfig,
-    ...outLinkAuthData
+    ...formatOutLinkAuth
   });
 
   const autoTTSResponse =
@@ -209,15 +214,15 @@ const Provider = ({
           appId: appId,
           chatId: chatId,
           dataId,
-          ...outLinkAuthData
+          ...formatOutLinkAuth
         });
         setChatRecords((state) =>
           state.map((item) => (item.dataId === dataId ? { ...item, responseData: resData } : item))
         );
         return resData;
       }
     },
-    [chatRecords, chatId, appId, outLinkAuthData, setChatRecords]
+    [chatRecords, chatId, appId, formatOutLinkAuth, setChatRecords]
   );
   const value: useChatStoreType = {
     ...props,
@@ -243,7 +248,7 @@ const Provider = ({
     chatInputGuide,
     appId,
     chatId,
-    outLinkAuthData,
+    outLinkAuthData: formatOutLinkAuth,
     getHistoryResponseData,
     chatType
   };

projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ChatItem.tsx

@@ -100,6 +100,7 @@ const AIContentCard = React.memo(function AIContentCard({
 
         return (
           <AIResponseBox
+            chatItemDataId={dataId}
             key={key}
             value={value}
             isLastResponseValue={isLastChild && i === chatValue.length - 1}

projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderOutput.tsx

@@ -35,6 +35,7 @@ const RenderOutput = () => {
                 const key = `${histories[1].dataId}-ai-${i}`;
                 return (
                   <AIResponseBox
+                    chatItemDataId={histories[1].dataId}
                     key={key}
                     value={value}
                     isLastResponseValue={true}

projects/app/src/components/core/chat/components/AIResponseBox.tsx

@@ -32,6 +32,7 @@ import { extractDeepestInteractive } from '@fastgpt/global/core/workflow/runtime
 import { useContextSelector } from 'use-context-selector';
 import { ChatItemContext } from '@/web/core/chat/context/chatItemContext';
 import { ChatBoxContext } from '../ChatContainer/ChatBox/Provider';
+import { useCreation } from 'ahooks';
 
 const accordionButtonStyle = {
   w: 'auto',
@@ -88,10 +89,12 @@ const RenderResoningContent = React.memo(function RenderResoningContent({
 });
 const RenderText = React.memo(function RenderText({
   showAnimation,
-  text
+  text,
+  chatItemDataId
 }: {
   showAnimation: boolean;
   text: string;
+  chatItemDataId: string;
 }) {
   const isResponseDetail = useContextSelector(ChatItemContext, (v) => v.isResponseDetail);
 
@@ -103,19 +106,16 @@ const RenderText = React.memo(function RenderText({
     if (!text) return '';
 
     // Remove quote references if not showing response detail
-    return isResponseDetail ? text : text.replace(/\[[a-f0-9]{24}\]\(QUOTE\)/g, '');
+    return isResponseDetail
+      ? text
+      : text.replace(/\[([a-f0-9]{24})\]\(QUOTE\)/g, '').replace(/\[([a-f0-9]{24})\](?!\()/g, '');
   }, [text, isResponseDetail]);
 
-  // First empty line
-  // if (!source && !isLastChild) return null;
+  const chatAuthData = useCreation(() => {
+    return { appId, chatId, chatItemDataId, ...outLinkAuthData };
+  }, [appId, chatId, chatItemDataId, outLinkAuthData]);
 
-  return (
-    <Markdown
-      source={source}
-      showAnimation={showAnimation}
-      metadata={{ appId, chatId, ...outLinkAuthData }}
-    />
-  );
+  return <Markdown source={source} showAnimation={showAnimation} chatAuthData={chatAuthData} />;
 });
 
 const RenderTool = React.memo(
@@ -241,17 +241,23 @@ const RenderUserFormInteractive = React.memo(function RenderFormInput({
 });
 
 const AIResponseBox = ({
+  chatItemDataId,
   value,
   isLastResponseValue,
   isChatting
 }: {
+  chatItemDataId: string;
   value: UserChatItemValueItemType | AIChatItemValueItemType;
   isLastResponseValue: boolean;
   isChatting: boolean;
 }) => {
   if (value.type === ChatItemValueTypeEnum.text && value.text) {
     return (
-      <RenderText showAnimation={isChatting && isLastResponseValue} text={value.text.content} />
+      <RenderText
+        chatItemDataId={chatItemDataId}
+        showAnimation={isChatting && isLastResponseValue}
+        text={value.text.content}
+      />
     );
   }
   if (value.type === ChatItemValueTypeEnum.reasoning && value.reasoning) {

projects/app/src/pages/api/core/chat/quote/getQuote.ts

@@ -36,7 +36,7 @@ async function handler(req: ApiRequestProps<GetQuoteDataProps>): Promise<GetQuot
     datasetDataIdList
   } = req.body;
 
-  const [chat, { chatItem }] = await Promise.all([
+  const [{ chat, responseDetail }, { chatItem }] = await Promise.all([
     authChatCrud({
       req,
       authToken: true,
@@ -49,7 +49,7 @@ async function handler(req: ApiRequestProps<GetQuoteDataProps>): Promise<GetQuot
     }),
     authCollectionInChat({ appId, chatId, chatItemDataId, collectionIds: collectionIdList })
   ]);
-  if (!chat) return Promise.reject(ChatErrEnum.unAuthChat);
+  if (!chat || !responseDetail) return Promise.reject(ChatErrEnum.unAuthChat);
 
   const list = await MongoDatasetData.find(
     { _id: { $in: datasetDataIdList }, collectionId: { $in: collectionIdList } },