Add workflow rename; Fix: userselect chatId unrefresh (#2672)

* feat: workflow node support rename

* perf: push data to training queue

* fix: userselect chatId unrefresh

docSite/content/zh-cn/docs/development/upgrading/4811.md

@@ -25,3 +25,4 @@ weight: 813
 8. 优化 - 工作流嵌套层级限制 20 层，避免因编排不合理导致的无限死循环。
 9. 优化 - 工作流 handler 性能优化。
 10. 修复 - 知识库选择权限问题。
+11. 修复 - 空 chatId 发起对话，首轮携带用户选择时会异常。

packages/service/core/dataset/training/controller.ts

@@ -10,6 +10,7 @@ import { ClientSession } from '../../../common/mongo';
 import { getLLMModel, getVectorModel } from '../../ai/model';
 import { addLog } from '../../../common/system/log';
 import { getCollectionWithDataset } from '../controller';
+import { mongoSessionRun } from '../../../common/mongo/sessionRun';
 
 export const lockTrainingDataByTeamId = async (teamId: string): Promise<any> => {
   try {
@@ -64,7 +65,7 @@ export async function pushDataListToTrainingQueue({
   vectorModel: string;
   session?: ClientSession;
 } & PushDatasetDataProps): Promise<PushDatasetDataResponse> {
-  const checkModelValid = async () => {
+  const { model, maxToken, weight } = await (async () => {
     const agentModelData = getLLMModel(agentModel);
     if (!agentModelData) {
       return Promise.reject(`File model ${agentModel} is inValid`);
@@ -91,9 +92,16 @@ export async function pushDataListToTrainingQueue({
     }
 
     return Promise.reject(`Training mode "${trainingMode}" is inValid`);
-  };
+  })();
 
-  const { model, maxToken, weight } = await checkModelValid();
+  // filter repeat or equal content
+  const set = new Set();
+  const filterResult: Record<string, PushDatasetDataChunkProps[]> = {
+    success: [],
+    overToken: [],
+    repeat: [],
+    error: []
+  };
 
   // format q and a, remove empty char
   data.forEach((item) => {
@@ -108,19 +116,8 @@ export async function pushDataListToTrainingQueue({
         };
       })
       .filter(Boolean);
-  });
-
-  // filter repeat or equal content
-  const set = new Set();
-  const filterResult: Record<string, PushDatasetDataChunkProps[]> = {
-    success: [],
-    overToken: [],
-    repeat: [],
-    error: []
-  };
 
     // filter repeat content
-  data.forEach((item) => {
     if (!item.q) {
       filterResult.error.push(item);
       return;
@@ -150,9 +147,15 @@ export async function pushDataListToTrainingQueue({
   const failedDocuments: PushDatasetDataChunkProps[] = [];
 
   // 使用 insertMany 批量插入
+  const batchSize = 200;
+  const insertData = async (startIndex: number, session: ClientSession) => {
+    const list = filterResult.success.slice(startIndex, startIndex + batchSize);
+
+    if (list.length === 0) return;
+
     try {
       await MongoDatasetTraining.insertMany(
-      filterResult.success.map((item) => ({
+        list.map((item) => ({
           teamId,
           tmbId,
           datasetId,
@@ -169,7 +172,7 @@ export async function pushDataListToTrainingQueue({
         })),
         {
           session,
-        ordered: false
+          ordered: true
         }
       );
     } catch (error: any) {
@@ -180,10 +183,19 @@ export async function pushDataListToTrainingQueue({
       });
       console.log('failed', failedDocuments);
     }
-
+    console.log(startIndex, '===');
     // 对于失败的文档，尝试单独插入
-  for await (const item of failedDocuments) {
+    await MongoDatasetTraining.create(failedDocuments, { session });
-    await MongoDatasetTraining.create(item);
+
+    return insertData(startIndex + batchSize, session);
+  };
+
+  if (session) {
+    await insertData(0, session);
+  } else {
+    await mongoSessionRun(async (session) => {
+      await insertData(0, session);
+    });
   }
 
   delete filterResult.success;

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

@@ -9,13 +9,11 @@ import { formatChatValue2InputType } from '../utils';
 import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { ChatBoxContext } from '../Provider';
 import { useContextSelector } from 'use-context-selector';
-import { SendPromptFnType } from '../type';
 
 export type ChatControllerProps = {
   isLastChild: boolean;
   chat: ChatSiteItemType;
   showVoiceIcon?: boolean;
-  onSendMessage: SendPromptFnType;
   onRetry?: () => void;
   onDelete?: () => void;
   onMark?: () => void;

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

@@ -19,7 +19,6 @@ import { useCopyData } from '@/web/common/hooks/useCopyData';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import { useTranslation } from 'next-i18next';
-import { SendPromptFnType } from '../type';
 import { AIChatItemValueItemType, ChatItemValueItemType } from '@fastgpt/global/core/chat/type';
 import { CodeClassNameEnum } from '@/components/Markdown/utils';
 import { isEqual } from 'lodash';
@@ -51,7 +50,6 @@ type BasicProps = {
 
 type Props = BasicProps & {
   type: ChatRoleEnum.Human | ChatRoleEnum.AI;
-  onSendMessage: SendPromptFnType;
 };
 
 const RenderQuestionGuide = ({ questionGuides }: { questionGuides: string[] }) => {
@@ -80,14 +78,12 @@ const AIContentCard = React.memo(function AIContentCard({
   dataId,
   isLastChild,
   isChatting,
-  onSendMessage,
   questionGuides
 }: {
   dataId: string;
   chatValue: ChatItemValueItemType[];
   isLastChild: boolean;
   isChatting: boolean;
-  onSendMessage: SendPromptFnType;
   questionGuides: string[];
 }) {
   return (
@@ -101,7 +97,6 @@ const AIContentCard = React.memo(function AIContentCard({
             value={value}
             isLastChild={isLastChild && i === chatValue.length - 1}
             isChatting={isChatting}
-            onSendMessage={onSendMessage}
           />
         );
       })}
@@ -113,16 +108,7 @@ const AIContentCard = React.memo(function AIContentCard({
 });
 
 const ChatItem = (props: Props) => {
-  const {
+  const { type, avatar, statusBoxData, children, isLastChild, questionGuides = [], chat } = props;
-    type,
-    avatar,
-    statusBoxData,
-    children,
-    isLastChild,
-    questionGuides = [],
-    onSendMessage,
-    chat
-  } = props;
 
   const styleMap: BoxProps =
     type === ChatRoleEnum.Human
@@ -270,7 +256,6 @@ const ChatItem = (props: Props) => {
                 dataId={chat.dataId}
                 isLastChild={isLastChild && i === splitAiResponseResults.length - 1}
                 isChatting={isChatting}
-                onSendMessage={onSendMessage}
                 questionGuides={questionGuides}
               />
             )}

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

@@ -60,7 +60,7 @@ import dynamic from 'next/dynamic';
 import type { StreamResponseType } from '@/web/common/api/fetch';
 import { useContextSelector } from 'use-context-selector';
 import { useSystem } from '@fastgpt/web/hooks/useSystem';
-import { useCreation, useMemoizedFn, useThrottleFn, useTrackedEffect } from 'ahooks';
+import { useCreation, useMemoizedFn, useThrottleFn } from 'ahooks';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 
 const ResponseTags = dynamic(() => import('./components/ResponseTags'));
@@ -832,12 +832,10 @@ const ChatBox = (
     };
     window.addEventListener('message', windowMessage);
 
-    eventBus.on(EventNameEnum.sendQuestion, ({ text }: { text: string }) => {
+    const fn: SendPromptFnType = (e) => {
-      if (!text) return;
+      sendPrompt(e);
-      sendPrompt({
+    };
-        text
+    eventBus.on(EventNameEnum.sendQuestion, fn);
-      });
-    });
     eventBus.on(EventNameEnum.editQuestion, ({ text }: { text: string }) => {
       if (!text) return;
       resetInputVal({ text });
@@ -881,7 +879,6 @@ const ChatBox = (
                     onRetry={retryInput(item.dataId)}
                     onDelete={delOneMessage(item.dataId)}
                     isLastChild={index === chatHistories.length - 1}
-                    onSendMessage={sendPrompt}
                   />
                 )}
                 {item.obj === ChatRoleEnum.AI && (
@@ -891,7 +888,6 @@ const ChatBox = (
                       avatar={appAvatar}
                       chat={item}
                       isLastChild={index === chatHistories.length - 1}
-                      onSendMessage={sendPrompt}
                       {...{
                         showVoiceIcon,
                         shareId,
@@ -977,7 +973,6 @@ const ChatBox = (
     outLinkUid,
     questionGuides,
     retryInput,
-    sendPrompt,
     shareId,
     showEmpty,
     showMarkIcon,

projects/app/src/components/core/chat/ChatContainer/useChat.ts

@@ -2,7 +2,8 @@ import { ChatSiteItemType } from '@fastgpt/global/core/chat/type';
 import { useCallback, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { PluginRunBoxTabEnum } from './PluginRunBox/constants';
-import { ComponentRef as ChatComponentRef } from './ChatBox/type';
+import { ComponentRef as ChatComponentRef, SendPromptFnType } from './ChatBox/type';
+import { eventBus, EventNameEnum } from '@/web/common/utils/eventbus';
 
 export const useChat = () => {
   const ChatBoxRef = useRef<ChatComponentRef>(null);
@@ -61,3 +62,5 @@ export const useChat = () => {
     resetChatRecords
   };
 };
+
+export const onSendPrompt: SendPromptFnType = (e) => eventBus.emit(EventNameEnum.sendQuestion, e);

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

@@ -12,24 +12,20 @@ import {
 import { ChatItemValueTypeEnum } from '@fastgpt/global/core/chat/constants';
 import {
   AIChatItemValueItemType,
-  ChatSiteItemType,
   ToolModuleResponseItemType,
   UserChatItemValueItemType
 } from '@fastgpt/global/core/chat/type';
 import React from 'react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import Avatar from '@fastgpt/web/components/common/Avatar';
-import { SendPromptFnType } from '../ChatContainer/ChatBox/type';
-import { useContextSelector } from 'use-context-selector';
-import { ChatBoxContext } from '../ChatContainer/ChatBox/Provider';
 import { InteractiveNodeResponseItemType } from '@fastgpt/global/core/workflow/template/system/userSelect/type';
 import { isEqual } from 'lodash';
+import { onSendPrompt } from '../ChatContainer/useChat';
 
 type props = {
   value: UserChatItemValueItemType | AIChatItemValueItemType;
   isLastChild: boolean;
   isChatting: boolean;
-  onSendMessage?: SendPromptFnType;
 };
 
 const RenderText = React.memo(function RenderText({
@@ -128,17 +124,10 @@ ${toolResponse}`}
   },
   (prevProps, nextProps) => isEqual(prevProps, nextProps)
 );
-const RenderInteractive = React.memo(
+const RenderInteractive = React.memo(function RenderInteractive({
-  function RenderInteractive({
+  interactive
-    isChatting,
-    interactive,
-    onSendMessage,
-    chatHistories
 }: {
-    isChatting: boolean;
   interactive: InteractiveNodeResponseItemType;
-    onSendMessage?: SendPromptFnType;
-    chatHistories: ChatSiteItemType[];
 }) {
   return (
     <>
@@ -164,7 +153,7 @@ const RenderInteractive = React.memo(
                   }
                 : {})}
               onClick={() => {
-                  onSendMessage?.({
+                onSendPrompt({
                   text: option.value,
                   isInteractivePrompt: true
                 });
@@ -177,18 +166,9 @@ const RenderInteractive = React.memo(
       </Flex>
     </>
   );
-  },
+});
-  (
-    prevProps,
-    nextProps // isChatting 更新时候，onSendMessage 和 chatHistories 肯定都更新了，这里不需要额外的刷新
-  ) =>
-    prevProps.isChatting === nextProps.isChatting &&
-    isEqual(prevProps.interactive, nextProps.interactive)
-);
-
-const AIResponseBox = ({ value, isLastChild, isChatting, onSendMessage }: props) => {
-  const chatHistories = useContextSelector(ChatBoxContext, (v) => v.chatHistories);
 
+const AIResponseBox = ({ value, isLastChild, isChatting }: props) => {
   if (value.type === ChatItemValueTypeEnum.text && value.text)
     return <RenderText showAnimation={isChatting && isLastChild} text={value.text.content} />;
   if (value.type === ChatItemValueTypeEnum.tool && value.tools)
@@ -198,14 +178,7 @@ const AIResponseBox = ({ value, isLastChild, isChatting, onSendMessage }: props)
     value.interactive &&
     value.interactive.type === 'userSelect'
   )
-    return (
+    return <RenderInteractive interactive={value.interactive} />;
-      <RenderInteractive
-        isChatting={isChatting}
-        interactive={value.interactive}
-        onSendMessage={onSendMessage}
-        chatHistories={chatHistories}
-      />
-    );
 };
 
 export default React.memo(AIResponseBox);

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/NodePluginConfig.tsx

@@ -53,7 +53,6 @@ const NodePluginConfig = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
       selected={selected}
       menuForbid={{
         debug: true,
-        rename: true,
         copy: true,
         delete: true
       }}

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/PluginInput.tsx

@@ -91,7 +91,6 @@ const NodePluginInput = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
         minW={'300px'}
         selected={selected}
         menuForbid={{
-          rename: true,
           copy: true,
           delete: true
         }}

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/PluginOutput.tsx

@@ -48,7 +48,6 @@ const NodePluginOutput = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
       selected={selected}
       menuForbid={{
         debug: true,
-        rename: true,
         copy: true,
         delete: true
       }}

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeSystemConfig.tsx

@@ -53,7 +53,6 @@ const NodeUserGuide = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
         selected={selected}
         menuForbid={{
           debug: true,
-          rename: true,
           copy: true,
           delete: true
         }}

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeWorkflowStart.tsx

@@ -68,7 +68,6 @@ const NodeStart = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
       minW={'240px'}
       selected={selected}
       menuForbid={{
-        rename: true,
         copy: true,
         delete: true
       }}

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx

@@ -33,7 +33,6 @@ type Props = FlowNodeItemType & {
   selected?: boolean;
   menuForbid?: {
     debug?: boolean;
-    rename?: boolean;
     copy?: boolean;
     delete?: boolean;
   };
@@ -154,7 +153,6 @@ const NodeCard = (props: Props) => {
             <Box ml={3} fontSize={'md'} fontWeight={'medium'}>
               {t(name as any)}
             </Box>
-            {!menuForbid?.rename && (
             <MyIcon
               className="controller-rename"
               display={'none'}
@@ -184,7 +182,6 @@ const NodeCard = (props: Props) => {
                 });
               }}
             />
-            )}
             <Box flex={1} />
             {hasNewVersion && (
               <MyTooltip label={t('app:app.modules.click to update')}>

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

@@ -130,7 +130,6 @@ const Chat = ({
       const completionChatId = chatId || getNanoid();
       // Just send a user prompt
       const histories = messages.slice(-1);
-
       const { responseText, responseData } = await streamFetch({
         data: {
           messages: histories,
@@ -146,11 +145,9 @@ const Chat = ({
       const newTitle = getChatTitleFromChatMessage(GPTMessages2Chats(histories)[0]);
 
       // new chat
-      if (completionChatId !== chatId) {
+      if (completionChatId !== chatId && controller.signal.reason !== 'leave') {
-        if (controller.signal.reason !== 'leave') {
         onChangeChatId(completionChatId, true);
       }
-      }
       loadHistories();
 
       // update chat window