v4.6-4 (#473)

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

@@ -170,7 +170,7 @@ const DataCard = () => {
       </Flex>
       <Grid
         minH={'100px'}
-        gridTemplateColumns={['1fr', 'repeat(2,1fr)', 'repeat(3,1fr)']}
+        gridTemplateColumns={['1fr', 'repeat(2,1fr)', 'repeat(3,1fr)', 'repeat(4,1fr)']}
         gridGap={4}
       >
         {datasetDataList.map((item) => (

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

@@ -34,10 +34,10 @@ const ImportData = ({
   const theme = useTheme();
   const { datasetDetail } = useDatasetStore();
   const [importType, setImportType] = useState<`${ImportTypeEnum}`>(ImportTypeEnum.chunk);
+  const vectorModel = datasetDetail.vectorModel;
+  const agentModel = datasetDetail.agentModel;
 
   const typeMap = useMemo(() => {
-    const vectorModel = datasetDetail.vectorModel;
-    const qaModel = qaModelList[0];
     const map = {
       [ImportTypeEnum.chunk]: {
         defaultChunkLen: vectorModel?.defaultToken || 500,
@@ -45,8 +45,8 @@ const ImportData = ({
         mode: TrainingModeEnum.chunk
       },
       [ImportTypeEnum.qa]: {
-        defaultChunkLen: qaModel?.maxContext * 0.5 || 8000,
-        unitPrice: qaModel?.price || 3,
+        defaultChunkLen: agentModel?.maxContext * 0.6 || 9000,
+        unitPrice: agentModel?.price || 3,
         mode: TrainingModeEnum.qa
       },
       [ImportTypeEnum.csv]: {
@@ -56,7 +56,13 @@ const ImportData = ({
       }
     };
     return map[importType];
-  }, [datasetDetail.vectorModel, importType]);
+  }, [
+    agentModel?.maxContext,
+    agentModel?.price,
+    importType,
+    vectorModel?.defaultToken,
+    vectorModel?.price
+  ]);
 
   const TitleStyle: BoxProps = {
     fontWeight: 'bold',
@@ -104,8 +110,10 @@ const ImportData = ({
 
         <Provider
           {...typeMap}
+          vectorModel={vectorModel.model}
+          agentModel={agentModel.model}
+          datasetId={datasetDetail._id}
           importType={importType}
-          datasetId={datasetId}
           parentId={parentId}
           onUploadSuccess={uploadSuccess}
         >

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

@@ -90,6 +90,8 @@ const Provider = ({
   parentId,
   unitPrice,
   mode,
+  vectorModel,
+  agentModel,
   defaultChunkLen = 500,
   importType,
   onUploadSuccess,
@@ -99,6 +101,8 @@ const Provider = ({
   parentId: string;
   unitPrice: number;
   mode: `${TrainingModeEnum}`;
+  vectorModel: string;
+  agentModel: string;
   defaultChunkLen: number;
   importType: `${ImportTypeEnum}`;
   onUploadSuccess: () => void;
@@ -132,7 +136,9 @@ const Provider = ({
         const chunks = file.chunks;
         // create training bill
         const billId = await postCreateTrainingBill({
-          name: t('dataset.collections.Create Training Data', { filename: file.filename })
+          name: t('dataset.collections.Create Training Data', { filename: file.filename }),
+          vectorModel,
+          agentModel
         });
         // create a file collection and training bill
         const collectionId = await postDatasetCollection({

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

@@ -13,8 +13,8 @@ const fileExtension = '.txt, .doc, .docx, .pdf, .md';
 
 const QAImport = () => {
   const { datasetDetail } = useDatasetStore();
-  const vectorModel = datasetDetail.vectorModel;
-  const unitPrice = vectorModel?.price || 0.2;
+  const agentModel = datasetDetail.agentModel;
+  const unitPrice = agentModel?.price || 3;
 
   const {
     successChunks,

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

@@ -9,7 +9,7 @@ import React, {
 import { useRouter } from 'next/router';
 import { Box, Flex, Button, FormControl, IconButton, Input } from '@chakra-ui/react';
 import { QuestionOutlineIcon, DeleteIcon } from '@chakra-ui/icons';
-import { delDatasetById, putDatasetById } from '@/web/core/dataset/api';
+import { delDatasetById } from '@/web/core/dataset/api';
 import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
 import { useToast } from '@/web/common/hooks/useToast';
 import { useDatasetStore } from '@/web/core/dataset/store/dataset';
@@ -22,6 +22,8 @@ import Tag from '@/components/Tag';
 import MyTooltip from '@/components/MyTooltip';
 import { useTranslation } from 'next-i18next';
 import PermissionRadio from '@/components/support/permission/Radio';
+import MySelect from '@/components/Select';
+import { qaModelList } from '@/web/common/system/staticData';
 
 export interface ComponentRef {
   initInput: (tags: string) => void;
@@ -50,7 +52,7 @@ const Info = (
     multiple: false
   });
 
-  const { datasetDetail, loadDatasetDetail, loadDatasets } = useDatasetStore();
+  const { datasetDetail, loadDatasetDetail, loadDatasets, updateDataset } = useDatasetStore();
 
   /* 点击删除 */
   const onclickDelKb = useCallback(async () => {
@@ -76,11 +78,10 @@ const Info = (
     async (data: DatasetItemType) => {
       setBtnLoading(true);
       try {
-        await putDatasetById({
+        await updateDataset({
           id: datasetId,
           ...data
         });
-        await loadDatasetDetail(datasetId, true);
         toast({
           title: '更新成功',
           status: 'success'
@@ -94,7 +95,7 @@ const Info = (
       }
       setBtnLoading(false);
     },
-    [loadDatasetDetail, datasetId, loadDatasets, toast]
+    [updateDataset, datasetId, loadDatasetDetail, toast, loadDatasets]
   );
   const saveSubmitError = useCallback(() => {
     // deep search message
@@ -194,6 +195,27 @@ const Info = (
           })}
         />
       </FormControl>
+      <Flex mt={6} alignItems={'center'}>
+        <Box flex={['0 0 90px', '0 0 160px']} w={0}>
+          {t('dataset.Agent Model')}
+        </Box>
+        <Box flex={[1, '0 0 300px']}>
+          <MySelect
+            w={'100%'}
+            value={getValues('agentModel').model}
+            list={qaModelList.map((item) => ({
+              label: item.name,
+              value: item.model
+            }))}
+            onchange={(e) => {
+              const agentModel = qaModelList.find((item) => item.model === e);
+              if (!agentModel) return;
+              setValue('agentModel', agentModel);
+              setRefresh((state) => !state);
+            }}
+          />
+        </Box>
+      </Flex>
       <Flex mt={8} alignItems={'center'} w={'100%'} flexWrap={'wrap'}>
         <Box flex={['0 0 90px', '0 0 160px']} w={0}>
           标签

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

@@ -196,7 +196,7 @@ const InputDataModal = ({
   const loading = useMemo(() => isImporting || isUpdating, [isImporting, isUpdating]);
 
   return (
-    <MyModal isOpen={true} isCentered w={'90vw'} maxW={'90vw'} h={'90vh'}>
+    <MyModal isOpen={true} isCentered w={'90vw'} maxW={'1440px'} h={'90vh'}>
       <Flex h={'100%'}>
         <Box p={5} borderRight={theme.borders.base}>
           <RawSourceText
@@ -250,7 +250,7 @@ const InputDataModal = ({
                     mt={1}
                     placeholder={`该输入框是必填项，该内容通常是对于知识点的描述，也可以是用户的问题，最多 ${maxToken} 字。`}
                     maxLength={maxToken}
-                    rows={10}
+                    rows={12}
                     bg={'myWhite.400'}
                     {...register(`q`, {
                       required: true
@@ -274,7 +274,7 @@ const InputDataModal = ({
                       maxToken * 1.5
                     } 字。`}
                     bg={'myWhite.400'}
-                    rows={10}
+                    rows={12}
                     maxLength={maxToken * 1.5}
                     {...register('a')}
                   />