V4.6.6-2 (#673)

2023-12-31 14:12:51 +08:00
parent ccca0468da
commit 9ccfda47b7
270 changed files with 8182 additions and 1295 deletions
--- a/projects/app/src/components/core/module/DatasetParamsModal.tsx
+++ b/projects/app/src/components/core/module/DatasetParamsModal.tsx
@@ -1,5 +1,15 @@
 import React, { useMemo, useState } from 'react';
-import { Box, Button, ModalBody, ModalFooter, Textarea } from '@chakra-ui/react';
+import {
+  Box,
+  Button,
+  Checkbox,
+  Divider,
+  Flex,
+  ModalBody,
+  ModalFooter,
+  Textarea,
+  useTheme
+} from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import MySlider from '@/components/Slider';
@@ -12,43 +22,58 @@ import { reRankModelList } from '@/web/common/system/staticData';
 import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
 import { DatasetSearchModeMap } from '@fastgpt/global/core/dataset/constant';
 import MyRadio from '@/components/common/MyRadio';
+import MyIcon from '@/components/Icon';

 type DatasetParamsProps = {
-  similarity?: number;
-  limit?: number;
  searchMode: `${DatasetSearchModeEnum}`;
  searchEmptyText?: string;
+  limit?: number;
+  similarity?: number;
+  usingReRank?: boolean;
  maxTokens?: number;
 };

 const DatasetParamsModal = ({
+  searchMode = DatasetSearchModeEnum.embedding,
  searchEmptyText,
  limit,
  similarity,
-  searchMode = DatasetSearchModeEnum.embedding,
+  usingReRank,
  maxTokens = 3000,
  onClose,
  onSuccess
 }: DatasetParamsProps & { onClose: () => void; onSuccess: (e: DatasetParamsProps) => void }) => {
  const { t } = useTranslation();
+  const theme = useTheme();
  const [refresh, setRefresh] = useState(false);
  const { register, setValue, getValues, handleSubmit } = useForm<DatasetParamsProps>({
    defaultValues: {
      searchEmptyText,
      limit,
      similarity,
-      searchMode
+      searchMode,
+      usingReRank
    }
  });

  const searchModeList = useMemo(() => {
    const list = Object.values(DatasetSearchModeMap);
-    if (reRankModelList.length > 0) {
-      return list;
-    }
-    return list.slice(0, 1);
+    return list;
  }, []);

+  const showSimilarity = useMemo(() => {
+    if (similarity === undefined) return false;
+    if (
+      getValues('searchMode') === DatasetSearchModeEnum.fullTextRecall &&
+      !getValues('usingReRank')
+    )
+      return false;
+    if (getValues('searchMode') === DatasetSearchModeEnum.mixedRecall && !getValues('usingReRank'))
+      return false;
+
+    return true;
+  }, [getValues, similarity, refresh]);
+
  return (
    <MyModal
      isOpen={true}
@@ -57,7 +82,6 @@ const DatasetParamsModal = ({
      title={t('core.dataset.search.Dataset Search Params')}
      w={['90vw', '550px']}
      h={['90vh', 'auto']}
-      overflow={'unset'}
      isCentered={searchEmptyText !== undefined}
    >
      <ModalBody flex={['1 0 0', 'auto']} overflow={'auto'}>
@@ -71,9 +95,73 @@ const DatasetParamsModal = ({
            setRefresh(!refresh);
          }}
        />
+        {usingReRank !== undefined && reRankModelList.length > 0 && (
+          <>
+            <Divider my={4} />
+            <Flex
+              alignItems={'center'}
+              cursor={'pointer'}
+              userSelect={'none'}
+              py={3}
+              pl={'14px'}
+              pr={'16px'}
+              border={theme.borders.sm}
+              borderWidth={'1.5px'}
+              borderRadius={'md'}
+              position={'relative'}
+              {...(getValues('usingReRank')
+                ? {
+                    borderColor: 'primary.400'
+                  }
+                : {})}
+              onClick={(e) => {
+                setValue('usingReRank', !getValues('usingReRank'));
+                setRefresh((state) => !state);
+              }}
+            >
+              <MyIcon name="core/dataset/rerank" w={'18px'} mr={'14px'} />
+              <Box pr={2} color={'myGray.800'} flex={'1 0 0'}>
+                <Box>{t('core.dataset.search.ReRank')}</Box>
+                <Box fontSize={['xs', 'sm']} color={'myGray.500'}>
+                  {t('core.dataset.search.ReRank desc')}
+                </Box>
+              </Box>
+              <Box position={'relative'} w={'18px'} h={'18px'}>
+                <Checkbox colorScheme="primary" isChecked={getValues('usingReRank')} size="lg" />
+                <Box position={'absolute'} top={0} right={0} bottom={0} left={0} zIndex={1}></Box>
+              </Box>
+            </Flex>
+          </>
+        )}

-        {similarity !== undefined && (
+        {limit !== undefined && (
          <Box display={['block', 'flex']} py={8} mt={3}>
+            <Box flex={'0 0 100px'} mb={[8, 0]}>
+              {t('core.dataset.search.Max Tokens')}
+              <MyTooltip label={t('core.dataset.search.Max Tokens Tips')} forceShow>
+                <QuestionOutlineIcon ml={1} />
+              </MyTooltip>
+            </Box>
+            <Box flex={1} mx={4}>
+              <MySlider
+                markList={[
+                  { label: '100', value: 100 },
+                  { label: maxTokens, value: maxTokens }
+                ]}
+                min={100}
+                max={maxTokens}
+                step={50}
+                value={getValues(ModuleInputKeyEnum.datasetLimit) ?? 1000}
+                onChange={(val) => {
+                  setValue(ModuleInputKeyEnum.datasetLimit, val);
+                  setRefresh(!refresh);
+                }}
+              />
+            </Box>
+          </Box>
+        )}
+        {showSimilarity && (
+          <Box display={['block', 'flex']} py={8}>
            <Box flex={'0 0 100px'} mb={[8, 0]}>
              {t('core.dataset.search.Min Similarity')}
              <MyTooltip label={t('core.dataset.search.Min Similarity Tips')} forceShow>
@@ -98,32 +186,7 @@ const DatasetParamsModal = ({
            </Box>
          </Box>
        )}
-        {limit !== undefined && (
-          <Box display={['block', 'flex']} py={8}>
-            <Box flex={'0 0 100px'} mb={[8, 0]}>
-              {t('core.dataset.search.Max Tokens')}
-              <MyTooltip label={t('core.dataset.search.Max Tokens Tips')} forceShow>
-                <QuestionOutlineIcon ml={1} />
-              </MyTooltip>
-            </Box>
-            <Box flex={1} mx={4}>
-              <MySlider
-                markList={[
-                  { label: '300', value: 300 },
-                  { label: maxTokens, value: maxTokens }
-                ]}
-                min={300}
-                max={maxTokens}
-                step={10}
-                value={getValues(ModuleInputKeyEnum.datasetLimit) ?? 1000}
-                onChange={(val) => {
-                  setValue(ModuleInputKeyEnum.datasetLimit, val);
-                  setRefresh(!refresh);
-                }}
-              />
-            </Box>
-          </Box>
-        )}
+
        {searchEmptyText !== undefined && (
          <Box display={['block', 'flex']} pt={3}>
            <Box flex={'0 0 100px'} mb={[2, 0]}>
--- a/projects/app/src/components/core/module/Flow/components/modules/TTSSelect.tsx
+++ b/projects/app/src/components/core/module/Flow/components/modules/TTSSelect.tsx
@@ -8,7 +8,7 @@ import MySelect from '@/components/Select';
 import { TTSTypeEnum } from '@/constants/app';
 import type { AppTTSConfigType } from '@fastgpt/global/core/module/type.d';
 import { useAudioPlay } from '@/web/common/utils/voice';
-import { audioSpeechModels } from '@/web/common/system/staticData';
+import { audioSpeechModelList } from '@/web/common/system/staticData';
 import MyModal from '@/components/MyModal';
 import MySlider from '@/components/Slider';

@@ -26,7 +26,7 @@ const TTSSelect = ({
    () => [
      { label: t('core.app.tts.Close'), value: TTSTypeEnum.none },
      { label: t('core.app.tts.Web'), value: TTSTypeEnum.web },
-      ...audioSpeechModels.map((item) => item?.voices || []).flat()
+      ...audioSpeechModelList.map((item) => item?.voices || []).flat()
    ],
    [t]
  );
@@ -52,7 +52,7 @@ const TTSSelect = ({
      if (e === TTSTypeEnum.none || e === TTSTypeEnum.web) {
        onChange({ type: e as `${TTSTypeEnum}` });
      } else {
-        const audioModel = audioSpeechModels.find(
+        const audioModel = audioSpeechModelList.find(
          (item) => item.voices?.find((voice) => voice.value === e)
        );
        if (!audioModel) {
--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectAiModel.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectAiModel.tsx
@@ -1,10 +1,9 @@
 import React, { useCallback, useEffect } from 'react';
 import type { RenderInputProps } from '../type';
 import { onChangeNode } from '../../../../FlowProvider';
-import MySelect from '@/components/Select';
+import SelectAiModel from '@/components/Select/SelectAiModel';
 import { FlowNodeInputTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { chatModelList, cqModelList, extractModelList } from '@/web/common/system/staticData';
-import { formatPrice } from '@fastgpt/global/support/wallet/bill/tools';

 const SelectAiModelRender = ({ item, inputs = [], moduleId }: RenderInputProps) => {
  const modelList = (() => {
@@ -16,8 +15,7 @@ const SelectAiModelRender = ({ item, inputs = [], moduleId }: RenderInputProps)
  })().map((item) => ({
    model: item.model,
    name: item.name,
-    maxResponse: item.maxResponse,
-    price: item.price
+    maxResponse: item.maxResponse
  }));

  const onChangeModel = useCallback(
@@ -55,11 +53,9 @@ const SelectAiModelRender = ({ item, inputs = [], moduleId }: RenderInputProps)
  );

  const list = modelList.map((item) => {
-    const priceStr = `(${formatPrice(item.price, 1000)}元/1k Tokens)`;
-
    return {
      value: item.model,
-      label: `${item.name}${priceStr}`
+      label: item.name
    };
  });

@@ -70,7 +66,7 @@ const SelectAiModelRender = ({ item, inputs = [], moduleId }: RenderInputProps)
  }, [item.value, list, onChangeModel]);

  return (
-    <MySelect
+    <SelectAiModel
      minW={'350px'}
      width={'100%'}
      value={item.value}
--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectDatasetParams.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectDatasetParams.tsx
@@ -17,7 +17,8 @@ const SelectDatasetParam = ({ inputs = [], moduleId }: RenderInputProps) => {
  const [data, setData] = useState({
    searchMode: DatasetSearchModeEnum.embedding,
    limit: 5,
-    similarity: 0.5
+    similarity: 0.5,
+    usingReRank: false
  });

  const tokenLimit = useMemo(() => {