feat(ai): add OrcaRouter as a built-in AI provider
This commit is contained in:
1 parent
74be035352
commit
5e9ac2876b
6 files changed
+160
-11
No files matched your search
@@ -73,6 +73,7 @@ pub enum AiProvider {
|
||||
Ollama,
|
||||
#[serde(rename = "openai-compatible")]
|
||||
OpenaiCompatible,
|
||||
OrcaRouter,
|
||||
#[serde(rename = "codex-cli")]
|
||||
CodexCli,
|
||||
#[serde(rename = "claude-code-cli")]
|
||||
@@ -104,6 +105,7 @@ impl AiProvider {
|
||||
AiProvider::MiniMax => "minimax",
|
||||
AiProvider::Ollama => "ollama",
|
||||
AiProvider::OpenaiCompatible => "openai-compatible",
|
||||
AiProvider::OrcaRouter => "orcarouter",
|
||||
AiProvider::ClaudeCodeCli => "claude-code-cli",
|
||||
AiProvider::PiAgentCli => "pi-agent-cli",
|
||||
AiProvider::OpenCodeCli => "opencode-cli",
|
||||
@@ -658,6 +660,7 @@ pub fn resolve_endpoint(config: &AiConfig) -> String {
|
||||
| AiProvider::MiniMax
|
||||
| AiProvider::Ollama
|
||||
| AiProvider::OpenaiCompatible
|
||||
| AiProvider::OrcaRouter
|
||||
| AiProvider::Custom => {
|
||||
let base = ensure_openai_version_prefix(ep);
|
||||
if config.api_style == AiApiStyle::Responses {
|
||||
@@ -1334,6 +1337,7 @@ fn provider_requires_api_key(provider: &AiProvider) -> bool {
|
||||
| AiProvider::Deepseek
|
||||
| AiProvider::Qwen
|
||||
| AiProvider::MiniMax
|
||||
| AiProvider::OrcaRouter
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1446,12 +1450,18 @@ pub fn build_ai_http_client(config: &AiConfig, timeout_secs: u64) -> Result<reqw
|
||||
// Model listing
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
fn parse_model_list_response(data: &serde_json::Value) -> Result<Vec<AiModelInfo>, String> {
|
||||
fn parse_model_list_response_with_filter(
|
||||
data: &serde_json::Value,
|
||||
mut include_item: impl FnMut(&serde_json::Value) -> bool,
|
||||
) -> Result<Vec<AiModelInfo>, String> {
|
||||
let items = data["data"].as_array().ok_or_else(|| "Invalid model list response".to_string())?;
|
||||
let mut seen = HashSet::new();
|
||||
let mut models = Vec::new();
|
||||
|
||||
for item in items {
|
||||
if !include_item(item) {
|
||||
continue;
|
||||
}
|
||||
let Some(id) = item["id"].as_str().filter(|id| !id.trim().is_empty()) else {
|
||||
continue;
|
||||
};
|
||||
@@ -1473,6 +1483,10 @@ fn parse_model_list_response(data: &serde_json::Value) -> Result<Vec<AiModelInfo
|
||||
Ok(models)
|
||||
}
|
||||
|
||||
fn parse_model_list_response(data: &serde_json::Value) -> Result<Vec<AiModelInfo>, String> {
|
||||
parse_model_list_response_with_filter(data, |_| true)
|
||||
}
|
||||
|
||||
fn parse_dynamic_effort_capability(
|
||||
model: &serde_json::Value,
|
||||
source: AiCapabilitySource,
|
||||
@@ -1644,7 +1658,13 @@ async fn list_openai_compatible_models(
|
||||
return Err(extract_error(&data).unwrap_or_else(|| format!("Model list API error: {status}")));
|
||||
}
|
||||
|
||||
parse_model_list_response(&data)
|
||||
if matches!(config.provider, AiProvider::OrcaRouter) {
|
||||
parse_model_list_response_with_filter(&data, |item| {
|
||||
crate::ai_model_filter::orcarouter_item_supports_api_style(item, &config.api_style)
|
||||
})
|
||||
} else {
|
||||
parse_model_list_response(&data)
|
||||
}
|
||||
}
|
||||
|
||||
fn resolve_ollama_show_endpoint(config: &AiConfig) -> Result<String, String> {
|
||||
@@ -1761,7 +1781,8 @@ pub async fn list_models_core(config: &AiConfig) -> Result<Vec<AiModelInfo>, Str
|
||||
| AiProvider::Deepseek
|
||||
| AiProvider::Qwen
|
||||
| AiProvider::MiniMax
|
||||
| AiProvider::OpenaiCompatible => list_openai_compatible_models(&client, config).await?,
|
||||
| AiProvider::OpenaiCompatible
|
||||
| AiProvider::OrcaRouter => list_openai_compatible_models(&client, config).await?,
|
||||
AiProvider::Custom => {
|
||||
if uses_anthropic_messages_api(config) {
|
||||
list_claude_models(&client, config).await?
|
||||
@@ -2802,7 +2823,8 @@ pub async fn complete(request: &AiCompletionRequest) -> Result<String, String> {
|
||||
| AiProvider::Qwen
|
||||
| AiProvider::MiniMax
|
||||
| AiProvider::Ollama
|
||||
| AiProvider::OpenaiCompatible => {
|
||||
| AiProvider::OpenaiCompatible
|
||||
| AiProvider::OrcaRouter => {
|
||||
if request.config.api_style == AiApiStyle::Responses {
|
||||
call_responses_api(&client, request).await
|
||||
} else {
|
||||
@@ -2863,7 +2885,8 @@ pub async fn stream(
|
||||
| AiProvider::Qwen
|
||||
| AiProvider::MiniMax
|
||||
| AiProvider::Ollama
|
||||
| AiProvider::OpenaiCompatible => {
|
||||
| AiProvider::OpenaiCompatible
|
||||
| AiProvider::OrcaRouter => {
|
||||
if request.config.api_style == AiApiStyle::Responses {
|
||||
stream_responses_api(&client, session_id, request, cancelled, &on_chunk).await
|
||||
} else {
|
||||
@@ -4585,6 +4608,16 @@ mod tests {
|
||||
config
|
||||
}
|
||||
|
||||
fn orcarouter_test_config(endpoint: impl Into<String>, api_style: AiApiStyle) -> AiConfig {
|
||||
let mut config = test_config(AiProvider::OrcaRouter);
|
||||
config.api_key = "secret".to_string();
|
||||
config.auth_method = AiAuthMethod::Bearer;
|
||||
config.endpoint = endpoint.into();
|
||||
config.model = "orcarouter/fusion-flash".to_string();
|
||||
config.api_style = api_style;
|
||||
config
|
||||
}
|
||||
|
||||
fn minimax_test_request(endpoint: impl Into<String>) -> AiCompletionRequest {
|
||||
AiCompletionRequest {
|
||||
config: minimax_test_config(endpoint),
|
||||
@@ -5422,6 +5455,7 @@ mod tests {
|
||||
AiProvider::Deepseek,
|
||||
AiProvider::Qwen,
|
||||
AiProvider::MiniMax,
|
||||
AiProvider::OrcaRouter,
|
||||
] {
|
||||
let config = AiConfig { provider, ..base.clone() };
|
||||
assert_eq!(validate_config(&config).unwrap_err(), "API key is required");
|
||||
@@ -5429,6 +5463,22 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn orcarouter_requires_api_key_for_completion_and_model_discovery() {
|
||||
let mut config = orcarouter_test_config("https://api.orcarouter.ai/v1", AiApiStyle::Completions);
|
||||
config.api_key.clear();
|
||||
|
||||
assert!(provider_requires_api_key(&config.provider));
|
||||
assert_eq!(validate_config(&config).unwrap_err(), "API key is required");
|
||||
assert_eq!(validate_model_list_config(&config).unwrap_err(), "API key is required");
|
||||
|
||||
config.api_key = "secret".to_string();
|
||||
let headers = maybe_bearer_headers(&config).unwrap();
|
||||
assert_eq!(headers.get(AUTHORIZATION).unwrap(), "Bearer secret");
|
||||
assert_eq!(resolve_endpoint(&config), "https://api.orcarouter.ai/v1/chat/completions");
|
||||
assert_eq!(resolve_model_list_endpoint(&config).unwrap(), "https://api.orcarouter.ai/v1/models");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolves_model_list_endpoints_from_base_and_completion_urls() {
|
||||
let openai = AiConfig {
|
||||
@@ -6458,6 +6508,34 @@ mod tests {
|
||||
assert!(request.contains("authorization: bearer secret"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn orcarouter_model_list_matches_configured_openai_api_style() {
|
||||
let response_body = r#"{"data":[
|
||||
{"id":"deepseek/deepseek-chat","supported_endpoint_types":["openai"]},
|
||||
{"id":"openai/gpt-response-only","supported_endpoint_types":["openai-response"]},
|
||||
{"id":"orcarouter/fusion-flash","supported_endpoint_types":["openai","openai-response"]},
|
||||
{"id":"google/gemini-embedding-001","supported_endpoint_types":["embeddings"]},
|
||||
{"id":"openai/gpt-image-1","supported_endpoint_types":["image-generation"]},
|
||||
{"id":"kling/kling-v3","supported_endpoint_types":["openai-video"]},
|
||||
{"id":"vendor/missing-metadata"}
|
||||
]}"#;
|
||||
|
||||
for (api_style, expected_ids) in [
|
||||
(AiApiStyle::Completions, vec!["deepseek/deepseek-chat", "orcarouter/fusion-flash"]),
|
||||
(AiApiStyle::Responses, vec!["openai/gpt-response-only", "orcarouter/fusion-flash"]),
|
||||
] {
|
||||
let (origin, server) = spawn_get_response_server("200 OK", response_body).await;
|
||||
let config = orcarouter_test_config(format!("{origin}/v1"), api_style);
|
||||
|
||||
let models = list_models_core(&config).await.unwrap();
|
||||
|
||||
assert_eq!(models.iter().map(|model| model.id.as_str()).collect::<Vec<_>>(), expected_ids);
|
||||
let request = server.await.unwrap().to_ascii_lowercase();
|
||||
assert!(request.starts_with("get /v1/models "));
|
||||
assert!(request.contains("authorization: bearer secret"));
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn anthropic_compatible_model_list_paginates_and_deduplicates() {
|
||||
let (origin, server) = spawn_paginated_model_server().await;
|
||||
|
||||
@@ -79,7 +79,10 @@ pub fn static_effort_capability(config: &AiConfig, model_id: &str) -> Option<AiE
|
||||
AiProvider::Ollama => ollama_capability(&model, source),
|
||||
AiProvider::MiniMax if matches_family(&model, "minimax-m3") => Some(boolean_capability(source)),
|
||||
AiProvider::MiniMax => None,
|
||||
AiProvider::AnthropicCompatible | AiProvider::OpenaiCompatible | AiProvider::Custom => {
|
||||
AiProvider::AnthropicCompatible
|
||||
| AiProvider::OpenaiCompatible
|
||||
| AiProvider::OrcaRouter
|
||||
| AiProvider::Custom => {
|
||||
Some(AiEffortCapability::FreeText { placeholder: None, source: AiCapabilitySource::Custom })
|
||||
}
|
||||
AiProvider::Claude
|
||||
@@ -192,6 +195,7 @@ pub fn registry_source_url(provider: &AiProvider) -> Option<&'static str> {
|
||||
AiProvider::Claude
|
||||
| AiProvider::AnthropicCompatible
|
||||
| AiProvider::OpenaiCompatible
|
||||
| AiProvider::OrcaRouter
|
||||
| AiProvider::CodexCli
|
||||
| AiProvider::ClaudeCodeCli
|
||||
| AiProvider::PiAgentCli
|
||||
@@ -267,7 +271,9 @@ pub fn apply_runtime_effort(body: &mut Value, config: &AiConfig) {
|
||||
AiProvider::Qwen => apply_qwen_effort(object, selection),
|
||||
AiProvider::Ollama => apply_openai_effort(object, &config.api_style, selection),
|
||||
AiProvider::MiniMax => apply_minimax_effort(object, selection),
|
||||
AiProvider::Openai | AiProvider::OpenaiCompatible => apply_openai_effort(object, &config.api_style, selection),
|
||||
AiProvider::Openai | AiProvider::OpenaiCompatible | AiProvider::OrcaRouter => {
|
||||
apply_openai_effort(object, &config.api_style, selection)
|
||||
}
|
||||
AiProvider::Custom => {
|
||||
if config.api_style == AiApiStyle::AnthropicMessages {
|
||||
apply_claude_effort(object, selection);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use crate::ai::{AiModelInfo, AiProvider};
|
||||
use crate::ai::{AiApiStyle, AiModelInfo, AiProvider};
|
||||
use serde_json::Value;
|
||||
|
||||
// Provider model-family exclusions last checked against official catalogs on 2026-07-27.
|
||||
@@ -93,6 +93,7 @@ pub(crate) fn model_is_assistant_compatible(provider: &AiProvider, model_id: &st
|
||||
| AiProvider::Deepseek
|
||||
| AiProvider::Ollama
|
||||
| AiProvider::OpenaiCompatible
|
||||
| AiProvider::OrcaRouter
|
||||
| AiProvider::CodexCli
|
||||
| AiProvider::ClaudeCodeCli
|
||||
| AiProvider::PiAgentCli
|
||||
@@ -130,6 +131,21 @@ pub(crate) fn gemini_item_is_assistant_compatible(item: &Value) -> bool {
|
||||
})
|
||||
}
|
||||
|
||||
pub(crate) fn orcarouter_item_supports_api_style(item: &Value, api_style: &AiApiStyle) -> bool {
|
||||
let required_endpoint_type = match api_style {
|
||||
AiApiStyle::Completions => "openai",
|
||||
AiApiStyle::Responses => "openai-response",
|
||||
AiApiStyle::AnthropicMessages => return false,
|
||||
};
|
||||
|
||||
item["supported_endpoint_types"].as_array().is_some_and(|endpoint_types| {
|
||||
endpoint_types
|
||||
.iter()
|
||||
.filter_map(Value::as_str)
|
||||
.any(|endpoint_type| endpoint_type.eq_ignore_ascii_case(required_endpoint_type))
|
||||
})
|
||||
}
|
||||
|
||||
fn ollama_capability(data: &Value, expected: &str) -> Option<bool> {
|
||||
let capabilities = data["capabilities"].as_array()?;
|
||||
if capabilities.is_empty() {
|
||||
@@ -150,9 +166,9 @@ pub(crate) fn ollama_tool_capability(data: &Value) -> Option<bool> {
|
||||
mod tests {
|
||||
use super::{
|
||||
gemini_item_is_assistant_compatible, model_is_assistant_compatible, ollama_completion_capability,
|
||||
ollama_tool_capability,
|
||||
ollama_tool_capability, orcarouter_item_supports_api_style,
|
||||
};
|
||||
use crate::ai::AiProvider;
|
||||
use crate::ai::{AiApiStyle, AiProvider};
|
||||
|
||||
#[test]
|
||||
fn openai_filter_keeps_assistant_models_and_hides_specialized_endpoints() {
|
||||
@@ -252,6 +268,24 @@ mod tests {
|
||||
})));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn orcarouter_filter_matches_configured_openai_api_style() {
|
||||
let chat_model = serde_json::json!({
|
||||
"id": "orcarouter/fusion-flash",
|
||||
"supported_endpoint_types": ["openai", "openai-response"]
|
||||
});
|
||||
assert!(orcarouter_item_supports_api_style(&chat_model, &AiApiStyle::Completions));
|
||||
assert!(orcarouter_item_supports_api_style(&chat_model, &AiApiStyle::Responses));
|
||||
assert!(!orcarouter_item_supports_api_style(&chat_model, &AiApiStyle::AnthropicMessages));
|
||||
|
||||
for endpoint_type in ["embeddings", "image-generation", "openai-video"] {
|
||||
let specialized_model = serde_json::json!({ "supported_endpoint_types": [endpoint_type] });
|
||||
assert!(!orcarouter_item_supports_api_style(&specialized_model, &AiApiStyle::Completions));
|
||||
assert!(!orcarouter_item_supports_api_style(&specialized_model, &AiApiStyle::Responses));
|
||||
}
|
||||
assert!(!orcarouter_item_supports_api_style(&serde_json::json!({}), &AiApiStyle::Completions));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ollama_capabilities_only_exclude_explicit_non_completion_models() {
|
||||
assert_eq!(
|
||||
|
||||
Reference in new issue
Block a user