Revert "sub plan page (#885)" (#886)

This reverts commit 443ad37b6a.

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

@@ -1,5 +1,6 @@
 import React, { useContext, useCallback, createContext, useState, useMemo, useEffect } from 'react';
 
+import { formatModelPrice2Read } from '@fastgpt/global/support/wallet/bill/tools';
 import { splitText2Chunks } from '@fastgpt/global/common/string/textSplitter';
 import { TrainingModeEnum } from '@fastgpt/global/core/dataset/constants';
 import { useTranslation } from 'next-i18next';
@@ -33,7 +34,7 @@ type useImportStoreType = {
   totalChunkChars: number;
   totalChunks: number;
   chunkSize: number;
-  predictPoints: number;
+  predictPrice: number;
   priceTip: string;
   uploadRate: number;
   splitSources2Chunks: () => void;
@@ -53,7 +54,7 @@ const StateContext = createContext<useImportStoreType>({
   totalChunkChars: 0,
   totalChunks: 0,
   chunkSize: 0,
-  predictPoints: 0,
+  predictPrice: 0,
   priceTip: '',
   uploadRate: 50,
   splitSources2Chunks: () => {}
@@ -104,9 +105,10 @@ const Provider = ({
       chunkSize: embeddingChunkSize,
       showChunkInput: true,
       showPromptInput: false,
-      charsPointsPrice: vectorModel.charsPointsPrice,
+      inputPrice: vectorModel.inputPrice,
+      outputPrice: 0,
       priceTip: t('core.dataset.import.Embedding Estimated Price Tips', {
-        price: vectorModel.charsPointsPrice
+        price: vectorModel.inputPrice
       }),
       uploadRate: 150
     },
@@ -118,9 +120,10 @@ const Provider = ({
       chunkSize: agentModel.maxContext * 0.55 || 6000,
       showChunkInput: false,
       showPromptInput: true,
-      charsPointsPrice: agentModel.charsPointsPrice,
+      inputPrice: agentModel.inputPrice,
+      outputPrice: agentModel.outputPrice,
       priceTip: t('core.dataset.import.QA Estimated Price Tips', {
-        price: agentModel?.charsPointsPrice
+        price: agentModel?.inputPrice
       }),
       uploadRate: 30
     }
@@ -148,12 +151,15 @@ const Provider = ({
     () => sources.reduce((sum, file) => sum + file.chunkChars, 0),
     [sources]
   );
-  const predictPoints = useMemo(() => {
+  const predictPrice = useMemo(() => {
     if (mode === TrainingModeEnum.qa) {
-      return +(((totalChunkChars * 1.5) / 1000) * agentModel.charsPointsPrice).toFixed(2);
+      const inputTotal = totalChunkChars * selectModelStaticParam.inputPrice;
+      const outputTotal = totalChunkChars * 0.5 * selectModelStaticParam.inputPrice;
+
+      return formatModelPrice2Read(inputTotal + outputTotal);
     }
-    return +((totalChunkChars / 1000) * vectorModel.charsPointsPrice).toFixed(2);
-  }, [agentModel.charsPointsPrice, mode, totalChunkChars, vectorModel.charsPointsPrice]);
+    return formatModelPrice2Read(totalChunkChars * selectModelStaticParam.inputPrice);
+  }, [mode, selectModelStaticParam.inputPrice, totalChunkChars]);
   const totalChunks = useMemo(
     () => sources.reduce((sum, file) => sum + file.chunks.length, 0),
     [sources]
@@ -172,8 +178,7 @@ const Provider = ({
         return {
           ...file,
           chunkChars: chars,
-          chunks: chunks.map((chunk, i) => ({
-            chunkIndex: i,
+          chunks: chunks.map((chunk) => ({
             q: chunk,
             a: ''
           }))
@@ -193,7 +198,7 @@ const Provider = ({
     totalChunkChars,
     totalChunks,
     chunkSize,
-    predictPoints,
+    predictPrice,
     splitSources2Chunks
   };
   return <StateContext.Provider value={value}>{children}</StateContext.Provider>;

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

@@ -46,7 +46,7 @@ function DataProcess({
     maxChunkSize,
     totalChunkChars,
     totalChunks,
-    predictPoints,
+    predictPrice,
     showRePreview,
     splitSources2Chunks,
     priceTip
@@ -275,7 +275,7 @@ function DataProcess({
             {feConfigs?.show_pay && (
               <MyTooltip label={priceTip}>
                 <Tag colorSchema={'gray'} py={'6px'} borderRadius={'md'} px={3}>
-                  {t('core.dataset.import.Estimated points', { points: predictPoints })}
+                  {t('core.dataset.import.Estimated Price', { amount: predictPrice, unit: '元' })}
                 </Tag>
               </MyTooltip>
             )}

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

@@ -16,7 +16,7 @@ import { useImportStore, type FormType } from '../Provider';
 import { useTranslation } from 'next-i18next';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useRequest } from '@/web/common/hooks/useRequest';
-import { postCreateTrainingUsage } from '@/web/support/wallet/usage/api';
+import { postCreateTrainingBill } from '@/web/support/wallet/bill/api';
 import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import { chunksUpload, fileCollectionCreate } from '@/web/core/dataset/utils';
 import { ImportSourceItemType } from '@/web/core/dataset/type';
@@ -54,7 +54,7 @@ const Upload = ({ showPreviewChunks }: { showPreviewChunks: boolean }) => {
 
       // Batch create collection and upload chunks
       for await (const item of uploadList) {
-        const billId = await postCreateTrainingUsage({
+        const billId = await postCreateTrainingBill({
           name: item.sourceName,
           datasetId: datasetDetail._id
         });

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

@@ -19,6 +19,7 @@ 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 { DatasetDataIndexTypeEnum } from '@fastgpt/global/core/dataset/constants';
 import { DatasetDataIndexItemType } from '@fastgpt/global/core/dataset/type';
 import SideTabs from '@/components/SideTabs';
 import DeleteIcon from '@fastgpt/web/components/common/Icon/delete';
@@ -161,10 +162,9 @@ const InputDataModal = ({
         q: e.q,
         a: e.a,
         // remove dataId
-        indexes: e.indexes.map((index) => ({
-          ...index,
-          dataId: undefined
-        }))
+        indexes: e.indexes.map((index) =>
+          index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a }) : index
+        )
       });
 
       return {
@@ -195,7 +195,7 @@ const InputDataModal = ({
         id: dataId,
         ...e,
         indexes: e.indexes.map((index) =>
-          index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a, dataId: index.dataId }) : index
+          index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a }) : index
         )
       });
 
@@ -278,7 +278,7 @@ const InputDataModal = ({
                     bg={i % 2 !== 0 ? 'myWhite.400' : ''}
                     _hover={{
                       '& .delete': {
-                        display: index.defaultIndex ? 'none' : 'block'
+                        display: index.defaultIndex && indexes.length === 1 ? 'none' : 'block'
                       }
                     }}
                   >
@@ -331,6 +331,7 @@ const InputDataModal = ({
                   onClick={() =>
                     appendIndexes({
                       defaultIndex: false,
+                      type: DatasetDataIndexTypeEnum.chunk,
                       text: '',
                       dataId: `${Date.now()}`
                     })
@@ -382,47 +383,45 @@ const InputTab = ({
   const [inputType, setInputType] = useState(InputTypeEnum.q);
 
   return (
-    <Flex flexDirection={'column'} h={'100%'}>
-      <Box>
-        <RowTabs
-          list={[
-            {
-              label: (
-                <Flex alignItems={'center'}>
-                  <Box as="span" color={'red.600'}>
-                    *
-                  </Box>
-                  {t('core.dataset.data.Main Content')}
-                  <MyTooltip label={t('core.dataset.data.Data Content Tip')}>
-                    <QuestionOutlineIcon ml={1} />
-                  </MyTooltip>
-                </Flex>
-              ),
-              value: InputTypeEnum.q
-            },
-            {
-              label: (
-                <Flex alignItems={'center'}>
-                  {t('core.dataset.data.Auxiliary Data')}
-                  <MyTooltip label={t('core.dataset.data.Auxiliary Data Tip')}>
-                    <QuestionOutlineIcon ml={1} />
-                  </MyTooltip>
-                </Flex>
-              ),
-              value: InputTypeEnum.a
-            }
-          ]}
-          value={inputType}
-          onChange={(e) => setInputType(e as InputTypeEnum)}
-        />
-      </Box>
+    <Box>
+      <RowTabs
+        list={[
+          {
+            label: (
+              <Flex alignItems={'center'}>
+                <Box as="span" color={'red.600'}>
+                  *
+                </Box>
+                {t('core.dataset.data.Main Content')}
+                <MyTooltip label={t('core.dataset.data.Data Content Tip')}>
+                  <QuestionOutlineIcon ml={1} />
+                </MyTooltip>
+              </Flex>
+            ),
+            value: InputTypeEnum.q
+          },
+          {
+            label: (
+              <Flex alignItems={'center'}>
+                {t('core.dataset.data.Auxiliary Data')}
+                <MyTooltip label={t('core.dataset.data.Auxiliary Data Tip')}>
+                  <QuestionOutlineIcon ml={1} />
+                </MyTooltip>
+              </Flex>
+            ),
+            value: InputTypeEnum.a
+          }
+        ]}
+        value={inputType}
+        onChange={(e) => setInputType(e as InputTypeEnum)}
+      />
 
-      <Box mt={3} flex={'1 0 0'}>
+      <Box mt={3}>
         {inputType === InputTypeEnum.q && (
           <Textarea
             placeholder={t('core.dataset.data.Data Content Placeholder', { maxToken })}
             maxLength={maxToken}
-            h={'100%'}
+            rows={isPc ? 24 : 12}
             bg={'myWhite.400'}
             {...register(`q`, {
               required: true
@@ -434,7 +433,6 @@ const InputTab = ({
             placeholder={t('core.dataset.data.Auxiliary Data Placeholder', {
               maxToken: maxToken * 1.5
             })}
-            h={'100%'}
             bg={'myWhite.400'}
             rows={isPc ? 24 : 12}
             maxLength={maxToken * 1.5}
@@ -442,6 +440,6 @@ const InputTab = ({
           />
         )}
       </Box>
-    </Flex>
+    </Box>
   );
 };

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

@@ -27,7 +27,6 @@ import {
 import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { useRequest } from '@/web/common/hooks/useRequest';
 import DatasetTypeTag from '@/components/core/dataset/DatasetTypeTag';
-import Head from 'next/head';
 
 const DataCard = dynamic(() => import('./components/DataCard'));
 const Test = dynamic(() => import('./components/Test'));
@@ -146,9 +145,7 @@ const Detail = ({ datasetId, currentTab }: { datasetId: string; currentTab: `${T
 
   return (
     <>
-      <Head>
-        <title>{datasetDetail?.name}</title>
-      </Head>
+      <Script src="/js/pdf.js" strategy="lazyOnload"></Script>
       <PageContainer>
         <Flex flexDirection={['column', 'row']} h={'100%'} pt={[4, 0]}>
           {isPc ? (