Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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: 4 additions & 0 deletions src/config/entities/providers-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
"groq",
"xai",
"mistral",
"moonshotai",
"moonshotai-cn",
"openai",
"openrouter"
]
Expand Down Expand Up @@ -60,6 +62,8 @@
"groq",
"xai",
"mistral",
"moonshotai",
"moonshotai-cn",
"openai",
"openrouter"
]
Expand Down
16 changes: 16 additions & 0 deletions src/config/entities/providers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ pub enum ProviderConfig {
Xai(configs::XaiProviderConfig),
#[serde(rename = "mistral")]
Mistral(configs::MistralProviderConfig),
#[serde(rename = "moonshotai")]
MoonshotAi(configs::MoonshotAiProviderConfig),
#[serde(rename = "moonshotai-cn")]
MoonshotAiCn(configs::MoonshotAiCnProviderConfig),
#[serde(rename = "openai")]
OpenAI(configs::OpenAIProviderConfig),
#[serde(rename = "openrouter")]
Expand All @@ -61,6 +65,8 @@ impl ProviderConfig {
Self::Groq(_) => identifiers::GROQ,
Self::Xai(_) => identifiers::XAI,
Self::Mistral(_) => identifiers::MISTRAL,
Self::MoonshotAi(_) => identifiers::MOONSHOT_AI,
Self::MoonshotAiCn(_) => identifiers::MOONSHOT_AI_CN,
Self::OpenAI(_) => identifiers::OPENAI,
Self::OpenRouter(_) => identifiers::OPENROUTER,
}
Expand Down Expand Up @@ -185,6 +191,16 @@ mod tests {
"type": "mistral",
"config": { "api_key": "test_key" }
}), true, None)]
#[case::moonshotai_ok(json!({
"name": "moonshot-primary",
"type": "moonshotai",
"config": { "api_key": "test_key" }
}), true, None)]
#[case::moonshotai_cn_ok(json!({
"name": "moonshot-cn-primary",
"type": "moonshotai-cn",
"config": { "api_key": "test_key" }
}), true, None)]
#[case::missing_type(json!({
"name": "openai-primary",
"config": { "api_key": "test_key" }
Expand Down
33 changes: 26 additions & 7 deletions src/gateway/providers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ pub mod gemini;
pub mod groq;
pub mod macros;
pub mod mistral;
pub mod moonshot;
pub mod openai;
pub mod openrouter;
pub mod xai;
Expand All @@ -21,14 +22,15 @@ pub use fireworks::FireworksAi;
pub use gemini::GoogleDef;
pub use groq::Groq;
pub use mistral::Mistral;
pub use moonshot::{MoonshotAi, MoonshotAiCn};
pub use openai::OpenAIDef;
pub use openrouter::OpenRouter;
pub use xai::Xai;

pub mod identifiers {
use super::{
anthropic, azure, bedrock, cohere, deepseek, fireworks, gemini, groq, mistral, openai,
openrouter, xai,
anthropic, azure, bedrock, cohere, deepseek, fireworks, gemini, groq, mistral, moonshot,
openai, openrouter, xai,
};

pub const ANTHROPIC: &str = anthropic::IDENTIFIER;
Expand All @@ -40,18 +42,28 @@ pub mod identifiers {
pub const GEMINI: &str = gemini::IDENTIFIER;
pub const GROQ: &str = groq::IDENTIFIER;
pub const MISTRAL: &str = mistral::IDENTIFIER;
pub const MOONSHOT_AI: &str = moonshot::IDENTIFIER;
pub const MOONSHOT_AI_CN: &str = moonshot::CN_IDENTIFIER;
pub const OPENAI: &str = openai::IDENTIFIER;
pub const OPENROUTER: &str = openrouter::IDENTIFIER;
pub const XAI: &str = xai::IDENTIFIER;
}

pub mod configs {
pub use super::{
anthropic::AnthropicProviderConfig, azure::AzureProviderConfig,
bedrock::BedrockProviderConfig, cohere::CohereProviderConfig,
deepseek::DeepSeekProviderConfig, fireworks::FireworksAiProviderConfig,
gemini::GeminiProviderConfig, groq::GroqProviderConfig, mistral::MistralProviderConfig,
openai::OpenAIProviderConfig, openrouter::OpenRouterProviderConfig, xai::XaiProviderConfig,
anthropic::AnthropicProviderConfig,
azure::AzureProviderConfig,
bedrock::BedrockProviderConfig,
cohere::CohereProviderConfig,
deepseek::DeepSeekProviderConfig,
fireworks::FireworksAiProviderConfig,
gemini::GeminiProviderConfig,
groq::GroqProviderConfig,
mistral::MistralProviderConfig,
moonshot::{MoonshotAiCnProviderConfig, MoonshotAiProviderConfig},
openai::OpenAIProviderConfig,
openrouter::OpenRouterProviderConfig,
xai::XaiProviderConfig,
};
}

Expand All @@ -68,6 +80,8 @@ pub fn default_provider_registry() -> Result<ProviderRegistry> {
.register(GoogleDef)?
.register(Groq)?
.register(Mistral)?
.register(MoonshotAi)?
.register(MoonshotAiCn)?
.register(OpenAIDef)?
.register(OpenRouter)?
.register(Xai)?;
Expand All @@ -93,6 +107,11 @@ mod tests {
assert_eq!(registry.get("gemini").unwrap().name(), "gemini");
assert_eq!(registry.get("groq").unwrap().name(), "groq");
assert_eq!(registry.get("mistral").unwrap().name(), "mistral");
assert_eq!(registry.get("moonshotai").unwrap().name(), "moonshotai");
assert_eq!(
registry.get("moonshotai-cn").unwrap().name(),
"moonshotai-cn"
);
assert_eq!(registry.get("deepseek").unwrap().name(), "deepseek");
assert_eq!(registry.get("openrouter").unwrap().name(), "openrouter");
assert_eq!(registry.get("xai").unwrap().name(), "xai");
Expand Down
Loading