fix: prompt toolcall ui (#4139)

* load log error adapt

* fix: prompt toolcall ui

* perf: commercial function tip

* update package

projects/app/package.json

@@ -82,7 +82,7 @@
     "@types/react-syntax-highlighter": "^15.5.6",
     "@types/request-ip": "^0.0.37",
     "eslint": "8.56.0",
-    "eslint-config-next": "14.2.3",
+    "eslint-config-next": "14.2.24",
     "nextjs-node-loader": "^1.1.5",
     "typescript": "^5.1.3",
     "vitest": "^3.0.2"

projects/app/src/pageComponents/account/model/Log/index.tsx

@@ -298,11 +298,15 @@ const LogDetail = ({ data, onClose }: { data: LogDetailType; onClose: () => void
   const { data: detailData } = useRequest2(
     async () => {
       if (data.code === 200) return data;
-      const res = await getLogDetail(data.id);
-      return {
-        ...res,
-        ...data
-      };
+      try {
+        const res = await getLogDetail(data.id);
+        return {
+          ...res,
+          ...data
+        };
+      } catch (error) {
+        return data;
+      }
     },
     {
       manual: false

projects/app/src/pageComponents/app/detail/Publish/index.tsx

@@ -99,7 +99,7 @@ const OutLink = () => {
             if (!feConfigs.isPlus && config.isProFn) {
               toast({
                 status: 'warning',
-                title: t('common:common.system.Commercial version function')
+                title: t('common:commercial_function_tip')
               });
             } else {
               setLinkType(e as PublishChannelEnum);

projects/app/src/pageComponents/dataset/detail/Import/commonProgress/DataProcess.tsx

@@ -159,23 +159,36 @@ function DataProcess() {
                   gridTemplateColumns={'repeat(2, 1fr)'}
                 />
               </Box>
-              {trainingType === DatasetCollectionDataProcessModeEnum.chunk && feConfigs?.isPlus && (
+              {trainingType === DatasetCollectionDataProcessModeEnum.chunk && (
                 <Box mt={6}>
                   <Box fontSize={'sm'} mb={2} color={'myGray.600'}>
                     {t('dataset:enhanced_indexes')}
                   </Box>
                   <HStack gap={[3, 7]}>
                     <HStack flex={'1'} spacing={1}>
-                      <Checkbox {...register('autoIndexes')}>
-                        <FormLabel>{t('dataset:auto_indexes')}</FormLabel>
-                      </Checkbox>
+                      <MyTooltip
+                        label={!feConfigs?.isPlus ? t('common:commercial_function_tip') : ''}
+                      >
+                        <Checkbox isDisabled={!feConfigs?.isPlus} {...register('autoIndexes')}>
+                          <FormLabel>{t('dataset:auto_indexes')}</FormLabel>
+                        </Checkbox>
+                      </MyTooltip>
                       <QuestionTip label={t('dataset:auto_indexes_tips')} />
                     </HStack>
                     <HStack flex={'1'} spacing={1}>
                       <MyTooltip
-                        label={!datasetDetail?.vlmModel ? t('common:error_vlm_not_config') : ''}
+                        label={
+                          !feConfigs?.isPlus
+                            ? t('common:commercial_function_tip')
+                            : !datasetDetail?.vlmModel
+                              ? t('common:error_vlm_not_config')
+                              : ''
+                        }
                       >
-                        <Checkbox isDisabled={!datasetDetail?.vlmModel} {...register('imageIndex')}>
+                        <Checkbox
+                          isDisabled={!feConfigs?.isPlus || !datasetDetail?.vlmModel}
+                          {...register('imageIndex')}
+                        >
                           <FormLabel>{t('dataset:image_auto_parse')}</FormLabel>
                         </Checkbox>
                       </MyTooltip>

projects/app/src/pageComponents/dataset/detail/Info/index.tsx

@@ -230,30 +230,28 @@ const Info = ({ datasetId }: { datasetId: string }) => {
           </Box>
         </Box>
 
-        {feConfigs?.isPlus && (
-          <Box pt={5}>
-            <FormLabel fontSize={'mini'} fontWeight={'500'}>
-              {t('dataset:vllm_model')}
-            </FormLabel>
-            <Box pt={2}>
-              <AIModelSelector
-                w={'100%'}
-                value={vlmModel?.model}
-                list={vllmModelList.map((item) => ({
-                  label: item.name,
-                  value: item.model
-                }))}
-                fontSize={'mini'}
-                onChange={(e) => {
-                  const vlmModel = vllmModelList.find((item) => item.model === e);
-                  if (!vlmModel) return;
-                  setValue('vlmModel', vlmModel);
-                  return handleSubmit((data) => onSave({ ...data, vlmModel }))();
-                }}
-              />
-            </Box>
+        <Box pt={5}>
+          <FormLabel fontSize={'mini'} fontWeight={'500'}>
+            {t('dataset:vllm_model')}
+          </FormLabel>
+          <Box pt={2}>
+            <AIModelSelector
+              w={'100%'}
+              value={vlmModel?.model}
+              list={vllmModelList.map((item) => ({
+                label: item.name,
+                value: item.model
+              }))}
+              fontSize={'mini'}
+              onChange={(e) => {
+                const vlmModel = vllmModelList.find((item) => item.model === e);
+                if (!vlmModel) return;
+                setValue('vlmModel', vlmModel);
+                return handleSubmit((data) => onSave({ ...data, vlmModel }))();
+              }}
+            />
           </Box>
-        )}
+        </Box>
 
         {feConfigs?.isPlus && (
           <Flex alignItems={'center'} pt={5}>

projects/app/src/pageComponents/dataset/list/CreateModal.tsx

@@ -244,38 +244,36 @@ const CreateModal = ({
           </Box>
         </Flex>
 
-        {feConfigs?.isPlus && (
-          <Flex
-            mt={6}
-            alignItems={['flex-start', 'center']}
-            justify={'space-between'}
-            flexDir={['column', 'row']}
+        <Flex
+          mt={6}
+          alignItems={['flex-start', 'center']}
+          justify={'space-between'}
+          flexDir={['column', 'row']}
+        >
+          <HStack
+            spacing={1}
+            flex={['', '0 0 110px']}
+            fontSize={'sm'}
+            color={'myGray.900'}
+            fontWeight={500}
+            pb={['12px', '0']}
           >
-            <HStack
-              spacing={1}
-              flex={['', '0 0 110px']}
-              fontSize={'sm'}
-              color={'myGray.900'}
-              fontWeight={500}
-              pb={['12px', '0']}
-            >
-              <Box>{t('dataset:vllm_model')}</Box>
-            </HStack>
-            <Box w={['100%', '300px']}>
-              <AIModelSelector
-                w={['100%', '300px']}
-                value={vlmModel}
-                list={vllmModelList.map((item) => ({
-                  label: item.name,
-                  value: item.model
-                }))}
-                onChange={(e) => {
-                  setValue('vlmModel', e);
-                }}
-              />
-            </Box>
-          </Flex>
-        )}
+            <Box>{t('dataset:vllm_model')}</Box>
+          </HStack>
+          <Box w={['100%', '300px']}>
+            <AIModelSelector
+              w={['100%', '300px']}
+              value={vlmModel}
+              list={vllmModelList.map((item) => ({
+                label: item.name,
+                value: item.model
+              }))}
+              onChange={(e) => {
+                setValue('vlmModel', e);
+              }}
+            />
+          </Box>
+        </Flex>
 
         {/* @ts-ignore */}
         <ApiDatasetForm type={type} form={form} />

projects/app/src/pages/api/core/app/list.ts

@@ -19,7 +19,6 @@ import { concatPer } from '@fastgpt/service/support/permission/controller';
 import { getGroupsByTmbId } from '@fastgpt/service/support/permission/memberGroup/controllers';
 import { getOrgIdSetWithParentByTmbId } from '@fastgpt/service/support/permission/org/controllers';
 import { addSourceMember } from '@fastgpt/service/support/user/utils';
-import { getNanoid } from '../../../../../../../packages/global/common/string/tools';
 
 export type ListAppBody = {
   parentId?: ParentIdType;

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

@@ -70,7 +70,7 @@ const Dataset = () => {
       ) {
         return toast({
           status: 'warning',
-          title: t('common:common.system.Commercial version function')
+          title: t('common:commercial_function_tip')
         });
       }
       setCreateDatasetType(e);