Skip to content

Add support for available_providers in model spec #136

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
aswink merged 1 commit into from
Mar 14, 2026
Merged

Add support for available_providers in model spec #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 79 additions & 23 deletions crates/braintrust-llm-router/src/catalog/resolver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl ModelResolver {
Arc::clone(&self.catalog)
}

pub fn resolve(&self, model: &str) -> Result<(Arc<ModelSpec>, ProviderFormat, String)> {
pub fn resolve(&self, model: &str) -> Result<(Arc<ModelSpec>, ProviderFormat, Vec<String>)> {
let spec = self
.catalog
.get(model)
Expand All @@ -44,14 +44,20 @@ impl ModelResolver {
} else {
spec.format
};
let provider_alias = self.aliases.get(model).cloned().unwrap_or_else(|| {
if lingua::is_vertex_model(model) {
"vertex".to_string()
} else {
format_identifier(format)
}
});
Ok((spec, format, provider_alias))
let provider_aliases = self
.aliases
.get(model)
.map(|alias| vec![alias.clone()])
.unwrap_or_else(|| {
if !spec.available_providers.is_empty() {
spec.available_providers.clone()
} else if lingua::is_vertex_model(model) {
vec!["vertex".to_string()]
Comment on lines +54 to +55
Copy link
Contributor

@knjiang Ken Jiang (knjiang) Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i had to do this because the current model_list.json doesn't tell u that its provider -> https://github.com/braintrustdata/braintrust-proxy/blob/main/packages/proxy/schema/model_list.json#L4022

i wonder if we can simplify now that we have available providers?

this could be a follow-up i tackle to get more familiar with the code.

Copy link
Contributor Author

@aswink aswink Mar 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, in that case yes? I'll leave that to a follow up just in case, though.

} else {
vec![format_identifier(format)]
}
});
Ok((spec, format, provider_aliases))
}
}

Expand Down Expand Up @@ -95,9 +101,20 @@ mod tests {
max_output_tokens: None,
supports_streaming: true,
extra: Default::default(),
available_providers: Default::default(),
}
}

fn spec_with_available_providers(
model: &str,
format: ProviderFormat,
providers: Vec<String>,
) -> ModelSpec {
let mut s = spec(model, format);
s.available_providers = providers;
s
}

#[test]
fn resolve_returns_default_alias() {
let mut catalog = ModelCatalog::empty();
Expand All @@ -107,9 +124,9 @@ mod tests {
);
let resolver = ModelResolver::new(Arc::new(catalog));

let (_, format, alias) = resolver.resolve("model").expect("resolves");
let (_, format, aliases) = resolver.resolve("model").expect("resolves");
assert_eq!(format, ProviderFormat::ChatCompletions);
assert_eq!(alias, "openai");
assert_eq!(aliases, vec!["openai".to_string()]);
}

#[test]
Expand All @@ -119,9 +136,9 @@ mod tests {
let resolver = ModelResolver::new(Arc::new(catalog))
.with_aliases(HashMap::from([("model".into(), "custom".into())]));

let (_, format, alias) = resolver.resolve("model").expect("resolves");
let (_, format, aliases) = resolver.resolve("model").expect("resolves");
assert_eq!(format, ProviderFormat::Anthropic);
assert_eq!(alias, "custom");
assert_eq!(aliases, vec!["custom".to_string()]);
}

#[test]
Expand All @@ -138,9 +155,9 @@ mod tests {
catalog.insert(model.into(), spec(model, ProviderFormat::Anthropic));
let resolver = ModelResolver::new(Arc::new(catalog));

let (_, format, alias) = resolver.resolve(model).expect("resolves");
let (_, format, aliases) = resolver.resolve(model).expect("resolves");
assert_eq!(format, ProviderFormat::BedrockAnthropic);
assert_eq!(alias, "bedrock");
assert_eq!(aliases, vec!["bedrock".to_string()]);
}

#[test]
Expand All @@ -150,9 +167,9 @@ mod tests {
catalog.insert(model.into(), spec(model, ProviderFormat::Anthropic));
let resolver = ModelResolver::new(Arc::new(catalog));

let (_, format, alias) = resolver.resolve(model).expect("resolves");
let (_, format, aliases) = resolver.resolve(model).expect("resolves");
assert_eq!(format, ProviderFormat::Anthropic);
assert_eq!(alias, "anthropic");
assert_eq!(aliases, vec!["anthropic".to_string()]);
}

#[test]
Expand All @@ -162,9 +179,9 @@ mod tests {
catalog.insert(model.into(), spec(model, ProviderFormat::Google));
let resolver = ModelResolver::new(Arc::new(catalog));

let (_, format, alias) = resolver.resolve(model).expect("resolves");
let (_, format, aliases) = resolver.resolve(model).expect("resolves");
assert_eq!(format, ProviderFormat::Google);
assert_eq!(alias, "vertex");
assert_eq!(aliases, vec!["vertex".to_string()]);
}

#[test]
Expand All @@ -174,9 +191,9 @@ mod tests {
catalog.insert(model.into(), spec(model, ProviderFormat::Google));
let resolver = ModelResolver::new(Arc::new(catalog));

let (_, format, alias) = resolver.resolve(model).expect("resolves");
let (_, format, aliases) = resolver.resolve(model).expect("resolves");
assert_eq!(format, ProviderFormat::Google);
assert_eq!(alias, "google");
assert_eq!(aliases, vec!["google".to_string()]);
}

#[test]
Expand All @@ -186,8 +203,47 @@ mod tests {
catalog.insert(model.into(), spec(model, ProviderFormat::Anthropic));
let resolver = ModelResolver::new(Arc::new(catalog));

let (_, format, alias) = resolver.resolve(model).expect("resolves");
let (_, format, aliases) = resolver.resolve(model).expect("resolves");
assert_eq!(format, ProviderFormat::VertexAnthropic);
assert_eq!(alias, "vertex");
assert_eq!(aliases, vec!["vertex".to_string()]);
}

#[test]
fn resolve_returns_available_providers_when_no_alias() {
let model = "gpt-4o";
let mut catalog = ModelCatalog::empty();
catalog.insert(
model.into(),
spec_with_available_providers(
model,
ProviderFormat::ChatCompletions,
vec!["openai".to_string(), "azure".to_string()],
),
);
let resolver = ModelResolver::new(Arc::new(catalog));

let (_, format, aliases) = resolver.resolve(model).expect("resolves");
assert_eq!(format, ProviderFormat::ChatCompletions);
assert_eq!(aliases, vec!["openai".to_string(), "azure".to_string()]);
}

#[test]
fn resolve_custom_alias_overrides_available_providers() {
let model = "gpt-4o";
let mut catalog = ModelCatalog::empty();
catalog.insert(
model.into(),
spec_with_available_providers(
model,
ProviderFormat::ChatCompletions,
vec!["openai".to_string(), "azure".to_string()],
),
);
let resolver = ModelResolver::new(Arc::new(catalog))
.with_aliases(HashMap::from([(model.into(), "custom".into())]));

let (_, format, aliases) = resolver.resolve(model).expect("resolves");
assert_eq!(format, ProviderFormat::ChatCompletions);
assert_eq!(aliases, vec!["custom".to_string()]);
}
}
3 changes: 3 additions & 0 deletions crates/braintrust-llm-router/src/catalog/spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ pub struct ModelSpec {
pub supports_streaming: bool,
#[serde(default)]
pub extra: serde_json::Map<String, serde_json::Value>,
#[serde(default)]
pub available_providers: Vec<String>,
}

fn default_true() -> bool {
Expand Down Expand Up @@ -115,6 +117,7 @@ mod tests {
max_output_tokens: None,
supports_streaming: true,
extra: serde_json::Map::new(),
available_providers: vec![],
};
assert!(spec.requires_responses_api());
}
Expand Down
12 changes: 12 additions & 0 deletions crates/braintrust-llm-router/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,15 @@ pub fn set_override_client(client: ClientWithMiddleware) {
pub fn clear_override_client() {
*OVERRIDE_CLIENT.write() = None;
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn build_middleware_client_with_no_override() {
clear_override_client();
let client = build_middleware_client(&ClientSettings::default());
assert!(client.is_ok());
}
}
Loading
Loading