sub plan page (#885)

* perf: insert mongo dataset data session * perf: dataset data index * remove delay * rename bill schema * rename bill record * perf: bill table * perf: prompt * perf: sub plan * change the usage count * feat: usage bill * publish usages * doc * 新增团队聊天功能 (#20) * perf: doc * feat 添加标签部分 feat 信息团队标签配置 feat 新增团队同步管理 feat team分享页面 feat 完成team分享页面 feat 实现模糊搜索 style 格式化 fix 修复迷糊匹配 style 样式修改 fix 团队标签功能修复 * fix 修复鉴权功能 * merge 合并代码 * fix 修复引用错误 * fix 修复pr问题 * fix 修复ts格式问题 --------- Co-authored-by: archer <545436317@qq.com> Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com> * update extra plan * fix: ts * format * perf: bill field * feat: standard plan * fix: ts * feat 个人账号页面修改 (#22) * feat 添加标签部分 feat 信息团队标签配置 feat 新增团队同步管理 feat team分享页面 feat 完成team分享页面 feat 实现模糊搜索 style 格式化 fix 修复迷糊匹配 style 样式修改 fix 团队标签功能修复 * fix 修复鉴权功能 * merge 合并代码 * fix 修复引用错误 * fix 修复pr问题 * fix 修复ts格式问题 * feat 修改个人账号页 --------- Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com> * fix chunk index; error page text * feat: dataset process Integral prediction * feat: stand plan field * feat: sub plan limit * perf: index * query extension * perf: share link push app name * perf: plan point unit * perf: get sub plan * perf: account page --------- Co-authored-by: yst <77910600+yu-and-liu@users.noreply.github.com> Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>
2025-08-02 20:58:12 +00:00 · 2024-02-23 17:47:34 +08:00
parent 7a87f13aa8
commit 443ad37b6a
246 changed files with 6277 additions and 4272 deletions
--- a/projects/app/src/pages/dataset/detail/components/Import/Provider.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/Provider.tsx
@@ -1,6 +1,5 @@
 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';
@@ -34,7 +33,7 @@ type useImportStoreType = {
  totalChunkChars: number;
  totalChunks: number;
  chunkSize: number;
-  predictPrice: number;
+  predictPoints: number;
  priceTip: string;
  uploadRate: number;
  splitSources2Chunks: () => void;
@@ -54,7 +53,7 @@ const StateContext = createContext<useImportStoreType>({
  totalChunkChars: 0,
  totalChunks: 0,
  chunkSize: 0,
-  predictPrice: 0,
+  predictPoints: 0,
  priceTip: '',
  uploadRate: 50,
  splitSources2Chunks: () => {}
@@ -105,10 +104,9 @@ const Provider = ({
      chunkSize: embeddingChunkSize,
      showChunkInput: true,
      showPromptInput: false,
-      inputPrice: vectorModel.inputPrice,
-      outputPrice: 0,
+      charsPointsPrice: vectorModel.charsPointsPrice,
      priceTip: t('core.dataset.import.Embedding Estimated Price Tips', {
-        price: vectorModel.inputPrice
+        price: vectorModel.charsPointsPrice
      }),
      uploadRate: 150
    },
@@ -120,10 +118,9 @@ const Provider = ({
      chunkSize: agentModel.maxContext * 0.55 || 6000,
      showChunkInput: false,
      showPromptInput: true,
-      inputPrice: agentModel.inputPrice,
-      outputPrice: agentModel.outputPrice,
+      charsPointsPrice: agentModel.charsPointsPrice,
      priceTip: t('core.dataset.import.QA Estimated Price Tips', {
-        price: agentModel?.inputPrice
+        price: agentModel?.charsPointsPrice
      }),
      uploadRate: 30
    }
@@ -151,15 +148,12 @@ const Provider = ({
    () => sources.reduce((sum, file) => sum + file.chunkChars, 0),
    [sources]
  );
-  const predictPrice = useMemo(() => {
+  const predictPoints = useMemo(() => {
    if (mode === TrainingModeEnum.qa) {
-      const inputTotal = totalChunkChars * selectModelStaticParam.inputPrice;
-      const outputTotal = totalChunkChars * 0.5 * selectModelStaticParam.inputPrice;
-
-      return formatModelPrice2Read(inputTotal + outputTotal);
+      return +(((totalChunkChars * 1.5) / 1000) * agentModel.charsPointsPrice).toFixed(2);
    }
-    return formatModelPrice2Read(totalChunkChars * selectModelStaticParam.inputPrice);
-  }, [mode, selectModelStaticParam.inputPrice, totalChunkChars]);
+    return +((totalChunkChars / 1000) * vectorModel.charsPointsPrice).toFixed(2);
+  }, [agentModel.charsPointsPrice, mode, totalChunkChars, vectorModel.charsPointsPrice]);
  const totalChunks = useMemo(
    () => sources.reduce((sum, file) => sum + file.chunks.length, 0),
    [sources]
@@ -178,7 +172,8 @@ const Provider = ({
        return {
          ...file,
          chunkChars: chars,
-          chunks: chunks.map((chunk) => ({
+          chunks: chunks.map((chunk, i) => ({
+            chunkIndex: i,
            q: chunk,
            a: ''
          }))
@@ -198,7 +193,7 @@ const Provider = ({
    totalChunkChars,
    totalChunks,
    chunkSize,
-    predictPrice,
+    predictPoints,
    splitSources2Chunks
  };
  return <StateContext.Provider value={value}>{children}</StateContext.Provider>;
--- a/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx
@@ -46,7 +46,7 @@ function DataProcess({
    maxChunkSize,
    totalChunkChars,
    totalChunks,
-    predictPrice,
+    predictPoints,
    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 Price', { amount: predictPrice, unit: '元' })}
+                  {t('core.dataset.import.Estimated points', { points: predictPoints })}
                </Tag>
              </MyTooltip>
            )}
--- a/projects/app/src/pages/dataset/detail/components/Import/commonProgress/Upload.tsx
+++ b/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 { postCreateTrainingBill } from '@/web/support/wallet/bill/api';
+import { postCreateTrainingUsage } from '@/web/support/wallet/usage/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 postCreateTrainingBill({
+        const billId = await postCreateTrainingUsage({
          name: item.sourceName,
          datasetId: datasetDetail._id
        });
--- a/projects/app/src/pages/dataset/detail/components/InputDataModal.tsx
+++ b/projects/app/src/pages/dataset/detail/components/InputDataModal.tsx
@@ -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 { 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';
@@ -162,9 +161,10 @@ const InputDataModal = ({
        q: e.q,
        a: e.a,
        // remove dataId
-        indexes: e.indexes.map((index) =>
-          index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a }) : index
-        )
+        indexes: e.indexes.map((index) => ({
+          ...index,
+          dataId: undefined
+        }))
      });

      return {
@@ -195,7 +195,7 @@ const InputDataModal = ({
        id: dataId,
        ...e,
        indexes: e.indexes.map((index) =>
-          index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a }) : index
+          index.defaultIndex ? getDefaultIndex({ q: e.q, a: e.a, dataId: index.dataId }) : index
        )
      });

@@ -278,7 +278,7 @@ const InputDataModal = ({
                    bg={i % 2 !== 0 ? 'myWhite.400' : ''}
                    _hover={{
                      '& .delete': {
-                        display: index.defaultIndex && indexes.length === 1 ? 'none' : 'block'
+                        display: index.defaultIndex ? 'none' : 'block'
                      }
                    }}
                  >
@@ -331,7 +331,6 @@ const InputDataModal = ({
                  onClick={() =>
                    appendIndexes({
                      defaultIndex: false,
-                      type: DatasetDataIndexTypeEnum.chunk,
                      text: '',
                      dataId: `${Date.now()}`
                    })
@@ -383,45 +382,47 @@ const InputTab = ({
  const [inputType, setInputType] = useState(InputTypeEnum.q);

  return (
-    <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)}
-      />
+    <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 mt={3}>
+      <Box mt={3} flex={'1 0 0'}>
        {inputType === InputTypeEnum.q && (
          <Textarea
            placeholder={t('core.dataset.data.Data Content Placeholder', { maxToken })}
            maxLength={maxToken}
-            rows={isPc ? 24 : 12}
+            h={'100%'}
            bg={'myWhite.400'}
            {...register(`q`, {
              required: true
@@ -433,6 +434,7 @@ 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}
@@ -440,6 +442,6 @@ const InputTab = ({
          />
        )}
      </Box>
-    </Box>
+    </Flex>
  );
 };
--- a/projects/app/src/pages/dataset/detail/index.tsx
+++ b/projects/app/src/pages/dataset/detail/index.tsx
@@ -27,6 +27,7 @@ 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'));
@@ -145,7 +146,9 @@ const Detail = ({ datasetId, currentTab }: { datasetId: string; currentTab: `${T

  return (
    <>
-      <Script src="/js/pdf.js" strategy="lazyOnload"></Script>
+      <Head>
+        <title>{datasetDetail?.name}</title>
+      </Head>
      <PageContainer>
        <Flex flexDirection={['column', 'row']} h={'100%'} pt={[4, 0]}>
          {isPc ? (