4.8 preview (#1288)

* Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * perf: workflow ux * system config * Newflow (#89) * docs: Add doc for Xinference (#1266) Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * perf: workflow ux * system config * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * rename code * move code * update flow * input type selector * perf: workflow runtime * feat: node adapt newflow * feat: adapt plugin * feat: 360 connection * check workflow * perf: flow 性能 * change plugin input type (#81) * change plugin input type * plugin label mode * perf: nodecard * debug * perf: debug ui * connection ui * change workflow ui (#82) * feat: workflow debug * adapt openAPI for new workflow (#83) * adapt openAPI for new workflow * i18n * perf: plugin debug * plugin input ui * delete * perf: global variable select * fix rebase * perf: workflow performance * feat: input render type icon * input icon * adapt flow (#84) * adapt newflow * temp * temp * fix * feat: app schedule trigger * feat: app schedule trigger * perf: schedule ui * feat: ioslatevm run js code * perf: workflow varialbe table ui * feat: adapt simple mode * feat: adapt input params * output * feat: adapt tamplate * fix: ts * add if-else module (#86) * perf: worker * if else node * perf: tiktoken worker * fix: ts * perf: tiktoken * fix if-else node (#87) * fix if-else node * type * fix * perf: audio render * perf: Parallel worker * log * perf: if else node * adapt plugin * prompt * perf: reference ui * reference ui * handle ux * template ui and plugin tool * adapt v1 workflow * adapt v1 workflow completions * perf: time variables * feat: workflow keyboard shortcuts * adapt v1 workflow * update workflow example doc (#88) * fix: simple mode select tool --------- Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com> * doc * perf: extract node * extra node field * update plugin version * doc * variable * change doc & fix prompt editor (#90) * fold workflow code * value type label --------- Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
2025-08-02 20:58:12 +00:00 · 2024-04-25 17:51:20 +08:00
parent b08d81f887
commit 439c819ff1
505 changed files with 23570 additions and 18215 deletions
--- a/projects/app/src/components/ChatBox/ContextModal.tsx
+++ b/projects/app/src/components/ChatBox/ContextModal.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { ModalBody, Box, useTheme } from '@chakra-ui/react';
 import MyModal from '@fastgpt/web/components/common/MyModal';
-import { DispatchNodeResponseType } from '@fastgpt/global/core/module/runtime/type.d';
+import { DispatchNodeResponseType } from '@fastgpt/global/core/workflow/runtime/type.d';

 const ContextModal = ({
  context = [],
--- a/projects/app/src/components/ChatBox/Provider.tsx
+++ b/projects/app/src/components/ChatBox/Provider.tsx
@@ -1,8 +1,8 @@
 import React, { useContext, createContext, useState, useMemo, useEffect, useCallback } from 'react';
 import { useAudioPlay } from '@/web/common/utils/voice';
 import { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat';
-import { ModuleItemType } from '@fastgpt/global/core/module/type';
-import { splitGuideModule } from '@fastgpt/global/core/module/utils';
+import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/index.d';
+import { splitGuideModule } from '@fastgpt/global/core/workflow/utils';
 import {
  AppTTSConfigType,
  AppWhisperConfigType,
@@ -91,7 +91,7 @@ const StateContext = createContext<useChatStoreType>({
 });

 export type ChatProviderProps = OutLinkChatAuthProps & {
-  userGuideModule?: ModuleItemType;
+  userGuideModule?: StoreNodeItemType;

  // not chat test params
  chatId?: string;
--- a/projects/app/src/components/ChatBox/ResponseTags.tsx
+++ b/projects/app/src/components/ChatBox/ResponseTags.tsx
@@ -1,15 +1,14 @@
 import React, { useMemo, useState } from 'react';
 import { type ChatHistoryItemResType } from '@fastgpt/global/core/chat/type.d';
-import { DispatchNodeResponseType } from '@fastgpt/global/core/module/runtime/type.d';
-import type { ChatItemType } from '@fastgpt/global/core/chat/type';
+import { DispatchNodeResponseType } from '@fastgpt/global/core/workflow/runtime/type.d';
 import { Flex, BoxProps, useDisclosure, useTheme, Box } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 import dynamic from 'next/dynamic';
-import Tag from '../Tag';
+import MyTag from '@fastgpt/web/components/common/Tag/index';
 import MyTooltip from '../MyTooltip';
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
+import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';
 import ChatBoxDivider from '@/components/core/chat/Divider';
 import { strIsLink } from '@fastgpt/global/common/string/tools';
@@ -99,11 +98,6 @@ const ResponseTags = ({
    };
  }, [showDetail, flowResponses]);

-  const TagStyles: BoxProps = {
-    mr: 2,
-    bg: 'transparent'
-  };
-
  return flowResponses.length === 0 ? null : (
    <>
      {sourceList.length > 0 && (
@@ -150,52 +144,52 @@ const ResponseTags = ({
        </>
      )}
      {showDetail && (
-        <Flex alignItems={'center'} mt={3} flexWrap={'wrap'}>
+        <Flex alignItems={'center'} mt={3} flexWrap={'wrap'} gap={2}>
          {quoteList.length > 0 && (
            <MyTooltip label="查看引用">
-              <Tag
+              <MyTag
                colorSchema="blue"
+                type="solid"
                cursor={'pointer'}
-                {...TagStyles}
                onClick={() => setQuoteModalData({ rawSearch: quoteList })}
              >
                {quoteList.length}条引用
-              </Tag>
+              </MyTag>
            </MyTooltip>
          )}
          {llmModuleAccount === 1 && (
            <>
              {historyPreview.length > 0 && (
                <MyTooltip label={'点击查看上下文预览'}>
-                  <Tag
+                  <MyTag
                    colorSchema="green"
                    cursor={'pointer'}
-                    {...TagStyles}
+                    type="solid"
                    onClick={() => setContextModalData(historyPreview)}
                  >
                    {historyPreview.length}条上下文
-                  </Tag>
+                  </MyTag>
                </MyTooltip>
              )}
            </>
          )}
          {llmModuleAccount > 1 && (
-            <Tag colorSchema="blue" {...TagStyles}>
+            <MyTag type="solid" colorSchema="blue">
              多组 AI 对话
-            </Tag>
+            </MyTag>
          )}

          {isPc && runningTime > 0 && (
            <MyTooltip label={'模块运行时间和'}>
-              <Tag colorSchema="purple" cursor={'default'} {...TagStyles}>
+              <MyTag colorSchema="purple" type="solid" cursor={'default'}>
                {runningTime}s
-              </Tag>
+              </MyTag>
            </MyTooltip>
          )}
          <MyTooltip label={t('core.chat.response.Read complete response tips')}>
-            <Tag colorSchema="gray" cursor={'pointer'} {...TagStyles} onClick={onOpenWholeModal}>
+            <MyTag colorSchema="gray" type="solid" cursor={'pointer'} onClick={onOpenWholeModal}>
              {t('core.chat.response.Read complete response')}
-            </Tag>
+            </MyTag>
          </MyTooltip>
        </Flex>
      )}
--- a/projects/app/src/components/ChatBox/WholeResponseModal.tsx
+++ b/projects/app/src/components/ChatBox/WholeResponseModal.tsx
@@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react';
 import { Box, useTheme, Flex, Image } from '@chakra-ui/react';
 import type { ChatHistoryItemResType } from '@fastgpt/global/core/chat/type.d';
 import { useTranslation } from 'next-i18next';
-import { moduleTemplatesFlat } from '@fastgpt/global/core/module/template/constants';
+import { moduleTemplatesFlat } from '@fastgpt/global/core/workflow/template/constants';

 import Tabs from '../Tabs';
 import MyModal from '@fastgpt/web/components/common/MyModal';
@@ -34,12 +34,13 @@ function Row({
        {t(label)}:
      </Box>
      <Box
-        borderRadius={'md'}
+        borderRadius={'sm'}
        fontSize={'sm'}
+        bg={'myGray.50'}
        {...(isCodeBlock
          ? { transform: 'translateY(-3px)' }
          : value
-            ? { px: 3, py: 1, border: theme.borders.base }
+            ? { px: 3, py: 2, border: theme.borders.base }
            : {})}
      >
        {value && <Markdown source={strValue} />}
@@ -86,12 +87,14 @@ const WholeResponseModal = ({

 export default WholeResponseModal;

-const ResponseBox = React.memo(function ResponseBox({
+export const ResponseBox = React.memo(function ResponseBox({
  response,
-  showDetail
+  showDetail,
+  hideTabs = false
 }: {
  response: ChatHistoryItemResType[];
  showDetail: boolean;
+  hideTabs?: boolean;
 }) {
  const theme = useTheme();
  const { t } = useTranslation();
@@ -105,7 +108,7 @@ const ResponseBox = React.memo(function ResponseBox({
              mr={2}
              src={
                item.moduleLogo ||
-                moduleTemplatesFlat.find((template) => item.moduleType === template.flowType)
+                moduleTemplatesFlat.find((template) => item.moduleType === template.flowNodeType)
                  ?.avatar
              }
              alt={''}
@@ -125,9 +128,11 @@ const ResponseBox = React.memo(function ResponseBox({

  return (
    <>
-      <Box>
-        <Tabs list={list} activeId={currentTab} onChange={setCurrentTab} />
-      </Box>
+      {!hideTabs && (
+        <Box>
+          <Tabs list={list} activeId={currentTab} onChange={setCurrentTab} />
+        </Box>
+      )}
      <Box py={2} px={4} flex={'1 0 0'} overflow={'auto'}>
        <>
          <Row label={t('core.chat.response.module name')} value={t(activeModule.moduleName)} />
@@ -222,6 +227,7 @@ const ResponseBox = React.memo(function ResponseBox({

        {/* classify question */}
        <>
+          <Row label={t('core.chat.response.module cq result')} value={activeModule?.cqResult} />
          <Row
            label={t('core.chat.response.module cq')}
            value={(() => {
@@ -229,7 +235,14 @@ const ResponseBox = React.memo(function ResponseBox({
              return activeModule.cqList.map((item) => `* ${item.value}`).join('\n');
            })()}
          />
-          <Row label={t('core.chat.response.module cq result')} value={activeModule?.cqResult} />
+        </>
+
+        {/* if-else */}
+        <>
+          <Row
+            label={t('core.chat.response.module if else Result')}
+            value={activeModule?.ifElseResult}
+          />
        </>

        {/* extract */}
--- a/projects/app/src/components/ChatBox/components/ChatController.tsx
+++ b/projects/app/src/components/ChatBox/components/ChatController.tsx
@@ -1,5 +1,4 @@
 import { useCopyData } from '@/web/common/hooks/useCopyData';
-import { useAudioPlay } from '@/web/common/utils/voice';
 import { Flex, FlexProps, Image, css, useTheme } from '@chakra-ui/react';
 import { ChatSiteItemType } from '@fastgpt/global/core/chat/type';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
--- a/projects/app/src/components/ChatBox/components/ChatItem.tsx
+++ b/projects/app/src/components/ChatBox/components/ChatItem.tsx
@@ -26,6 +26,7 @@ import {
 } from '@fastgpt/global/core/chat/constants';
 import FilesBlock from './FilesBox';
 import { useChatProviderStore } from '../Provider';
+import Avatar from '@/components/Avatar';

 const colorMap = {
  [ChatStatusEnum.loading]: {
@@ -157,7 +158,7 @@ ${JSON.stringify(questionGuides)}`;
                              color: 'primary.600'
                            }}
                          >
-                            <Image src={tool.toolAvatar} alt={''} w={'14px'} mr={2} />
+                            <Avatar src={tool.toolAvatar} borderRadius={'md'} w={'14px'} mr={2} />
                            <Box mr={1}>{tool.toolName}</Box>
                            {isChatting && !tool.response && (
                              <MyIcon name={'common/loading'} w={'14px'} />
--- a/projects/app/src/components/ChatBox/components/VariableInput.tsx
+++ b/projects/app/src/components/ChatBox/components/VariableInput.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'next-i18next';
 import { Box, Button, Card, Input, Textarea } from '@chakra-ui/react';
 import ChatAvatar from './ChatAvatar';
 import { MessageCardStyle } from '../constants';
-import { VariableInputEnum } from '@fastgpt/global/core/module/constants';
+import { VariableInputEnum } from '@fastgpt/global/core/workflow/constants';
 import MySelect from '@fastgpt/web/components/common/MySelect';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { ChatBoxInputFormType } from '../type.d';
--- a/projects/app/src/components/ChatBox/index.tsx
+++ b/projects/app/src/components/ChatBox/index.tsx
@@ -21,9 +21,9 @@ import { getErrText } from '@fastgpt/global/common/error/utils';
 import { Box, Flex, Checkbox } from '@chakra-ui/react';
 import { EventNameEnum, eventBus } from '@/web/common/utils/eventbus';
 import { chats2GPTMessages } from '@fastgpt/global/core/chat/adapt';
-import { ModuleItemType } from '@fastgpt/global/core/module/type.d';
-import { VariableInputEnum } from '@fastgpt/global/core/module/constants';
-import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/module/runtime/constants';
+import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/index.d';
+import { VariableInputEnum } from '@fastgpt/global/core/workflow/constants';
+import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import { useForm } from 'react-hook-form';
 import { useRouter } from 'next/router';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
@@ -52,7 +52,7 @@ import { getNanoid } from '@fastgpt/global/common/string/tools';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { formatChatValue2InputType } from './utils';
 import { textareaMinH } from './constants';
-import { SseResponseEventEnum } from '@fastgpt/global/core/module/runtime/constants';
+import { SseResponseEventEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import ChatProvider, { useChatProviderStore } from './Provider';

 import ChatItem from './components/ChatItem';
@@ -79,7 +79,7 @@ type Props = OutLinkChatAuthProps & {
  showEmptyIntro?: boolean;
  appAvatar?: string;
  userAvatar?: string;
-  userGuideModule?: ModuleItemType;
+  userGuideModule?: StoreNodeItemType;
  showFileSelector?: boolean;
  active?: boolean; // can use
  appId: string;
@@ -588,7 +588,7 @@ const ChatBox = (
        setLoading(false);
      };
    },
-    [chatHistories, onDelMessage, sendPrompt, setLoading, toast]
+    [chatHistories, onDelMessage, sendPrompt, setChatHistories, setLoading, toast]
  );
  // delete one message(One human and the ai response)
  const delOneMessage = useCallback(
--- a/projects/app/src/components/ChatBox/type.d.ts
+++ b/projects/app/src/components/ChatBox/type.d.ts
@@ -5,7 +5,7 @@ import {
  ChatSiteItemType,
  ToolModuleResponseItemType
 } from '@fastgpt/global/core/chat/type';
-import { SseResponseEventEnum } from '@fastgpt/global/core/module/runtime/constants';
+import { SseResponseEventEnum } from '@fastgpt/global/core/workflow/runtime/constants';

 export type generatingMessageProps = {
  event: `${SseResponseEventEnum}`;