4.6.8 supplement (#831)

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/account/components/BillTable.tsx

@@ -71,7 +71,6 @@ const BillTable = () => {
       })),
     [members]
   );
-  console.log(members);
 
   const {
     data: bills,

projects/app/src/pages/api/core/dataset/searchTest.ts

@@ -94,6 +94,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       data: {
         list: searchRes,
         duration: `${((Date.now() - start) / 1000).toFixed(3)}s`,
+        usingQueryExtension: !!aiExtensionResult,
         ...result
       }
     });

projects/app/src/pages/api/plugins/TFSwitch/index.ts

@@ -10,9 +10,7 @@ type Props = HttpBodyType<{
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const {
-      data: { input, rule = '' }
-    } = req.body as Props;
+    const { input, rule = '' } = req.body as Props;
 
     await authRequestFromLocal({ req });
 

projects/app/src/pages/api/plugins/customFeedback/index.ts

@@ -5,6 +5,9 @@ import { addCustomFeedbacks } from '@fastgpt/service/core/chat/controller';
 import { authRequestFromLocal } from '@fastgpt/service/support/permission/auth/common';
 
 type Props = HttpBodyType<{
+  appId: string;
+  chatId?: string;
+  responseChatItemId?: string;
   defaultFeedback: string;
   customFeedback: string;
 }>;
@@ -15,7 +18,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       appId,
       chatId,
       responseChatItemId: chatItemId,
-      data: { defaultFeedback, customFeedback }
+      defaultFeedback,
+      customFeedback
     } = req.body as Props;
 
     await authRequestFromLocal({ req });

projects/app/src/pages/api/plugins/textEditor/index.ts

@@ -12,7 +12,8 @@ type Props = HttpBodyType<{
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
     const {
-      data: { text, ...obj }
+      text,
+      DYNAMIC_INPUT_KEY: { ...obj }
     } = req.body as Props;
 
     await authRequestFromLocal({ req });

projects/app/src/pages/app/detail/components/SimpleEdit/EditForm.tsx

@@ -26,7 +26,6 @@ import { useAppStore } from '@/web/core/app/store/useAppStore';
 import { postForm2Modules } from '@/web/core/app/utils';
 
 import dynamic from 'next/dynamic';
-import MySelect from '@/components/Select';
 import MyTooltip from '@/components/MyTooltip';
 import Avatar from '@/components/Avatar';
 import MyIcon from '@fastgpt/web/components/common/Icon';
@@ -36,6 +35,7 @@ import { DatasetSearchModeMap } from '@fastgpt/global/core/dataset/constants';
 import SelectAiModel from '@/components/Select/SelectAiModel';
 import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
 import { formatEditorVariablePickerIcon } from '@fastgpt/global/core/module/utils';
+import SearchParamsTip from '@/components/core/dataset/SearchParamsTip';
 
 const DatasetSelectModal = dynamic(() => import('@/components/core/module/DatasetSelectModal'));
 const DatasetParamsModal = dynamic(() => import('@/components/core/module/DatasetParamsModal'));
@@ -113,11 +113,6 @@ const EditForm = ({
     return llmModelList.find((item) => item.model === selectLLMModel)?.quoteMaxToken || 3000;
   }, [selectLLMModel, llmModelList]);
 
-  const datasetSearchMode = useMemo(() => {
-    if (!searchMode) return '';
-    return t(DatasetSearchModeMap[searchMode]?.title);
-  }, [searchMode, t]);
-
   const { mutate: onSubmitSave, isLoading: isSaving } = useRequest({
     mutationFn: async (data: AppSimpleEditFormType) => {
       const modules = await postForm2Modules(data);
@@ -308,23 +303,16 @@ const EditForm = ({
               </Flex>
             </Flex>
             {getValues('dataset.datasets').length > 0 && (
-              <Flex mt={1} color={'myGray.600'} fontSize={'sm'} mb={2}>
-                {t('core.dataset.search.search mode')}: {datasetSearchMode}
-                {', '}
-                {reRankModelList.length > 0 && (
-                  <>
-                    {t('core.dataset.search.ReRank')}:{' '}
-                    {getValues('dataset.usingReRank') ? '✅' : '✖'}
-                  </>
-                )}
-                {', '}
-                {t('core.dataset.search.Min Similarity')}: {getValues('dataset.similarity')}
-                {', '}
-                {t('core.dataset.search.Max Tokens')}: {getValues('dataset.limit')}
-                {getValues('dataset.searchEmptyText') === ''
-                  ? ''
-                  : t('core.dataset.Set Empty Result Tip')}
-              </Flex>
+              <Box my={3}>
+                <SearchParamsTip
+                  searchMode={searchMode}
+                  similarity={getValues('dataset.similarity')}
+                  limit={getValues('dataset.limit')}
+                  usingReRank={getValues('dataset.usingReRank')}
+                  usingQueryExtension={getValues('dataset.datasetSearchUsingExtensionQuery')}
+                  responseEmptyText={getValues('dataset.searchEmptyText')}
+                />
+              </Box>
             )}
             <Grid
               gridTemplateColumns={['repeat(2, minmax(0, 1fr))', 'repeat(3, minmax(0, 1fr))']}

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

@@ -120,43 +120,39 @@ const Info = ({ datasetId }: { datasetId: string }) => {
         </Box>
         <Input flex={[1, '0 0 300px']} maxLength={30} {...register('name')} />
       </Flex>
-      {vectorModelList.length > 1 && (
-        <Flex mt={8} w={'100%'} alignItems={'center'}>
-          <Box flex={['0 0 90px', '0 0 160px']} w={0}>
-            {t('core.ai.model.Vector Model')}
-          </Box>
-          <Box flex={[1, '0 0 300px']}>{getValues('vectorModel').name}</Box>
-        </Flex>
-      )}
+      <Flex mt={8} w={'100%'} alignItems={'center'}>
+        <Box flex={['0 0 90px', '0 0 160px']} w={0}>
+          {t('core.ai.model.Vector Model')}
+        </Box>
+        <Box flex={[1, '0 0 300px']}>{getValues('vectorModel').name}</Box>
+      </Flex>
       <Flex mt={8} w={'100%'} alignItems={'center'}>
         <Box flex={['0 0 90px', '0 0 160px']} w={0}>
           {t('core.Max Token')}
         </Box>
         <Box flex={[1, '0 0 300px']}>{getValues('vectorModel').maxToken}</Box>
       </Flex>
-      {datasetModelList.length > 1 && (
-        <Flex mt={6} alignItems={'center'}>
-          <Box flex={['0 0 90px', '0 0 160px']} w={0}>
-            {t('core.ai.model.Dataset Agent Model')}
-          </Box>
-          <Box flex={[1, '0 0 300px']}>
-            <MySelect
-              w={'100%'}
-              value={getValues('agentModel').model}
-              list={datasetModelList.map((item) => ({
-                label: item.name,
-                value: item.model
-              }))}
-              onchange={(e) => {
-                const agentModel = datasetModelList.find((item) => item.model === e);
-                if (!agentModel) return;
-                setValue('agentModel', agentModel);
-                setRefresh((state) => !state);
-              }}
-            />
-          </Box>
-        </Flex>
-      )}
+      <Flex mt={6} alignItems={'center'}>
+        <Box flex={['0 0 90px', '0 0 160px']} w={0}>
+          {t('core.ai.model.Dataset Agent Model')}
+        </Box>
+        <Box flex={[1, '0 0 300px']}>
+          <MySelect
+            w={'100%'}
+            value={getValues('agentModel').model}
+            list={datasetModelList.map((item) => ({
+              label: item.name,
+              value: item.model
+            }))}
+            onchange={(e) => {
+              const agentModel = datasetModelList.find((item) => item.model === e);
+              if (!agentModel) return;
+              setValue('agentModel', agentModel);
+              setRefresh((state) => !state);
+            }}
+          />
+        </Box>
+      </Flex>
 
       <Flex mt={8} alignItems={'center'} w={'100%'}>
         <Box flex={['0 0 90px', '0 0 160px']}>{t('common.Intro')}</Box>

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

@@ -41,6 +41,7 @@ import { delay } from '@fastgpt/global/common/system/utils';
 import QuoteItem from '@/components/core/dataset/QuoteItem';
 import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
+import SearchParamsTip from '@/components/core/dataset/SearchParamsTip';
 
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 12);
 
@@ -121,7 +122,8 @@ const Test = ({ datasetId }: { datasetId: string }) => {
         searchMode: res.searchMode,
         usingReRank: res.usingReRank,
         limit: res.limit,
-        similarity: res.similarity
+        similarity: res.similarity,
+        usingQueryExtension: res.usingQueryExtension
       };
       pushDatasetTestItem(testItem);
       setDatasetTestItem(testItem);
@@ -477,41 +479,15 @@ const TestResults = React.memo(function TestResults({
             <MyIcon name={'common/paramsLight'} w={'18px'} mr={2} />
             {t('core.dataset.test.Test params')}
           </Flex>
-          <TableContainer
-            mt={3}
-            bg={'primary.50'}
-            borderRadius={'lg'}
-            borderWidth={'1px'}
-            borderColor={'primary.1'}
-          >
-            <Table>
-              <Thead>
-                <Tr color={'myGray.600'}>
-                  <Th>{t('core.dataset.search.search mode')}</Th>
-                  <Th>{t('core.dataset.search.ReRank')}</Th>
-                  <Th>{t('core.dataset.search.Max Tokens')}</Th>
-                  <Th>{t('core.dataset.search.Min Similarity')}</Th>
-                </Tr>
-              </Thead>
-              <Tbody>
-                <Tr color={'myGray.800'}>
-                  <Td pt={0}>
-                    <Flex alignItems={'center'}>
-                      <MyIcon
-                        name={DatasetSearchModeMap[datasetTestItem.searchMode]?.icon as any}
-                        w={'12px'}
-                        mr={'1px'}
-                      />
-                      {t(DatasetSearchModeMap[datasetTestItem.searchMode]?.title)}
-                    </Flex>
-                  </Td>
-                  <Td pt={0}>{datasetTestItem.usingReRank ? '✅' : '❌'}</Td>
-                  <Td pt={0}>{datasetTestItem.limit}</Td>
-                  <Td pt={0}>{datasetTestItem.similarity}</Td>
-                </Tr>
-              </Tbody>
-            </Table>
-          </TableContainer>
+          <Box mt={3}>
+            <SearchParamsTip
+              searchMode={datasetTestItem.searchMode}
+              similarity={datasetTestItem.similarity}
+              limit={datasetTestItem.limit}
+              usingReRank={datasetTestItem.usingReRank}
+              usingQueryExtension={datasetTestItem.usingQueryExtension}
+            />
+          </Box>
 
           <Flex mt={5} mb={3} alignItems={'center'}>
             <Flex fontSize={'xl'} color={'myGray.900'} alignItems={'center'}>