fix(providers): drive pre-key model lists from the canonical registry (#11475)

Co-authored-by: Douwe Osinga <douwe.osinga@gmail.com>
This commit is contained in:
Wolfe-James
2026-09-18 18:02:33 +00:00
committed by GitHub
parent 1e83e89f55
commit 8fd84be23b
6 changed files with 219 additions and 141 deletions
+11 -1
View File
@@ -8,7 +8,10 @@ use std::pin::Pin;
use tokio::sync::watch;
use crate::{
canonical::{catalog::ProviderSetupMetadata, map_to_canonical_model, CanonicalModelRegistry},
canonical::{
catalog::ProviderSetupMetadata, map_to_canonical_model, recommended_models_from_registry,
CanonicalModelRegistry,
},
conversation::{
message::{Message, MessageContentBlock},
token_usage::{ProviderUsage, Usage},
@@ -361,6 +364,13 @@ pub fn model_info_for_provider_model(provider_name: &str, model_name: &str) -> M
}
}
pub fn known_models_from_registry(provider: &str) -> Vec<ModelInfo> {
recommended_models_from_registry(provider)
.into_iter()
.map(|name| model_info_for_provider_model(provider, &name))
.collect()
}
/// Collect all chunks from a MessageStream into a single Message and ProviderUsage
pub async fn collect_stream(
mut stream: MessageStream,
+138 -6
View File
@@ -46,25 +46,109 @@ pub fn recommended_models_from_registry(provider: &str) -> Vec<String> {
let mut models_with_dates: Vec<(String, Option<String>)> = all
.iter()
.filter(|m| m.modalities.input.contains(&Modality::Text) && m.tool_call)
.filter(|m| match registry_provider {
"openai" => !m.id.contains("realtime"),
"google" => !m.id.contains("deep-research") && !m.id.contains("live"),
_ => true,
})
.filter_map(|m| {
let (_, name) = m.id.split_once('/')?;
Some((name.to_string(), m.release_date.clone()))
Some((
provider_wire_name(provider, &m.id, name),
m.release_date.clone(),
))
})
.collect();
models_with_dates.sort_by(|a, b| match (&a.1, &b.1) {
(Some(date_a), Some(date_b)) => date_b.cmp(date_a),
(Some(_), None) => std::cmp::Ordering::Less,
(None, Some(_)) => std::cmp::Ordering::Greater,
(None, None) => a.0.cmp(&b.0),
if matches!(provider, "google" | "xai") {
models_with_dates.extend(
mapping_report()["all_mappings"][provider]
.as_array()
.into_iter()
.flatten()
.filter_map(|mapping| mapping["provider_model"].as_str())
.filter(|name| provider != "google" || google_generate_content_model(name))
.map(|name| (name.to_string(), None)),
);
}
models_with_dates.sort_by(|a, b| {
let date_order = match (&a.1, &b.1) {
(Some(date_a), Some(date_b)) => date_b.cmp(date_a),
(Some(_), None) => std::cmp::Ordering::Less,
(None, Some(_)) => std::cmp::Ordering::Greater,
(None, None) => std::cmp::Ordering::Equal,
};
date_order.then_with(|| a.0.cmp(&b.0))
});
let mut seen = std::collections::HashSet::new();
models_with_dates.retain(|(name, _)| seen.insert(name.clone()));
models_with_dates
.into_iter()
.map(|(name, _)| name)
.collect()
}
fn google_generate_content_model(name: &str) -> bool {
!name.contains("deep-research")
&& !name.contains("live")
&& !name.contains("image")
&& !name.contains("tts")
&& !name.contains("embedding")
}
fn mapping_report() -> &'static serde_json::Value {
static REPORT: once_cell::sync::Lazy<serde_json::Value> = once_cell::sync::Lazy::new(|| {
serde_json::from_str(include_str!("canonical/data/canonical_mapping_report.json"))
.expect("bundled canonical mapping report must be valid")
});
&REPORT
}
pub fn provider_wire_name(provider: &str, canonical_id: &str, canonical_name: &str) -> String {
if map_provider_name(provider) == "anthropic" {
return dotted_version_to_dash(canonical_name);
}
let mapped = mapping_report()["all_mappings"][provider]
.as_array()
.into_iter()
.flatten()
.filter(|mapping| mapping["canonical_model"].as_str() == Some(canonical_id))
.filter_map(|mapping| mapping["provider_model"].as_str())
.min_by_key(|name| (!name.ends_with("-latest"), name.len(), *name));
mapped
.or_else(|| {
mapping_report()["unmapped_models"]
.as_array()?
.iter()
.filter(|model| model["provider"].as_str() == Some(provider))
.filter_map(|model| model["model"].as_str())
.find(|name| name.strip_suffix("-latest") == Some(canonical_name))
})
.unwrap_or(canonical_name)
.to_string()
}
fn dotted_version_to_dash(name: &str) -> String {
let bytes = name.as_bytes();
let mut out = String::with_capacity(name.len());
for (i, &b) in bytes.iter().enumerate() {
if b == b'.'
&& i > 0
&& i + 1 < bytes.len()
&& bytes[i - 1].is_ascii_digit()
&& bytes[i + 1].is_ascii_digit()
{
out.push('-');
} else {
out.push(b as char);
}
}
out
}
/// Catalog pricing is not valid for local inference: models served via ollama or a
/// local runtime are actually free to run, so any catalog price would be misleading.
///
@@ -203,4 +287,52 @@ mod tests {
assert_eq!(canonical.reasoning, Some(true));
assert_eq!(canonical.temperature, Some(false));
}
#[test]
fn recommended_google_models_use_generate_content() {
let models = recommended_models_from_registry("google");
assert!(!models.iter().any(|model| model.contains("deep-research")));
assert!(!models.iter().any(|model| model.contains("live")));
assert!(models.iter().any(|model| model == "gemini-2.5-pro"));
assert!(models.iter().any(|model| model == "gemini-2.0-flash"));
assert!(models.iter().any(|model| model == "gemini-2.0-flash-lite"));
assert!(models.iter().any(|model| model == "gemini-3-pro-preview"));
}
#[test]
fn anthropic_wire_name_uses_dashed_versions() {
assert_eq!(
provider_wire_name(
"anthropic",
"anthropic/claude-sonnet-4.5",
"claude-sonnet-4.5"
),
"claude-sonnet-4-5"
);
assert_eq!(
provider_wire_name("anthropic", "anthropic/claude-opus-5", "claude-opus-5"),
"claude-opus-5"
);
assert_eq!(
provider_wire_name("openai", "openai/gpt-5.2", "gpt-5.2"),
"gpt-5.2"
);
assert_eq!(
provider_wire_name("openai", "openai/gpt-5.2-chat", "gpt-5.2-chat"),
"gpt-5.2-chat-latest"
);
assert_eq!(
provider_wire_name("openai", "openai/gpt-5.3-chat", "gpt-5.3-chat"),
"gpt-5.3-chat-latest"
);
}
#[test]
fn xai_models_include_provider_inventory_aliases() {
let models = recommended_models_from_registry("xai");
assert!(models.iter().any(|model| model == "grok-3"));
assert!(models.iter().any(|model| model == "grok-3-mini"));
assert!(models.iter().any(|model| model == "grok-4-0709"));
assert!(models.iter().any(|model| model == "grok-code-fast-1"));
}
}
+22 -30
View File
@@ -14,7 +14,9 @@ use tokio::pin;
use tokio_util::io::StreamReader;
use super::api_client::ApiClient;
use super::base::{ConfigKey, MessageStream, ModelInfo, Provider, ProviderMetadata};
use super::base::{
known_models_from_registry, ConfigKey, MessageStream, ModelInfo, Provider, ProviderMetadata,
};
use super::formats::anthropic::{
block_binding_behavior, create_request_for_model, is_thinking_signature_error,
response_to_streaming_message, AnthropicFormatOptions, PrefixMismatchBehavior,
@@ -27,29 +29,6 @@ use crate::model::ModelConfig;
use rmcp::model::Tool;
pub const ANTHROPIC_DEFAULT_MODEL: &str = "claude-sonnet-4-5";
const ANTHROPIC_KNOWN_MODELS: &[&str] = &[
"claude-fable-5-1",
"claude-opus-5",
"claude-sonnet-5",
"claude-fable-5",
"claude-opus-4-8",
"claude-opus-4-7",
// Claude 4.6 models
"claude-opus-4-6",
"claude-sonnet-4-6",
// Claude 4.5 models with aliases
"claude-sonnet-4-5",
"claude-sonnet-4-5-20250929",
"claude-haiku-4-5",
"claude-haiku-4-5-20251001",
"claude-opus-4-5",
"claude-opus-4-5-20251101",
// Legacy Claude 4.0 models
"claude-sonnet-4-0",
"claude-sonnet-4-20250514",
"claude-opus-4-0",
"claude-opus-4-20250514",
];
const ANTHROPIC_DOC_URL: &str = "https://docs.anthropic.com/en/docs/about-claude/models";
pub const ANTHROPIC_API_VERSION: &str = "2023-06-01";
@@ -339,17 +318,12 @@ impl AnthropicProvider {
impl ProviderDescriptor for AnthropicProvider {
fn metadata() -> ProviderMetadata {
let models: Vec<ModelInfo> = ANTHROPIC_KNOWN_MODELS
.iter()
.map(|&model_name| ModelInfo::new(model_name).with_context_limit(200_000))
.collect();
ProviderMetadata::with_models(
ANTHROPIC_PROVIDER_NAME,
"Anthropic",
"Claude and other models from Anthropic",
ANTHROPIC_DEFAULT_MODEL,
models,
known_models_from_registry(ANTHROPIC_PROVIDER_NAME),
ANTHROPIC_DOC_URL,
vec![
ConfigKey::new("ANTHROPIC_API_KEY", true, true, None, true),
@@ -861,4 +835,22 @@ mod tests {
Some("context-1m-2025-08-07,thinking-binding-controls-2026-08-01")
);
}
#[test]
fn metadata_comes_from_the_registry() {
let metadata = AnthropicProvider::metadata();
let sonnet = metadata
.known_models
.iter()
.find(|model| model.name == "claude-sonnet-4-5")
.expect("claude-sonnet-4-5 should come from the catalog");
assert_eq!(sonnet.context_limit, Some(1_000_000));
assert!(
metadata
.known_models
.iter()
.all(|model| !model.name.contains('.')),
"Anthropic picker ids must be dashed wire names, not dotted catalog names"
);
}
}
+27 -33
View File
@@ -5,7 +5,7 @@ use crate::errors::ProviderError;
use crate::openai_compatible::{handle_status, map_http_error_to_provider_error, sanitize_url};
use crate::retry::ProviderRetry;
use crate::base::{ConfigKey, Provider, ProviderMetadata};
use crate::base::{known_models_from_registry, ConfigKey, Provider, ProviderMetadata};
use crate::formats::google::{create_request_with_thinking_budget, response_to_streaming_message};
use crate::model::ModelConfig;
use crate::request_log::{start_log, LoggerHandleExt};
@@ -24,36 +24,6 @@ use tokio_util::io::StreamReader;
pub const GOOGLE_PROVIDER_NAME: &str = "google";
pub const GOOGLE_API_HOST: &str = "https://generativelanguage.googleapis.com";
pub const GOOGLE_DEFAULT_MODEL: &str = "gemini-2.5-pro";
pub const GOOGLE_KNOWN_MODELS: &[&str] = &[
"gemini-3.6-flash",
"gemini-3.5-flash",
"gemini-3.5-flash-lite",
// Gemini 3 models
"gemini-3-pro-preview",
"gemini-3-pro-image-preview",
// Gemini 2.5 Pro models
"gemini-2.5-pro",
"gemini-2.5-pro-preview-tts",
// Gemini 2.5 Flash models
"gemini-2.5-flash",
"gemini-2.5-flash-preview-09-2025",
"gemini-2.5-flash-image",
"gemini-2.5-flash-image-preview",
"gemini-2.5-flash-native-audio-preview-09-2025",
"gemini-2.5-flash-preview-tts",
// Gemini 2.5 Flash-Lite models
"gemini-2.5-flash-lite",
"gemini-2.5-flash-lite-preview-09-2025",
// Gemini 2.0 Flash models
"gemini-2.0-flash",
"gemini-2.0-flash-001",
"gemini-2.0-flash-exp",
"gemini-2.0-flash-preview-image-generation",
"gemini-2.0-flash-live-001",
// Gemini 2.0 Flash-Lite models
"gemini-2.0-flash-lite",
"gemini-2.0-flash-lite-001",
];
pub const GOOGLE_DOC_URL: &str = "https://ai.google.dev/gemini-api/docs/models";
@@ -115,12 +85,12 @@ impl GoogleProvider {
impl crate::base::ProviderDescriptor for GoogleProvider {
fn metadata() -> ProviderMetadata {
ProviderMetadata::new(
ProviderMetadata::with_models(
GOOGLE_PROVIDER_NAME,
"Google Gemini (API Key)",
"Gemini models from Google AI",
GOOGLE_DEFAULT_MODEL,
GOOGLE_KNOWN_MODELS.to_vec(),
known_models_from_registry(GOOGLE_PROVIDER_NAME),
GOOGLE_DOC_URL,
vec![
ConfigKey::new("GOOGLE_API_KEY", true, true, None, true),
@@ -219,3 +189,27 @@ impl Provider for GoogleProvider {
}))
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::base::ProviderDescriptor;
#[test]
fn metadata_comes_from_the_registry() {
let metadata = GoogleProvider::metadata();
assert!(
metadata
.known_models
.iter()
.any(|model| model.name == GOOGLE_DEFAULT_MODEL),
"default model should be in the catalog-backed picker"
);
let pro = metadata
.known_models
.iter()
.find(|model| model.name == "gemini-2.5-pro")
.unwrap();
assert_eq!(pro.context_limit, Some(1_048_576));
}
}
+20 -40
View File
@@ -1,5 +1,5 @@
use super::api_client::ApiClient;
use super::base::{ConfigKey, ModelInfo, Provider, ProviderMetadata};
use super::base::{known_models_from_registry, ConfigKey, ModelInfo, Provider, ProviderMetadata};
use super::retry::ProviderRetry;
use crate::api_client::{AuthMethod, TlsConfig};
use crate::conversation::message::Message;
@@ -58,40 +58,6 @@ impl CachedContextLimit {
}
}
pub const OPEN_AI_DEFAULT_MODEL: &str = "gpt-4o";
pub const OPEN_AI_KNOWN_MODELS: &[(&str, usize)] = &[
("gpt-4o", 128_000),
("gpt-4o-mini", 128_000),
("gpt-4.1", 1_047_576),
("gpt-4.1-mini", 1_047_576),
("gpt-4.1-nano", 1_047_576),
("o1", 200_000),
("o1-pro", 200_000),
("o3", 200_000),
("o3-mini", 200_000),
("o3-pro", 200_000),
("gpt-3.5-turbo", 16_385),
("gpt-4-turbo", 128_000),
("o4-mini", 200_000),
("gpt-5", 400_000),
("gpt-5-mini", 400_000),
("gpt-5-nano", 400_000),
("gpt-5-pro", 400_000),
("gpt-5.1", 400_000),
("gpt-5.2", 400_000),
("gpt-5.2-pro", 400_000),
("gpt-5.3-codex", 400_000),
("gpt-5.4", 1_050_000),
("gpt-5.4-mini", 400_000),
("gpt-5.4-nano", 400_000),
("gpt-5.4-pro", 1_050_000),
("gpt-5.5", 1_050_000),
("gpt-5.5-pro", 1_050_000),
("gpt-5.6", 1_050_000),
("gpt-5.6-sol", 1_050_000),
("gpt-5.6-terra", 1_050_000),
("gpt-5.6-luna", 1_050_000),
("gpt-6-astra", 1_050_000),
];
pub const OPEN_AI_DOC_URL: &str = "https://platform.openai.com/docs/models";
const DEFAULT_TIMEOUT_SECONDS: u64 = 600;
@@ -655,16 +621,12 @@ fn parse_n_ctx_from_models(json: &serde_json::Value, model_name: &str) -> Option
impl ProviderDescriptor for OpenAiProvider {
fn metadata() -> ProviderMetadata {
let models = OPEN_AI_KNOWN_MODELS
.iter()
.map(|(name, limit)| ModelInfo::new(*name).with_context_limit(*limit))
.collect();
ProviderMetadata::with_models(
OPEN_AI_PROVIDER_NAME,
"OpenAI",
"GPT-4 and other OpenAI models, including OpenAI compatible ones",
OPEN_AI_DEFAULT_MODEL,
models,
known_models_from_registry(OPEN_AI_PROVIDER_NAME),
OPEN_AI_DOC_URL,
vec![
ConfigKey::new("OPENAI_API_KEY", false, true, None, true),
@@ -1922,4 +1884,22 @@ mod tests {
assert_eq!(payload["stream_options"], json!({"include_usage": true}));
assert_eq!(payload["messages"].as_array().unwrap().len(), 1);
}
#[test]
fn metadata_comes_from_the_registry() {
let metadata = OpenAiProvider::metadata();
let gpt_4o = metadata
.known_models
.iter()
.find(|model| model.name == "gpt-4o")
.expect("gpt-4o should come from the catalog");
assert_eq!(gpt_4o.context_limit, Some(128_000));
assert!(
metadata
.known_models
.iter()
.any(|model| model.name == "gpt-4"),
"registry-only list should include models the old hardcoded list had drifted past"
);
}
}
+1 -31
View File
@@ -7,43 +7,13 @@ use futures::future::BoxFuture;
const XAI_PROVIDER_NAME: &str = "xai";
pub const XAI_API_HOST: &str = "https://api.x.ai/v1";
pub const XAI_DEFAULT_MODEL: &str = "grok-4.5";
pub const XAI_KNOWN_MODELS: &[&str] = &[
"grok-4.5",
"grok-4.3",
"grok-4.20-0309-reasoning",
"grok-4.20-0309-non-reasoning",
"grok-build-0.1",
"grok-code-fast-1",
"grok-4-0709",
"grok-3",
"grok-3-fast",
"grok-3-mini",
"grok-3-mini-fast",
"grok-2-vision-1212",
"grok-2-image-1212",
"grok-3-latest",
"grok-3-fast-latest",
"grok-3-mini-latest",
"grok-3-mini-fast-latest",
"grok-2-vision",
"grok-2-vision-latest",
"grok-2-image",
"grok-2-image-latest",
"grok-2",
"grok-2-latest",
];
pub const XAI_DOC_URL: &str = "https://docs.x.ai/docs/overview";
pub struct XaiProvider;
pub fn xai_known_model_info() -> Vec<goose_providers::base::ModelInfo> {
XAI_KNOWN_MODELS
.iter()
.map(|model_name| {
goose_providers::base::model_info_for_provider_model(XAI_PROVIDER_NAME, model_name)
})
.collect()
goose_providers::base::known_models_from_registry(XAI_PROVIDER_NAME)
}
impl goose_providers::base::ProviderDescriptor for XaiProvider {