4.7.1-alpha2 (#1153)

Co-authored-by: UUUUnotfound <31206589+UUUUnotfound@users.noreply.github.com>
Co-authored-by: Hexiao Zhang <731931282qq@gmail.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

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

@@ -12,7 +12,6 @@ import { MongoTTSBuffer } from '@fastgpt/service/common/buffer/tts/schema';
 /* 
 1. get tts from chatItem store
 2. get tts from ai
-3. save tts to chatItem store if chatItemId is provided
 4. push bill
 */
 
@@ -34,6 +33,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       throw new Error('voice not found');
     }
 
+    /* get audio from buffer */
     const ttsBuffer = await MongoTTSBuffer.findOne(
       {
         bufferId: voiceData.bufferId,
@@ -46,6 +46,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       return res.end(new Uint8Array(ttsBuffer.buffer.buffer));
     }
 
+    /* request audio */
     await text2Speech({
       res,
       input,
@@ -54,6 +55,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       speed: ttsConfig.speed,
       onSuccess: async ({ model, buffer }) => {
         try {
+          /* bill */
           pushAudioSpeechUsage({
             model: model,
             charsLength: input.length,
@@ -62,6 +64,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
             source: authType2UsageSource({ authType })
           });
 
+          /* create buffer */
           await MongoTTSBuffer.create({
             bufferId: voiceData.bufferId,
             text: JSON.stringify({ text: input, speed: ttsConfig.speed }),

projects/app/src/pages/api/v1/audio/transcriptions.ts

@@ -7,6 +7,8 @@ import fs from 'fs';
 import { getAIApi } from '@fastgpt/service/core/ai/config';
 import { pushWhisperUsage } from '@/service/support/wallet/usage/push';
 import { authChatCert } from '@/service/support/permission/auth/chat';
+import { MongoApp } from '@fastgpt/service/core/app/schema';
+import { getGuideModule, splitGuideModule } from '@fastgpt/global/core/module/utils';
 
 const upload = getUploadModel({
   maxSize: 2
@@ -18,8 +20,9 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
   try {
     const {
       file,
-      data: { duration, teamId: spaceTeamId, teamToken }
+      data: { appId, duration, teamId: spaceTeamId, teamToken }
     } = await upload.doUpload<{
+      appId: string;
       duration: number;
       shareId?: string;
       teamId?: string;
@@ -31,8 +34,6 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
 
     filePaths = [file.path];
 
-    const { teamId, tmbId } = await authChatCert({ req, authToken: true });
-
     if (!global.whisperModel) {
       throw new Error('whisper model not found');
     }
@@ -41,6 +42,18 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       throw new Error('file not found');
     }
 
+    // auth role
+    const { teamId, tmbId } = await authChatCert({ req, authToken: true });
+    // auth app
+    const app = await MongoApp.findById(appId, 'modules').lean();
+    if (!app) {
+      throw new Error('app not found');
+    }
+    const { whisperConfig } = splitGuideModule(getGuideModule(app?.modules));
+    if (!whisperConfig?.open) {
+      throw new Error('Whisper is not open in the app');
+    }
+
     const ai = getAIApi();
 
     const result = await ai.audio.transcriptions.create({

projects/app/src/pages/app/detail/components/Logs.tsx

@@ -32,6 +32,7 @@ import MyBox from '@/components/common/MyBox';
 import { usePagination } from '@fastgpt/web/hooks/usePagination';
 import DateRangePicker, { DateRangeType } from '@fastgpt/web/components/common/DateRangePicker';
 import { formatChatValue2InputType } from '@/components/ChatBox/utils';
+import { getNanoid } from '@fastgpt/global/common/string/tools';
 
 const Logs = ({ appId }: { appId: string }) => {
   const { t } = useTranslation();
@@ -234,6 +235,7 @@ const DetailLogsModal = ({
       onSuccess(res) {
         const history = res.history.map((item) => ({
           ...item,
+          dataId: item.dataId || getNanoid(),
           status: 'finish' as any
         }));
         ChatBoxRef.current?.resetHistory(history);

projects/app/src/pages/app/detail/components/SimpleEdit/ChatTest.tsx

@@ -99,6 +99,7 @@ const ChatTest = ({ appId }: { appId: string }) => {
       <Box flex={1}>
         <ChatBox
           ref={ChatBoxRef}
+          appId={appDetail._id}
           appAvatar={appDetail.avatar}
           userAvatar={userInfo?.avatar}
           showMarkIcon

projects/app/src/pages/app/detail/components/SimpleEdit/EditForm.tsx

@@ -6,7 +6,7 @@ import { useForm, useFieldArray } from 'react-hook-form';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { appModules2Form, getDefaultAppForm } from '@fastgpt/global/core/app/utils';
 import type { AppSimpleEditFormType } from '@fastgpt/global/core/app/type.d';
-import { chatNodeSystemPromptTip, welcomeTextTip } from '@fastgpt/global/core/module/template/tip';
+import { welcomeTextTip } from '@fastgpt/global/core/module/template/tip';
 import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 import { useRouter } from 'next/router';
@@ -20,7 +20,7 @@ import dynamic from 'next/dynamic';
 import MyTooltip from '@/components/MyTooltip';
 import Avatar from '@/components/Avatar';
 import MyIcon from '@fastgpt/web/components/common/Icon';
-import VariableEdit from '@/components/core/module/Flow/components/modules/VariableEdit';
+import VariableEdit from '@/components/core/app/VariableEdit';
 import MyTextarea from '@/components/common/Textarea/MyTextarea/index';
 import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
 import { formatEditorVariablePickerIcon } from '@fastgpt/global/core/module/utils';
@@ -28,14 +28,26 @@ import SearchParamsTip from '@/components/core/dataset/SearchParamsTip';
 import SettingLLMModel from '@/components/core/ai/SettingLLMModel';
 import { SettingAIDataType } from '@fastgpt/global/core/module/node/type';
 import DeleteIcon, { hoverDeleteStyles } from '@fastgpt/web/components/common/Icon/delete';
+import { TTSTypeEnum } from '@/constants/app';
 
 const DatasetSelectModal = dynamic(() => import('@/components/core/module/DatasetSelectModal'));
 const DatasetParamsModal = dynamic(() => import('@/components/core/module/DatasetParamsModal'));
 const ToolSelectModal = dynamic(() => import('./ToolSelectModal'));
-const TTSSelect = dynamic(
-  () => import('@/components/core/module/Flow/components/modules/TTSSelect')
-);
-const QGSwitch = dynamic(() => import('@/components/core/module/Flow/components/modules/QGSwitch'));
+const TTSSelect = dynamic(() => import('@/components/core/app/TTSSelect'));
+const QGSwitch = dynamic(() => import('@/components/core/app/QGSwitch'));
+const WhisperConfig = dynamic(() => import('@/components/core/app/WhisperConfig'));
+
+const BoxStyles: BoxProps = {
+  px: 5,
+  py: '16px',
+  borderBottomWidth: '1px',
+  borderBottomColor: 'borderColor.low'
+};
+const LabelStyles: BoxProps = {
+  w: ['60px', '100px'],
+  flexShrink: 0,
+  fontSize: ['sm', 'md']
+};
 
 const EditForm = ({
   divRef,
@@ -131,18 +143,6 @@ const EditForm = ({
   );
   useQuery(['loadAllDatasets'], loadAllDatasets);
 
-  const BoxStyles: BoxProps = {
-    px: 5,
-    py: '16px',
-    borderBottomWidth: '1px',
-    borderBottomColor: 'borderColor.low'
-  };
-  const LabelStyles: BoxProps = {
-    w: ['60px', '100px'],
-    flexShrink: 0,
-    fontSize: ['sm', 'md']
-  };
-
   return (
     <Box>
       {/* title */}
@@ -154,7 +154,7 @@ const EditForm = ({
         py={4}
         justifyContent={'space-between'}
         alignItems={'center'}
-        zIndex={10}
+        zIndex={100}
         px={4}
         {...(isSticky && {
           borderBottom: theme.borders.base,
@@ -414,6 +414,18 @@ const EditForm = ({
             />
           </Box>
 
+          {/* whisper */}
+          <Box {...BoxStyles}>
+            <WhisperConfig
+              isOpenAudio={getValues('userGuide.tts').type !== TTSTypeEnum.none}
+              value={getValues('userGuide.whisper')}
+              onChange={(e) => {
+                setValue('userGuide.whisper', e);
+                setRefresh((state) => !state);
+              }}
+            />
+          </Box>
+
           {/* question guide */}
           <Box {...BoxStyles} borderBottom={'none'}>
             <QGSwitch

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

@@ -146,6 +146,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
         const res = await getInitChatInfo({ appId, chatId });
         const history = res.history.map((item) => ({
           ...item,
+          dataId: item.dataId || nanoid(),
           status: ChatStatusEnum.finish
         }));
 

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

@@ -141,6 +141,7 @@ const OutLink = ({
       /* post message to report result */
       const result: ChatSiteItemType[] = GPTMessages2Chats(prompts).map((item) => ({
         ...item,
+        dataId: item.dataId || nanoid(),
         status: 'finish'
       }));
 
@@ -183,6 +184,7 @@ const OutLink = ({
         });
         const history = res.history.map((item) => ({
           ...item,
+          dataId: item.dataId || nanoid(),
           status: ChatStatusEnum.finish
         }));
 

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

@@ -210,6 +210,7 @@ const OutLink = () => {
 
       const history = res.history.map((item) => ({
         ...item,
+        dataId: item.dataId || nanoid(),
         status: ChatStatusEnum.finish
       }));