add model test log (#4272)

* sync collection * remove lock * add model test log * update ui * update log * fix: channel test * preview chunk ui * test model ux * test model log * perf: dataset selector * fix: system plugin auth * update nextjs

add model test log (#4272)
* sync collection * remove lock * add model test log * update ui * update log * fix: channel test * preview chunk ui * test model ux * test model log * perf: dataset selector * fix: system plugin auth * update nextjs
2fcf4216 · Archer · archer · a680b565 · 2fcf4216 · 2fcf4216
Commit 2fcf4216 authored Mar 24, 2025 by Archer Committed by archer Mar 27, 2025
24 changed files
--- a/docSite/content/zh-cn/docs/development/upgrading/492.md
+++ b/docSite/content/zh-cn/docs/development/upgrading/492.md
@@ -25,7 +25,11 @@ weight: 799
 2. 邀请链接交互。
 3. 无 SSL 证书时复制失败，会提示弹窗用于手动复制。
 4. FastGPT 未内置 ai proxy 渠道时，也能正常展示其名称。
+5. 升级 nextjs 版本至 14.2.25。
 ## 🐛 修复
 1. 飞书和语雀知识库无法同步。
+2. 渠道测试时，如果配置了模型自定义请求地址，会走自定义请求地址，而不是渠道请求地址。
+3. 语音识别模型测试未启用的模型时，无法正常测试。
+4. 管理员配置系统插件时，如果插件包含其他系统应用，无法正常鉴权。
\ No newline at end of file
--- a/packages/global/core/plugin/type.d.ts
+++ b/packages/global/core/plugin/type.d.ts
@@ -41,6 +41,8 @@ export type PluginTemplateType = PluginRuntimeType & {
 export type PluginRuntimeType = {
  id: string;
  teamId?: string;
+  tmbId?: string;
  name: string;
  avatar: string;
  showStatus?: boolean;

--- a/packages/global/package.json
+++ b/packages/global/package.json
@@ -10,7 +10,7 @@
    "js-yaml": "^4.1.0",
    "jschardet": "3.1.1",
    "nanoid": "^5.1.3",
-    "next": "14.2.24",
+    "next": "14.2.25",
    "openai": "4.61.0",
    "openapi-types": "^12.1.3",
    "json5": "^2.2.3",

--- a/packages/service/core/ai/audio/transcriptions.ts
+++ b/packages/service/core/ai/audio/transcriptions.ts
@@ -3,21 +3,25 @@ import { getAxiosConfig } from '../config';
 import axios from 'axios';
 import FormData from 'form-data';
 import { getSTTModel } from '../model';
+import { STTModelType } from '@fastgpt/global/core/ai/model.d';
 export const aiTranscriptions = async ({
-  model,
+  model: modelData,
  fileStream,
  headers
 }: {
-  model: string;
+  model: STTModelType;
  fileStream: fs.ReadStream;
  headers?: Record<string, string>;
 }) => {
+  if (!modelData) {
+    return Promise.reject('no model');
+  }
  const data = new FormData();
-  data.append('model', model);
+  data.append('model', modelData.model);
  data.append('file', fileStream);
-  const modelData = getSTTModel(model);
  const aiAxiosConfig = getAxiosConfig();
  const { data: result } = await axios<{ text: string }>({

--- a/packages/service/core/app/plugin/controller.ts
+++ b/packages/service/core/app/plugin/controller.ts
@@ -37,11 +37,12 @@ export async function splitCombinePluginId(id: string) {
  return { source, pluginId: id };
 }
-type ChildAppType = SystemPluginTemplateItemType & { teamId?: string };
+type ChildAppType = SystemPluginTemplateItemType & { teamId?: string; tmbId?: string };
 const getSystemPluginTemplateById = async (
  pluginId: string,
  versionId?: string
-): Promise<SystemPluginTemplateItemType> => {
+): Promise<ChildAppType> => {
  const item = getSystemPluginTemplates().find((plugin) => plugin.id === pluginId);
  if (!item) return Promise.reject(PluginErrEnum.unAuth);
@@ -67,12 +68,17 @@ const getSystemPluginTemplateById = async (
      : await getAppLatestVersion(plugin.associatedPluginId, app);
    if (!version.versionId) return Promise.reject('App version not found');
-    plugin.workflow = {
+    return {
+      ...plugin,
+      workflow: {
        nodes: version.nodes,
        edges: version.edges,
        chatConfig: version.chatConfig
+      },
+      version: versionId || String(version.versionId),
+      teamId: String(app.teamId),
+      tmbId: String(app.tmbId)
    };
-    plugin.version = versionId || String(version.versionId);
  }
  return plugin;
 };
@@ -168,6 +174,7 @@ export async function getChildAppRuntimeById(
      return {
        id: String(item._id),
        teamId: String(item.teamId),
+        tmbId: String(item.tmbId),
        name: item.name,
        avatar: item.avatar,
        intro: item.intro,
@@ -187,6 +194,7 @@ export async function getChildAppRuntimeById(
        pluginOrder: 0
      };
    } else {
+      // System
      return getSystemPluginTemplateById(pluginId, versionId);
    }
  })();
@@ -194,6 +202,7 @@ export async function getChildAppRuntimeById(
  return {
    id: app.id,
    teamId: app.teamId,
+    tmbId: app.tmbId,
    name: app.name,
    avatar: app.avatar,
    showStatus: app.showStatus,

--- a/packages/service/core/workflow/dispatch/plugin/run.ts
+++ b/packages/service/core/workflow/dispatch/plugin/run.ts
@@ -88,9 +88,9 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
      : {}),
    runningAppInfo: {
      id: String(plugin.id),
-      // 如果是系统插件，则使用当前团队的 teamId 和 tmbId
+      // 如果系统插件有 teamId 和 tmbId，则使用系统插件的 teamId 和 tmbId（管理员指定了插件作为系统插件）
      teamId: plugin.teamId || runningAppInfo.teamId,
-      tmbId: pluginData?.tmbId || runningAppInfo.tmbId
+      tmbId: plugin.tmbId || runningAppInfo.tmbId
    },
    variables: runtimeVariables,
    query: getPluginRunUserQuery({

--- a/packages/service/package.json
+++ b/packages/service/package.json
@@ -26,7 +26,7 @@
    "mammoth": "^1.6.0",
    "mongoose": "^8.10.1",
    "multer": "1.4.5-lts.1",
-    "next": "14.2.24",
+    "next": "14.2.25",
    "nextjs-cors": "^2.2.0",
    "node-cron": "^3.0.3",
    "node-xlsx": "^0.24.0",

--- a/packages/web/i18n/en/account_model.json
+++ b/packages/web/i18n/en/account_model.json
@@ -12,6 +12,7 @@
  "channel_status_unknown": "unknown",
  "channel_type": "Manufacturer",
  "clear_model": "Clear the model",
+  "confirm_delete_channel": "Confirm the deletion of the [{{name}}] channel?",
  "copy_model_id_success": "Copyed model id",
  "create_channel": "Added channels",
  "default_url": "Default address",

--- a/packages/web/i18n/en/dataset.json
+++ b/packages/web/i18n/en/dataset.json
@@ -80,7 +80,7 @@
  "permission.des.write": "Ability to add and change knowledge base content",
  "preview_chunk": "Preview chunks",
  "preview_chunk_empty": "Unable to read the contents of the file",
-  "preview_chunk_intro": "Display up to 10 pieces",
+  "preview_chunk_intro": "A total of {{total}} blocks, up to 10",
  "preview_chunk_not_selected": "Click on the file on the left to preview",
  "rebuild_embedding_start_tip": "Index model switching task has started",
  "rebuilding_index_count": "Number of indexes being rebuilt: {{count}}",

--- a/packages/web/i18n/zh-CN/account_model.json
+++ b/packages/web/i18n/zh-CN/account_model.json
@@ -12,6 +12,7 @@
  "channel_status_unknown": "未知",
  "channel_type": "厂商",
  "clear_model": "清空模型",
+  "confirm_delete_channel": "确认删除 【{{name}}】渠道？",
  "copy_model_id_success": "已复制模型id",
  "create_channel": "新增渠道",
  "default_url": "默认地址",

--- a/packages/web/i18n/zh-CN/dataset.json
+++ b/packages/web/i18n/zh-CN/dataset.json
@@ -80,7 +80,7 @@
  "permission.des.write": "可增加和变更知识库内容",
  "preview_chunk": "分块预览",
  "preview_chunk_empty": "无法读取该文件内容",
-  "preview_chunk_intro": "最多展示 10 个分块",
+  "preview_chunk_intro": "共 {{total}} 个分块，最多展示 10 个",
  "preview_chunk_not_selected": "点击左侧文件后进行预览",
  "rebuild_embedding_start_tip": "切换索引模型任务已开始",
  "rebuilding_index_count": "重建中索引数量：{{count}}",

--- a/packages/web/i18n/zh-Hant/account_model.json
+++ b/packages/web/i18n/zh-Hant/account_model.json
@@ -12,6 +12,7 @@
  "channel_status_unknown": "未知",
  "channel_type": "廠商",
  "clear_model": "清空模型",
+  "confirm_delete_channel": "確認刪除 【{{name}}】渠道？",
  "copy_model_id_success": "已復制模型id",
  "create_channel": "新增渠道",
  "default_url": "默認地址",

--- a/packages/web/i18n/zh-Hant/dataset.json
+++ b/packages/web/i18n/zh-Hant/dataset.json
@@ -80,7 +80,7 @@
  "permission.des.write": "可新增和變更資料集內容",
  "preview_chunk": "分塊預覽",
  "preview_chunk_empty": "無法讀取該文件內容",
-  "preview_chunk_intro": "最多展示 10 個分塊",
+  "preview_chunk_intro": "共 {{total}} 個分塊，最多展示 10 個",
  "preview_chunk_not_selected": "點擊左側文件後進行預覽",
  "rebuild_embedding_start_tip": "切換索引模型任務已開始",
  "rebuilding_index_count": "重建中索引數量：{{count}}",

--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/projects/app/package.json
+++ b/projects/app/package.json
@@ -42,7 +42,7 @@
    "lodash": "^4.17.21",
    "mermaid": "^10.2.3",
    "nanoid": "^5.1.3",
-    "next": "14.2.24",
+    "next": "14.2.25",
    "next-i18next": "15.4.2",
    "nprogress": "^0.2.0",
    "qrcode": "^1.5.4",

--- a/projects/app/src/components/core/app/DatasetSelectModal.tsx
+++ b/projects/app/src/components/core/app/DatasetSelectModal.tsx
@@ -69,16 +69,21 @@ export const DatasetSelectModal = ({
            {selectedDatasets.map((item) =>
              (() => {
                return (
+                  <MyTooltip label={item.name}>
                    <Card
                      key={item.datasetId}
                      p={3}
-                    border={theme.borders.base}
+                      border={'base'}
                      boxShadow={'sm'}
                      bg={'primary.200'}
                    >
                      <Flex alignItems={'center'} h={'38px'}>
-                      <Avatar src={item.avatar} w={['1.25rem', '1.75rem']}></Avatar>
+                        <Avatar
-                      <Box flex={'1 0 0'} w={0} className="textEllipsis" mx={3}>
+                          src={item.avatar}
+                          w={['1.25rem', '1.75rem']}
+                          borderRadius={'sm'}
+                        ></Avatar>
+                        <Box flex={'1 0 0'} w={0} className="textEllipsis" mx={3} fontSize={'sm'}>
                          {item.name}
                        </Box>
                        <MyIcon
@@ -94,6 +99,7 @@ export const DatasetSelectModal = ({
                        />
                      </Flex>
                    </Card>
+                  </MyTooltip>
                );
              })()
            )}
@@ -117,7 +123,7 @@ export const DatasetSelectModal = ({
                    label={
                      item.type === DatasetTypeEnum.folder
                        ? t('common:dataset.Select Folder')
-                        : t('common:dataset.Select Dataset')
+                        : item.name
                    }
                  >
                    <Card
@@ -152,14 +158,18 @@ export const DatasetSelectModal = ({
                      }}
                    >
                      <Flex alignItems={'center'} h={'38px'}>
-                        <Avatar src={item.avatar} w={['24px', '28px']}></Avatar>
+                        <Avatar
+                          src={item.avatar}
+                          w={['1.25rem', '1.75rem']}
+                          borderRadius={'sm'}
+                        ></Avatar>
                        <Box
                          flex={'1 0 0'}
                          w={0}
                          className="textEllipsis"
                          ml={3}
-                          fontSize={'md'}
                          color={'myGray.900'}
+                          fontSize={'sm'}
                        >
                          {item.name}
                        </Box>

--- a/projects/app/src/components/core/chat/components/AIResponseBox.tsx
+++ b/projects/app/src/components/core/chat/components/AIResponseBox.tsx
@@ -268,12 +268,10 @@ const RenderUserFormInteractive = React.memo(function RenderFormInput({
      {interactive.params.description && <Markdown source={interactive.params.description} />}
      {interactive.params.inputForm?.map((input) => (
        <Box key={input.label}>
-          <Flex mb={1} alignItems={'center'} w={'full'}>
+          <FormLabel mb={1} required={input.required} whiteSpace={'pre-wrap'}>
-            <FormLabel required={input.required} w={'full'} whiteSpace={'pre-wrap'}>
            {input.label}
            {input.description && <QuestionTip ml={1} label={input.description} />}
          </FormLabel>
-          </Flex>
          {input.type === FlowNodeInputTypeEnum.input && (
            <MyTextarea
              isDisabled={interactive.params.submitted}

--- a/projects/app/src/components/core/chat/components/WholeResponseModal.tsx
+++ b/projects/app/src/components/core/chat/components/WholeResponseModal.tsx
@@ -250,6 +250,7 @@ export const WholeResponseContent = ({
          value={activeModule?.similarity}
        />
        <Row label={t('common:core.chat.response.module limit')} value={activeModule?.limit} />
+        {activeModule?.searchUsingReRank !== undefined && (
          <Row
            label={t('common:core.chat.response.search using reRank')}
            rawDom={
@@ -266,6 +267,7 @@ export const WholeResponseContent = ({
              </Box>
            }
          />
+        )}
        {activeModule.queryExtensionResult && (
          <>
            <Row

--- a/projects/app/src/pageComponents/account/model/Channel/index.tsx
+++ b/projects/app/src/pageComponents/account/model/Channel/index.tsx
@@ -38,6 +38,7 @@ import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
 import MyNumberInput from '@fastgpt/web/components/common/Input/NumberInput';
 import { getModelProvider } from '@fastgpt/global/core/ai/provider';
 import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 const EditChannelModal = dynamic(() => import('./EditChannelModal'), { ssr: false });
 const ModelTest = dynamic(() => import('./ModelTest'), { ssr: false });
@@ -77,6 +78,9 @@ const ChannelTable = ({ Tab }: { Tab: React.ReactNode }) => {
    }
  );
+  const { openConfirm, ConfirmModal } = useConfirm({
+    type: 'delete'
+  });
  const { runAsync: onDeleteChannel, loading: loadingDeleteChannel } = useRequest2(deleteChannel, {
    manual: true,
    onSuccess: () => {
@@ -212,7 +216,14 @@ const ChannelTable = ({ Tab }: { Tab: React.ReactNode }) => {
                                type: 'danger',
                                icon: 'delete',
                                label: t('common:common.Delete'),
-                                onClick: () => onDeleteChannel(item.id)
+                                onClick: () =>
+                                  openConfirm(
+                                    () => onDeleteChannel(item.id),
+                                    undefined,
+                                    t('account_model:confirm_delete_channel', {
+                                      name: item.name
+                                    })
+                                  )()
                              }
                            ]
                          }
@@ -238,6 +249,7 @@ const ChannelTable = ({ Tab }: { Tab: React.ReactNode }) => {
      {!!modelTestData && (
        <ModelTest {...modelTestData} onClose={() => setTestModelData(undefined)} />
      )}
+      <ConfirmModal />
    </>
  );
 };

--- a/projects/app/src/pageComponents/account/model/Log/index.tsx
+++ b/projects/app/src/pageComponents/account/model/Log/index.tsx
@@ -197,7 +197,7 @@ const ChannelLog = ({ Tab }: { Tab: React.ReactNode }) => {
            />
          </Box>
        </HStack>
-        <HStack flex={'0 0 200px'}>
+        <HStack>
          <FormLabel>{t('account_model:channel_name')}</FormLabel>
          <Box flex={'1 0 0'}>
            <MySelect<string>
@@ -210,7 +210,7 @@ const ChannelLog = ({ Tab }: { Tab: React.ReactNode }) => {
            />
          </Box>
        </HStack>
-        <HStack flex={'0 0 200px'}>
+        <HStack>
          <FormLabel>{t('account_model:model_name')}</FormLabel>
          <Box flex={'1 0 0'}>
            <MySelect<string>

--- a/projects/app/src/pageComponents/dataset/detail/Import/commonProgress/PreviewData.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/Import/commonProgress/PreviewData.tsx
@@ -34,9 +34,9 @@ const PreviewData = () => {
  const [previewFile, setPreviewFile] = useState<ImportSourceItemType>();
-  const { data = [], loading: isLoading } = useRequest2(
+  const { data = { chunks: [], total: 0 }, loading: isLoading } = useRequest2(
    async () => {
-      if (!previewFile) return;
+      if (!previewFile) return { chunks: [], total: 0 };
      if (importSource === ImportDataSourceEnum.fileCustom) {
        const chunkSplitter = processParamsForm.getValues('chunkSplitter');
        const { chunks } = splitText2Chunks({
@@ -46,10 +46,13 @@ const PreviewData = () => {
          overlapRatio: chunkOverlapRatio,
          customReg: chunkSplitter ? [chunkSplitter] : []
        });
-        return chunks.map((chunk) => ({
+        return {
+          chunks: chunks.map((chunk) => ({
            q: chunk,
            a: ''
-        }));
+          })),
+          total: chunks.length
+        };
      }
      return getPreviewChunks({
@@ -81,7 +84,7 @@ const PreviewData = () => {
      manual: false,
      onSuccess(result) {
        if (!previewFile) return;
-        if (!result || result.length === 0) {
+        if (!result || result.total === 0) {
          toast({
            title: t('dataset:preview_chunk_empty'),
            status: 'error'
@@ -130,14 +133,14 @@ const PreviewData = () => {
          <Flex py={4} px={5} borderBottom={'base'} justifyContent={'space-between'}>
            <FormLabel fontSize={'md'}>{t('dataset:preview_chunk')}</FormLabel>
            <Box fontSize={'xs'} color={'myGray.500'}>
-              {t('dataset:preview_chunk_intro')}
+              {t('dataset:preview_chunk_intro', { total: data.total })}
            </Box>
          </Flex>
          <MyBox isLoading={isLoading} flex={'1 0 0'} h={0}>
            <Box h={'100%'} overflowY={'auto'} px={5} py={3}>
              {previewFile ? (
                <>
-                  {data.map((item, index) => (
+                  {data.chunks.map((item, index) => (
                    <Box
                      key={index}
                      fontSize={'sm'}

--- a/projects/app/src/pages/api/core/ai/model/test.ts
+++ b/projects/app/src/pages/api/core/ai/model/test.ts
@@ -35,11 +35,17 @@ async function handler(
  if (!modelData) return Promise.reject('Model not found');
+  if (channelId) {
+    delete modelData.requestUrl;
+    delete modelData.requestAuth;
+  }
  const headers: Record<string, string> = channelId
    ? {
        'Aiproxy-Channel': String(channelId)
      }
    : {};
+  addLog.debug(`Test model`, modelData);
  if (modelData.type === 'llm') {
    return testLLMModel(modelData, headers);
@@ -63,10 +69,6 @@ async function handler(
 export default NextAPI(handler);
 const testLLMModel = async (model: LLMModelItemType, headers: Record<string, string>) => {
-  const ai = getAIApi({
-    timeout: 10000
-  });
  const requestBody = llmCompletionsBodyFormat(
    {
      model: model.model,
@@ -75,6 +77,7 @@ const testLLMModel = async (model: LLMModelItemType, headers: Record<string, str
    },
    model
  );
  const { response, isStreamResponse } = await createChatCompletion({
    body: requestBody,
    options: {
@@ -144,7 +147,7 @@ const testTTSModel = async (model: TTSModelType, headers: Record<string, string>
 const testSTTModel = async (model: STTModelType, headers: Record<string, string>) => {
  const path = isProduction ? '/app/data/test.mp3' : 'data/test.mp3';
  const { text } = await aiTranscriptions({
-    model: model.model,
+    model,
    fileStream: fs.createReadStream(path),
    headers
  });

--- a/projects/app/src/pages/api/core/dataset/file/getPreviewChunks.ts
+++ b/projects/app/src/pages/api/core/dataset/file/getPreviewChunks.ts
@@ -43,9 +43,12 @@ export type PostPreviewFilesChunksProps = {
  externalFileId?: string;
 };
 export type PreviewChunksResponse = {
+  chunks: {
    q: string;
    a: string;
-}[];
+  }[];
+  total: number;
+};
 async function handler(
  req: ApiRequestProps<PostPreviewFilesChunksProps>
@@ -123,13 +126,17 @@ async function handler(
    customPdfParse
  });
-  return rawText2Chunks({
+  const chunks = rawText2Chunks({
    rawText,
    chunkSize,
    maxSize: getLLMMaxChunkSize(getLLMModel(dataset.agentModel)),
    overlapRatio,
    customReg: chunkSplitter ? [chunkSplitter] : [],
    isQAImport: isQAImport
-  }).slice(0, 10);
+  });
+  return {
+    chunks: chunks.slice(0, 10),
+    total: chunks.length
+  };
 }
 export default NextAPI(handler);
--- a/projects/app/src/pages/api/v1/audio/transcriptions.ts
+++ b/projects/app/src/pages/api/v1/audio/transcriptions.ts
@@ -66,7 +66,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
    // }
    const result = await aiTranscriptions({
-      model: getDefaultSTTModel().model,
+      model: getDefaultSTTModel(),
      fileStream: fs.createReadStream(file.path)
    });