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

* feat: workflow node support rename * perf: push data to training queue * fix: userselect chatId unrefresh
Update 4810.md (#2668 )
2024-09-11 15:27:47 +08:00 · 2024-09-11 10:09:56 +08:00 · 2024-09-10 18:24:29 +08:00 · 2024-09-10 16:57:59 +08:00 · 2024-09-10 14:04:57 +08:00 · 2024-09-10 13:50:23 +08:00
40 changed files with 451 additions and 1506 deletions
--- a/docSite/content/zh-cn/docs/development/upgrading/4810.md
+++ b/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
+- 更新 FastGPT 镜像 tag: v4.8.10-fix
+- 更新 FastGPT 商业版镜像 tag: v4.8.10-fix
 - Sandbox 镜像，可以不更新

 ## 4. 执行初始化
--- a/docSite/content/zh-cn/docs/development/upgrading/4811.md
+++ b/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 发起对话，首轮携带用户选择时会异常。
--- a/packages/global/core/workflow/runtime/constants.ts
+++ b/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 = [
--- a/packages/global/core/workflow/runtime/type.d.ts
+++ b/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 */
--- a/packages/service/core/dataset/training/controller.ts
+++ b/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) => {
+    // filter repeat content
    if (!item.q) {
      filterResult.error.push(item);
      return;
@@ -150,40 +147,55 @@ export async function pushDataListToTrainingQueue({
  const failedDocuments: PushDatasetDataChunkProps[] = [];

  // 使用 insertMany 批量插入
-  try {
-    await MongoDatasetTraining.insertMany(
-      filterResult.success.map((item) => ({
-        teamId,
-        tmbId,
-        datasetId,
-        collectionId,
-        billId,
-        mode: trainingMode,
-        prompt,
-        model,
-        q: item.q,
-        a: item.a,
-        chunkIndex: item.chunkIndex ?? 0,
-        weight: weight ?? 0,
-        indexes: item.indexes
-      })),
-      {
-        session,
-        ordered: false
-      }
-    );
-  } catch (error: any) {
-    addLog.error(`Insert error`, error);
-    // 如果有错误，将失败的文档添加到失败列表中
-    error.writeErrors?.forEach((writeError: any) => {
-      failedDocuments.push(data[writeError.index]);
-    });
-    console.log('failed', failedDocuments);
-  }
+  const batchSize = 200;
+  const insertData = async (startIndex: number, session: ClientSession) => {
+    const list = filterResult.success.slice(startIndex, startIndex + batchSize);

-  // 对于失败的文档，尝试单独插入
-  for await (const item of failedDocuments) {
-    await MongoDatasetTraining.create(item);
+    if (list.length === 0) return;
+
+    try {
+      await MongoDatasetTraining.insertMany(
+        list.map((item) => ({
+          teamId,
+          tmbId,
+          datasetId,
+          collectionId,
+          billId,
+          mode: trainingMode,
+          prompt,
+          model,
+          q: item.q,
+          a: item.a,
+          chunkIndex: item.chunkIndex ?? 0,
+          weight: weight ?? 0,
+          indexes: item.indexes
+        })),
+        {
+          session,
+          ordered: true
+        }
+      );
+    } catch (error: any) {
+      addLog.error(`Insert error`, error);
+      // 如果有错误，将失败的文档添加到失败列表中
+      error.writeErrors?.forEach((writeError: any) => {
+        failedDocuments.push(data[writeError.index]);
+      });
+      console.log('failed', failedDocuments);
+    }
+    console.log(startIndex, '===');
+    // 对于失败的文档，尝试单独插入
+    await MongoDatasetTraining.create(failedDocuments, { session });
+
+    return insertData(startIndex + batchSize, session);
+  };
+
+  if (session) {
+    await insertData(0, session);
+  } else {
+    await mongoSessionRun(async (session) => {
+      await insertData(0, session);
+    });
  }

  delete filterResult.success;
--- a/packages/service/core/workflow/constants.ts
+++ b/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;
--- a/packages/service/core/workflow/dispatch/agent/runTool/functionCall.ts
+++ b/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
    };
  }
 };
--- a/packages/service/core/workflow/dispatch/agent/runTool/index.ts
+++ b/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 || '')
--- a/packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts
+++ b/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
    }
  );
 };
--- a/packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts
+++ b/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) {
--- a/packages/service/core/workflow/dispatch/agent/runTool/type.d.ts
+++ b/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'];
--- a/packages/service/core/workflow/dispatch/index.ts
+++ b/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,
--- a/packages/service/core/workflow/dispatch/plugin/run.ts
+++ b/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,
--- a/packages/service/core/workflow/dispatch/plugin/runApp.ts
+++ b/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,
--- a/packages/service/core/workflow/dispatch/type.d.ts
+++ b/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>;
 };

--- a/packages/service/support/permission/dataset/auth.ts
+++ b/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
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/projects/app/.env.template
+++ b/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
--- a/projects/app/src/components/core/app/FileSelect.tsx
+++ b/projects/app/src/components/core/app/FileSelect.tsx
@@ -6,7 +6,6 @@ import {
  Flex,
  ModalBody,
  useDisclosure,
-  Image,
  HStack,
  Switch,
  ModalFooter
--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ChatController.tsx
+++ b/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;
--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ChatItem.tsx
+++ b/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 {
-    type,
-    avatar,
-    statusBoxData,
-    children,
-    isLastChild,
-    questionGuides = [],
-    onSendMessage,
-    chat
-  } = props;
+  const { type, avatar, statusBoxData, children, isLastChild, questionGuides = [], 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}
              />
            )}
--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/index.tsx
+++ b/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 }) => {
-      if (!text) return;
-      sendPrompt({
-        text
-      });
-    });
+    const fn: SendPromptFnType = (e) => {
+      sendPrompt(e);
+    };
+    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,
--- a/projects/app/src/components/core/chat/ChatContainer/useChat.ts
+++ b/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);
--- a/projects/app/src/components/core/chat/components/AIResponseBox.tsx
+++ b/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,67 +124,51 @@ ${toolResponse}`}
  },
  (prevProps, nextProps) => isEqual(prevProps, nextProps)
 );
-const RenderInteractive = React.memo(
-  function RenderInteractive({
-    isChatting,
-    interactive,
-    onSendMessage,
-    chatHistories
-  }: {
-    isChatting: boolean;
-    interactive: InteractiveNodeResponseItemType;
-    onSendMessage?: SendPromptFnType;
-    chatHistories: ChatSiteItemType[];
-  }) {
-    return (
-      <>
-        {interactive?.params?.description && <Markdown source={interactive.params.description} />}
-        <Flex flexDirection={'column'} gap={2} w={'250px'}>
-          {interactive.params.userSelectOptions?.map((option) => {
-            const selected = option.value === interactive?.params?.userSelectedVal;
+const RenderInteractive = React.memo(function RenderInteractive({
+  interactive
+}: {
+  interactive: InteractiveNodeResponseItemType;
+}) {
+  return (
+    <>
+      {interactive?.params?.description && <Markdown source={interactive.params.description} />}
+      <Flex flexDirection={'column'} gap={2} w={'250px'}>
+        {interactive.params.userSelectOptions?.map((option) => {
+          const selected = option.value === interactive?.params?.userSelectedVal;

-            return (
-              <Button
-                key={option.key}
-                variant={'whitePrimary'}
-                whiteSpace={'pre-wrap'}
-                isDisabled={interactive?.params?.userSelectedVal !== undefined}
-                {...(selected
-                  ? {
-                      _disabled: {
-                        cursor: 'default',
-                        borderColor: 'primary.300',
-                        bg: 'primary.50 !important',
-                        color: 'primary.600'
-                      }
+          return (
+            <Button
+              key={option.key}
+              variant={'whitePrimary'}
+              whiteSpace={'pre-wrap'}
+              isDisabled={interactive?.params?.userSelectedVal !== undefined}
+              {...(selected
+                ? {
+                    _disabled: {
+                      cursor: 'default',
+                      borderColor: 'primary.300',
+                      bg: 'primary.50 !important',
+                      color: 'primary.600'
                    }
-                  : {})}
-                onClick={() => {
-                  onSendMessage?.({
-                    text: option.value,
-                    isInteractivePrompt: true
-                  });
-                }}
-              >
-                {option.value}
-              </Button>
-            );
-          })}
-        </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);
+                  }
+                : {})}
+              onClick={() => {
+                onSendPrompt({
+                  text: option.value,
+                  isInteractivePrompt: true
+                });
+              }}
+            >
+              {option.value}
+            </Button>
+          );
+        })}
+      </Flex>
+    </>
+  );
+});

+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 (
-      <RenderInteractive
-        isChatting={isChatting}
-        interactive={value.interactive}
-        onSendMessage={onSendMessage}
-        chatHistories={chatHistories}
-      />
-    );
+    return <RenderInteractive interactive={value.interactive} />;
 };

 export default React.memo(AIResponseBox);
--- a/projects/app/src/components/support/wallet/QRCodePayModal.tsx
+++ b/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}
--- a/projects/app/src/pages/api/core/chat/chatTest.ts
+++ b/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
    });

--- a/projects/app/src/pages/api/core/dataset/allDataset.ts
+++ b/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,
-      type: {
-        $ne: DatasetTypeEnum.folder
-      }
+      teamId
    })
      .sort({
        updateTime: -1
@@ -45,9 +42,29 @@ async function handler(req: NextApiRequest): Promise<DatasetSimpleItemType[]> {

  const filterDatasets = myDatasets
    .map((dataset) => {
-      const perVal = rpList.find(
-        (item) => String(item.resourceId) === String(dataset._id)
-      )?.permission;
+      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
--- a/projects/app/src/pages/api/core/workflow/debug.ts
+++ b/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({
--- a/projects/app/src/pages/api/v1/chat/completions.ts
+++ b/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
        });
      }
--- a/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx
+++ b/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);
          }}
        />
      )}
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/NodePluginConfig.tsx
+++ b/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
      }}
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/PluginInput.tsx
+++ b/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
        }}
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/PluginOutput.tsx
+++ b/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
      }}
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeSystemConfig.tsx
+++ b/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
        }}
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeWorkflowStart.tsx
+++ b/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
      }}
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/Handle/ConnectionHandle.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/Handle/ConnectionHandle.tsx
@@ -11,88 +11,98 @@ 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(() => {
-    if (!node) return false;
-    if (connectingEdge && connectingEdge.nodeId !== nodeId) return false;
-    return true;
-  }, [connectingEdge, node, nodeId]);
+    /* not node/not connecting node, hidden */
+    const showSourceHandle = (() => {
+      if (!node) return false;
+      if (connectingEdge && connectingEdge.nodeId !== nodeId) return false;
+      return true;
+    })();

-  const RightHandle = useMemo(() => {
-    const handleId = getHandleId(nodeId, 'source', Position.Right);
-    const rightTargetConnected = edges.some(
-      (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Right)
-    );
+    const RightHandle = (() => {
+      const handleId = getHandleId(nodeId, 'source', Position.Right);
+      const rightTargetConnected = edges.some(
+        (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Right)
+      );

-    if (!node || !node?.sourceHandle?.right || rightTargetConnected) return null;
+      if (!node || !node?.sourceHandle?.right || rightTargetConnected) return null;

-    return (
-      <SourceHandle
-        nodeId={nodeId}
-        handleId={handleId}
-        position={Position.Right}
-        translate={[2, 0]}
-      />
-    );
-  }, [edges, node, nodeId]);
-  const LeftHandlee = useMemo(() => {
-    const leftTargetConnected = edges.some(
-      (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Left)
-    );
-    if (!node || !node?.sourceHandle?.left || leftTargetConnected) return null;
+      return (
+        <SourceHandle
+          nodeId={nodeId}
+          handleId={handleId}
+          position={Position.Right}
+          translate={[2, 0]}
+        />
+      );
+    })();
+    const LeftHandlee = (() => {
+      const leftTargetConnected = edges.some(
+        (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Left)
+      );
+      if (!node || !node?.sourceHandle?.left || leftTargetConnected) return null;

-    const handleId = getHandleId(nodeId, 'source', Position.Left);
+      const handleId = getHandleId(nodeId, 'source', Position.Left);

-    return (
-      <SourceHandle
-        nodeId={nodeId}
-        handleId={handleId}
-        position={Position.Left}
-        translate={[-6, 0]}
-      />
-    );
-  }, [edges, node, nodeId]);
-  const TopHandlee = useMemo(() => {
-    if (
-      edges.some(
-        (edge) => edge.target === nodeId && edge.targetHandle === NodeOutputKeyEnum.selectedTools
+      return (
+        <SourceHandle
+          nodeId={nodeId}
+          handleId={handleId}
+          position={Position.Left}
+          translate={[-6, 0]}
+        />
+      );
+    })();
+    const TopHandlee = (() => {
+      if (
+        edges.some(
+          (edge) => edge.target === nodeId && edge.targetHandle === NodeOutputKeyEnum.selectedTools
+        )
      )
-    )
-      return null;
+        return null;

-    const handleId = getHandleId(nodeId, 'source', Position.Top);
-    const topTargetConnected = edges.some(
-      (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Top)
-    );
-    if (!node || !node?.sourceHandle?.top || topTargetConnected) return null;
+      const handleId = getHandleId(nodeId, 'source', Position.Top);
+      const topTargetConnected = edges.some(
+        (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Top)
+      );
+      if (!node || !node?.sourceHandle?.top || topTargetConnected) return null;

-    return (
-      <SourceHandle
-        nodeId={nodeId}
-        handleId={handleId}
-        position={Position.Top}
-        translate={[0, -2]}
-      />
-    );
-  }, [edges, node, nodeId]);
-  const BottomHandlee = useMemo(() => {
-    const handleId = getHandleId(nodeId, 'source', Position.Bottom);
-    const targetConnected = edges.some(
-      (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Bottom)
-    );
-    if (!node || !node?.sourceHandle?.bottom || targetConnected) return null;
+      return (
+        <SourceHandle
+          nodeId={nodeId}
+          handleId={handleId}
+          position={Position.Top}
+          translate={[0, -2]}
+        />
+      );
+    })();
+    const BottomHandlee = (() => {
+      const handleId = getHandleId(nodeId, 'source', Position.Bottom);
+      const targetConnected = edges.some(
+        (edge) => edge.targetHandle === getHandleId(nodeId, 'target', Position.Bottom)
+      );
+      if (!node || !node?.sourceHandle?.bottom || targetConnected) return null;

-    return (
-      <SourceHandle
-        nodeId={nodeId}
-        handleId={handleId}
-        position={Position.Bottom}
-        translate={[0, 2]}
-      />
-    );
-  }, [edges, node, nodeId]);
+      return (
+        <SourceHandle
+          nodeId={nodeId}
+          handleId={handleId}
+          position={Position.Bottom}
+          translate={[0, 2]}
+        />
+      );
+    })();
+
+    return {
+      showSourceHandle,
+      RightHandle,
+      LeftHandlee,
+      TopHandlee,
+      BottomHandlee
+    };
+  }, [connectingEdge, edges, nodeId, nodeList]);

  return showSourceHandle ? (
    <>
@@ -104,74 +114,96 @@ 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(() => {
-    if (!node) return false;
-    if (connectingEdge && connectingEdge.nodeId === nodeId) return false;
-    return true;
-  }, [connectingEdge, node, nodeId]);
+    const sourceEdges = edges.filter((edge) => edge.target === connectingNode?.nodeId);
+    const connectingNodeSourceNodeIds = sourceEdges.map((edge) => edge.source);

-  const LeftHandle = useMemo(() => {
-    if (!node || !node?.targetHandle?.left) return null;
+    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;
+    })();

-    const handleId = getHandleId(nodeId, 'target', Position.Left);
+    const LeftHandle = (() => {
+      if (!node || !node?.targetHandle?.left) return null;

-    return (
-      <TargetHandle
-        nodeId={nodeId}
-        handleId={handleId}
-        position={Position.Left}
-        translate={[-2, 0]}
-      />
-    );
-  }, [node, nodeId]);
-  const rightHandle = useMemo(() => {
-    if (!node || !node?.targetHandle?.right) return null;
+      const handleId = getHandleId(nodeId, 'target', Position.Left);

-    const handleId = getHandleId(nodeId, 'target', Position.Right);
+      return (
+        <TargetHandle
+          nodeId={nodeId}
+          handleId={handleId}
+          position={Position.Left}
+          translate={[-2, 0]}
+        />
+      );
+    })();
+    const rightHandle = (() => {
+      if (!node || !node?.targetHandle?.right) return null;

-    return (
-      <TargetHandle
-        nodeId={nodeId}
-        handleId={handleId}
-        position={Position.Right}
-        translate={[2, 0]}
-      />
-    );
-  }, [node, nodeId]);
-  const topHandle = useMemo(() => {
-    if (!node || !node?.targetHandle?.top) return null;
+      const handleId = getHandleId(nodeId, 'target', Position.Right);

-    const handleId = getHandleId(nodeId, 'target', Position.Top);
+      return (
+        <TargetHandle
+          nodeId={nodeId}
+          handleId={handleId}
+          position={Position.Right}
+          translate={[2, 0]}
+        />
+      );
+    })();
+    const topHandle = (() => {
+      if (!node || !node?.targetHandle?.top) return null;

-    return (
-      <TargetHandle
-        nodeId={nodeId}
-        handleId={handleId}
-        position={Position.Top}
-        translate={[0, -2]}
-      />
-    );
-  }, [node, nodeId]);
-  const bottomHandle = useMemo(() => {
-    if (!node || !node?.targetHandle?.bottom) return null;
+      const handleId = getHandleId(nodeId, 'target', Position.Top);

-    const handleId = getHandleId(nodeId, 'target', Position.Bottom);
+      return (
+        <TargetHandle
+          nodeId={nodeId}
+          handleId={handleId}
+          position={Position.Top}
+          translate={[0, -2]}
+        />
+      );
+    })();
+    const bottomHandle = (() => {
+      if (!node || !node?.targetHandle?.bottom) return null;

-    return (
-      <TargetHandle
-        nodeId={nodeId}
-        handleId={handleId}
-        position={Position.Bottom}
-        translate={[0, 2]}
-      />
-    );
-  }, [node, nodeId]);
+      const handleId = getHandleId(nodeId, 'target', Position.Bottom);
+
+      return (
+        <TargetHandle
+          nodeId={nodeId}
+          handleId={handleId}
+          position={Position.Bottom}
+          translate={[0, 2]}
+        />
+      );
+    })();
+
+    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 <></>;
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx
+++ b/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,37 +153,35 @@ const NodeCard = (props: Props) => {
            <Box ml={3} fontSize={'md'} fontWeight={'medium'}>
              {t(name as any)}
            </Box>
-            {!menuForbid?.rename && (
-              <MyIcon
-                className="controller-rename"
-                display={'none'}
-                name={'edit'}
-                w={'14px'}
-                cursor={'pointer'}
-                ml={1}
-                color={'myGray.500'}
-                _hover={{ color: 'primary.600' }}
-                onClick={() => {
-                  onOpenCustomTitleModal({
-                    defaultVal: name,
-                    onSuccess: (e) => {
-                      if (!e) {
-                        return toast({
-                          title: t('app:modules.Title is required'),
-                          status: 'warning'
-                        });
-                      }
-                      onChangeNode({
-                        nodeId,
-                        type: 'attr',
-                        key: 'name',
-                        value: e
+            <MyIcon
+              className="controller-rename"
+              display={'none'}
+              name={'edit'}
+              w={'14px'}
+              cursor={'pointer'}
+              ml={1}
+              color={'myGray.500'}
+              _hover={{ color: 'primary.600' }}
+              onClick={() => {
+                onOpenCustomTitleModal({
+                  defaultVal: name,
+                  onSuccess: (e) => {
+                    if (!e) {
+                      return toast({
+                        title: t('app:modules.Title is required'),
+                        status: 'warning'
                      });
                    }
-                  });
-                }}
-              />
-            )}
+                    onChangeNode({
+                      nodeId,
+                      type: 'attr',
+                      key: 'name',
+                      value: e
+                    });
+                  }
+                });
+              }}
+            />
            <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} />
-      <ConnectionTargetHandle nodeId={nodeId} />
+      {RenderHandle}

      <EditTitleModal maxLength={20} />
    </Box>
--- a/projects/app/src/pages/chat/index.tsx
+++ b/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,10 +145,8 @@ const Chat = ({
      const newTitle = getChatTitleFromChatMessage(GPTMessages2Chats(histories)[0]);

      // new chat
-      if (completionChatId !== chatId) {
-        if (controller.signal.reason !== 'leave') {
-          onChangeChatId(completionChatId, true);
-        }
+      if (completionChatId !== chatId && controller.signal.reason !== 'leave') {
+        onChangeChatId(completionChatId, true);
      }
      loadHistories();

--- a/projects/app/src/pages/login/sso.tsx
+++ b/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);

--- a/projects/app/src/service/core/app/utils.ts
+++ b/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,
Author	SHA1	Message	Date
Archer	02bf400bf3	Add workflow rename; Fix: userselect chatId unrefresh (#2672 ) * feat: workflow node support rename * perf: push data to training queue * fix: userselect chatId unrefresh	2024-09-11 15:27:47 +08:00
Archer	11cbcca2d4	Update 4810.md (#2668 )	2024-09-11 10:09:56 +08:00
Finley Ge	34422f9549	fix: sso (#2661 )	2024-09-10 18:24:29 +08:00
Archer	aeba79267a	Workflow deep and workflow connection performance (#2664 ) * feat: Workflow dispatch deep * perf: workflow connection	2024-09-10 16:57:59 +08:00
Archer	7473be5922	pay pre wrap (#2659 )	2024-09-10 14:04:57 +08:00
Finley Ge	de59b3d2e5	fix: app select dataset (#2660 )	2024-09-10 13:50:23 +08:00