perf: gate

2025-05-30 17:02:49 +08:00 · 2025-05-30 17:02:49 +08:00 · ded0383ac4
commit ded0383ac4
parent 81202c53a8
9 changed files with 80 additions and 59 deletions
--- a/packages/global/core/app/utils.ts
+++ b/packages/global/core/app/utils.ts
@ -46,7 +46,7 @@ export const appWorkflow2Form = ({
  chatConfig
 }: {
  nodes: StoreNodeItemType[];
-  chatConfig: AppChatConfigType;
+  chatConfig?: AppChatConfigType;
 }) => {
  const defaultAppForm = getDefaultAppForm();
  const findInputValueByKey = (inputs: FlowNodeInputItemType[], key: string) => {
@ -172,6 +172,10 @@ export const appWorkflow2Form = ({
    }
  });

+  if (chatConfig) {
+    defaultAppForm.chatConfig = chatConfig;
+  }
+
  return defaultAppForm;
 };

--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx
@ -281,7 +281,7 @@ const ChatInput = ({
    [
      File,
      TextareaDom,
-      fileList,
+      fileList.length,
      handleSend,
      hasFileUploading,
      havInput,
@ -296,7 +296,8 @@ const ChatInput = ({
      setValue,
      showSelectFile,
      showSelectImg,
-      t
+      t,
+      whisperConfig?.open
    ]
  );

--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/GateChatInput.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/GateChatInput.tsx
@ -83,7 +83,6 @@ const GateChatInput = ({
  const selectedTools = externalSelectedToolIds ?? [];
  const setSelectedToolIds = onSelectTools!;

-  const { appDetail } = useContextSelector(AppContext, (v) => v);
  const { llmModelList } = useSystemStore();
  const modelList = useMemo(
    () => llmModelList.map((item) => ({ label: item.name, value: item.model })),
@ -101,36 +100,6 @@ const GateChatInput = ({
    return router.pathname === '/chat/gate';
  }, [router.pathname]);

-  // 初始化加载appForm - 从Gate应用获取配置
-  useEffect(() => {
-    if (!appId || !showTools) return;
-
-    const fetchAppForm = async () => {
-      try {
-        // 加载Gate应用列表
-        // 获取当前应用或第一个可用的Gate应用
-        const currentApp = appDetail;
-
-        if (currentApp && currentApp.modules) {
-          // 将模块转换为appForm格式
-          const form = appWorkflow2Form({
-            nodes: currentApp.modules,
-            chatConfig: currentApp.chatConfig || {}
-          });
-          setAppForm(form);
-          // 如果选择了模型，设置为默认模型
-          if (form.aiSettings.model) {
-            setSelectedModel(form.aiSettings.model);
-          }
-        }
-      } catch (error) {
-        console.error('加载Gate应用信息失败:', error);
-      }
-    };
-
-    fetchAppForm();
-  }, [appId, showTools, appDetail, setAppForm]);
-
  // 当模型选择变化时更新appForm
  useEffect(() => {
    if (!showTools) return;
@ -230,15 +199,6 @@ const GateChatInput = ({
        <FilePreview fileList={fileList} removeFiles={removeFiles} />
      </Box>

-      {/* voice input and loading container */}
-      {!inputValue && (
-        <VoiceInput
-          ref={VoiceInputRef}
-          onSendMessage={onSendMessage}
-          resetInputVal={resetInputVal}
-        />
-      )}
-
      <Textarea
        ref={TextareaDom}
        value={inputValue}
@ -451,6 +411,15 @@ const GateChatInput = ({

      <File onSelect={(files) => onSelectFile({ files })} />
      <ComplianceTip type={'chat'} />
+
+      {/* voice input and loading container */}
+      {!inputValue && (
+        <VoiceInput
+          ref={VoiceInputRef}
+          onSendMessage={onSendMessage}
+          resetInputVal={resetInputVal}
+        />
+      )}
    </Box>
  );
 };
--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/VoiceInput.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/VoiceInput.tsx
@ -6,12 +6,10 @@ import React, {
  useCallback,
  useState,
  forwardRef,
-  useImperativeHandle,
-  useMemo
+  useImperativeHandle
 } from 'react';
 import { useTranslation } from 'next-i18next';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
-import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useSystem } from '@fastgpt/web/hooks/useSystem';
 import { useContextSelector } from 'use-context-selector';
 import { ChatBoxContext } from '../Provider';
--- a/projects/app/src/pageComponents/account/gateway/ConfigButtons.tsx
+++ b/projects/app/src/pageComponents/account/gateway/ConfigButtons.tsx
@ -14,6 +14,7 @@ import type { putUpdateGateConfigCopyRightData } from '@fastgpt/global/support/u
 import { saveCopyRightConfig } from './CopyrightTable';
 import type { AppSimpleEditFormType } from '@fastgpt/global/core/app/type';
 import { form2AppWorkflow } from '@/web/core/app/utils';
+import { useSystemStore } from '@/web/common/system/useSystemStore';

 type Props = {
  tab: 'home' | 'copyright' | 'app' | 'logs';
@ -84,6 +85,7 @@ const ConfigButtons = ({ tab, appForm, gateConfig, copyRightConfig }: Props) =>
    }
  );

+  const { ttsModelList, sttModelList } = useSystemStore();
  const checkAndCreateGateApp = async () => {
    try {
      // 获取应用列表
@ -103,7 +105,27 @@ const ConfigButtons = ({ tab, appForm, gateConfig, copyRightConfig }: Props) =>
            intro: currentSlogan,
            name: gateConfig?.name,
            nodes,
-            edges
+            edges,
+            chatConfig: {
+              ttsConfig:
+                ttsModelList.length > 0
+                  ? {
+                      type: 'model',
+                      model: ttsModelList[0].model
+                    }
+                  : undefined,
+              whisperConfig: {
+                open: sttModelList.length > 0,
+                autoSend: false,
+                autoTTSResponse: false
+              },
+              fileSelectConfig: {
+                canSelectFile: true,
+                customPdfParse: false,
+                canSelectImg: true,
+                maxFiles: 10
+              }
+            }
          });
        }
      } else {
@ -114,7 +136,26 @@ const ConfigButtons = ({ tab, appForm, gateConfig, copyRightConfig }: Props) =>
          type: AppTypeEnum.gate,
          modules: emptyTemplates[AppTypeEnum.gate].nodes,
          edges: emptyTemplates[AppTypeEnum.gate].edges,
-          chatConfig: emptyTemplates[AppTypeEnum.gate].chatConfig
+          chatConfig: {
+            ttsConfig:
+              ttsModelList.length > 0
+                ? {
+                    type: 'model',
+                    model: ttsModelList[0].model
+                  }
+                : undefined,
+            whisperConfig: {
+              open: sttModelList.length > 0,
+              autoSend: false,
+              autoTTSResponse: false
+            },
+            fileSelectConfig: {
+              canSelectFile: true,
+              customPdfParse: false,
+              canSelectImg: true,
+              maxFiles: 10
+            }
+          }
        });
      }
    } catch (error) {
--- a/projects/app/src/pageComponents/account/gateway/GateAppInfoModal.tsx
+++ b/projects/app/src/pageComponents/account/gateway/GateAppInfoModal.tsx
@ -36,6 +36,7 @@ import {
  batchRemoveTagsFromApp
 } from '@/web/core/app/api/tags';
 import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useSystemStore } from '@/web/common/system/useSystemStore';

 interface AppInfoModalProps {
  app: AppListItemType;
@ -52,6 +53,8 @@ const AppInfoModal = ({ app, onClose, onUpdateSuccess }: AppInfoModalProps) => {
  const [initialTags, setInitialTags] = useState<string[]>(app.tags || []);
  const [refreshTrigger, setRefreshTrigger] = useState(0);

+  const { ttsModelList, sttModelList } = useSystemStore();
+
  const {
    File,
    onOpen: onOpenSelectFile,
--- a/projects/app/src/pageComponents/app/detail/useChatGate.tsx
+++ b/projects/app/src/pageComponents/app/detail/useChatGate.tsx
@ -153,7 +153,7 @@ export const useChatGate = ({
  const { data: recommendApps = [] } = useRequest2(listQuickApps, {
    manual: false
  });
-
+  console.log(appForm, 111);
  const CustomChatContainer = useMemoizedFn(() => (
    <ChatBox
      isReady={isReady}
--- a/projects/app/src/pages/api/core/chat/init.ts
+++ b/projects/app/src/pages/api/core/chat/init.ts
@ -10,6 +10,7 @@ import { getAppLatestVersion } from '@fastgpt/service/core/app/version/controlle
 import { NextAPI } from '@/service/middleware/entry';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
+import { AppTypeEnum } from '@fastgpt/global/core/app/constants';

 async function handler(
  req: NextApiRequest,
@ -42,7 +43,13 @@ async function handler(
  }

  // get app and history
-  const { nodes, chatConfig } = await getAppLatestVersion(app._id, app);
+  const { nodes, chatConfig } =
+    app.type === AppTypeEnum.gate
+      ? {
+          nodes: app.modules,
+          chatConfig: app.chatConfig
+        }
+      : await getAppLatestVersion(app._id, app);
  const pluginInputs =
    chat?.pluginInputs ??
    nodes?.find((node) => node.flowNodeType === FlowNodeTypeEnum.pluginInput)?.inputs ??
--- a/projects/app/src/pages/chat/gate/index.tsx
+++ b/projects/app/src/pages/chat/gate/index.tsx
@ -124,17 +124,15 @@ const Chat = ({
      });

      // 如果还没有 AppDetail，则重新获取
-      if (!appDetail && appId) {
+      if (appId) {
        try {
          const detail = await getAppDetailById(appId);
-          if (detail?.modules) {
-            setAppDetail(detail);
-            const form = appWorkflow2Form({
-              nodes: detail.modules,
-              chatConfig: detail.chatConfig || {}
-            });
-            setAppForm(form);
-          }
+          const form = appWorkflow2Form({
+            nodes: detail.modules,
+            chatConfig: detail.chatConfig || {}
+          });
+          setAppDetail(detail);
+          setAppForm(form);
        } catch (error) {
          console.error('Failed to fetch app detail:', error);
        }