feat: model config required check;feat: dataset text model default setting (#3866)

* feat: model config required check

* feat: dataset text model default setting

* perf: collection list count

* fix: ts

* remove index count

projects/app/src/pageComponents/dataset/detail/CollectionCard/TagManageModal.tsx

@@ -10,7 +10,7 @@ import { getCollectionIcon } from '@fastgpt/global/core/dataset/utils';
 import {
   delDatasetCollectionTag,
   getDatasetCollectionTags,
-  getScrollCollectionList,
+  getDatasetCollections,
   getTagUsage,
   postAddTagsToCollections,
   updateDatasetCollectionTag
@@ -146,7 +146,7 @@ const TagManageModal = ({ onClose }: { onClose: () => void }) => {
     scrollDataList: collectionsList,
     ScrollList: ScrollListCollections,
     isLoading: collectionsListLoading
-  } = useVirtualScrollPagination(getScrollCollectionList, {
+  } = useVirtualScrollPagination(getDatasetCollections, {
     refreshDeps: [searchText],
     // debounceWait: 300,
 
@@ -156,6 +156,7 @@ const TagManageModal = ({ onClose }: { onClose: () => void }) => {
     pageSize: 30,
     defaultParams: {
       datasetId: datasetDetail._id,
+      simple: true,
       searchText
     }
   });

projects/app/src/pageComponents/dataset/detail/CollectionCard/index.tsx

@@ -195,7 +195,7 @@ const CollectionCard = () => {
               <Tr>
                 <Th py={4}>{t('common:common.Name')}</Th>
                 <Th py={4}>{t('dataset:collection.Training type')}</Th>
-                <Th py={4}>{t('common:dataset.collections.Data Amount')}</Th>
+                <Th py={4}>{t('dataset:collection_data_count')}</Th>
                 <Th py={4}>{t('dataset:collection.Create update time')}</Th>
                 <Th py={4}>{t('common:common.Status')}</Th>
                 <Th py={4}>{t('dataset:Enable')}</Th>

projects/app/src/pageComponents/dataset/detail/DataCard.tsx

@@ -29,10 +29,8 @@ import Markdown from '@/components/Markdown';
 import { useMemoizedFn } from 'ahooks';
 import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
 import { TabEnum } from './NavBar';
-import {
-  DatasetCollectionTypeEnum,
-  ImportDataSourceEnum
-} from '@fastgpt/global/core/dataset/constants';
+import { ImportDataSourceEnum } from '@fastgpt/global/core/dataset/constants';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 
 const DataCard = () => {
   const theme = useTheme();
@@ -76,19 +74,17 @@ const DataCard = () => {
   const [editDataId, setEditDataId] = useState<string>();
 
   // get file info
-  const { data: collection } = useQuery(
-    ['getDatasetCollectionById', collectionId],
-    () => getDatasetCollectionById(collectionId),
-    {
-      onError: () => {
-        router.replace({
-          query: {
-            datasetId
-          }
-        });
-      }
+  const { data: collection } = useRequest2(() => getDatasetCollectionById(collectionId), {
+    refreshDeps: [collectionId],
+    manual: false,
+    onError: () => {
+      router.replace({
+        query: {
+          datasetId
+        }
+      });
     }
-  );
+  });
 
   const canWrite = useMemo(() => datasetDetail.permission.hasWritePer, [datasetDetail]);
 
@@ -182,7 +178,10 @@ const DataCard = () => {
           <Flex align={'center'} color={'myGray.500'}>
             <MyIcon name="common/list" mr={2} w={'18px'} />
             <Box as={'span'} fontSize={['sm', '14px']} fontWeight={'500'}>
-              {t('common:core.dataset.data.Total Amount', { total })}
+              {t('dataset:data_amount', {
+                dataAmount: total,
+                indexAmount: collection?.indexAmount ?? '-'
+              })}
             </Box>
           </Flex>
           <Box flex={1} mr={1} />

projects/app/src/pageComponents/dataset/detail/Info/index.tsx

@@ -164,12 +164,12 @@ const Info = ({ datasetId }: { datasetId: string }) => {
         </Flex>
 
         <Box mt={5} w={'100%'}>
-          <Flex alignItems={'center'} fontSize={'mini'}>
-            <FormLabel fontWeight={'500'} flex={'1 0 0'}>
+          <Flex alignItems={'center'}>
+            <FormLabel fontWeight={'500'} flex={'1 0 0'} fontSize={'mini'}>
               {t('common:core.ai.model.Vector Model')}
             </FormLabel>
             <MyTooltip label={t('dataset:vector_model_max_tokens_tip')}>
-              <Box>
+              <Box fontSize={'mini'}>
                 {t('dataset:chunk_max_tokens')}: {vectorModel.maxToken}
               </Box>
             </MyTooltip>

projects/app/src/pageComponents/dataset/list/CreateModal.tsx

@@ -21,7 +21,7 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
 import { getDocPath } from '@/web/common/system/doc';
 import { datasetTypeCourseMap } from '@/web/core/dataset/constants';
 import ApiDatasetForm from '../ApiDatasetForm';
-import { getWebDefaultModel } from '@/web/common/system/utils';
+import { getWebDefaultEmbeddingModel, getWebDefaultLLMModel } from '@/web/common/system/utils';
 
 export type CreateDatasetType =
   | DatasetTypeEnum.dataset
@@ -40,7 +40,6 @@ const CreateModal = ({
   type: CreateDatasetType;
 }) => {
   const { t } = useTranslation();
-  const { toast } = useToast();
   const router = useRouter();
   const { defaultModels, embeddingModelList, datasetModelList } = useSystemStore();
   const { isPc } = useSystem();
@@ -79,8 +78,10 @@ const CreateModal = ({
       avatar: datasetTypeMap[type].icon,
       name: '',
       intro: '',
-      vectorModel: defaultModels.embedding?.model,
-      agentModel: getWebDefaultModel(datasetModelList)?.model
+      vectorModel:
+        defaultModels.embedding?.model || getWebDefaultEmbeddingModel(embeddingModelList)?.model,
+      agentModel:
+        defaultModels.datasetTextLLM?.model || getWebDefaultLLMModel(datasetModelList)?.model
     }
   });
   const { register, setValue, handleSubmit, watch } = form;