refactor: remove ModelProviderIdType and update related types

Author: ctrlz526

packages/global/core/ai/model.d.ts

@@ -1,5 +1,4 @@
 import type { ModelTypeEnum } from './model';
-import type { ModelProviderIdType } from './provider';
 
 type PriceType = {
   charsPointsPrice?: number; // 1k chars=n points; 60s=n points;
@@ -9,7 +8,7 @@ type PriceType = {
   outputPrice?: number; // 1k tokens=n points
 };
 type BaseModelItemType = {
-  provider: ModelProviderIdType;
+  provider: string;
   model: string;
   name: string;
   avatar?: string; // model icon, from provider

packages/global/core/ai/model.ts

@@ -1,6 +1,5 @@
 import { i18nT } from '../../../web/i18n/utils';
 import type { LLMModelItemType, STTModelType, EmbeddingModelItemType } from './model.d';
-import { getModelProvider, type ModelProviderIdType } from './provider';
 
 export enum ModelTypeEnum {
   llm = 'llm',
@@ -54,29 +53,6 @@ export const defaultSTTModels: STTModelType[] = [
   }
 ];
 
-export const getModelFromList = (
-  modelList: { provider: ModelProviderIdType; name: string; model: string }[],
-  model: string,
-  language: string
-):
-  | {
-      avatar: string;
-      provider: ModelProviderIdType;
-      name: string;
-      model: string;
-    }
-  | undefined => {
-  const modelData = modelList.find((item) => item.model === model) ?? modelList[0];
-  if (!modelData) {
-    return;
-  }
-  const provider = getModelProvider(modelData.provider, language);
-  return {
-    ...modelData,
-    avatar: provider.avatar
-  };
-};
-
 export const modelTypeList = [
   { label: i18nT('common:model.type.chat'), value: ModelTypeEnum.llm },
   { label: i18nT('common:model.type.embedding'), value: ModelTypeEnum.embedding },

packages/global/core/ai/provider.ts

@@ -0,0 +1,31 @@
+import type { I18nStringType } from '../../../common/i18n/type';
+
+export type ModelShowType = {
+  id: string;
+  name: string;
+  avatar: string;
+  order: number;
+};
+
+export type ModelProviderType = {
+  id: string;
+  name: I18nStringType;
+  avatar: string;
+  order: number;
+};
+
+export type ModelProviderListType = {
+  id: string;
+  name: I18nStringType | string;
+  avatar: string;
+  provider: string;
+};
+
+declare global {
+  var ModelProviders_cache:
+    | { listData: Array<ModelProviderType>; mapData: Map<string, ModelProviderType> }
+    | undefined;
+  var aiproxyIdMap_cache:
+    | { listData: Array<ModelProviderListType>; mapData: Map<string, ModelProviderListType> }
+    | undefined;
+}

packages/global/core/app/model/type.ts

@@ -1 +1,3 @@
 export * from '@fastgpt-sdk/plugin';
+
+export { default } from '@fastgpt-sdk/plugin';

packages/global/sdk/fastgpt-plugin.ts

@@ -9,7 +9,7 @@ import {
   type RerankModelItemType
 } from '@fastgpt/global/core/ai/model.d';
 import { debounce } from 'lodash';
-import { getModelProvider } from '@fastgpt/global/core/ai/provider';
+import { getModelProvider } from '../../../core/app/provider/controller';
 import { findModelFromAlldata } from '../model';
 import {
   reloadFastGPTConfigBuffer,
@@ -18,6 +18,7 @@ import {
 import { delay } from '@fastgpt/global/common/system/utils';
 import { pluginClient } from '../../../thirdProvider/fastgptPlugin';
 import { setCron } from '../../../common/system/cron';
+import { preloadModelProviders } from '../../../core/app/provider/controller';
 
 export const loadSystemModels = async (init = false, language = 'en') => {
   const pushModel = (model: SystemModelItemType) => {
@@ -258,6 +259,7 @@ export const cronRefreshModels = async () => {
   setCron('*/5 * * * *', async () => {
     // 1. 更新模型（所有节点都会触发）
     await loadSystemModels(true);
+    await preloadModelProviders();
     // 2. 更新缓存（仅主节点触发）
     await updateFastGPTConfigBuffer();
   });

packages/service/core/ai/config/utils.ts

@@ -0,0 +1,69 @@
+import type { I18nStringType } from '@fastgpt/global/common/i18n/type';
+import { getProviderList } from '../../app/tool/api';
+import type { ModelProviderType } from '@fastgpt/global/core/app/model/type';
+
+export const defaultProvider: ModelProviderType = {
+  id: 'Other',
+  name: { en: 'Other' } as I18nStringType,
+  avatar: 'model/other',
+  order: 0
+};
+
+export const defaultMapData = [
+  {
+    id: 'Other',
+    name: 'Other',
+    avatar: 'model/other',
+    provider: 'Other'
+  }
+];
+
+// Preload model providers
+export async function preloadModelProviders(): Promise<void> {
+  const res = await getProviderList();
+
+  const ModelProviders = Object.entries(res.ModelProviders).map(
+    ([id, info]: [string, I18nStringType], index: number) => ({
+      id: id,
+      name: info,
+      avatar: `/api/system/plugin/models/${id}.svg`,
+      order: index
+    })
+  );
+
+  const aiproxyIdMap = Object.entries(res.aiproxyIdMap).map(
+    ([id, info]: [
+      string,
+      { name: I18nStringType | string; provider: string; avatar?: string }
+    ]) => ({
+      id,
+      name: info.name,
+      avatar: info.avatar || defaultProvider.avatar,
+      provider: info.provider
+    })
+  );
+  global.ModelProviders_cache = {
+    listData: ModelProviders,
+    mapData: new Map(ModelProviders.map((item) => [item.id, item]))
+  };
+  global.aiproxyIdMap_cache = {
+    listData: aiproxyIdMap,
+    mapData: new Map(aiproxyIdMap.map((item) => [item.id, item]))
+  };
+}
+
+export const getModelProvider = (provider?: string, language = 'en') => {
+  if (!provider) {
+    return defaultProvider;
+  }
+
+  const providerData = global.ModelProviders_cache?.mapData.get(provider);
+  if (!providerData) {
+    return defaultProvider;
+  }
+
+  return {
+    ...providerData,
+    name: (providerData.name as I18nStringType)[language as keyof I18nStringType]
+  };
+};

packages/service/core/app/provider/controller.ts

@@ -22,6 +22,11 @@ export async function APIGetSystemToolList() {
   return Promise.reject(res.body);
 }
 
+export async function getProviderList() {
+  const res = await pluginClient.model.provider();
+  return res.status === 200 ? res.body : Promise.reject(res.body);
+}
+
 const runToolInstance = new RunToolWithStream({
   baseUrl: BASE_URL,
   token: TOKEN

packages/service/core/app/tool/api.ts

@@ -1,4 +1,4 @@
-import { createClient } from '@fastgpt/global/sdk/fastgpt-plugin';
+import createClient from '@fastgpt/global/sdk/fastgpt-plugin';
 
 export const BASE_URL = process.env.PLUGIN_BASE_URL || '';
 export const TOKEN = process.env.PLUGIN_TOKEN || '';