feat(providers): add multi-model router for task-based provider routing
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
eadeffef26
commit
1cfc63831c
9 changed files with 537 additions and 9 deletions
|
|
@ -5,6 +5,7 @@ pub mod ollama;
|
|||
pub mod openai;
|
||||
pub mod openrouter;
|
||||
pub mod reliable;
|
||||
pub mod router;
|
||||
pub mod traits;
|
||||
|
||||
pub use traits::Provider;
|
||||
|
|
@ -153,7 +154,7 @@ fn resolve_api_key(name: &str, api_key: Option<&str>) -> Option<String> {
|
|||
/// Factory: create the right provider from config
|
||||
#[allow(clippy::too_many_lines)]
|
||||
pub fn create_provider(name: &str, api_key: Option<&str>) -> anyhow::Result<Box<dyn Provider>> {
|
||||
let resolved_key = resolve_api_key(name, api_key);
|
||||
let _resolved_key = resolve_api_key(name, api_key);
|
||||
match name {
|
||||
// ── Primary providers (custom implementations) ───────
|
||||
"openrouter" => Ok(Box::new(openrouter::OpenRouterProvider::new(api_key))),
|
||||
|
|
@ -316,6 +317,71 @@ pub fn create_resilient_provider(
|
|||
)))
|
||||
}
|
||||
|
||||
/// Create a RouterProvider if model routes are configured, otherwise return a
|
||||
/// standard resilient provider. The router wraps individual providers per route,
|
||||
/// each with its own retry/fallback chain.
|
||||
pub fn create_routed_provider(
|
||||
primary_name: &str,
|
||||
api_key: Option<&str>,
|
||||
reliability: &crate::config::ReliabilityConfig,
|
||||
model_routes: &[crate::config::ModelRouteConfig],
|
||||
default_model: &str,
|
||||
) -> anyhow::Result<Box<dyn Provider>> {
|
||||
if model_routes.is_empty() {
|
||||
return create_resilient_provider(primary_name, api_key, reliability);
|
||||
}
|
||||
|
||||
// Collect unique provider names needed
|
||||
let mut needed: Vec<String> = vec![primary_name.to_string()];
|
||||
for route in model_routes {
|
||||
if !needed.iter().any(|n| n == &route.provider) {
|
||||
needed.push(route.provider.clone());
|
||||
}
|
||||
}
|
||||
|
||||
// Create each provider (with its own resilience wrapper)
|
||||
let mut providers: Vec<(String, Box<dyn Provider>)> = Vec::new();
|
||||
for name in &needed {
|
||||
let key = model_routes
|
||||
.iter()
|
||||
.find(|r| &r.provider == name)
|
||||
.and_then(|r| r.api_key.as_deref())
|
||||
.or(api_key);
|
||||
match create_resilient_provider(name, key, reliability) {
|
||||
Ok(provider) => providers.push((name.clone(), provider)),
|
||||
Err(e) => {
|
||||
if name == primary_name {
|
||||
return Err(e);
|
||||
}
|
||||
tracing::warn!(
|
||||
provider = name.as_str(),
|
||||
"Ignoring routed provider that failed to create: {e}"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Build route table
|
||||
let routes: Vec<(String, router::Route)> = model_routes
|
||||
.iter()
|
||||
.map(|r| {
|
||||
(
|
||||
r.hint.clone(),
|
||||
router::Route {
|
||||
provider_name: r.provider.clone(),
|
||||
model: r.model.clone(),
|
||||
},
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
|
||||
Ok(Box::new(router::RouterProvider::new(
|
||||
providers,
|
||||
routes,
|
||||
default_model.to_string(),
|
||||
)))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
|
|
|||
348
src/providers/router.rs
Normal file
348
src/providers/router.rs
Normal file
|
|
@ -0,0 +1,348 @@
|
|||
use super::Provider;
|
||||
use async_trait::async_trait;
|
||||
use std::collections::HashMap;
|
||||
|
||||
/// A single route: maps a task hint to a provider + model combo.
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Route {
|
||||
pub provider_name: String,
|
||||
pub model: String,
|
||||
}
|
||||
|
||||
/// Multi-model router — routes requests to different provider+model combos
|
||||
/// based on a task hint encoded in the model parameter.
|
||||
///
|
||||
/// The model parameter can be:
|
||||
/// - A regular model name (e.g. "anthropic/claude-sonnet-4-20250514") → uses default provider
|
||||
/// - A hint-prefixed string (e.g. "hint:reasoning") → resolves via route table
|
||||
///
|
||||
/// This wraps multiple pre-created providers and selects the right one per request.
|
||||
pub struct RouterProvider {
|
||||
routes: HashMap<String, (usize, String)>, // hint → (provider_index, model)
|
||||
providers: Vec<(String, Box<dyn Provider>)>,
|
||||
default_index: usize,
|
||||
default_model: String,
|
||||
}
|
||||
|
||||
impl RouterProvider {
|
||||
/// Create a new router with a default provider and optional routes.
|
||||
///
|
||||
/// `providers` is a list of (name, provider) pairs. The first one is the default.
|
||||
/// `routes` maps hint names to Route structs containing provider_name and model.
|
||||
pub fn new(
|
||||
providers: Vec<(String, Box<dyn Provider>)>,
|
||||
routes: Vec<(String, Route)>,
|
||||
default_model: String,
|
||||
) -> Self {
|
||||
// Build provider name → index lookup
|
||||
let name_to_index: HashMap<&str, usize> = providers
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(i, (name, _))| (name.as_str(), i))
|
||||
.collect();
|
||||
|
||||
// Resolve routes to provider indices
|
||||
let resolved_routes: HashMap<String, (usize, String)> = routes
|
||||
.into_iter()
|
||||
.filter_map(|(hint, route)| {
|
||||
let index = name_to_index.get(route.provider_name.as_str()).copied();
|
||||
match index {
|
||||
Some(i) => Some((hint, (i, route.model))),
|
||||
None => {
|
||||
tracing::warn!(
|
||||
hint = hint,
|
||||
provider = route.provider_name,
|
||||
"Route references unknown provider, skipping"
|
||||
);
|
||||
None
|
||||
}
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
||||
Self {
|
||||
routes: resolved_routes,
|
||||
providers,
|
||||
default_index: 0,
|
||||
default_model,
|
||||
}
|
||||
}
|
||||
|
||||
/// Resolve a model parameter to a (provider, actual_model) pair.
|
||||
///
|
||||
/// If the model starts with "hint:", look up the hint in the route table.
|
||||
/// Otherwise, use the default provider with the given model name.
|
||||
/// Resolve a model parameter to a (provider_index, actual_model) pair.
|
||||
fn resolve(&self, model: &str) -> (usize, String) {
|
||||
if let Some(hint) = model.strip_prefix("hint:") {
|
||||
if let Some((idx, resolved_model)) = self.routes.get(hint) {
|
||||
return (*idx, resolved_model.clone());
|
||||
}
|
||||
tracing::warn!(
|
||||
hint = hint,
|
||||
"Unknown route hint, falling back to default provider"
|
||||
);
|
||||
}
|
||||
|
||||
// Not a hint or hint not found — use default provider with the model as-is
|
||||
(self.default_index, model.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Provider for RouterProvider {
|
||||
async fn chat_with_system(
|
||||
&self,
|
||||
system_prompt: Option<&str>,
|
||||
message: &str,
|
||||
model: &str,
|
||||
temperature: f64,
|
||||
) -> anyhow::Result<String> {
|
||||
let (provider_idx, resolved_model) = self.resolve(model);
|
||||
|
||||
let (provider_name, provider) = &self.providers[provider_idx];
|
||||
tracing::info!(
|
||||
provider = provider_name.as_str(),
|
||||
model = resolved_model.as_str(),
|
||||
"Router dispatching request"
|
||||
);
|
||||
|
||||
provider
|
||||
.chat_with_system(system_prompt, message, &resolved_model, temperature)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn warmup(&self) -> anyhow::Result<()> {
|
||||
for (name, provider) in &self.providers {
|
||||
tracing::info!(provider = name, "Warming up routed provider");
|
||||
if let Err(e) = provider.warmup().await {
|
||||
tracing::warn!(provider = name, "Warmup failed (non-fatal): {e}");
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::sync::Arc;
|
||||
|
||||
struct MockProvider {
|
||||
calls: Arc<AtomicUsize>,
|
||||
response: &'static str,
|
||||
last_model: std::sync::Mutex<String>,
|
||||
}
|
||||
|
||||
impl MockProvider {
|
||||
fn new(response: &'static str) -> Self {
|
||||
Self {
|
||||
calls: Arc::new(AtomicUsize::new(0)),
|
||||
response,
|
||||
last_model: std::sync::Mutex::new(String::new()),
|
||||
}
|
||||
}
|
||||
|
||||
fn call_count(&self) -> usize {
|
||||
self.calls.load(Ordering::SeqCst)
|
||||
}
|
||||
|
||||
fn last_model(&self) -> String {
|
||||
self.last_model.lock().unwrap().clone()
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Provider for MockProvider {
|
||||
async fn chat_with_system(
|
||||
&self,
|
||||
_system_prompt: Option<&str>,
|
||||
_message: &str,
|
||||
model: &str,
|
||||
_temperature: f64,
|
||||
) -> anyhow::Result<String> {
|
||||
self.calls.fetch_add(1, Ordering::SeqCst);
|
||||
*self.last_model.lock().unwrap() = model.to_string();
|
||||
Ok(self.response.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
fn make_router(
|
||||
providers: Vec<(&'static str, &'static str)>,
|
||||
routes: Vec<(&str, &str, &str)>,
|
||||
) -> (RouterProvider, Vec<Arc<MockProvider>>) {
|
||||
let mocks: Vec<Arc<MockProvider>> = providers
|
||||
.iter()
|
||||
.map(|(_, response)| Arc::new(MockProvider::new(response)))
|
||||
.collect();
|
||||
|
||||
let provider_list: Vec<(String, Box<dyn Provider>)> = providers
|
||||
.iter()
|
||||
.zip(mocks.iter())
|
||||
.map(|((name, _), mock)| {
|
||||
(name.to_string(), Box::new(Arc::clone(mock)) as Box<dyn Provider>)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let route_list: Vec<(String, Route)> = routes
|
||||
.iter()
|
||||
.map(|(hint, provider_name, model)| {
|
||||
(
|
||||
hint.to_string(),
|
||||
Route {
|
||||
provider_name: provider_name.to_string(),
|
||||
model: model.to_string(),
|
||||
},
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let router = RouterProvider::new(
|
||||
provider_list,
|
||||
route_list,
|
||||
"default-model".to_string(),
|
||||
);
|
||||
|
||||
(router, mocks)
|
||||
}
|
||||
|
||||
// Arc<MockProvider> should also be a Provider
|
||||
#[async_trait]
|
||||
impl Provider for Arc<MockProvider> {
|
||||
async fn chat_with_system(
|
||||
&self,
|
||||
system_prompt: Option<&str>,
|
||||
message: &str,
|
||||
model: &str,
|
||||
temperature: f64,
|
||||
) -> anyhow::Result<String> {
|
||||
self.as_ref()
|
||||
.chat_with_system(system_prompt, message, model, temperature)
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn routes_hint_to_correct_provider() {
|
||||
let (router, mocks) = make_router(
|
||||
vec![("fast", "fast-response"), ("smart", "smart-response")],
|
||||
vec![
|
||||
("fast", "fast", "llama-3-70b"),
|
||||
("reasoning", "smart", "claude-opus"),
|
||||
],
|
||||
);
|
||||
|
||||
let result = router.chat("hello", "hint:reasoning", 0.5).await.unwrap();
|
||||
assert_eq!(result, "smart-response");
|
||||
assert_eq!(mocks[1].call_count(), 1);
|
||||
assert_eq!(mocks[1].last_model(), "claude-opus");
|
||||
assert_eq!(mocks[0].call_count(), 0);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn routes_fast_hint() {
|
||||
let (router, mocks) = make_router(
|
||||
vec![("fast", "fast-response"), ("smart", "smart-response")],
|
||||
vec![("fast", "fast", "llama-3-70b")],
|
||||
);
|
||||
|
||||
let result = router.chat("hello", "hint:fast", 0.5).await.unwrap();
|
||||
assert_eq!(result, "fast-response");
|
||||
assert_eq!(mocks[0].call_count(), 1);
|
||||
assert_eq!(mocks[0].last_model(), "llama-3-70b");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn unknown_hint_falls_back_to_default() {
|
||||
let (router, mocks) = make_router(
|
||||
vec![("default", "default-response"), ("other", "other-response")],
|
||||
vec![],
|
||||
);
|
||||
|
||||
let result = router.chat("hello", "hint:nonexistent", 0.5).await.unwrap();
|
||||
assert_eq!(result, "default-response");
|
||||
assert_eq!(mocks[0].call_count(), 1);
|
||||
// Falls back to default with the hint as model name
|
||||
assert_eq!(mocks[0].last_model(), "hint:nonexistent");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn non_hint_model_uses_default_provider() {
|
||||
let (router, mocks) = make_router(
|
||||
vec![("primary", "primary-response"), ("secondary", "secondary-response")],
|
||||
vec![("code", "secondary", "codellama")],
|
||||
);
|
||||
|
||||
let result = router
|
||||
.chat("hello", "anthropic/claude-sonnet-4-20250514", 0.5)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(result, "primary-response");
|
||||
assert_eq!(mocks[0].call_count(), 1);
|
||||
assert_eq!(mocks[0].last_model(), "anthropic/claude-sonnet-4-20250514");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_preserves_model_for_non_hints() {
|
||||
let (router, _) = make_router(
|
||||
vec![("default", "ok")],
|
||||
vec![],
|
||||
);
|
||||
|
||||
let (idx, model) = router.resolve("gpt-4o");
|
||||
assert_eq!(idx, 0);
|
||||
assert_eq!(model, "gpt-4o");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_strips_hint_prefix() {
|
||||
let (router, _) = make_router(
|
||||
vec![("fast", "ok"), ("smart", "ok")],
|
||||
vec![("reasoning", "smart", "claude-opus")],
|
||||
);
|
||||
|
||||
let (idx, model) = router.resolve("hint:reasoning");
|
||||
assert_eq!(idx, 1);
|
||||
assert_eq!(model, "claude-opus");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn skips_routes_with_unknown_provider() {
|
||||
let (router, _) = make_router(
|
||||
vec![("default", "ok")],
|
||||
vec![("broken", "nonexistent", "model")],
|
||||
);
|
||||
|
||||
// Route should not exist
|
||||
assert!(!router.routes.contains_key("broken"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn warmup_calls_all_providers() {
|
||||
let (router, _) = make_router(
|
||||
vec![("a", "ok"), ("b", "ok")],
|
||||
vec![],
|
||||
);
|
||||
|
||||
// Warmup should not error
|
||||
assert!(router.warmup().await.is_ok());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn chat_with_system_passes_system_prompt() {
|
||||
let mock = Arc::new(MockProvider::new("response"));
|
||||
let router = RouterProvider::new(
|
||||
vec![("default".into(), Box::new(Arc::clone(&mock)) as Box<dyn Provider>)],
|
||||
vec![],
|
||||
"model".into(),
|
||||
);
|
||||
|
||||
let result = router
|
||||
.chat_with_system(Some("system"), "hello", "model", 0.5)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(result, "response");
|
||||
assert_eq!(mock.call_count(), 1);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue