4.7.1 production (#1173)

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

projects/app/src/components/ChatBox/components/ChatItem.tsx

@@ -97,10 +97,11 @@ const ChatItem = ({
       <Flex flexDirection={'column'} key={chat.dataId} gap={2}>
         {chat.value.map((value, i) => {
           const key = `${chat.dataId}-ai-${i}`;
+
           if (value.text) {
             let source = (value.text?.content || '').trim();
 
-            if (!source && chat.value.length > 1) return <></>;
+            if (!source && chat.value.length > 1) return null;
 
             if (
               isLastChild &&

projects/app/src/components/core/module/Flow/components/nodes/NodeLaf.tsx

@@ -90,10 +90,23 @@ const NodeLaf = (props: NodeProps<FlowModuleItemType>) => {
 
   const lafFunctionSelectList = useMemo(
     () =>
-      lafData?.lafFunctions.map((item) => ({
-        label: item.description ? `${item.name} (${item.description})` : item.name,
-        value: item.requestUrl
-      })) || [],
+      lafData?.lafFunctions.map((item) => {
+        const functionName = item.path.slice(1);
+        return {
+          alias: functionName,
+          label: item.description ? (
+            <Box>
+              <Box>{functionName}</Box>
+              <Box fontSize={'xs'} color={'gray.500'}>
+                {item.description}
+              </Box>
+            </Box>
+          ) : (
+            functionName
+          ),
+          value: item.requestUrl
+        };
+      }) || [],
     [lafData?.lafFunctions]
   );
 
@@ -111,6 +124,16 @@ const NodeLaf = (props: NodeProps<FlowModuleItemType>) => {
 
       if (!lafFunction) return;
 
+      // update intro
+      if (lafFunction.description) {
+        onChangeNode({
+          moduleId,
+          type: 'attr',
+          key: 'intro',
+          value: lafFunction.description
+        });
+      }
+
       const bodyParams =
         lafFunction?.request?.content?.['application/json']?.schema?.properties || {};
 
@@ -232,7 +255,7 @@ const NodeLaf = (props: NodeProps<FlowModuleItemType>) => {
                 );
 
                 if (!lafFunction) return;
-                const url = `${feConfigs.lafEnv}/app/${lafData?.lafApp?.appid}/function${lafFunction?.path}?templateid=fastgptflow`;
+                const url = `${feConfigs.lafEnv}/app/${lafData?.lafApp?.appid}/function${lafFunction?.path}?templateid=FastGPT_Laf`;
                 window.open(url, '_blank');
               }}
             >

projects/app/src/pages/api/common/file/read.ts

@@ -2,11 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authFileToken } from '@fastgpt/service/support/permission/controller';
-import {
-  getDownloadStream,
-  getFileById,
-  readFileEncode
-} from '@fastgpt/service/common/file/gridfs/controller';
+import { getDownloadStream, getFileById } from '@fastgpt/service/common/file/gridfs/controller';
 import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
@@ -21,9 +17,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       throw new Error('fileId is empty');
     }
 
-    const [file, encoding, fileStream] = await Promise.all([
+    const [file, { fileStream, encoding }] = await Promise.all([
       getFileById({ bucketName, fileId }),
-      readFileEncode({ bucketName, fileId }),
       getDownloadStream({ bucketName, fileId })
     ]);
 

projects/app/src/pages/chat/share.tsx

@@ -25,10 +25,12 @@ import { useTranslation } from 'next-i18next';
 import { getInitOutLinkChatInfo } from '@/web/core/chat/api';
 import { getChatTitleFromChatMessage } from '@fastgpt/global/core/chat/utils';
 import { useChatStore } from '@/web/core/chat/storeChat';
-import { ChatRoleEnum, ChatStatusEnum } from '@fastgpt/global/core/chat/constants';
+import { ChatStatusEnum } from '@fastgpt/global/core/chat/constants';
 import MyBox from '@/components/common/MyBox';
 import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
 import { OutLinkWithAppType } from '@fastgpt/global/support/outLink/type';
+import { addLog } from '@fastgpt/service/common/system/log';
+import { connectToDatabase } from '@/service/mongo';
 
 const OutLink = ({
   appName,
@@ -397,6 +399,7 @@ export async function getServerSideProps(context: any) {
 
   const app = await (async () => {
     try {
+      await connectToDatabase();
       const app = (await MongoOutLink.findOne(
         {
           shareId
@@ -407,6 +410,7 @@ export async function getServerSideProps(context: any) {
         .lean()) as OutLinkWithAppType;
       return app;
     } catch (error) {
+      addLog.error('getServerSideProps', error);
       return undefined;
     }
   })();

projects/app/src/pages/dataset/list/index.tsx

@@ -34,7 +34,7 @@ import ParentPaths from '@/components/common/ParentPaths';
 import DatasetTypeTag from '@/components/core/dataset/DatasetTypeTag';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { getErrText } from '@fastgpt/global/common/error/utils';
-import { getToken } from '@/web/support/user/auth';
+import { xmlDownloadFetch } from '@/web/common/api/xmlFetch';
 
 const CreateModal = dynamic(() => import('./component/CreateModal'), { ssr: false });
 const MoveModal = dynamic(() => import('./component/MoveModal'), { ssr: false });
@@ -91,9 +91,11 @@ const Kb = () => {
     mutationFn: async (dataset: DatasetItemType) => {
       setLoading(true);
       await checkTeamExportDatasetLimit(dataset._id);
-      const url = `/api/core/dataset/exportAll?datasetId=${dataset._id}`;
-      const name = `${dataset.name}.csv`;
-      localDownLoadWithToken(url, name, getToken());
+
+      xmlDownloadFetch({
+        url: `/api/core/dataset/exportAll?datasetId=${dataset._id}`,
+        filename: `${dataset.name}.csv`
+      });
     },
     onSettled() {
       setLoading(false);
@@ -101,26 +103,6 @@ const Kb = () => {
     errorToast: t('dataset.Export Dataset Limit Error')
   });
 
-  const localDownLoadWithToken = (url: string | URL, filename: string, token: string) => {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', url, true);
-    xhr.setRequestHeader("token", token);
-    xhr.responseType = 'blob';
-    xhr.onload = function (e) {
-      if (this.status == 200) {
-        var blob = this.response;
-        var a = document.createElement('a');
-        var url = URL.createObjectURL(blob);
-        a.href = url;
-        a.download = filename;
-        a.click();
-        window.URL.revokeObjectURL(url);
-      }
-    };
-    xhr.send();
-  };
-
-
   const { data, refetch, isFetching } = useQuery(
     ['loadDataset', parentId],
     () => {
@@ -256,7 +238,7 @@ const Kb = () => {
                   parentId: dragTargetId
                 });
                 refetch();
-              } catch (error) { }
+              } catch (error) {}
               setDragTargetId(undefined);
             }}
             _hover={{
@@ -319,41 +301,41 @@ const Kb = () => {
                   menuList={[
                     ...(dataset.permission === PermissionTypeEnum.private
                       ? [
-                        {
-                          label: (
-                            <Flex alignItems={'center'}>
-                              <MyIcon name={'support/permission/publicLight'} w={'14px'} mr={2} />
-                              {t('permission.Set Public')}
-                            </Flex>
-                          ),
-                          onClick: () => {
-                            updateDataset({
-                              id: dataset._id,
-                              permission: PermissionTypeEnum.public
-                            });
+                          {
+                            label: (
+                              <Flex alignItems={'center'}>
+                                <MyIcon name={'support/permission/publicLight'} w={'14px'} mr={2} />
+                                {t('permission.Set Public')}
+                              </Flex>
+                            ),
+                            onClick: () => {
+                              updateDataset({
+                                id: dataset._id,
+                                permission: PermissionTypeEnum.public
+                              });
+                            }
                           }
-                        }
-                      ]
+                        ]
                       : [
-                        {
-                          label: (
-                            <Flex alignItems={'center'}>
-                              <MyIcon
-                                name={'support/permission/privateLight'}
-                                w={'14px'}
-                                mr={2}
-                              />
-                              {t('permission.Set Private')}
-                            </Flex>
-                          ),
-                          onClick: () => {
-                            updateDataset({
-                              id: dataset._id,
-                              permission: PermissionTypeEnum.private
-                            });
+                          {
+                            label: (
+                              <Flex alignItems={'center'}>
+                                <MyIcon
+                                  name={'support/permission/privateLight'}
+                                  w={'14px'}
+                                  mr={2}
+                                />
+                                {t('permission.Set Private')}
+                              </Flex>
+                            ),
+                            onClick: () => {
+                              updateDataset({
+                                id: dataset._id,
+                                permission: PermissionTypeEnum.private
+                              });
+                            }
                           }
-                        }
-                      ]),
+                        ]),
                     {
                       label: (
                         <Flex alignItems={'center'}>

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

@@ -10,7 +10,7 @@ export async function authDatasetData({
 }: AuthModeType & {
   dataId: string;
 }) {
-  // get pg data
+  // get mongo dataset.data
   const datasetData = await MongoDatasetData.findById(dataId);
 
   if (!datasetData) {

projects/app/src/web/common/api/xmlFetch.ts

@@ -0,0 +1,20 @@
+import { getToken } from '@/web/support/user/auth';
+
+export const xmlDownloadFetch = ({ url, filename }: { url: string; filename: string }) => {
+  const xhr = new XMLHttpRequest();
+  xhr.open('GET', url, true);
+  xhr.setRequestHeader('token', getToken());
+  xhr.responseType = 'blob';
+  xhr.onload = function (e) {
+    if (this.status == 200) {
+      const blob = this.response;
+      const a = document.createElement('a');
+      const url = URL.createObjectURL(blob);
+      a.href = url;
+      a.download = filename;
+      a.click();
+      window.URL.revokeObjectURL(url);
+    }
+  };
+  xhr.send();
+};

projects/app/src/web/common/hooks/useSpeech.ts

@@ -121,6 +121,9 @@ export const useSpeech = (props?: OutLinkChatAuthProps & { appId?: string }) =>
           }
         }
 
+        // close media stream
+        stream.getTracks().forEach((track) => track.stop());
+
         setIsTransCription(false);
         setIsSpeaking(false);
       };