4.6.8-alpha (#804)

* perf: redirect request and err log replace

perf: dataset openapi

feat: session

fix: retry input error

feat: 468 doc

sub page

feat: standard sub

perf: rerank tip

perf: rerank tip

perf: api sdk

perf: openapi

sub plan

perf: sub ui

fix: ts

* perf: init log

* fix: variable select

* sub page

* icon

* perf: llm model config

* perf: menu ux

* perf: system store

* perf: publish app name

* fix: init data

* perf: flow edit ux

* fix: value type format and ux

* fix prompt editor default value (#13)

* fix prompt editor default value

* fix prompt editor update when not focus

* add key with variable

---------

Co-authored-by: Archer <545436317@qq.com>

* fix: value type

* doc

* i18n

* import path

* home page

* perf: mongo session running

* fix: ts

* perf: use toast

* perf: flow edit

* perf: sse response

* slider ui

* fetch error

* fix prompt editor rerender when not focus by key defaultvalue (#14)

* perf: prompt editor

* feat: dataset search concat

* perf: doc

* fix:ts

* perf: doc

* fix json editor onblur value (#15)

* faq

* vector model default config

* ipv6

---------

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/dataset/detail/components/CollectionCard.tsx

@@ -55,7 +55,7 @@ import ParentPath from '@/components/common/ParentPaths';
 import dynamic from 'next/dynamic';
 import { useDrag } from '@/web/common/hooks/useDrag';
 import SelectCollections from '@/web/core/dataset/components/SelectCollections';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import MyTooltip from '@/components/MyTooltip';
 import { useUserStore } from '@/web/support/user/useUserStore';
 import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant';
@@ -381,8 +381,7 @@ const CollectionCard = () => {
             <>
               {userInfo?.team?.role !== TeamMemberRoleEnum.visitor && (
                 <MyMenu
-                  offset={[-0, 10]}
-                  width={120}
+                  offset={[0, 5]}
                   Button={
                     <MenuButton
                       _hover={{
@@ -408,7 +407,7 @@ const CollectionCard = () => {
                   }
                   menuList={[
                     {
-                      child: (
+                      label: (
                         <Flex>
                           <MyIcon name={'common/folderFill'} w={'20px'} mr={2} />
                           {t('Folder')}
@@ -417,7 +416,7 @@ const CollectionCard = () => {
                       onClick: () => setEditFolderData({})
                     },
                     {
-                      child: (
+                      label: (
                         <Flex>
                           <MyIcon name={'core/dataset/manualCollection'} mr={2} w={'20px'} />
                           {t('core.dataset.Manual collection')}
@@ -433,7 +432,7 @@ const CollectionCard = () => {
                       }
                     },
                     {
-                      child: (
+                      label: (
                         <Flex>
                           <MyIcon name={'core/dataset/fileCollection'} mr={2} w={'20px'} />
                           {t('core.dataset.Text collection')}
@@ -442,7 +441,7 @@ const CollectionCard = () => {
                       onClick: onOpenFileSourceSelector
                     },
                     {
-                      child: (
+                      label: (
                         <Flex>
                           <MyIcon name={'core/dataset/tableCollection'} mr={2} w={'20px'} />
                           {t('core.dataset.Table collection')}
@@ -627,6 +626,7 @@ const CollectionCard = () => {
                     {collection.canWrite && userInfo?.team?.role !== TeamMemberRoleEnum.visitor && (
                       <MyMenu
                         width={100}
+                        offset={[-70, 5]}
                         Button={
                           <MenuButton
                             w={'22px'}
@@ -655,7 +655,7 @@ const CollectionCard = () => {
                           ...(collection.type === DatasetCollectionTypeEnum.link
                             ? [
                                 {
-                                  child: (
+                                  label: (
                                     <Flex alignItems={'center'}>
                                       <MyIcon name={'common/refreshLight'} w={'14px'} mr={2} />
                                       {t('core.dataset.collection.Sync')}
@@ -669,7 +669,7 @@ const CollectionCard = () => {
                               ]
                             : []),
                           {
-                            child: (
+                            label: (
                               <Flex alignItems={'center'}>
                                 <MyIcon name={'common/file/move'} w={'14px'} mr={2} />
                                 {t('Move')}
@@ -678,7 +678,7 @@ const CollectionCard = () => {
                             onClick: () => setMoveCollectionData({ collectionId: collection._id })
                           },
                           {
-                            child: (
+                            label: (
                               <Flex alignItems={'center'}>
                                 <MyIcon name={'edit'} w={'14px'} mr={2} />
                                 {t('Rename')}
@@ -696,7 +696,7 @@ const CollectionCard = () => {
                               })
                           },
                           {
-                            child: (
+                            label: (
                               <Flex alignItems={'center'}>
                                 <MyIcon
                                   mr={1}

projects/app/src/pages/dataset/detail/components/DataCard.tsx

@@ -23,7 +23,7 @@ import {
 } from '@/web/core/dataset/api';
 import { DeleteIcon } from '@chakra-ui/icons';
 import { useQuery } from '@tanstack/react-query';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { debounce } from 'lodash';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { useConfirm } from '@/web/common/hooks/useConfirm';

projects/app/src/pages/dataset/detail/components/Import/WebsiteConfig.tsx

@@ -3,11 +3,11 @@ import MyModal from '@/components/MyModal';
 import { useTranslation } from 'next-i18next';
 import { Box, Button, Input, Link, ModalBody, ModalFooter } from '@chakra-ui/react';
 import { strIsLink } from '@fastgpt/global/common/string/tools';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useForm } from 'react-hook-form';
 import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { getDocPath } from '@/web/common/system/doc';
-import { feConfigs } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 
 type FormType = {
   url?: string | undefined;
@@ -27,6 +27,7 @@ const WebsiteConfigModal = ({
   defaultValue?: FormType;
 }) => {
   const { t } = useTranslation();
+  const { feConfigs } = useSystemStore();
   const { toast } = useToast();
   const { register, handleSubmit } = useForm({
     defaultValues: defaultValue

projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx

@@ -21,8 +21,8 @@ import { TrainingTypeMap } from '@fastgpt/global/core/dataset/constants';
 import { ImportProcessWayEnum } from '@/web/core/dataset/constants';
 import MyTooltip from '@/components/MyTooltip';
 import { useImportStore } from '../Provider';
-import { feConfigs } from '@/web/common/system/staticData';
 import Tag from '@/components/Tag';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import MyModal from '@/components/MyModal';
 import { Prompt_AgentQA } from '@/global/core/prompt/agent';
 import Preview from '../components/Preview';
@@ -35,6 +35,7 @@ function DataProcess({
   goToNext: () => void;
 }) {
   const { t } = useTranslation();
+  const { feConfigs } = useSystemStore();
   const {
     processParamsForm,
     sources,

projects/app/src/pages/dataset/detail/components/Import/commonProgress/Upload.tsx

@@ -21,7 +21,7 @@ import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import { chunksUpload, fileCollectionCreate } from '@/web/core/dataset/utils';
 import { ImportSourceItemType } from '@/web/core/dataset/type';
 import { hashStr } from '@fastgpt/global/common/string/tools';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useRouter } from 'next/router';
 import { TabEnum } from '../../../index';
 import { postCreateDatasetLinkCollection, postDatasetCollection } from '@/web/core/dataset/api';

projects/app/src/pages/dataset/detail/components/Import/components/Preview.tsx

@@ -29,7 +29,7 @@ const Preview = ({
       .map((source) =>
         source.chunks.slice(0, oneSourceChunkLength).map((chunk, i) => ({
           ...chunk,
-          chunkIndex: i + 1,
+          index: i + 1,
           sourceName: source.sourceName,
           sourceIcon: source.icon
         }))
@@ -86,7 +86,7 @@ const Preview = ({
                     bg={'primary.50'}
                     borderRadius={'sm'}
                   >
-                    # {chunk.chunkIndex}
+                    # {chunk.index}
                   </Box>
                   <Flex ml={2} fontWeight={'bold'} alignItems={'center'} gap={1}>
                     <MyIcon name={chunk.sourceIcon as any} w={'14px'} />

projects/app/src/pages/dataset/detail/components/Import/diffSource/FileLink.tsx

@@ -9,7 +9,7 @@ import { Box, Button, Flex, Input, Link, Textarea } from '@chakra-ui/react';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { LinkCollectionIcon } from '@fastgpt/global/core/dataset/constants';
-import { feConfigs } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { getDocPath } from '@/web/common/system/doc';
 import Loading from '@/components/Loading';
 
@@ -32,6 +32,7 @@ export default React.memo(LinkCollection);
 
 const CustomLinkImport = ({ goToNext }: { goToNext: () => void }) => {
   const { t } = useTranslation();
+  const { feConfigs } = useSystemStore();
   const { sources, setSources, processParamsForm } = useImportStore();
   const { register, reset, handleSubmit, watch } = useForm({
     defaultValues: {

projects/app/src/pages/dataset/detail/components/Import/diffSource/FileLocal.tsx

@@ -15,7 +15,7 @@ import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants'
 import MyTooltip from '@/components/MyTooltip';
 import type { PreviewRawTextProps } from '../components/PreviewRawText';
 import { useImportStore } from '../Provider';
-import { feConfigs } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 
 import dynamic from 'next/dynamic';
 import Loading from '@/components/Loading';
@@ -44,6 +44,7 @@ export default React.memo(FileLocal);
 
 const SelectFile = React.memo(function SelectFile({ goToNext }: { goToNext: () => void }) {
   const { t } = useTranslation();
+  const { feConfigs } = useSystemStore();
   const { sources, setSources } = useImportStore();
   // @ts-ignore
   const [selectFiles, setSelectFiles] = useState<FileItemType[]>(sources);

projects/app/src/pages/dataset/detail/components/Import/diffSource/TableLocal.tsx

@@ -11,7 +11,7 @@ import { getNanoid } from '@fastgpt/global/common/string/tools';
 import { useRequest } from '@/web/common/hooks/useRequest';
 import MyTooltip from '@/components/MyTooltip';
 import { useImportStore } from '../Provider';
-import { feConfigs } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 
 import dynamic from 'next/dynamic';
 import { fileDownload } from '@/web/common/file/utils';
@@ -43,6 +43,7 @@ const csvTemplate = `index,content
 
 const SelectFile = React.memo(function SelectFile({ goToNext }: { goToNext: () => void }) {
   const { t } = useTranslation();
+  const { feConfigs } = useSystemStore();
   const { sources, setSources } = useImportStore();
   // @ts-ignore
   const [selectFiles, setSelectFiles] = useState<FileItemType[]>(sources);
@@ -61,10 +62,10 @@ const SelectFile = React.memo(function SelectFile({ goToNext }: { goToNext: () =
 
           const filterData: FileItemType['chunks'] = data
             .filter((item) => item[0])
-            .map((item, i) => ({
+            .map((item) => ({
               q: item[0] || '',
               a: item[1] || '',
-              chunkIndex: i
+              chunkIndex: 0
             }));
 
           const item: FileItemType = {

projects/app/src/pages/dataset/detail/components/Info.tsx

@@ -14,7 +14,7 @@ import MyTooltip from '@/components/MyTooltip';
 import { useTranslation } from 'next-i18next';
 import PermissionRadio from '@/components/support/permission/Radio';
 import MySelect from '@/components/Select';
-import { qaModelList, vectorModelList } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useRequest } from '@/web/common/hooks/useRequest';
 import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
 
@@ -24,6 +24,7 @@ const Info = ({ datasetId }: { datasetId: string }) => {
   const { getValues, setValue, register, handleSubmit } = useForm<DatasetItemType>({
     defaultValues: datasetDetail
   });
+  const { datasetModelList, vectorModelList } = useSystemStore();
 
   const router = useRouter();
 
@@ -133,7 +134,7 @@ const Info = ({ datasetId }: { datasetId: string }) => {
         </Box>
         <Box flex={[1, '0 0 300px']}>{getValues('vectorModel').maxToken}</Box>
       </Flex>
-      {qaModelList.length > 1 && (
+      {datasetModelList.length > 1 && (
         <Flex mt={6} alignItems={'center'}>
           <Box flex={['0 0 90px', '0 0 160px']} w={0}>
             {t('core.ai.model.Dataset Agent Model')}
@@ -142,12 +143,12 @@ const Info = ({ datasetId }: { datasetId: string }) => {
             <MySelect
               w={'100%'}
               value={getValues('agentModel').model}
-              list={qaModelList.map((item) => ({
+              list={datasetModelList.map((item) => ({
                 label: item.name,
                 value: item.model
               }))}
               onchange={(e) => {
-                const agentModel = qaModelList.find((item) => item.model === e);
+                const agentModel = datasetModelList.find((item) => item.model === e);
                 if (!agentModel) return;
                 setValue('agentModel', agentModel);
                 setRefresh((state) => !state);

projects/app/src/pages/dataset/detail/components/InputDataModal.tsx

@@ -8,7 +8,7 @@ import {
   getDatasetCollectionById,
   getDatasetDataItemById
 } from '@/web/core/dataset/api';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import MyModal from '@/components/MyModal';
 import MyTooltip from '@/components/MyTooltip';
@@ -19,7 +19,6 @@ import { useRequest } from '@/web/common/hooks/useRequest';
 import { countPromptTokens } from '@fastgpt/global/common/string/tiktoken';
 import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { getDefaultIndex } from '@fastgpt/global/core/dataset/utils';
-import { vectorModelList } from '@/web/common/system/staticData';
 import { DatasetDataIndexTypeEnum } from '@fastgpt/global/core/dataset/constants';
 import { DatasetDataIndexItemType } from '@fastgpt/global/core/dataset/type';
 import SideTabs from '@/components/SideTabs';
@@ -66,6 +65,7 @@ const InputDataModal = ({
   const theme = useTheme();
   const { toast } = useToast();
   const [currentTab, setCurrentTab] = useState(TabEnum.content);
+  const { vectorModelList } = useSystemStore();
 
   const { register, handleSubmit, reset, control } = useForm<InputDataType>();
   const {
@@ -139,7 +139,7 @@ const InputDataModal = ({
       vectorModelList[0];
 
     return vectorModel?.maxToken || 3000;
-  }, [collection.datasetId.vectorModel]);
+  }, [collection.datasetId.vectorModel, vectorModelList]);
 
   // import new data
   const { mutate: sureImportData, isLoading: isImporting } = useRequest({

projects/app/src/pages/dataset/detail/components/Test.tsx

@@ -21,7 +21,7 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useRequest } from '@/web/common/hooks/useRequest';
 import { formatTimeToChatTime } from '@/utils/tools';
 import { getErrText } from '@fastgpt/global/common/error/utils';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { customAlphabet } from 'nanoid';
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';

projects/app/src/pages/dataset/detail/index.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
 import { useRouter } from 'next/router';
 import { Box, Flex, IconButton, useTheme, Progress } from '@chakra-ui/react';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useQuery } from '@tanstack/react-query';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { useSystemStore } from '@/web/common/system/useSystemStore';