fix: auto send prompt runtime (#3295)

2024-12-03 00:02:56 +08:00
parent c506442993
commit f28b7e41a8
8 changed files with 79 additions and 76 deletions
--- a/projects/app/src/pages/chat/components/ChatHeader.tsx
+++ b/projects/app/src/pages/chat/components/ChatHeader.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from 'react';
-import { Flex, useTheme, Box, useDisclosure } from '@chakra-ui/react';
+import { Flex, Box, useDisclosure } from '@chakra-ui/react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import Avatar from '@fastgpt/web/components/common/Avatar';
 import ToolMenu from './ToolMenu';
@@ -10,7 +10,6 @@ import MyTag from '@fastgpt/web/components/common/Tag/index';
 import { useContextSelector } from 'use-context-selector';
 import { ChatContext } from '@/web/core/chat/context/chatContext';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
-import { InitChatResponse } from '@/global/core/chat/api';
 import { AppFolderTypeList, AppTypeEnum } from '@fastgpt/global/core/app/constants';
 import { useSystem } from '@fastgpt/web/hooks/useSystem';
 import LightRowTabs from '@fastgpt/web/components/common/Tabs/LightRowTabs';
@@ -22,9 +21,9 @@ import {
 } from '@fastgpt/global/common/parentFolder/type';
 import { getMyApps } from '@/web/core/app/api';
 import SelectOneResource from '@/components/common/folder/SelectOneResource';
+import { ChatItemContext } from '@/web/core/chat/context/chatItemContext';

 const ChatHeader = ({
-  chatData,
  history,
  showHistory,
  apps,
@@ -33,15 +32,16 @@ const ChatHeader = ({
 }: {
  history: ChatItemType[];
  showHistory?: boolean;
-  chatData: InitChatResponse;
  apps?: AppListItemType[];
  onRouteToAppDetail?: () => void;
  totalRecordsCount: number;
 }) => {
  const { t } = useTranslation();
-  const isPlugin = chatData.app.type === AppTypeEnum.plugin;
  const { isPc } = useSystem();

+  const chatData = useContextSelector(ChatItemContext, (v) => v.chatBoxData);
+  const isPlugin = chatData.app.type === AppTypeEnum.plugin;
+
  return isPc && isPlugin ? null : (
    <Flex
      alignItems={'center'}
--- a/projects/app/src/pages/chat/index.tsx
+++ b/projects/app/src/pages/chat/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import NextHead from '@/components/common/NextHead';
 import { useRouter } from 'next/router';
 import { getInitChatInfo } from '@/web/core/chat/api';
@@ -24,7 +24,7 @@ import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { useMount } from 'ahooks';
 import { getNanoid } from '@fastgpt/global/common/string/tools';

-import { defaultChatData, GetChatTypeEnum } from '@/global/core/chat/constants';
+import { GetChatTypeEnum } from '@/global/core/chat/constants';
 import ChatContextProvider, { ChatContext } from '@/web/core/chat/context/chatContext';
 import { AppListItemType } from '@fastgpt/global/core/app/type';
 import { useContextSelector } from 'use-context-selector';
@@ -36,7 +36,6 @@ import ChatItemContextProvider, { ChatItemContext } from '@/web/core/chat/contex
 import ChatRecordContextProvider, {
  ChatRecordContext
 } from '@/web/core/chat/context/chatRecordContext';
-import { InitChatResponse } from '@/global/core/chat/api';

 const CustomPluginRunBox = dynamic(() => import('./components/CustomPluginRunBox'));

@@ -56,13 +55,13 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {

  const resetVariables = useContextSelector(ChatItemContext, (v) => v.resetVariables);
  const isPlugin = useContextSelector(ChatItemContext, (v) => v.isPlugin);
+  const chatBoxData = useContextSelector(ChatItemContext, (v) => v.chatBoxData);
  const setChatBoxData = useContextSelector(ChatItemContext, (v) => v.setChatBoxData);

  const chatRecords = useContextSelector(ChatRecordContext, (v) => v.chatRecords);
  const totalRecordsCount = useContextSelector(ChatRecordContext, (v) => v.totalRecordsCount);

  // Load chat init data
-  const [chatData, setChatData] = useState<InitChatResponse>(defaultChatData);
  const { loading } = useRequest2(
    async () => {
      if (!appId || forbidLoadChat.current) return;
@@ -71,11 +70,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
      res.userAvatar = userInfo?.avatar;

      // Wait for state update to complete
-      await new Promise((resolve) => {
-        setChatData(res);
-        setChatBoxData(res);
-        setTimeout(resolve, 0);
-      });
+      setChatBoxData(res);

      // reset chat variables
      resetVariables({
@@ -132,14 +127,14 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
      // new chat
      onUpdateHistoryTitle({ chatId, newTitle });
      // update chat window
-      setChatData((state) => ({
+      setChatBoxData((state) => ({
        ...state,
        title: newTitle
      }));

      return { responseText, responseData, isNewChat: forbidLoadChat.current };
    },
-    [chatId, appId, onUpdateHistoryTitle, forbidLoadChat]
+    [appId, chatId, onUpdateHistoryTitle, setChatBoxData, forbidLoadChat]
  );
  const RenderHistorySlider = useMemo(() => {
    const Children = (
@@ -164,7 +159,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {

  return (
    <Flex h={'100%'}>
-      <NextHead title={chatData.app.name} icon={chatData.app.avatar}></NextHead>
+      <NextHead title={chatBoxData.app.name} icon={chatBoxData.app.avatar}></NextHead>
      {/* pc show myself apps */}
      {isPc && (
        <Box borderRight={theme.borders.base} w={'220px'} flexShrink={0}>
@@ -188,7 +183,6 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
            <ChatHeader
              totalRecordsCount={totalRecordsCount}
              apps={myApps}
-              chatData={chatData}
              history={chatRecords}
              showHistory
              onRouteToAppDetail={() => router.push(`/app/detail?appId=${appId}`)}
@@ -213,7 +207,6 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
                  feedbackType={'user'}
                  onStartChat={onStartChat}
                  chatType={'chat'}
-                  isReady={!loading}
                  showRawSource
                  showNodeStatus
                />
--- a/projects/app/src/pages/chat/share.tsx
+++ b/projects/app/src/pages/chat/share.tsx
@@ -87,7 +87,6 @@ const OutLink = (props: Props) => {
  const isChatRecordsLoaded = useContextSelector(ChatRecordContext, (v) => v.isChatRecordsLoaded);

  const initSign = useRef(false);
-  const [chatData, setChatData] = useState<InitChatResponse>(defaultChatData);
  const { data, loading } = useRequest2(
    async () => {
      const shareId = outLinkAuthData.shareId;
@@ -100,11 +99,7 @@ const OutLink = (props: Props) => {
        outLinkUid
      });

-      await new Promise((resolve) => {
-        setChatData(res);
-        setChatBoxData(res);
-        setTimeout(resolve, 0);
-      });
+      setChatBoxData(res);

      resetVariables({
        variables: res.variables
@@ -180,7 +175,7 @@ const OutLink = (props: Props) => {
      onUpdateHistoryTitle({ chatId: completionChatId, newTitle });

      // update chat window
-      setChatData((state) => ({
+      setChatBoxData((state) => ({
        ...state,
        title: newTitle
      }));
@@ -199,7 +194,15 @@ const OutLink = (props: Props) => {

      return { responseText, responseData, isNewChat: forbidLoadChat.current };
    },
-    [chatId, customVariables, outLinkAuthData, onUpdateHistoryTitle, forbidLoadChat, onChangeChatId]
+    [
+      chatId,
+      customVariables,
+      outLinkAuthData,
+      onUpdateHistoryTitle,
+      setChatBoxData,
+      forbidLoadChat,
+      onChangeChatId
+    ]
  );

  // window init
@@ -258,7 +261,6 @@ const OutLink = (props: Props) => {
            {/* header */}
            {showHead === '1' ? (
              <ChatHeader
-                chatData={chatData}
                history={chatRecords}
                totalRecordsCount={totalRecordsCount}
                showHistory={showHistory === '1'}
@@ -282,7 +284,6 @@ const OutLink = (props: Props) => {
                  feedbackType={'user'}
                  onStartChat={startChat}
                  chatType="share"
-                  isReady={!loading}
                  showRawSource={showRawSource}
                  showNodeStatus={showNodeStatus}
                />
--- a/projects/app/src/pages/chat/team.tsx
+++ b/projects/app/src/pages/chat/team.tsx
@@ -62,24 +62,21 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
  const onUpdateHistoryTitle = useContextSelector(ChatContext, (v) => v.onUpdateHistoryTitle);

  const resetVariables = useContextSelector(ChatItemContext, (v) => v.resetVariables);
+  const chatBoxData = useContextSelector(ChatItemContext, (v) => v.chatBoxData);
  const setChatBoxData = useContextSelector(ChatItemContext, (v) => v.setChatBoxData);

  const chatRecords = useContextSelector(ChatRecordContext, (v) => v.chatRecords);
  const totalRecordsCount = useContextSelector(ChatRecordContext, (v) => v.totalRecordsCount);

  // get chat app info
-  const [chatData, setChatData] = useState<InitChatResponse>(defaultChatData);
  const { loading } = useRequest2(
    async () => {
      if (!appId || forbidLoadChat.current) return;

      const res = await getTeamChatInfo({ teamId, appId, chatId, teamToken });

-      await new Promise((resolve) => {
-        setChatData(res);
-        setChatBoxData(res);
-        setTimeout(resolve, 0);
-      });
+      setChatBoxData(res);
+
      // reset chat records
      resetVariables({
        variables: res.variables
@@ -124,7 +121,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
          teamId,
          teamToken,
          chatId: completionChatId,
-          appType: chatData.app.type
+          appType: chatBoxData.app.type
        },
        onMessage: generatingMessage,
        abortCtrl: controller
@@ -139,7 +136,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
      onUpdateHistoryTitle({ chatId: completionChatId, newTitle });

      // update chat window
-      setChatData((state) => ({
+      setChatBoxData((state) => ({
        ...state,
        title: newTitle
      }));
@@ -152,8 +149,9 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
      appId,
      teamId,
      teamToken,
-      chatData.app.type,
+      chatBoxData.app.type,
      onUpdateHistoryTitle,
+      setChatBoxData,
      forbidLoadChat,
      onChangeChatId
    ]
@@ -182,7 +180,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {

  return (
    <Flex h={'100%'}>
-      <NextHead title={chatData.app.name} icon={chatData.app.avatar}></NextHead>
+      <NextHead title={chatBoxData.app.name} icon={chatBoxData.app.avatar}></NextHead>
      {/* pc show myself apps */}
      {isPc && (
        <Box borderRight={theme.borders.base} w={'220px'} flexShrink={0}>
@@ -205,13 +203,12 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
            <ChatHeader
              totalRecordsCount={totalRecordsCount}
              apps={myApps}
-              chatData={chatData}
              history={chatRecords}
              showHistory
            />
            {/* chat box */}
            <Box flex={1}>
-              {chatData.app.type === AppTypeEnum.plugin ? (
+              {chatBoxData.app.type === AppTypeEnum.plugin ? (
                <CustomPluginRunBox
                  appId={appId}
                  chatId={chatId}
@@ -227,7 +224,6 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
                  feedbackType={'user'}
                  onStartChat={startChat}
                  chatType="team"
-                  isReady={!loading}
                  showRawSource
                  showNodeStatus
                />