4.8 test (#1382)

* perf: some log, chatTest histories slice; http request failed tip * fix: ssr render * perf: if else node ui and fix value type select

4.8 test (#1382)
* perf: some log, chatTest histories slice; http request failed tip * fix: ssr render * perf: if else node ui and fix value type select
8f9203c0 · Archer · GitHub · 2053bbdb · 8f9203c0 · 8f9203c0
Commit 8f9203c0 authored May 07, 2024 by Archer Committed by GitHub May 07, 2024
21 changed files
--- a/packages/global/core/workflow/template/system/ifElse/index.ts
+++ b/packages/global/core/workflow/template/system/ifElse/index.ts
@@ -46,7 +46,7 @@ export const IfElseNode: FlowNodeTemplateType = {
    {
      id: NodeOutputKeyEnum.ifElseResult,
      key: NodeOutputKeyEnum.ifElseResult,
-      label: 'IF ELSE',
+      label: '判断结果',
      valueType: WorkflowIOValueTypeEnum.string,
      type: FlowNodeOutputTypeEnum.static
    }

--- a/packages/global/core/workflow/type/index.d.ts
+++ b/packages/global/core/workflow/type/index.d.ts
@@ -40,7 +40,7 @@ export type FlowNodeCommonType = {
 };
 export type FlowNodeTemplateType = FlowNodeCommonType & {
-  id: string; // module id, unique
+  id: string; // node id, unique
  templateType: `${FlowNodeTemplateTypeEnum}`;
  // show handle
@@ -132,11 +132,12 @@ export type ChatDispatchProps = {
  chatId?: string;
  responseChatItemId?: string;
  histories: ChatItemType[];
-  variables: Record<string, any>;
+  variables: Record<string, any>; // global variable
-  query: UserChatItemValueItemType[];
+  query: UserChatItemValueItemType[]; // trigger query
  stream: boolean;
  detail: boolean; // response detail
  maxRunTimes: number;
+  isToolCall?: boolean;
 };
 export type ModuleDispatchProps<T> = ChatDispatchProps & {

--- a/packages/service/core/ai/rerank/index.ts
+++ b/packages/service/core/ai/rerank/index.ts
+import { addLog } from '../../../common/system/log';
 import { POST } from '../../../common/api/serverRequest';
 type PostReRankResponse = {
@@ -38,7 +39,7 @@ export function reRankRecall({
    }
  )
    .then((data) => {
-      console.log('rerank time:', Date.now() - start);
+      addLog.info('ReRank finish:', { time: Date.now() - start });
      return data?.results?.map((item) => ({
        id: documents[item.index].id,
@@ -46,7 +47,7 @@ export function reRankRecall({
      }));
    })
    .catch((err) => {
-      console.log('rerank error:', err);
+      addLog.error('rerank error', err);
      return [];
    });

--- a/packages/service/core/workflow/dispatch/agent/runTool/functionCall.ts
+++ b/packages/service/core/workflow/dispatch/agent/runTool/functionCall.ts
@@ -161,6 +161,7 @@ export const runToolWithFunctionCall = async (
        const toolRunResponse = await dispatchWorkFlow({
          ...props,
+          isToolCall: true,
          runtimeNodes: runtimeNodes.map((item) =>
            item.nodeId === toolNode.nodeId
              ? {

--- a/packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts
+++ b/packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts
@@ -185,6 +185,7 @@ export const runToolWithPromptCall = async (
    const moduleRunResponse = await dispatchWorkFlow({
      ...props,
+      isToolCall: true,
      runtimeNodes: runtimeNodes.map((item) =>
        item.nodeId === toolNode.nodeId
          ? {

--- a/packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts
+++ b/packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts
@@ -182,6 +182,7 @@ export const runToolWithToolChoice = async (
        const toolRunResponse = await dispatchWorkFlow({
          ...props,
+          isToolCall: true,
          runtimeNodes: runtimeNodes.map((item) =>
            item.nodeId === toolNode.nodeId
              ? {

--- a/packages/service/core/workflow/dispatch/init/workflowStart.tsx
+++ b/packages/service/core/workflow/dispatch/init/workflowStart.tsx
@@ -8,12 +8,15 @@ export type UserChatInputProps = ModuleDispatchProps<{
 }>;
 export const dispatchWorkflowStart = (props: Record<string, any>) => {
-  const { query } = props as UserChatInputProps;
+  const {
+    query,
+    params: { userChatInput }
+  } = props as UserChatInputProps;
  const { text, files } = chatValue2RuntimePrompt(query);
  return {
-    [NodeInputKeyEnum.userChatInput]: text,
+    [NodeInputKeyEnum.userChatInput]: text || userChatInput,
    [NodeInputKeyEnum.inputFiles]: files
  };
 };
--- a/packages/service/core/workflow/dispatch/tools/http468.ts
+++ b/packages/service/core/workflow/dispatch/tools/http468.ts
@@ -49,6 +49,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
    variables,
    node: { outputs },
    histories,
+    isToolCall,
    params: {
      system_httpMethod: httpMethod = 'POST',
      system_httpReqUrl: httpReqUrl,
@@ -156,6 +157,8 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
    };
  } catch (error) {
    addLog.error('Http request error', error);
+    if (isToolCall) {
      return {
        [NodeOutputKeyEnum.failed]: true,
        [DispatchNodeResponseKeyEnum.nodeResponse]: {
@@ -168,6 +171,8 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
        [NodeOutputKeyEnum.httpRawResponse]: getErrText(error)
      };
    }
+    return Promise.reject(error);
+  }
 };
 async function fetchData({

--- a/packages/service/core/workflow/dispatch/tools/runIfElse.ts
+++ b/packages/service/core/workflow/dispatch/tools/runIfElse.ts
-import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 import { VariableConditionEnum } from '@fastgpt/global/core/workflow/template/system/ifElse/constant';
@@ -15,6 +15,9 @@ type Props = ModuleDispatchProps<{
  [NodeInputKeyEnum.condition]: IfElseConditionType;
  [NodeInputKeyEnum.ifElseList]: IfElseListItemType[];
 }>;
+type Response = DispatchNodeResultType<{
+  [NodeOutputKeyEnum.ifElseResult]: string;
+}>;
 function checkCondition(condition: VariableConditionEnum, variableValue: any, value: string) {
  const operations = {
@@ -63,7 +66,7 @@ function getResult(
  return condition === 'AND' ? listResult.every(Boolean) : listResult.some(Boolean);
 }
-export const dispatchIfElse = async (props: Props): Promise<DispatchNodeResultType<{}>> => {
+export const dispatchIfElse = async (props: Props): Promise<Response> => {
  const {
    params,
    runtimeNodes,
@@ -88,6 +91,7 @@ export const dispatchIfElse = async (props: Props): Promise<DispatchNodeResultTy
  });
  return {
+    [NodeOutputKeyEnum.ifElseResult]: res,
    [DispatchNodeResponseKeyEnum.nodeResponse]: {
      totalPoints: 0,
      ifElseResult: res

--- a/packages/web/hooks/useBeforeunload.ts
+++ b/packages/web/hooks/useBeforeunload.ts
@@ -14,7 +14,9 @@ export const useBeforeunload = (props?: { callback?: () => any; tip?: string }) 
            e.returnValue = tip;
            callback?.();
          }
-        : () => {};
+        : () => {
+            callback?.();
+          };
    window.addEventListener('beforeunload', listen);
    return () => {

--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
 settings:
  autoInstallPeers: true

--- a/projects/app/src/components/Markdown/index.tsx
+++ b/projects/app/src/components/Markdown/index.tsx
@@ -17,13 +17,13 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
 import { getFileAndOpen } from '@/web/core/dataset/utils';
 import { MARKDOWN_QUOTE_SIGN } from '@fastgpt/global/core/chat/constants';
-const CodeLight = dynamic(() => import('./CodeLight'));
+const CodeLight = dynamic(() => import('./CodeLight'), { ssr: false });
-const MermaidCodeBlock = dynamic(() => import('./img/MermaidCodeBlock'));
+const MermaidCodeBlock = dynamic(() => import('./img/MermaidCodeBlock'), { ssr: false });
-const MdImage = dynamic(() => import('./img/Image'));
+const MdImage = dynamic(() => import('./img/Image'), { ssr: false });
-const EChartsCodeBlock = dynamic(() => import('./img/EChartsCodeBlock'));
+const EChartsCodeBlock = dynamic(() => import('./img/EChartsCodeBlock'), { ssr: false });
-const ChatGuide = dynamic(() => import('./chat/Guide'));
+const ChatGuide = dynamic(() => import('./chat/Guide'), { ssr: false });
-const QuestionGuide = dynamic(() => import('./chat/QuestionGuide'));
+const QuestionGuide = dynamic(() => import('./chat/QuestionGuide'), { ssr: false });
 export enum CodeClassName {
  guide = 'guide',

--- a/projects/app/src/components/core/workflow/Flow/ChatTest.tsx
+++ b/projects/app/src/components/core/workflow/Flow/ChatTest.tsx
@@ -65,7 +65,7 @@ const ChatTest = (
          }
        });
      });
-      const history = chatList.slice(-historyMaxLen - 2, -2);
+      const history = chatList.slice(-(historyMaxLen * 2) - 2, -2);
      // 流请求，获取数据
      const { responseText, responseData, newVariables } = await streamFetch({

--- a/projects/app/src/components/core/workflow/Flow/nodes/NodeIfElse/ListItem.tsx
+++ b/projects/app/src/components/core/workflow/Flow/nodes/NodeIfElse/ListItem.tsx
@@ -24,6 +24,7 @@ import MyInput from '@/components/MyInput';
 import { getHandleId } from '@fastgpt/global/core/workflow/utils';
 import { SourceHandle } from '../render/Handle';
 import { Position, useReactFlow } from 'reactflow';
+import { getReferenceDataValueType } from '@/web/core/workflow/utils';
 const ListItem = ({
  provided,
@@ -305,19 +306,17 @@ const ConditionSelect = ({
  variable?: ReferenceValueProps;
  onSelect: (e: VariableConditionEnum) => void;
 }) => {
+  const { t } = useTranslation();
  const nodeList = useContextSelector(WorkflowContext, (v) => v.nodeList);
  // get condition type
  const valueType = useMemo(() => {
-    if (!variable) return;
+    return getReferenceDataValueType({
-    const node = nodeList.find((node) => node.nodeId === variable[0]);
+      variable,
+      nodeList,
-    if (!node) return WorkflowIOValueTypeEnum.any;
+      t
-    const output = node.outputs.find((item) => item.id === variable[1]);
+    });
+  }, [nodeList, t, variable]);
-    if (!output) return WorkflowIOValueTypeEnum.any;
-    return output.valueType;
-  }, [nodeList, variable]);
  const conditionList = useMemo(() => {
    if (valueType === WorkflowIOValueTypeEnum.string) return stringConditionList;

--- a/projects/app/src/components/core/workflow/Flow/nodes/NodeVariableUpdate.tsx
+++ b/projects/app/src/components/core/workflow/Flow/nodes/NodeVariableUpdate.tsx
@@ -30,7 +30,7 @@ import { SmallAddIcon } from '@chakra-ui/icons';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import { ReferenceValueProps } from '@fastgpt/global/core/workflow/type/io';
 import { ReferSelector, useReference } from './render/RenderInput/templates/Reference';
-import { getWorkflowGlobalVariables } from '@/web/core/workflow/utils';
+import { getReferenceDataValueType } from '@/web/core/workflow/utils';
 import { isReferenceValue } from '@fastgpt/global/core/workflow/utils';
 const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
@@ -82,19 +82,11 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) => 
    return (
      <>
        {updateList.map((updateItem, index) => {
-          const valueType = (() => {
+          const valueType = getReferenceDataValueType({
-            const variable = updateItem.variable;
+            variable: updateItem.variable,
-            const variableNodeId = variable?.[0];
+            nodeList,
-            const variableNode = nodeList.find((node) => node.nodeId === variableNodeId);
+            t
-            const systemVariables = getWorkflowGlobalVariables(nodeList, t);
+          });
-            const variableInput = !variableNode
-              ? systemVariables.find((item) => item.key === variable?.[1])
-              : variableNode.outputs.find((output) => output.id === variable?.[1]);
-            if (!variableInput) return WorkflowIOValueTypeEnum.any;
-            return variableInput.valueType;
-          })();
          const renderTypeData = menuList.find((item) => item.renderType === updateItem.renderType);
          const handleUpdate = (newValue: ReferenceValueProps | string) => {

--- a/projects/app/src/components/core/workflow/Flow/nodes/render/NodeCard.tsx
+++ b/projects/app/src/components/core/workflow/Flow/nodes/render/NodeCard.tsx
@@ -79,7 +79,6 @@ const NodeCard = (props: Props) => {
    return (
      <Box position={'relative'}>
        {/* debug */}
-        <NodeDebugResponse nodeId={nodeId} debugResult={debugResult} />
        <Box className="custom-drag-handle" px={4} py={3}>
          {/* tool target handle */}
          {showToolHandle && <ToolTargetHandle nodeId={nodeId} />}
@@ -134,7 +133,6 @@ const NodeCard = (props: Props) => {
    );
  }, [
    nodeId,
-    debugResult,
    showToolHandle,
    avatar,
    t,
@@ -179,6 +177,7 @@ const NodeCard = (props: Props) => {
            borderColor: selected ? 'primary.600' : 'borderColor.base'
          })}
    >
+      <NodeDebugResponse nodeId={nodeId} debugResult={debugResult} />
      {Header}
      {children}
      <ConnectionSourceHandle nodeId={nodeId} />
@@ -259,6 +258,22 @@ const MenuRender = React.memo(function MenuRender({
    },
    [setEdges, setNodes]
  );
+  const onclickSyncVersion = useCallback(async () => {
+    if (!pluginId) return;
+    try {
+      setLoading(true);
+      onResetNode({
+        id: nodeId,
+        node: await getPreviewPluginModule(pluginId)
+      });
+    } catch (e) {
+      return toast({
+        status: 'error',
+        title: getErrText(e, t('plugin.Get Plugin Module Detail Failed'))
+      });
+    }
+    setLoading(false);
+  }, [nodeId, onResetNode, pluginId, setLoading, t, toast]);
  const Render = useMemo(() => {
    const menuList = [
@@ -288,25 +303,7 @@ const MenuRender = React.memo(function MenuRender({
              icon: 'common/refreshLight',
              label: t('plugin.Synchronous version'),
              variant: 'whiteBase',
-              onClick: () => {
+              onClick: onOpenConfirmSync(onclickSyncVersion)
-                if (!pluginId) return;
-                onOpenConfirmSync(async () => {
-                  try {
-                    setLoading(true);
-                    const pluginModule = await getPreviewPluginModule(pluginId);
-                    onResetNode({
-                      id: nodeId,
-                      module: pluginModule
-                    });
-                  } catch (e) {
-                    return toast({
-                      status: 'error',
-                      title: getErrText(e, t('plugin.Get Plugin Module Detail Failed'))
-                    });
-                  }
-                  setLoading(false);
-                })();
-              }
            }
          ]
        : []),
@@ -370,12 +367,9 @@ const MenuRender = React.memo(function MenuRender({
    onDelNode,
    onOpenConfirmDeleteNode,
    onOpenConfirmSync,
-    onResetNode,
+    onclickSyncVersion,
    openDebugNode,
-    pluginId,
+    t
-    setLoading,
-    t,
-    toast
  ]);
  return Render;
@@ -530,7 +524,8 @@ const NodeDebugResponse = React.memo(function NodeDebugResponse({
            top={0}
            zIndex={10}
            w={'420px'}
-            maxH={'540px'}
+            maxH={'100%'}
+            minH={'300px'}
            overflowY={'auto'}
            border={'base'}
          >

--- a/projects/app/src/components/core/workflow/context.tsx
+++ b/projects/app/src/components/core/workflow/context.tsx
@@ -55,7 +55,7 @@ type WorkflowContextType = {
  hoverNodeId?: string;
  setHoverNodeId: React.Dispatch<React.SetStateAction<string | undefined>>;
  onUpdateNodeError: (node: string, isError: Boolean) => void;
-  onResetNode: (e: { id: string; module: FlowNodeTemplateType }) => void;
+  onResetNode: (e: { id: string; node: FlowNodeTemplateType }) => void;
  onChangeNode: (e: FlowNodeChangeProps) => void;
  // edges
@@ -159,7 +159,7 @@ export const WorkflowContext = createContext<WorkflowContextType>({
  onEdgesChange: function (changes: EdgeChange[]): void {
    throw new Error('Function not implemented.');
  },
-  onResetNode: function (e: { id: string; module: FlowNodeTemplateType }): void {
+  onResetNode: function (e: { id: string; node: FlowNodeTemplateType }): void {
    throw new Error('Function not implemented.');
  },
  onDelEdge: function (e: {
@@ -279,31 +279,30 @@ const WorkflowContextProvider = ({
  });
  // reset a node data. delete edge and replace it
-  const onResetNode = useMemoizedFn(
+  const onResetNode = useMemoizedFn(({ id, node }: { id: string; node: FlowNodeTemplateType }) => {
-    ({ id, module }: { id: string; module: FlowNodeTemplateType }) => {
    setNodes((state) =>
-        state.map((node) => {
+      state.map((item) => {
-          if (node.id === id) {
+        if (item.id === id) {
-            // delete edge
-            node.data.inputs.forEach((item) => {
-              onDelEdge({ nodeId: id, targetHandle: item.key });
-            });
-            node.data.outputs.forEach((item) => {
-              onDelEdge({ nodeId: id, sourceHandle: item.key });
-            });
          return {
-              ...node,
+            ...item,
            data: {
-                ...node.data,
+              ...item.data,
-                ...module
+              ...node,
+              inputs: node.inputs.map((input) => {
+                const value =
+                  item.data.inputs.find((i) => i.key === input.key)?.value ?? input.value;
+                return {
+                  ...input,
+                  value
+                };
+              })
            }
          };
        }
-          return node;
+        return item;
      })
    );
-    }
+  });
-  );
  const onChangeNode = useMemoizedFn((props: FlowNodeChangeProps) => {
    const { nodeId, type } = props;
@@ -431,7 +430,6 @@ const WorkflowContextProvider = ({
  const initData = useMemoizedFn(
    async (e: { nodes: StoreNodeItemType[]; edges: StoreEdgeItemType[] }) => {
      setNodes(e.nodes?.map((item) => storeNode2FlowNode({ item })));
      setEdges(e.edges?.map((item) => storeEdgesRenderEdge({ edge: item })));
    }
  );

--- a/projects/app/src/pages/api/core/workflow/debug.ts
+++ b/projects/app/src/pages/api/core/workflow/debug.ts
@@ -53,10 +53,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      appId,
      runtimeNodes: nodes,
      runtimeEdges: edges,
-      variables: {
+      variables,
-        ...variables,
-        userChatInput: ''
-      },
      query: [],
      histories: [],
      stream: false,

--- a/projects/app/src/pages/app/detail/components/FlowEdit/Header.tsx
+++ b/projects/app/src/pages/app/detail/components/FlowEdit/Header.tsx
@@ -75,6 +75,7 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
    WorkflowContext,
    (v) => v.setIsShowVersionHistories
  );
+  const workflowDebugData = useContextSelector(WorkflowContext, (v) => v.workflowDebugData);
  const flowData2StoreDataAndCheck = useCallback(async () => {
    const { nodes } = await getWorkflowStore();
@@ -93,8 +94,11 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
    }
  }, [edges, onUpdateNodeError, t, toast]);
-  const onclickSave = useCallback(async () => {
+  const onclickSave = useCallback(
-    if (isShowVersionHistories) return;
+    async (forbid?: boolean) => {
+      // version preview / debug mode, not save
+      if (isShowVersionHistories || forbid) return;
      const { nodes } = await getWorkflowStore();
      if (nodes.length === 0) return null;
@@ -121,7 +125,9 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
      setIsSaving(false);
      return null;
-  }, [isShowVersionHistories, edges, updateAppDetail, app._id, t]);
+    },
+    [isShowVersionHistories, edges, updateAppDetail, app._id, t]
+  );
  const onclickPublish = useCallback(async () => {
    setIsSaving(true);
@@ -182,7 +188,7 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
  useInterval(() => {
    if (!app._id) return;
-    onclickSave();
+    onclickSave(!!workflowDebugData);
  }, 20000);
  const Render = useMemo(() => {
@@ -221,7 +227,7 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
                  display={'inline-block'}
                  borderRadius={'xs'}
                  cursor={'pointer'}
-                  onClick={onclickSave}
+                  onClick={() => onclickSave()}
                  color={'myGray.500'}
                >
                  {saveLabel}

--- a/projects/app/src/pages/app/detail/components/SimpleEdit/ChatTest.tsx
+++ b/projects/app/src/pages/app/detail/components/SimpleEdit/ChatTest.tsx
@@ -62,7 +62,7 @@ const ChatTest = ({
          }
        });
      });
-      const history = chatList.slice(-historyMaxLen - 2, -2);
+      const history = chatList.slice(-(historyMaxLen * 2) - 2, -2);
      // 流请求，获取数据
      const { responseText, responseData } = await streamFetch({

--- a/projects/app/src/web/core/workflow/utils.ts
+++ b/projects/app/src/web/core/workflow/utils.ts
@@ -24,6 +24,7 @@ import {
 } from '@fastgpt/global/core/workflow/utils';
 import { getSystemVariables } from '../app/utils';
 import { TFunction } from 'next-i18next';
+import { ReferenceValueProps } from '@fastgpt/global/core/workflow/type/io';
 export const nodeTemplate2FlowNode = ({
  template,
@@ -140,6 +141,26 @@ export const computedNodeInputReference = ({
  return sourceNodes;
 };
+export const getReferenceDataValueType = ({
+  variable,
+  nodeList,
+  t
+}: {
+  variable?: ReferenceValueProps;
+  nodeList: FlowNodeItemType[];
+  t: TFunction;
+}) => {
+  if (!variable) return WorkflowIOValueTypeEnum.any;
+  const node = nodeList.find((node) => node.nodeId === variable[0]);
+  const systemVariables = getWorkflowGlobalVariables(nodeList, t);
+  if (!node) return systemVariables.find((item) => item.key === variable?.[1])?.valueType;
+  const output = node.outputs.find((item) => item.id === variable[1]);
+  if (!output) return WorkflowIOValueTypeEnum.any;
+  return output.valueType;
+};
 /* Connection rules */
 export const checkWorkflowNodeAndConnection = ({