Skip to content

fix: model avatar #5848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 4, 2025
Merged

fix: model avatar #5848

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e93fa5
fix: model avatar
FinleyGe Nov 3, 2025
62dbc92
fix: ts
c121914yu Nov 4, 2025
6508930
fix: avatar migration to s3
FinleyGe Nov 4, 2025
01cba6f
update lock
c121914yu Nov 4, 2025
c4d37ac
fix: avatar redirect
c121914yu Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/global/core/ai/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
});
Expand Down
2 changes: 1 addition & 1 deletion packages/global/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/service/core/ai/type.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
37 changes: 21 additions & 16 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion projects/app/src/pages/api/common/system/getInitData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down
10 changes: 8 additions & 2 deletions projects/app/src/pages/api/system/plugin/[...path].ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@ 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: ['plugin', 'models' | 'tools'] };

const requestPath = (global.s3BucketMap[S3Buckets.public] as S3PublicBucket).createPublicUrl(
// !hack: waiting s3 migrate to SDK
`/system/${path.join('/')}`
);

if (!requestPath) {
throw new Error('url is empty');
Expand Down
Loading