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
2025-07-26 07:06:33 +00:00 · 2025-03-24 13:49:43 +08:00
parent a680b565ea
commit 2fcf421672
24 changed files with 210 additions and 153 deletions
--- 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 = {
-      nodes: version.nodes,
-      edges: version.edges,
-      chatConfig: version.chatConfig
+    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}}",