fix: import dataset step error;perf: ai proxy avatar (#4074)

* perf: pg config params * perf: ai proxy avatar * fix: import dataset step error * feat: data input ux * perf: app dataset rewite
2025-03-11 14:04:48 +08:00
parent aaa496fbdb
commit c23ce4c15a
37 changed files with 503 additions and 392 deletions
--- a/projects/app/src/global/aiproxy/constants.ts
+++ b/projects/app/src/global/aiproxy/constants.ts
@@ -40,12 +40,16 @@ export const defaultChannel: ChannelInfoType = {
  priority: 0
 };

-export const aiproxyIdMap: Record<number, { label: string; provider: ModelProviderIdType }> = {
+export const aiproxyIdMap: Record<
+  number,
+  { label: string; provider: ModelProviderIdType; avatar?: string }
+> = {
  1: {
    label: 'OpenAI',
    provider: 'OpenAI'
  },
  3: {
+    avatar: 'model/azure',
    label: i18nT('account_model:azure'),
    provider: 'OpenAI'
  },
@@ -124,5 +128,28 @@ export const aiproxyIdMap: Record<number, { label: string; provider: ModelProvid
  30: {
    label: 'Ollama',
    provider: 'Ollama'
+  },
+  23: {
+    label: 'OneAPI',
+    provider: 'Hunyuan'
+  },
+  44: {
+    label: 'doubao audio',
+    provider: 'Doubao'
+  },
+  33: {
+    label: 'AWS',
+    provider: 'Other',
+    avatar: 'model/aws'
+  },
+  35: {
+    label: 'Cohere',
+    provider: 'Other',
+    avatar: 'model/cohere'
+  },
+  37: {
+    label: 'Cloudflare',
+    provider: 'Other',
+    avatar: 'model/cloudflare'
  }
 };
--- a/projects/app/src/pageComponents/account/model/Channel/EditChannelModal.tsx
+++ b/projects/app/src/pageComponents/account/model/Channel/EditChannelModal.tsx
@@ -79,7 +79,7 @@ const EditChannelModal = ({
              order: provider.order,
              defaultBaseUrl: value.defaultBaseUrl,
              keyHelp: value.keyHelp,
-              icon: provider.avatar,
+              icon: mapData?.avatar ?? provider.avatar,
              label: t(mapData.label as any),
              value: Number(key)
            };
@@ -90,6 +90,7 @@ const EditChannelModal = ({
      manual: false
    }
  );
+
  const selectedProvider = useMemo(() => {
    const res = providerList.find((item) => item.value === providerType);
    return res;
--- a/projects/app/src/pageComponents/dataset/detail/Import/Context.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/Import/Context.tsx
@@ -113,7 +113,7 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode
    ],
    [ImportDataSourceEnum.fileLink]: [
      {
-        title: t('dataset:import_select_file')
+        title: t('dataset:import_select_link')
      },
      {
        title: t('dataset:import_param_setting')
--- a/projects/app/src/pageComponents/dataset/detail/Import/diffSource/APIDataset.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/Import/diffSource/APIDataset.tsx
@@ -21,6 +21,7 @@ const DataProcess = dynamic(() => import('../commonProgress/DataProcess'), {
  loading: () => <Loading fixed={false} />
 });
 const Upload = dynamic(() => import('../commonProgress/Upload'));
+const PreviewData = dynamic(() => import('../commonProgress/PreviewData'));

 const APIDatasetCollection = () => {
  const activeStep = useContextSelector(DatasetImportContext, (v) => v.activeStep);
@@ -29,7 +30,8 @@ const APIDatasetCollection = () => {
    <>
      {activeStep === 0 && <CustomAPIFileInput />}
      {activeStep === 1 && <DataProcess />}
-      {activeStep === 2 && <Upload />}
+      {activeStep === 2 && <PreviewData />}
+      {activeStep === 3 && <Upload />}
    </>
  );
 };
--- a/projects/app/src/pageComponents/dataset/detail/Import/diffSource/ExternalFile.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/Import/diffSource/ExternalFile.tsx
@@ -27,6 +27,7 @@ const DataProcess = dynamic(() => import('../commonProgress/DataProcess'), {
  loading: () => <Loading fixed={false} />
 });
 const Upload = dynamic(() => import('../commonProgress/Upload'));
+const PreviewData = dynamic(() => import('../commonProgress/PreviewData'));

 const ExternalFileCollection = () => {
  const activeStep = useContextSelector(DatasetImportContext, (v) => v.activeStep);
@@ -35,7 +36,8 @@ const ExternalFileCollection = () => {
    <>
      {activeStep === 0 && <CustomLinkInput />}
      {activeStep === 1 && <DataProcess />}
-      {activeStep === 2 && <Upload />}
+      {activeStep === 2 && <PreviewData />}
+      {activeStep === 3 && <Upload />}
    </>
  );
 };
--- a/projects/app/src/pageComponents/dataset/detail/Import/diffSource/FileCustomText.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/Import/diffSource/FileCustomText.tsx
@@ -13,6 +13,7 @@ const DataProcess = dynamic(() => import('../commonProgress/DataProcess'), {
  loading: () => <Loading fixed={false} />
 });
 const Upload = dynamic(() => import('../commonProgress/Upload'));
+const PreviewData = dynamic(() => import('../commonProgress/PreviewData'));

 const CustomTet = () => {
  const activeStep = useContextSelector(DatasetImportContext, (v) => v.activeStep);
@@ -20,7 +21,8 @@ const CustomTet = () => {
    <>
      {activeStep === 0 && <CustomTextInput />}
      {activeStep === 1 && <DataProcess />}
-      {activeStep === 2 && <Upload />}
+      {activeStep === 2 && <PreviewData />}
+      {activeStep === 3 && <Upload />}
    </>
  );
 };
--- a/projects/app/src/pageComponents/dataset/detail/Import/diffSource/FileLink.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/Import/diffSource/FileLink.tsx
@@ -16,6 +16,7 @@ const DataProcess = dynamic(() => import('../commonProgress/DataProcess'), {
  loading: () => <Loading fixed={false} />
 });
 const Upload = dynamic(() => import('../commonProgress/Upload'));
+const PreviewData = dynamic(() => import('../commonProgress/PreviewData'));

 const LinkCollection = () => {
  const activeStep = useContextSelector(DatasetImportContext, (v) => v.activeStep);
@@ -24,7 +25,8 @@ const LinkCollection = () => {
    <>
      {activeStep === 0 && <CustomLinkImport />}
      {activeStep === 1 && <DataProcess />}
-      {activeStep === 2 && <Upload />}
+      {activeStep === 2 && <PreviewData />}
+      {activeStep === 3 && <Upload />}
    </>
  );
 };
--- a/projects/app/src/pageComponents/dataset/detail/Import/diffSource/ReTraining.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/Import/diffSource/ReTraining.tsx
@@ -57,7 +57,7 @@ const ReTraining = () => {
        qaChunkSize: collection.chunkSize,
        customSplitChar: collection.chunkSplitter,
        qaPrompt: collection.qaPrompt,
-        webSelector: collection.metadata?.webSelector
+        webSelector: collection.metadata?.webPageSelector
      });
    }
  });
--- a/projects/app/src/pageComponents/dataset/detail/InputDataModal.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/InputDataModal.tsx
@@ -1,12 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Box, Flex, Button, Textarea } from '@chakra-ui/react';
-import {
-  FieldArrayWithId,
-  UseFieldArrayRemove,
-  UseFormRegister,
-  useFieldArray,
-  useForm
-} from 'react-hook-form';
+import { Box, Flex, Button, Textarea, ModalFooter, HStack, VStack } from '@chakra-ui/react';
+import { UseFormRegister, useFieldArray, useForm } from 'react-hook-form';
 import {
  postInsertData2Dataset,
  putDatasetDataById,
@@ -17,7 +11,6 @@ import { useToast } from '@fastgpt/web/hooks/useToast';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
-import { useQuery } from '@tanstack/react-query';
 import { useTranslation } from 'next-i18next';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';
@@ -28,25 +21,27 @@ import { getDocPath } from '@/web/common/system/doc';
 import MyBox from '@fastgpt/web/components/common/MyBox';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
-import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
-import LightRowTabs from '@fastgpt/web/components/common/Tabs/LightRowTabs';
 import styles from './styles.module.scss';
 import {
  DatasetDataIndexTypeEnum,
  getDatasetIndexMapData
 } from '@fastgpt/global/core/dataset/data/constants';
+import FillRowTabs from '@fastgpt/web/components/common/Tabs/FillRowTabs';
+import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
+import MyIconButton from '@fastgpt/web/components/common/Icon/button';

 export type InputDataType = {
  q: string;
  a: string;
  indexes: (Omit<DatasetDataIndexItemType, 'dataId'> & {
    dataId?: string; // pg data id
+    fold: boolean;
  })[];
 };

 enum TabEnum {
-  content = 'content',
-  index = 'index'
+  chunk = 'chunk',
+  qa = 'qa'
 }

 const InputDataModal = ({
@@ -64,73 +59,47 @@ const InputDataModal = ({
 }) => {
  const { t } = useTranslation();
  const { toast } = useToast();
-  const [currentTab, setCurrentTab] = useState(TabEnum.content);
  const { embeddingModelList, defaultModels } = useSystemStore();

+  const [currentTab, setCurrentTab] = useState(TabEnum.chunk);
+
  const { register, handleSubmit, reset, control } = useForm<InputDataType>();
  const {
    fields: indexes,
-    append: appendIndexes,
-    remove: removeIndexes
+    prepend: prependIndexes,
+    remove: removeIndexes,
+    update: updateIndexes
  } = useFieldArray({
    control,
    name: 'indexes'
  });

-  const tabList = [
-    {
-      label: (
-        <Flex align={'center'}>
-          <Box>{t('common:dataset.data.edit.divide_content')}</Box>
-        </Flex>
-      ),
-      value: TabEnum.content
-    },
-    {
-      label: (
-        <Flex align={'center'}>
-          <Box>{t('common:dataset.data.edit.Index', { amount: indexes.length })}</Box>
-          <MyTooltip label={t('common:core.app.tool_label.view_doc')}>
-            <MyIcon
-              name={'book'}
-              w={'1rem'}
-              mr={'0.38rem'}
-              color={'myGray.500'}
-              ml={1}
-              onClick={() =>
-                window.open(getDocPath('/docs/guide/knowledge_base/dataset_engine/'), '_blank')
-              }
-              _hover={{
-                color: 'primary.600',
-                cursor: 'pointer'
-              }}
-            />
-          </MyTooltip>
-        </Flex>
-      ),
-      value: TabEnum.index
-    }
-  ];
-
-  const { data: collection = defaultCollectionDetail } = useQuery(
-    ['loadCollectionId', collectionId],
+  const { data: collection = defaultCollectionDetail } = useRequest2(
    () => {
      return getDatasetCollectionById(collectionId);
+    },
+    {
+      manual: false,
+      refreshDeps: [collectionId]
    }
  );
-  const { isFetching: isFetchingData } = useQuery(
-    ['getDatasetDataItemById', dataId],
-    () => {
+  const { loading: isFetchingData } = useRequest2(
+    async () => {
      if (dataId) return getDatasetDataItemById(dataId);
      return null;
    },
    {
+      manual: false,
+      refreshDeps: [dataId],
      onSuccess(res) {
        if (res) {
          reset({
            q: res.q,
            a: res.a,
-            indexes: res.indexes
+            indexes: res.indexes.map((item) => ({
+              ...item,
+              fold: true
+            }))
          });
        } else if (defaultValue) {
          reset({
@@ -138,6 +107,10 @@ const InputDataModal = ({
            a: defaultValue.a
          });
        }
+
+        if (res?.a || defaultValue?.a) {
+          setCurrentTab(TabEnum.qa);
+        }
      },
      onError(err) {
        toast({
@@ -161,7 +134,6 @@ const InputDataModal = ({
  const { runAsync: sureImportData, loading: isImporting } = useRequest2(
    async (e: InputDataType) => {
      if (!e.q) {
-        setCurrentTab(TabEnum.content);
        return Promise.reject(t('common:dataset.data.input is empty'));
      }

@@ -175,9 +147,9 @@ const InputDataModal = ({
      const dataId = await postInsertData2Dataset({
        collectionId: collection._id,
        q: e.q,
-        a: e.a,
+        a: currentTab === TabEnum.qa ? e.a : '',
        // Contains no default index
-        indexes: e.indexes
+        indexes: e.indexes.filter((item) => !!item.text?.trim())
      });

      return {
@@ -186,6 +158,7 @@ const InputDataModal = ({
      };
    },
    {
+      refreshDeps: [currentTab],
      successToast: t('common:dataset.data.Input Success Tip'),
      onSuccess(e) {
        reset({
@@ -208,8 +181,9 @@ const InputDataModal = ({
      // not exactly same
      await putDatasetDataById({
        dataId,
-        ...e,
-        indexes: e.indexes
+        q: e.q,
+        a: currentTab === TabEnum.qa ? e.a : '',
+        indexes: e.indexes.filter((item) => !!item.text?.trim())
      });

      return {
@@ -218,6 +192,7 @@ const InputDataModal = ({
      };
    },
    {
+      refreshDeps: [currentTab],
      successToast: t('common:dataset.data.Update Success Tip'),
      onSuccess(data) {
        onSuccess(data);
@@ -267,49 +242,166 @@ const InputDataModal = ({
        isLoading={isLoading}
        h={'100%'}
        py={[6, '1.5rem']}
-        px={[5, '3.25rem']}
      >
-        <Flex justify={'space-between'} gap={4} w={'100%'}>
-          <Flex justify={'space-between'} pb={4}>
-            <LightRowTabs<TabEnum>
-              list={tabList}
-              p={0}
-              value={currentTab}
-              onChange={(e: TabEnum) => setCurrentTab(e)}
-            />
-          </Flex>
-          {currentTab === TabEnum.index && (
-            <Button
-              variant={'whiteBase'}
-              boxShadow={'1'}
-              p={0}
-              onClick={() =>
-                appendIndexes({
-                  type: DatasetDataIndexTypeEnum.custom,
-                  text: ''
-                })
-              }
-            >
-              <Flex px={'0.62rem'} py={2}>
-                <MyIcon name={'common/addLight'} w={'1rem'} mr={'0.38rem'} />
-                {t('common:add_new')}
-              </Flex>
-            </Button>
-          )}
-        </Flex>
-        <Box w={'100%'} flexGrow={1} overflow={'scroll'}>
-          {currentTab === TabEnum.content && <InputTab maxToken={maxToken} register={register} />}
-          {currentTab === TabEnum.index && (
-            <DataIndex
-              register={register}
-              maxToken={maxToken}
-              removeIndexes={removeIndexes}
-              indexes={indexes}
-            />
-          )}
+        {/* Tab */}
+        <Box px={[5, '3.25rem']}>
+          <FillRowTabs
+            list={[
+              { label: t('common:dataset_data_input_chunk'), value: TabEnum.chunk },
+              { label: t('common:dataset_data_input_qa'), value: TabEnum.qa }
+            ]}
+            py={1}
+            value={currentTab}
+            onChange={(e) => {
+              setCurrentTab(e);
+            }}
+          />
        </Box>

-        <Flex justifyContent={'flex-end'} pt={8} pb={[8, 0]} h={[24, 16]}>
+        <Flex
+          pt={4}
+          flex={'1 0 0'}
+          gap={6}
+          flexDir={['column', 'row']}
+          overflow={'auto'}
+          px={[5, '3.25rem']}
+        >
+          {/* Data */}
+          <Flex flexDir={'column'} h={'100%'} gap={3} flex={'1 0 0'}>
+            <Flex flexDir={'column'} h={'100%'}>
+              <FormLabel required mb={1} h={'30px'}>
+                {currentTab === TabEnum.chunk
+                  ? t('common:dataset_data_input_chunk_content')
+                  : t('common:dataset_data_input_q')}
+              </FormLabel>
+              <Textarea
+                resize={'none'}
+                placeholder={t('common:dataset_data_import_q_placeholder', { maxToken })}
+                className={styles.scrollbar}
+                maxLength={maxToken}
+                flex={'1 0 0'}
+                tabIndex={1}
+                _focus={{
+                  borderColor: 'primary.500',
+                  boxShadow: '0px 0px 0px 2.4px rgba(51, 112, 255, 0.15)',
+                  bg: 'white'
+                }}
+                bg={'myGray.25'}
+                borderRadius={'md'}
+                borderColor={'myGray.200'}
+                {...register(`q`, {
+                  required: true
+                })}
+              />
+            </Flex>
+            {currentTab === TabEnum.qa && (
+              <Flex flexDir={'column'} h={'100%'}>
+                <FormLabel required mb={1}>
+                  {t('common:dataset_data_input_a')}
+                </FormLabel>
+                <Textarea
+                  resize={'none'}
+                  placeholder={t('common:dataset_data_import_q_placeholder', { maxToken })}
+                  className={styles.scrollbar}
+                  flex={'1 0 0'}
+                  tabIndex={1}
+                  bg={'myGray.25'}
+                  maxLength={maxToken}
+                  borderRadius={'md'}
+                  border={'1.5px solid '}
+                  borderColor={'myGray.200'}
+                  {...register('a', { required: true })}
+                />
+              </Flex>
+            )}
+          </Flex>
+          {/* Index */}
+          <Box flex={'1 0 0'}>
+            <Flex alignItems={'flex-start'} justifyContent={'space-between'} h={'30px'}>
+              <FormLabel>
+                {t('common:dataset.data.edit.Index', {
+                  amount: indexes.length
+                })}
+              </FormLabel>
+              <Button
+                variant={'whiteBase'}
+                size={'sm'}
+                p={0}
+                transform={'translateY(-6px)'}
+                onClick={() =>
+                  prependIndexes({
+                    type: DatasetDataIndexTypeEnum.custom,
+                    text: '',
+                    fold: false
+                  })
+                }
+              >
+                <Flex px={'0.62rem'} py={2}>
+                  <MyIcon name={'common/addLight'} w={'1rem'} mr={'0.38rem'} />
+                  {t('common:add_new')}
+                </Flex>
+              </Button>
+            </Flex>
+
+            <VStack>
+              {indexes?.map((index, i) => {
+                const data = getDatasetIndexMapData(index.type);
+                return (
+                  <Box
+                    key={index.dataId || i}
+                    p={4}
+                    borderRadius={'md'}
+                    border={'base'}
+                    bg={'myGray.25'}
+                    w={'100%'}
+                    _hover={{
+                      '& .delete': {
+                        display: 'block'
+                      }
+                    }}
+                  >
+                    {/* Header */}
+                    <Flex mb={2} alignItems={'center'}>
+                      <FormLabel flex={'1 0 0'}>{t(data.label)}</FormLabel>
+                      {/* Delete */}
+                      {index.type !== 'default' && (
+                        <HStack className={'delete'} borderRight={'base'} pr={3} mr={2}>
+                          <DeleteIcon
+                            onClick={() => {
+                              removeIndexes(i);
+                            }}
+                          />
+                        </HStack>
+                      )}
+                      {indexes.length > 1 && (
+                        <MyIconButton
+                          icon={index.fold ? 'core/chat/chevronDown' : 'core/chat/chevronUp'}
+                          onClick={() => {
+                            updateIndexes(i, { ...index, fold: !index.fold });
+                          }}
+                        />
+                      )}
+                    </Flex>
+                    {/* Content */}
+                    <DataIndexTextArea
+                      disabled={index.type === 'default'}
+                      index={i}
+                      value={index.text}
+                      isFolder={index.fold && indexes.length > 1}
+                      maxToken={maxToken}
+                      register={register}
+                      onFocus={() => {
+                        updateIndexes(i, { ...index, fold: false });
+                      }}
+                    />
+                  </Box>
+                );
+              })}
+            </VStack>
+          </Box>
+        </Flex>
+
+        <ModalFooter px={[5, '3.25rem']} py={0} pt={4}>
          <MyTooltip
            label={collection.permission.hasWritePer ? '' : t('common:dataset.data.Can not edit')}
          >
@@ -322,7 +414,7 @@ const InputDataModal = ({
              {dataId ? t('common:common.Confirm Update') : t('common:common.Confirm Import')}
            </Button>
          </MyTooltip>
-        </Flex>
+        </ModalFooter>
      </MyBox>
    </MyModal>
  );
@@ -330,153 +422,23 @@ const InputDataModal = ({

 export default React.memo(InputDataModal);

-const InputTab = ({
-  maxToken,
-  register
-}: {
-  maxToken: number;
-  register: UseFormRegister<InputDataType>;
-}) => {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <Flex h={'100%'} gap={6} flexDir={['column', 'row']} w={'100%'}>
-        <Flex flexDir={'column'} flex={1}>
-          <Flex mb={2} fontWeight={'medium'} fontSize={'sm'} alignItems={'center'} h={8}>
-            <Box color={'red.600'}>*</Box>
-            <Box color={'myGray.900'}>{t('common:core.dataset.data.Main Content')}</Box>
-            <QuestionTip label={t('common:core.dataset.data.Data Content Tip')} ml={1} />
-          </Flex>
-          <Box
-            borderRadius={'md'}
-            border={'1.5px solid var(--Gray-Modern-200, #E8EBF0)'}
-            bg={'myGray.25'}
-            flex={1}
-          >
-            <Textarea
-              resize={'none'}
-              placeholder={t('core.dataset.data.Data Content Placeholder', { maxToken })}
-              className={styles.scrollbar}
-              maxLength={maxToken}
-              h={'100%'}
-              tabIndex={1}
-              _focus={{
-                borderColor: 'primary.500',
-                boxShadow: '0px 0px 0px 2.4px rgba(51, 112, 255, 0.15)',
-                bg: 'white'
-              }}
-              borderColor={'transparent'}
-              bg={'myGray.25'}
-              {...register(`q`, {
-                required: true
-              })}
-            />
-          </Box>
-        </Flex>
-        <Flex flex={1} flexDir={'column'}>
-          <Flex mb={2} fontWeight={'medium'} fontSize={'sm'} alignItems={'center'} h={8}>
-            <Box color={'myGray.900'}>{t('common:core.dataset.data.Auxiliary Data')}</Box>
-            <QuestionTip label={t('common:core.dataset.data.Auxiliary Data Tip')} ml={1} />
-          </Flex>
-          <Box
-            borderRadius={'md'}
-            border={'1.5px solid '}
-            borderColor={'myGray.200'}
-            bg={'myGray.25'}
-            flex={1}
-          >
-            <Textarea
-              resize={'none'}
-              placeholder={t('core.dataset.data.Auxiliary Data Placeholder', {
-                maxToken: maxToken * 1.5
-              })}
-              className={styles.scrollbar}
-              borderColor={'transparent'}
-              h={'100%'}
-              tabIndex={1}
-              bg={'myGray.25'}
-              maxLength={maxToken * 1.5}
-              {...register('a')}
-            />
-          </Box>
-        </Flex>
-      </Flex>
-    </>
-  );
-};
-
-const DataIndex = ({
-  maxToken,
-  register,
-  indexes,
-  removeIndexes
-}: {
-  maxToken: number;
-  register: UseFormRegister<InputDataType>;
-  indexes: FieldArrayWithId<InputDataType, 'indexes', 'id'>[];
-  removeIndexes: UseFieldArrayRemove;
-}) => {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <Flex mt={3} gap={3} flexDir={'column'}>
-        {indexes?.map((index, i) => {
-          const data = getDatasetIndexMapData(index.type);
-          return (
-            <Box
-              key={index.dataId || i}
-              p={4}
-              borderRadius={'md'}
-              border={'1.5px solid var(--Gray-Modern-200, #E8EBF0)'}
-              bg={'myGray.25'}
-              _hover={{
-                '& .delete': {
-                  display: 'block'
-                }
-              }}
-            >
-              <Flex mb={2}>
-                <Box flex={1} fontWeight={'medium'} fontSize={'sm'} color={'myGray.900'}>
-                  {t(data.label)}
-                </Box>
-                {index.type !== 'default' && (
-                  <DeleteIcon
-                    onClick={() => {
-                      removeIndexes(i);
-                    }}
-                  />
-                )}
-              </Flex>
-              <DataIndexTextArea
-                disabled={index.type === 'default'}
-                index={i}
-                value={index.text}
-                maxToken={maxToken}
-                register={register}
-              />
-            </Box>
-          );
-        })}
-      </Flex>
-    </>
-  );
-};
-
 const textareaMinH = '40px';
 const DataIndexTextArea = ({
  value,
  index,
  maxToken,
  register,
-  disabled
+  disabled,
+  isFolder,
+  onFocus
 }: {
  value: string;
  index: number;
  maxToken: number;
  register: UseFormRegister<InputDataType>;
  disabled?: boolean;
+  isFolder: boolean;
+  onFocus: () => void;
 }) => {
  const { t } = useTranslation();
  const TextareaDom = useRef<HTMLTextAreaElement | null>(null);
@@ -501,41 +463,76 @@ const DataIndexTextArea = ({
    }
  }, []);

-  return disabled ? (
-    <Box fontSize={'sm'} color={'myGray.500'} whiteSpace={'pre-wrap'}>
-      {value}
+  const onclickMark = () => {
+    TextareaDom?.current?.focus();
+    onFocus();
+  };
+
+  return (
+    <Box
+      pos={'relative'}
+      {...(isFolder
+        ? {
+            maxH: '50px',
+            overflow: 'hidden'
+          }
+        : {
+            maxH: 'auto'
+          })}
+    >
+      {disabled ? (
+        <Box fontSize={'sm'} color={'myGray.500'} whiteSpace={'pre-wrap'}>
+          {value}
+        </Box>
+      ) : (
+        <Textarea
+          maxLength={maxToken}
+          borderColor={'transparent'}
+          className={styles.scrollbar}
+          minH={textareaMinH}
+          px={0}
+          pt={0}
+          isRequired={required}
+          whiteSpace={'pre-wrap'}
+          resize={'none'}
+          _focus={{
+            px: 3,
+            py: 1,
+            borderColor: 'primary.500',
+            boxShadow: '0px 0px 0px 2.4px rgba(51, 112, 255, 0.15)',
+            bg: 'white'
+          }}
+          placeholder={t('common:dataset.data.Index Placeholder')}
+          ref={(e) => {
+            if (e) TextareaDom.current = e;
+            TextareaRef(e);
+          }}
+          required
+          name={name}
+          onChange={(e) => {
+            autoHeight(e);
+            onTextChange(e);
+          }}
+          onFocus={autoHeight}
+          onBlur={onBlur}
+        />
+      )}
+      {isFolder && (
+        <Box
+          pos={'absolute'}
+          bottom={0}
+          left={0}
+          right={0}
+          top={0}
+          bg={'linear-gradient(182deg, rgba(251, 251, 252, 0.00) 1.76%, #FBFBFC 84.07%)'}
+          {...(disabled
+            ? {}
+            : {
+                cursor: 'pointer',
+                onClick: onclickMark
+              })}
+        />
+      )}
    </Box>
-  ) : (
-    <Textarea
-      maxLength={maxToken}
-      borderColor={'transparent'}
-      className={styles.scrollbar}
-      minH={textareaMinH}
-      px={0}
-      pt={0}
-      isRequired={required}
-      whiteSpace={'pre-wrap'}
-      resize={'none'}
-      _focus={{
-        px: 3,
-        py: 1,
-        borderColor: 'primary.500',
-        boxShadow: '0px 0px 0px 2.4px rgba(51, 112, 255, 0.15)',
-        bg: 'white'
-      }}
-      placeholder={t('common:dataset.data.Index Placeholder')}
-      ref={(e) => {
-        if (e) TextareaDom.current = e;
-        TextareaRef(e);
-      }}
-      required
-      name={name}
-      onChange={(e) => {
-        autoHeight(e);
-        onTextChange(e);
-      }}
-      onFocus={autoHeight}
-      onBlur={onBlur}
-    />
  );
 };
--- a/projects/app/src/pages/account/usage/index.tsx
+++ b/projects/app/src/pages/account/usage/index.tsx
@@ -199,8 +199,6 @@ const UsageTable = () => {
    [
      t,
      dateRange,
-      usageTab,
-      unit,
      userInfo?.team?.permission.hasManagePer,
      tmbList,
      selectTmbIds,
--- a/projects/app/src/pages/api/core/ai/model/test.ts
+++ b/projects/app/src/pages/api/core/ai/model/test.ts
@@ -18,7 +18,7 @@ import { isProduction } from '@fastgpt/global/common/system/constants';
 import * as fs from 'fs';
 import { llmCompletionsBodyFormat } from '@fastgpt/service/core/ai/utils';

-export type testQuery = { model: string };
+export type testQuery = { model: string; channelId?: string };

 export type testBody = {};

@@ -30,7 +30,7 @@ async function handler(
 ): Promise<testResponse> {
  await authSystemAdmin({ req });

-  const { model } = req.query;
+  const { model, channelId } = req.query;
  const modelData = findModelFromAlldata(model);

  if (!modelData) return Promise.reject('Model not found');
@@ -65,8 +65,7 @@ const testLLMModel = async (model: LLMModelItemType) => {
    {
      model: model.model,
      messages: [{ role: 'user', content: 'hi' }],
-      stream: false,
-      max_tokens: 10
+      stream: false
    },
    model
  );
--- a/projects/app/src/pages/api/core/app/detail.ts
+++ b/projects/app/src/pages/api/core/app/detail.ts
@@ -13,10 +13,18 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
    Promise.reject(CommonErrEnum.missingParams);
  }
  // 凭证校验
-  const { app } = await authApp({ req, authToken: true, appId, per: ReadPermissionVal });
-  const teamId = app.teamId;
+  const { app, teamId, isRoot } = await authApp({
+    req,
+    authToken: true,
+    appId,
+    per: ReadPermissionVal
+  });

-  await rewriteAppWorkflowToDetail(app.modules, teamId);
+  await rewriteAppWorkflowToDetail({
+    nodes: app.modules,
+    teamId,
+    isRoot
+  });

  if (!app.permission.hasWritePer) {
    return {
--- a/projects/app/src/pages/api/core/app/version/detail.ts
+++ b/projects/app/src/pages/api/core/app/version/detail.ts
@@ -6,6 +6,7 @@ import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'
 import { AppVersionSchemaType } from '@fastgpt/global/core/app/version';
 import { formatTime2YMDHM } from '@fastgpt/global/common/string/time';
 import { checkNode } from '@/service/core/app/utils';
+import { rewriteAppWorkflowToDetail } from '@fastgpt/service/core/app/utils';

 type Props = {
  versionId: string;
@@ -18,13 +19,24 @@ async function handler(
 ): Promise<AppVersionSchemaType> {
  const { versionId, appId } = req.query as Props;

-  const { app } = await authApp({ req, authToken: true, appId, per: WritePermissionVal });
+  const { app, teamId, isRoot } = await authApp({
+    req,
+    authToken: true,
+    appId,
+    per: WritePermissionVal
+  });
  const result = await MongoAppVersion.findById(versionId).lean();

  if (!result) {
    return Promise.reject('version not found');
  }

+  await rewriteAppWorkflowToDetail({
+    nodes: result.nodes,
+    teamId,
+    isRoot
+  });
+
  return {
    ...result,
    nodes: await Promise.all(
--- a/projects/app/src/pages/api/core/app/version/latest.ts
+++ b/projects/app/src/pages/api/core/app/version/latest.ts
@@ -24,16 +24,18 @@ async function handler(
  req: ApiRequestProps<getLatestVersionBody, getLatestVersionQuery>,
  res: ApiResponseType<any>
 ): Promise<getLatestVersionResponse> {
-  const { app } = await authApp({
+  const { app, isRoot, teamId } = await authApp({
    req,
    authToken: true,
    appId: req.query.appId,
    per: WritePermissionVal
  });

-  const teamId = app.teamId;
-
-  await rewriteAppWorkflowToDetail(app.modules, teamId);
+  await rewriteAppWorkflowToDetail({
+    nodes: app.modules,
+    teamId,
+    isRoot
+  });

  return getAppLatestVersion(req.query.appId, app);
 }