Skip to content
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.

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

✨ feat: Support Doubao Models #3055

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from 18 commits
Commits
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
4 changes: 3 additions & 1 deletion src/app/(main)/settings/llm/ProviderList/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
AnthropicProviderCard,
BaichuanProviderCard,
DeepSeekProviderCard,
DoubaoProviderCard,
FireworksAIProviderCard,
GoogleProviderCard,
GroqProviderCard,
Expand Down Expand Up @@ -56,6 +57,7 @@ export const useProviderList = (): ProviderItem[] => {
BedrockProvider,
GoogleProviderCard,
DeepSeekProviderCard,
DoubaoProviderCard,
HuggingFaceProvider,
OpenRouterProviderCard,
GithubProvider,
Expand Down Expand Up @@ -93,4 +95,4 @@ export const useProviderList = (): ProviderItem[] => {
SenseNovaProvider,
],
);
};
};
8 changes: 8 additions & 0 deletions src/config/llm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ export const getLLMConfig = () => {
SENSENOVA_ACCESS_KEY_ID: z.string().optional(),
SENSENOVA_ACCESS_KEY_SECRET: z.string().optional(),
SENSENOVA_MODEL_LIST: z.string().optional(),

ENABLED_DOUBAO: z.boolean(),
ARK_API_KEY: z.string().optional(),
ARK_MODEL_LIST: z.string().optional(),
},
runtimeEnv: {
API_KEY_SELECT_MODE: process.env.API_KEY_SELECT_MODE,
Expand Down Expand Up @@ -295,6 +299,10 @@ export const getLLMConfig = () => {
SENSENOVA_ACCESS_KEY_ID: process.env.SENSENOVA_ACCESS_KEY_ID,
SENSENOVA_ACCESS_KEY_SECRET: process.env.SENSENOVA_ACCESS_KEY_SECRET,
SENSENOVA_MODEL_LIST: process.env.SENSENOVA_MODEL_LIST,

ENABLED_DOUBAO: !!(process.env.ARK_API_KEY && process.env.ARK_MODEL_LIST),
ARK_API_KEY: process.env.ARK_API_KEY,
ARK_MODEL_LIST: process.env.ARK_MODEL_LIST,
},
});
};
Expand Down
12 changes: 12 additions & 0 deletions src/config/modelProviders/doubao.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { ModelProviderCard } from '@/types/llm';

// ref https://www.volcengine.com/docs/82379/1330310
const Doubao: ModelProviderCard = {
chatModels: [],
disableBrowserRequest: true, // CORS error
id: 'doubao',
name: '豆包',
url: 'https://www.volcengine.com/product/doubao',
};

export default Doubao;
4 changes: 4 additions & 0 deletions src/config/modelProviders/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import AzureProvider from './azure';
import BaichuanProvider from './baichuan';
import BedrockProvider from './bedrock';
import DeepSeekProvider from './deepseek';
import DoubaoProvider from './doubao';
import FireworksAIProvider from './fireworksai';
import GithubProvider from './github';
import GoogleProvider from './google';
Expand Down Expand Up @@ -65,6 +66,7 @@ export const LOBE_DEFAULT_MODEL_LIST: ChatModelCard[] = [
HunyuanProvider.chatModels,
WenxinProvider.chatModels,
SenseNovaProvider.chatModels,
DoubaoProvider.chatModels,
].flat();

export const DEFAULT_MODEL_PROVIDER_LIST = [
Expand All @@ -88,6 +90,7 @@ export const DEFAULT_MODEL_PROVIDER_LIST = [
UpstageProvider,
QwenProvider,
WenxinProvider,
DoubaoProvider,
HunyuanProvider,
SparkProvider,
ZhiPuProvider,
Expand Down Expand Up @@ -118,6 +121,7 @@ export { default as AzureProviderCard } from './azure';
export { default as BaichuanProviderCard } from './baichuan';
export { default as BedrockProviderCard } from './bedrock';
export { default as DeepSeekProviderCard } from './deepseek';
export { default as DoubaoProviderCard } from './doubao';
export { default as FireworksAIProviderCard } from './fireworksai';
export { default as GithubProviderCard } from './github';
export { default as GoogleProviderCard } from './google';
Expand Down
3 changes: 3 additions & 0 deletions src/const/settings/llm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ export const DEFAULT_LLM_CONFIG: UserModelProviderConfig = {
enabled: false,
enabledModels: filterEnabledModels(DeepSeekProviderCard),
},
doubao: {
enabled: false,
},
fireworksai: {
enabled: false,
enabledModels: filterEnabledModels(FireworksAIProviderCard),
Expand Down
7 changes: 7 additions & 0 deletions src/libs/agent-runtime/AgentRuntime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { LobeAzureOpenAI } from './azureOpenai';
import { LobeBaichuanAI } from './baichuan';
import { LobeBedrockAI, LobeBedrockAIParams } from './bedrock';
import { LobeDeepSeekAI } from './deepseek';
import { LobeDoubaoAI } from './doubao';
import { LobeFireworksAI } from './fireworksai';
import { LobeGithubAI } from './github';
import { LobeGoogleAI } from './google';
Expand Down Expand Up @@ -132,6 +133,7 @@ class AgentRuntime {
baichuan: Partial<ClientOptions>;
bedrock: Partial<LobeBedrockAIParams>;
deepseek: Partial<ClientOptions>;
doubao: Partial<ClientOptions>;
fireworksai: Partial<ClientOptions>;
github: Partial<ClientOptions>;
google: { apiKey?: string; baseURL?: string };
Expand Down Expand Up @@ -321,6 +323,11 @@ class AgentRuntime {
runtimeModel = await LobeSenseNovaAI.fromAPIKey(params.sensenova);
break;
}

case ModelProvider.Doubao: {
runtimeModel = new LobeDoubaoAI(params.doubao ?? {});
break;
}
}

return new AgentRuntime(runtimeModel);
Expand Down
10 changes: 10 additions & 0 deletions src/libs/agent-runtime/doubao/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { ModelProvider } from '../types';
import { LobeOpenAICompatibleFactory } from '../utils/openaiCompatibleFactory';

export const LobeDoubaoAI = LobeOpenAICompatibleFactory({
baseURL: 'https://ark.cn-beijing.volces.com/api/v3',
debug: {
chatCompletion: () => process.env.DEBUG_DOUBAO_CHAT_COMPLETION === '1',
},
provider: ModelProvider.Doubao,
});
1 change: 1 addition & 0 deletions src/libs/agent-runtime/types/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export enum ModelProvider {
Baichuan = 'baichuan',
Bedrock = 'bedrock',
DeepSeek = 'deepseek',
Doubao = 'doubao',
FireworksAI = 'fireworksai',
Github = 'github',
Google = 'google',
Expand Down
10 changes: 10 additions & 0 deletions src/server/globalConfig/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ export const getServerGlobalConfig = () => {

ENABLED_HUGGINGFACE,
HUGGINGFACE_MODEL_LIST,

ENABLED_DOUBAO,
ARK_MODEL_LIST,
} = getLLMConfig();

const config: GlobalServerConfig = {
Expand Down Expand Up @@ -210,6 +213,13 @@ export const getServerGlobalConfig = () => {
modelString: DEEPSEEK_MODEL_LIST,
}),
},
doubao: { enabled: ENABLED_DOUBAO,
enabledModels: extractEnabledModels(ARK_MODEL_LIST),
serverModelCards: transformToChatModelCards({
defaultChatModels: [],
modelString: ARK_MODEL_LIST,
}),
},
fireworksai: {
enabled: ENABLED_FIREWORKSAI,
enabledModels: extractEnabledModels(FIREWORKSAI_MODEL_LIST),
Expand Down
7 changes: 7 additions & 0 deletions src/server/modules/AgentRuntime/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,13 @@ const getLlmOptionsFromPayload = (provider: string, payload: JWTPayload) => {

const apiKey = sensenovaAccessKeyID + ':' + sensenovaAccessKeySecret;

return { apiKey };
}
case ModelProvider.Doubao: {
const { ARK_API_KEY } = getLLMConfig();

const apiKey = apiKeyManager.pick(payload?.apiKey || ARK_API_KEY);

return { apiKey };
}
}
Expand Down
1 change: 1 addition & 0 deletions src/types/user/settings/keyVaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export interface UserKeyVaults {
baichuan?: OpenAICompatibleKeyVault;
bedrock?: AWSBedrockKeyVault;
deepseek?: OpenAICompatibleKeyVault;
doubao?: OpenAICompatibleKeyVault;
fireworksai?: OpenAICompatibleKeyVault;
github?: OpenAICompatibleKeyVault;
google?: OpenAICompatibleKeyVault;
Expand Down