fix: model avatar (#5848)

* fix: model avatar

* fix: ts

* fix: avatar migration to s3

* update lock

* fix: avatar redirect

---------

Co-authored-by: archer <[email protected]>

Author: FinleyGe

packages/global/core/ai/provider.ts

@@ -23,28 +23,30 @@ export const defaultProvider: ModelProviderItemType = {
   order: 999
 };
 
-export const formatModelProviders = (data: { provider: string; value: I18nStringStrictType }[]) => {
+export const formatModelProviders = (
+  data: { provider: string; value: I18nStringStrictType; avatar: string }[]
+) => {
   const getLocalizedName = (translations: I18nStringStrictType, language = 'en'): string => {
     return translations[language as langType] || translations.en;
   };
 
   const formatModelProviderList = (language?: string): ModelProviderItemType[] => {
-    return data.map(({ provider, value }, index) => ({
+    return data.map(({ provider, value, avatar }, index) => ({
       id: provider,
       name: getLocalizedName(value, language),
-      avatar: `/api/system/plugin/models/${provider}.svg`,
+      avatar,
       order: index
     }));
   };
 
   const formatModelProviderMap = (language?: string) => {
     const provider = {} as Record<string, ModelProviderItemType>;
 
-    data.forEach(({ provider: id, value }, index) => {
+    data.forEach(({ provider: id, value, avatar }, index) => {
       provider[id] = {
         id,
         name: getLocalizedName(value, language),
-        avatar: `/api/system/plugin/models/${id}.svg`,
+        avatar,
         order: index
       };
     });

packages/global/package.json

@@ -2,7 +2,7 @@
   "name": "@fastgpt/global",
   "version": "1.0.0",
   "dependencies": {
-    "@fastgpt-sdk/plugin": "0.2.13",
+    "@fastgpt-sdk/plugin": "0.2.15",
     "@apidevtools/swagger-parser": "^10.1.0",
     "@bany/curl-to-json": "^1.2.8",
     "axios": "^1.12.1",

packages/service/core/ai/type.d.ts

@@ -38,7 +38,7 @@ export type SystemDefaultModelType = {
 };
 
 declare global {
-  var ModelProviderRawCache: { provider: string; value: I18nStringStrictType }[];
+  var ModelProviderRawCache: { provider: string; value: I18nStringStrictType; avatar: string }[];
   var ModelProviderListCache: Record<langType, ModelProviderItemType[]>;
   var ModelProviderMapCache: Record<langType, Record<string, ModelProviderItemType>>;
   var aiproxyIdMapCache: AiproxyMapProviderType;

pnpm-lock.yaml

@@ -19,7 +19,7 @@ export type InitDateResponse = {
 
   activeModelList?: SystemModelItemType[];
   defaultModels?: SystemDefaultModelType;
-  modelProviders?: { provider: string; value: I18nStringStrictType }[];
+  modelProviders?: { provider: string; value: I18nStringStrictType; avatar: string }[];
   aiproxyIdMap?: AiproxyMapProviderType;
 };
 

projects/app/src/pages/api/common/system/getInitData.ts

@@ -1,49 +1,18 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
-import { request } from 'http';
-import { FastGPTPluginUrl } from '@fastgpt/service/common/system/constants';
+import { S3Buckets } from '@fastgpt/service/common/s3/constants';
+import type { S3PublicBucket } from '@fastgpt/service/common/s3/buckets/public';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
-    const { path = [] } = req.query as any;
-    const requestPath = `/imgs/${path?.join('/')}`;
+    const { path = [] } = req.query as { path: ['models' | 'tools', string] };
 
-    if (!requestPath) {
-      throw new Error('url is empty');
-    }
-    if (!FastGPTPluginUrl) {
-      throw new Error(`未配置插件服务链接: ${path}`);
-    }
+    const bucket = global.s3BucketMap[S3Buckets.public] as S3PublicBucket;
 
-    const parsedUrl = new URL(FastGPTPluginUrl);
-    delete req.headers?.rootkey;
-    delete req.headers?.cookie;
-    delete req.headers?.host;
-    delete req.headers?.origin;
+    const baseUrl = `system/plugin/${path.join('/')}`.split('.')[0];
+    const requestPath = bucket.createPublicUrl(`${baseUrl}/logo`);
 
-    const requestResult = request({
-      protocol: parsedUrl.protocol,
-      hostname: parsedUrl.hostname,
-      port: parsedUrl.port,
-      path: requestPath,
-      method: req.method,
-      headers: req.headers
-    });
-    req.pipe(requestResult);
-
-    requestResult.on('response', (response) => {
-      Object.keys(response.headers).forEach((key) => {
-        // @ts-ignore
-        res.setHeader(key, response.headers[key]);
-      });
-      response.statusCode && res.writeHead(response.statusCode);
-      response.pipe(res);
-    });
-
-    requestResult.on('error', (e) => {
-      res.send(e);
-      res.end();
-    });
+    res.redirect(requestPath);
   } catch (error) {
     jsonRes(res, {
       code: 500,