4.6.4-alpha (#582)

projects/app/src/components/core/module/DatasetParamsModal.tsx

@@ -18,6 +18,7 @@ type DatasetParamsProps = {
   limit?: number;
   searchMode: `${DatasetSearchModeEnum}`;
   searchEmptyText?: string;
+  maxTokens?: number;
 };
 
 const DatasetParamsModal = ({
@@ -25,6 +26,7 @@ const DatasetParamsModal = ({
   limit,
   similarity,
   searchMode = DatasetSearchModeEnum.embedding,
+  maxTokens = 3000,
   onClose,
   onSuccess
 }: DatasetParamsProps & { onClose: () => void; onSuccess: (e: DatasetParamsProps) => void }) => {
@@ -52,8 +54,8 @@ const DatasetParamsModal = ({
       isOpen={true}
       onClose={onClose}
       iconSrc="/imgs/modal/params.svg"
-      title={'搜索参数调整'}
-      minW={['90vw', '500px']}
+      title={t('core.dataset.search.Dataset Search Params')}
+      w={['90vw', '550px']}
       h={['90vh', 'auto']}
       overflow={'unset'}
       isCentered={searchEmptyText !== undefined}
@@ -78,36 +80,42 @@ const DatasetParamsModal = ({
                 <QuestionOutlineIcon ml={1} />
               </MyTooltip>
             </Box>
-            <MySlider
-              markList={[
-                { label: '0', value: 0 },
-                { label: '1', value: 1 }
-              ]}
-              min={0}
-              max={1}
-              step={0.01}
-              value={getValues(ModuleInputKeyEnum.datasetSimilarity) ?? 0.5}
-              onChange={(val) => {
-                setValue(ModuleInputKeyEnum.datasetSimilarity, val);
-                setRefresh(!refresh);
-              }}
-            />
+            <Box flex={1} mx={4}>
+              <MySlider
+                markList={[
+                  { label: '0', value: 0 },
+                  { label: '1', value: 1 }
+                ]}
+                min={0}
+                max={1}
+                step={0.01}
+                value={getValues(ModuleInputKeyEnum.datasetSimilarity) ?? 0.5}
+                onChange={(val) => {
+                  setValue(ModuleInputKeyEnum.datasetSimilarity, val);
+                  setRefresh(!refresh);
+                }}
+              />
+            </Box>
           </Box>
         )}
         {limit !== undefined && (
           <Box display={['block', 'flex']} py={8}>
             <Box flex={'0 0 100px'} mb={[8, 0]}>
-              {t('core.dataset.search.Top K')}
+              {t('core.dataset.search.Max Tokens')}
+              <MyTooltip label={t('core.dataset.search.Max Tokens Tips')} forceShow>
+                <QuestionOutlineIcon ml={1} />
+              </MyTooltip>
             </Box>
-            <Box flex={1}>
+            <Box flex={1} mx={4}>
               <MySlider
                 markList={[
-                  { label: '1', value: 1 },
-                  { label: '30', value: 30 }
+                  { label: '300', value: 300 },
+                  { label: maxTokens, value: maxTokens }
                 ]}
-                min={1}
-                max={30}
-                value={getValues(ModuleInputKeyEnum.datasetLimit) ?? 5}
+                min={300}
+                max={maxTokens}
+                step={10}
+                value={getValues(ModuleInputKeyEnum.datasetLimit) ?? 1000}
                 onChange={(val) => {
                   setValue(ModuleInputKeyEnum.datasetLimit, val);
                   setRefresh(!refresh);

projects/app/src/components/core/module/Flow/components/render/RenderInput.tsx

@@ -17,7 +17,7 @@ import {
   Grid,
   Switch
 } from '@chakra-ui/react';
-import { FlowNodeInputTypeEnum } from '@fastgpt/global/core/module/node/constant';
+import { FlowNodeInputTypeEnum, FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import dynamic from 'next/dynamic';
 import { onChangeNode, useFlowProviderStore } from '../../FlowProvider';
@@ -37,6 +37,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { EditFieldModeType, EditFieldType } from '../modules/FieldEditModal';
 import { feConfigs } from '@/web/common/system/staticData';
 import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constant';
+import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
 
 const FieldEditModal = dynamic(() => import('../modules/FieldEditModal'));
 const SelectAppModal = dynamic(() => import('../../SelectAppModal'));
@@ -635,9 +636,12 @@ const SelectAppRender = React.memo(function SelectAppRender({ item, moduleId }:
 });
 
 const SelectDatasetParamsRender = React.memo(function SelectDatasetParamsRender({
+  item,
   inputs = [],
   moduleId
 }: RenderProps) {
+  const { nodes } = useFlowProviderStore();
+
   const { t } = useTranslation();
   const [data, setData] = useState({
     searchMode: DatasetSearchModeEnum.embedding,
@@ -645,6 +649,23 @@ const SelectDatasetParamsRender = React.memo(function SelectDatasetParamsRender(
     similarity: 0.5
   });
 
+  const tokenLimit = useMemo(() => {
+    let maxTokens = 3000;
+
+    nodes.forEach((item) => {
+      if (item.type === FlowNodeTypeEnum.chatNode) {
+        const model =
+          item.data.inputs.find((item) => item.key === ModuleInputKeyEnum.aiModel)?.value || '';
+        const quoteMaxToken =
+          chatModelList.find((item) => item.model === model)?.quoteMaxToken || 3000;
+
+        maxTokens = Math.max(maxTokens, quoteMaxToken);
+      }
+    });
+
+    return maxTokens;
+  }, [nodes]);
+
   const { isOpen, onOpen, onClose } = useDisclosure();
 
   useEffect(() => {
@@ -671,6 +692,7 @@ const SelectDatasetParamsRender = React.memo(function SelectDatasetParamsRender(
       {isOpen && (
         <DatasetParamsModal
           {...data}
+          maxTokens={tokenLimit}
           onClose={onClose}
           onSuccess={(e) => {
             for (let key in e) {