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/4810.md

@@ -24,8 +24,8 @@ STORE_LOG_LEVEL=warn
 
 ### 3. 修改镜像tag
 
-- 更新 FastGPT 镜像 tag: v4.8.10
+- 更新 FastGPT 镜像 tag: v4.8.10-fix
-- 更新 FastGPT 商业版镜像 tag: v4.8.10
+- 更新 FastGPT 商业版镜像 tag: v4.8.10-fix
 - Sandbox 镜像，可以不更新
 
 ## 4. 执行初始化

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

@@ -22,3 +22,7 @@ weight: 813
 5. 新增 - 插件支持配置使用引导、全局变量和文件输入。
 6. 新增 - 简易模式支持新的版本管理方式。
 7. 新增 - 聊天记录滚动加载，不再只加载 30 条。
+8. 优化 - 工作流嵌套层级限制 20 层，避免因编排不合理导致的无限死循环。
+9. 优化 - 工作流 handler 性能优化。
+10. 修复 - 知识库选择权限问题。
+11. 修复 - 空 chatId 发起对话，首轮携带用户选择时会异常。

packages/global/core/workflow/runtime/constants.ts

@@ -24,7 +24,8 @@ export enum DispatchNodeResponseKeyEnum {
   assistantResponses = 'assistantResponses', // assistant response
   rewriteHistories = 'rewriteHistories', // If have the response, workflow histories will be rewrite
 
-  interactive = 'INTERACTIVE' // is interactive
+  interactive = 'INTERACTIVE', // is interactive
+  runTimes = 'runTimes' // run times
 }
 
 export const needReplaceReferenceInputTypeList = [

packages/global/core/workflow/runtime/type.d.ts

@@ -45,6 +45,7 @@ export type ChatDispatchProps = {
   maxRunTimes: number;
   isToolCall?: boolean;
   workflowStreamResponse?: WorkflowResponseType;
+  workflowDispatchDeep?: number;
 };
 
 export type ModuleDispatchProps<T> = ChatDispatchProps & {
@@ -181,6 +182,7 @@ export type DispatchNodeResultType<T = {}> = {
   [DispatchNodeResponseKeyEnum.toolResponses]?: ToolRunResponseItemType; // Tool response
   [DispatchNodeResponseKeyEnum.assistantResponses]?: AIChatItemValueItemType[]; // Assistant response(Store to db)
   [DispatchNodeResponseKeyEnum.rewriteHistories]?: ChatItemType[];
+  [DispatchNodeResponseKeyEnum.runTimes]?: number;
 } & T;
 
 /* Single node props */

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;

packages/service/core/workflow/constants.ts

@@ -0,0 +1,3 @@
+export const WORKFLOW_MAX_RUN_TIMES = process.env.WORKFLOW_MAX_RUN_TIMES
+  ? parseInt(process.env.WORKFLOW_MAX_RUN_TIMES)
+  : 500;

packages/service/core/workflow/dispatch/agent/runTool/functionCall.ts

@@ -298,7 +298,10 @@ export const runToolWithFunctionCall = async (
         dispatchFlowResponse,
         totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
         completeMessages: filterMessages,
-        assistantResponses: toolNodeAssistants
+        assistantResponses: toolNodeAssistants,
+        runTimes:
+          (response?.runTimes || 0) +
+          flatToolsResponseData.reduce((sum, item) => sum + item.runTimes, 0)
       };
     }
 
@@ -310,7 +313,10 @@ export const runToolWithFunctionCall = async (
       {
         dispatchFlowResponse,
         totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
-        assistantResponses: toolNodeAssistants
+        assistantResponses: toolNodeAssistants,
+        runTimes:
+          (response?.runTimes || 0) +
+          flatToolsResponseData.reduce((sum, item) => sum + item.runTimes, 0)
       }
     );
   } else {
@@ -330,7 +336,8 @@ export const runToolWithFunctionCall = async (
       dispatchFlowResponse: response?.dispatchFlowResponse || [],
       totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
       completeMessages,
-      assistantResponses: [...assistantResponses, ...toolNodeAssistant.value]
+      assistantResponses: [...assistantResponses, ...toolNodeAssistant.value],
+      runTimes: (response?.runTimes || 0) + 1
     };
   }
 };

packages/service/core/workflow/dispatch/agent/runTool/index.ts

@@ -125,7 +125,8 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
     dispatchFlowResponse, // tool flow response
     totalTokens,
     completeMessages = [], // The actual message sent to AI(just save text)
-    assistantResponses = [] // FastGPT system store assistant.value response
+    assistantResponses = [], // FastGPT system store assistant.value response
+    runTimes
   } = await (async () => {
     const adaptMessages = chats2GPTMessages({ messages, reserveId: false });
 
@@ -195,6 +196,7 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
   const previewAssistantResponses = filterToolResponseToPreview(assistantResponses);
 
   return {
+    [DispatchNodeResponseKeyEnum.runTimes]: runTimes,
     [NodeOutputKeyEnum.answerText]: previewAssistantResponses
       .filter((item) => item.text?.content)
       .map((item) => item.text?.content || '')

packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts

@@ -180,7 +180,8 @@ export const runToolWithPromptCall = async (
       dispatchFlowResponse: response?.dispatchFlowResponse || [],
       totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
       completeMessages,
-      assistantResponses: [...assistantResponses, ...toolNodeAssistant.value]
+      assistantResponses: [...assistantResponses, ...toolNodeAssistant.value],
+      runTimes: (response?.runTimes || 0) + 1
     };
   }
 
@@ -318,7 +319,8 @@ ANSWER: `;
       dispatchFlowResponse,
       totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
       completeMessages: filterMessages,
-      assistantResponses: toolNodeAssistants
+      assistantResponses: toolNodeAssistants,
+      runTimes: (response?.runTimes || 0) + toolsRunResponse.moduleRunResponse.runTimes
     };
   }
 
@@ -330,7 +332,8 @@ ANSWER: `;
     {
       dispatchFlowResponse,
       totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
-      assistantResponses: toolNodeAssistants
+      assistantResponses: toolNodeAssistants,
+      runTimes: (response?.runTimes || 0) + toolsRunResponse.moduleRunResponse.runTimes
     }
   );
 };

packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts

@@ -325,7 +325,10 @@ export const runToolWithToolChoice = async (
           dispatchFlowResponse,
           totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
           completeMessages,
-          assistantResponses: toolNodeAssistants
+          assistantResponses: toolNodeAssistants,
+          runTimes:
+            (response?.runTimes || 0) +
+            flatToolsResponseData.reduce((sum, item) => sum + item.runTimes, 0)
         };
       }
 
@@ -338,7 +341,10 @@ export const runToolWithToolChoice = async (
         {
           dispatchFlowResponse,
           totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
-          assistantResponses: toolNodeAssistants
+          assistantResponses: toolNodeAssistants,
+          runTimes:
+            (response?.runTimes || 0) +
+            flatToolsResponseData.reduce((sum, item) => sum + item.runTimes, 0)
         }
       );
     } else {
@@ -358,7 +364,8 @@ export const runToolWithToolChoice = async (
         dispatchFlowResponse: response?.dispatchFlowResponse || [],
         totalTokens: response?.totalTokens ? response.totalTokens + tokens : tokens,
         completeMessages,
-        assistantResponses: [...assistantResponses, ...toolNodeAssistant.value]
+        assistantResponses: [...assistantResponses, ...toolNodeAssistant.value],
+        runTimes: (response?.runTimes || 0) + 1
       };
     }
   } catch (error) {

packages/service/core/workflow/dispatch/agent/runTool/type.d.ts

@@ -8,6 +8,7 @@ import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/
 import { ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type';
 import type { DispatchFlowResponse } from '../../type.d';
 import { AIChatItemValueItemType, ChatItemValueItemType } from '@fastgpt/global/core/chat/type';
+import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 
 export type DispatchToolModuleProps = ModuleDispatchProps<{
   [NodeInputKeyEnum.history]?: ChatItemType[];
@@ -25,6 +26,7 @@ export type RunToolResponse = {
   totalTokens: number;
   completeMessages?: ChatCompletionMessageParam[];
   assistantResponses?: AIChatItemValueItemType[];
+  [DispatchNodeResponseKeyEnum.runTimes]: number;
 };
 export type ToolNodeItemType = RuntimeNodeItemType & {
   toolParams: RuntimeNodeItemType['inputs'];

packages/service/core/workflow/dispatch/index.ts

@@ -119,6 +119,31 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
     ...props
   } = data;
 
+  // 初始化深度和自动增加深度，避免无限嵌套
+  if (!props.workflowDispatchDeep) {
+    props.workflowDispatchDeep = 1;
+  } else {
+    props.workflowDispatchDeep += 1;
+  }
+
+  if (props.workflowDispatchDeep > 20) {
+    return {
+      flowResponses: [],
+      flowUsages: [],
+      debugResponse: {
+        finishedNodes: [],
+        finishedEdges: [],
+        nextStepRunNodes: []
+      },
+      [DispatchNodeResponseKeyEnum.runTimes]: 1,
+      [DispatchNodeResponseKeyEnum.assistantResponses]: [],
+      [DispatchNodeResponseKeyEnum.toolResponses]: null,
+      newVariables: removeSystemVariable(variables)
+    };
+  }
+
+  let workflowRunTimes = 0;
+
   // set sse response headers
   if (stream && res) {
     res.setHeader('Content-Type', 'text/event-stream;charset=utf-8');
@@ -154,7 +179,8 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
       nodeDispatchUsages,
       toolResponses,
       assistantResponses,
-      rewriteHistories
+      rewriteHistories,
+      runTimes = 1
     }: Omit<
       DispatchNodeResultType<{
         [NodeOutputKeyEnum.answerText]?: string;
@@ -163,6 +189,10 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
       'nodeResponse'
     >
   ) {
+    // Add run times
+    workflowRunTimes += runTimes;
+    props.maxRunTimes -= runTimes;
+
     if (responseData) {
       chatResponses.push(responseData);
     }
@@ -330,7 +360,6 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
     const nodeRunResult = await (() => {
       if (status === 'run') {
         nodeRunBeforeHook(node);
-        props.maxRunTimes--;
         addLog.debug(`[dispatchWorkFlow] nodeRunWithActive: ${node.name}`);
         return nodeRunWithActive(node);
       }
@@ -565,6 +594,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
       finishedEdges: runtimeEdges,
       nextStepRunNodes: debugNextStepRunNodes
     },
+    [DispatchNodeResponseKeyEnum.runTimes]: workflowRunTimes,
     [DispatchNodeResponseKeyEnum.assistantResponses]:
       mergeAssistantResponseAnswerText(chatAssistantResponse),
     [DispatchNodeResponseKeyEnum.toolResponses]: toolRunResponse,

packages/service/core/workflow/dispatch/plugin/run.ts

@@ -66,7 +66,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
     appId: String(plugin.id)
   };
 
-  const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
+  const { flowResponses, flowUsages, assistantResponses, runTimes } = await dispatchWorkFlow({
     ...props,
     runningAppInfo: {
       id: String(plugin.id),
@@ -92,6 +92,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
   return {
     assistantResponses,
     // responseData, // debug
+    [DispatchNodeResponseKeyEnum.runTimes]: runTimes,
     [DispatchNodeResponseKeyEnum.nodeResponse]: {
       moduleLogo: plugin.avatar,
       totalPoints: usagePoints,

packages/service/core/workflow/dispatch/plugin/runApp.ts

@@ -75,7 +75,7 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
     appId: String(appData._id)
   };
 
-  const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
+  const { flowResponses, flowUsages, assistantResponses, runTimes } = await dispatchWorkFlow({
     ...props,
     runningAppInfo: {
       id: String(appData._id),
@@ -107,6 +107,7 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
   const { text } = chatValue2RuntimePrompt(assistantResponses);
 
   return {
+    [DispatchNodeResponseKeyEnum.runTimes]: runTimes,
     [DispatchNodeResponseKeyEnum.nodeResponse]: {
       moduleLogo: appData.avatar,
       query: userChatInput,

packages/service/core/workflow/dispatch/type.d.ts

@@ -22,6 +22,7 @@ export type DispatchFlowResponse = {
   };
   [DispatchNodeResponseKeyEnum.toolResponses]: ToolRunResponseItemType;
   [DispatchNodeResponseKeyEnum.assistantResponses]: AIChatItemValueItemType[];
+  [DispatchNodeResponseKeyEnum.runTimes]: number;
   newVariables: Record<string, string>;
 };
 

packages/service/support/permission/dataset/auth.ts

@@ -90,13 +90,15 @@ export const authDatasetByTmbId = async ({
         const { dataset: parent } = await authDatasetByTmbId({
           tmbId,
           datasetId: dataset.parentId,
-          per
+          per,
+          isRoot
         });
 
         const Per = new DatasetPermission({
           per: parent.permission.value,
           isOwner
         });
+
         return {
           Per,
           defaultPermission: parent.defaultPermission

projects/app/.env.template

@@ -36,3 +36,6 @@ HOME_URL=/
 # 日志等级: debug, info, warn, error
 LOG_LEVEL=debug
 STORE_LOG_LEVEL=warn
+
+# 工作流最大运行次数，避免极端的死循环情况
+WORKFLOW_MAX_RUN_TIMES=500

projects/app/src/components/core/app/FileSelect.tsx

@@ -6,7 +6,6 @@ import {
   Flex,
   ModalBody,
   useDisclosure,
-  Image,
   HStack,
   Switch,
   ModalFooter

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/components/support/wallet/QRCodePayModal.tsx

@@ -74,7 +74,7 @@ const QRCodePayModal = ({
 
   return (
     <MyModal isOpen title={t('common:user.Pay')} iconSrc="/imgs/modal/pay.svg">
-      <ModalBody textAlign={'center'} py={6} whiteSpace={'pre'}>
+      <ModalBody textAlign={'center'} py={6} whiteSpace={'pre-wrap'}>
         {tip && (
           <Box fontSize={'sm'} whiteSpace={'pre'} mb={3}>
             {tip}

projects/app/src/pages/api/core/chat/chatTest.ts

@@ -27,6 +27,7 @@ import {
 import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
 import { getWorkflowResponseWrite } from '@fastgpt/service/core/workflow/dispatch/utils';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
+import { WORKFLOW_MAX_RUN_TIMES } from '@fastgpt/service/core/workflow/constants';
 
 export type Props = {
   messages: ChatCompletionMessageParam[];
@@ -120,7 +121,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
       chatConfig,
       histories: chatMessages,
       stream: true,
-      maxRunTimes: 200,
+      maxRunTimes: WORKFLOW_MAX_RUN_TIMES,
       workflowStreamResponse: workflowResponseWrite
     });
 

projects/app/src/pages/api/core/dataset/allDataset.ts

@@ -27,10 +27,7 @@ async function handler(req: NextApiRequest): Promise<DatasetSimpleItemType[]> {
 
   const [myDatasets, rpList] = await Promise.all([
     MongoDataset.find({
-      teamId,
+      teamId
-      type: {
-        $ne: DatasetTypeEnum.folder
-      }
     })
       .sort({
         updateTime: -1
@@ -45,9 +42,29 @@ async function handler(req: NextApiRequest): Promise<DatasetSimpleItemType[]> {
 
   const filterDatasets = myDatasets
     .map((dataset) => {
+      const perVal = (() => {
         const perVal = rpList.find(
           (item) => String(item.resourceId) === String(dataset._id)
         )?.permission;
+        if (perVal) {
+          return perVal;
+        }
+
+        if (dataset.inheritPermission && dataset.parentId) {
+          const parentDataset = myDatasets.find(
+            (item) => String(item._id) === String(dataset.parentId)
+          );
+          if (parentDataset) {
+            const parentPerVal =
+              rpList.find((item) => String(item.resourceId) === String(parentDataset._id))
+                ?.permission ?? parentDataset.defaultPermission;
+            if (parentPerVal) {
+              return parentPerVal;
+            }
+          }
+        }
+      })();
+
       const Per = new DatasetPermission({
         per: perVal ?? dataset.defaultPermission,
         isOwner: String(dataset.tmbId) === tmbId || tmbPer.isOwner

projects/app/src/pages/api/core/workflow/debug.ts

@@ -9,6 +9,7 @@ import { PostWorkflowDebugProps, PostWorkflowDebugResponse } from '@/global/core
 import { NextAPI } from '@/service/middleware/entry';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { defaultApp } from '@/web/core/app/constants';
+import { WORKFLOW_MAX_RUN_TIMES } from '@fastgpt/service/core/workflow/constants';
 
 async function handler(
   req: NextApiRequest,
@@ -57,7 +58,7 @@ async function handler(
     chatConfig: defaultApp.chatConfig,
     histories: [],
     stream: false,
-    maxRunTimes: 200
+    maxRunTimes: WORKFLOW_MAX_RUN_TIMES
   });
 
   pushChatUsage({

projects/app/src/pages/api/v1/chat/completions.ts

@@ -59,6 +59,7 @@ import { getSystemTime } from '@fastgpt/global/common/time/timezone';
 import { rewriteNodeOutputByHistories } from '@fastgpt/global/core/workflow/runtime/utils';
 import { getWorkflowResponseWrite } from '@fastgpt/service/core/workflow/dispatch/utils';
 import { getPluginRunUserQuery } from '@fastgpt/service/core/workflow/utils';
+import { WORKFLOW_MAX_RUN_TIMES } from '@fastgpt/service/core/workflow/constants';
 
 type FastGptWebChatProps = {
   chatId?: string; // undefined: get histories from messages, '': new chat, 'xxxxx': get histories from db
@@ -264,7 +265,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           chatConfig,
           histories: newHistories,
           stream,
-          maxRunTimes: 200,
+          maxRunTimes: WORKFLOW_MAX_RUN_TIMES,
           workflowStreamResponse: workflowResponseWrite
         });
       }

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

@@ -10,7 +10,6 @@ import {
   HStack
 } from '@chakra-ui/react';
 import { SmallAddIcon } from '@chakra-ui/icons';
-import { useSystemStore } from '@/web/common/system/useSystemStore';
 import type { AppSimpleEditFormType } from '@fastgpt/global/core/app/type.d';
 import { useRouter } from 'next/router';
 import { useTranslation } from 'next-i18next';
@@ -79,7 +78,6 @@ const EditForm = ({
   const { appDetail } = useContextSelector(AppContext, (v) => v);
 
   const { allDatasets } = useDatasetStore();
-  const { llmModelList } = useSystemStore();
   const [, startTst] = useTransition();
 
   const selectDatasets = useMemo(
@@ -506,6 +504,8 @@ const EditForm = ({
                 ...e
               }
             }));
+
+            console.dir(e);
           }}
         />
       )}

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/Handle/ConnectionHandle.tsx

@@ -11,16 +11,17 @@ export const ConnectionSourceHandle = ({ nodeId }: { nodeId: string }) => {
   const nodeList = useContextSelector(WorkflowContext, (v) => v.nodeList);
   const edges = useContextSelector(WorkflowContext, (v) => v.edges);
 
-  const node = useMemo(() => nodeList.find((node) => node.nodeId === nodeId), [nodeList, nodeId]);
+  const { showSourceHandle, RightHandle, LeftHandlee, TopHandlee, BottomHandlee } = useMemo(() => {
+    const node = nodeList.find((node) => node.nodeId === nodeId);
 
     /* not node/not connecting node, hidden */
-  const showSourceHandle = useMemo(() => {
+    const showSourceHandle = (() => {
       if (!node) return false;
       if (connectingEdge && connectingEdge.nodeId !== nodeId) return false;
       return true;
-  }, [connectingEdge, node, nodeId]);
+    })();
 
-  const RightHandle = useMemo(() => {
+    const RightHandle = (() => {
       const handleId = getHandleId(nodeId, 'source', Position.Right);
       const rightTargetConnected = edges.some(
         (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Right)
@@ -36,8 +37,8 @@ export const ConnectionSourceHandle = ({ nodeId }: { nodeId: string }) => {
           translate={[2, 0]}
         />
       );
-  }, [edges, node, nodeId]);
+    })();
-  const LeftHandlee = useMemo(() => {
+    const LeftHandlee = (() => {
       const leftTargetConnected = edges.some(
         (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Left)
       );
@@ -53,8 +54,8 @@ export const ConnectionSourceHandle = ({ nodeId }: { nodeId: string }) => {
           translate={[-6, 0]}
         />
       );
-  }, [edges, node, nodeId]);
+    })();
-  const TopHandlee = useMemo(() => {
+    const TopHandlee = (() => {
       if (
         edges.some(
           (edge) => edge.target === nodeId && edge.targetHandle === NodeOutputKeyEnum.selectedTools
@@ -76,8 +77,8 @@ export const ConnectionSourceHandle = ({ nodeId }: { nodeId: string }) => {
           translate={[0, -2]}
         />
       );
-  }, [edges, node, nodeId]);
+    })();
-  const BottomHandlee = useMemo(() => {
+    const BottomHandlee = (() => {
       const handleId = getHandleId(nodeId, 'source', Position.Bottom);
       const targetConnected = edges.some(
         (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Bottom)
@@ -92,7 +93,16 @@ export const ConnectionSourceHandle = ({ nodeId }: { nodeId: string }) => {
           translate={[0, 2]}
         />
       );
-  }, [edges, node, nodeId]);
+    })();
+
+    return {
+      showSourceHandle,
+      RightHandle,
+      LeftHandlee,
+      TopHandlee,
+      BottomHandlee
+    };
+  }, [connectingEdge, edges, nodeId, nodeList]);
 
   return showSourceHandle ? (
     <>
@@ -104,19 +114,32 @@ export const ConnectionSourceHandle = ({ nodeId }: { nodeId: string }) => {
   ) : null;
 };
 
-export const ConnectionTargetHandle = ({ nodeId }: { nodeId: string }) => {
+export const ConnectionTargetHandle = React.memo(function ConnectionTargetHandle({
+  nodeId
+}: {
+  nodeId: string;
+}) {
   const connectingEdge = useContextSelector(WorkflowContext, (ctx) => ctx.connectingEdge);
   const nodeList = useContextSelector(WorkflowContext, (v) => v.nodeList);
+  const edges = useContextSelector(WorkflowContext, (v) => v.edges);
 
-  const node = useMemo(() => nodeList.find((node) => node.nodeId === nodeId), [nodeList, nodeId]);
+  const { showHandle, LeftHandle, rightHandle, topHandle, bottomHandle } = useMemo(() => {
+    const node = nodeList.find((node) => node.nodeId === nodeId);
+    const connectingNode = nodeList.find((node) => node.nodeId === connectingEdge?.nodeId);
 
-  const showHandle = useMemo(() => {
+    const sourceEdges = edges.filter((edge) => edge.target === connectingNode?.nodeId);
+    const connectingNodeSourceNodeIds = sourceEdges.map((edge) => edge.source);
+
+    const showHandle = (() => {
       if (!node) return false;
+      // Unable to connect oneself
       if (connectingEdge && connectingEdge.nodeId === nodeId) return false;
+      // Unable to connect to the source node
+      if (connectingNodeSourceNodeIds.includes(nodeId)) return false;
       return true;
-  }, [connectingEdge, node, nodeId]);
+    })();
 
-  const LeftHandle = useMemo(() => {
+    const LeftHandle = (() => {
       if (!node || !node?.targetHandle?.left) return null;
 
       const handleId = getHandleId(nodeId, 'target', Position.Left);
@@ -129,8 +152,8 @@ export const ConnectionTargetHandle = ({ nodeId }: { nodeId: string }) => {
           translate={[-2, 0]}
         />
       );
-  }, [node, nodeId]);
+    })();
-  const rightHandle = useMemo(() => {
+    const rightHandle = (() => {
       if (!node || !node?.targetHandle?.right) return null;
 
       const handleId = getHandleId(nodeId, 'target', Position.Right);
@@ -143,8 +166,8 @@ export const ConnectionTargetHandle = ({ nodeId }: { nodeId: string }) => {
           translate={[2, 0]}
         />
       );
-  }, [node, nodeId]);
+    })();
-  const topHandle = useMemo(() => {
+    const topHandle = (() => {
       if (!node || !node?.targetHandle?.top) return null;
 
       const handleId = getHandleId(nodeId, 'target', Position.Top);
@@ -157,8 +180,8 @@ export const ConnectionTargetHandle = ({ nodeId }: { nodeId: string }) => {
           translate={[0, -2]}
         />
       );
-  }, [node, nodeId]);
+    })();
-  const bottomHandle = useMemo(() => {
+    const bottomHandle = (() => {
       if (!node || !node?.targetHandle?.bottom) return null;
 
       const handleId = getHandleId(nodeId, 'target', Position.Bottom);
@@ -171,7 +194,16 @@ export const ConnectionTargetHandle = ({ nodeId }: { nodeId: string }) => {
           translate={[0, 2]}
         />
       );
-  }, [node, nodeId]);
+    })();
+
+    return {
+      showHandle,
+      LeftHandle,
+      rightHandle,
+      topHandle,
+      bottomHandle
+    };
+  }, [connectingEdge, edges, nodeId, nodeList]);
 
   return showHandle ? (
     <>
@@ -181,7 +213,7 @@ export const ConnectionTargetHandle = ({ nodeId }: { nodeId: string }) => {
       {bottomHandle}
     </>
   ) : null;
-};
+});
 
 export default function Dom() {
   return <></>;

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')}>
@@ -248,6 +245,14 @@ const NodeCard = (props: Props) => {
     onChangeNode,
     toast
   ]);
+  const RenderHandle = useMemo(() => {
+    return (
+      <>
+        <ConnectionSourceHandle nodeId={nodeId} />
+        <ConnectionTargetHandle nodeId={nodeId} />
+      </>
+    );
+  }, [nodeId]);
 
   return (
     <Box
@@ -283,8 +288,7 @@ const NodeCard = (props: Props) => {
       <NodeDebugResponse nodeId={nodeId} debugResult={debugResult} />
       {Header}
       {children}
-      <ConnectionSourceHandle nodeId={nodeId} />
+      {RenderHandle}
-      <ConnectionTargetHandle nodeId={nodeId} />
 
       <EditTitleModal maxLength={20} />
     </Box>

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

projects/app/src/pages/login/sso.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { useRouter } from 'next/router';
 import type { ResLogin } from '@/global/support/api/userRes.d';
 import { useChatStore } from '@/web/core/chat/context/storeChat';
@@ -35,9 +35,6 @@ const provider = () => {
   );
 
   const handleSSO = useCallback(async () => {
-    if (isOauthLogging) return;
-    isOauthLogging = true;
-
     try {
       const res = await ssoLogin(query);
 

projects/app/src/service/core/app/utils.ts

@@ -13,6 +13,7 @@ import {
 import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
 import { addLog } from '@fastgpt/service/common/system/log';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
+import { WORKFLOW_MAX_RUN_TIMES } from '@fastgpt/service/core/workflow/constants';
 import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
 
 export const getScheduleTriggerApp = async () => {
@@ -55,7 +56,7 @@ export const getScheduleTriggerApp = async () => {
           chatConfig: defaultApp.chatConfig,
           histories: [],
           stream: false,
-          maxRunTimes: 200
+          maxRunTimes: WORKFLOW_MAX_RUN_TIMES
         });
         pushChatUsage({
           appName: app.name,