Refresh the model catalog on the blocking pool (#12727)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Douwe Osinga
2026-10-06 22:00:35 +00:00
committed by GitHub
parent a32c92dbc4
commit da75f59f66
3 changed files with 37 additions and 13 deletions
+3 -1
View File
@@ -8,7 +8,9 @@ pub use model::{CanonicalModel, Limit, Modalities, Modality, Pricing, ThinkingMo
pub use name_builder::{
canonical_name, map_provider_name, map_to_canonical_model, strip_version_suffix,
};
pub use registry::{load_cached_catalog, refresh_remote_catalog, CanonicalModelRegistry};
pub use registry::{
fetch_remote_catalog, load_cached_catalog, CanonicalModelRegistry, RemoteCatalog,
};
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
pub struct ModelMapping {
@@ -140,7 +140,13 @@ pub fn load_cached_catalog(cache_dir: &Path) -> Result<bool> {
Ok(true)
}
pub async fn refresh_remote_catalog(url: &str, cache_dir: &Path) -> Result<bool> {
pub struct RemoteCatalog {
body: Vec<u8>,
etag: Option<String>,
}
/// Returns `None` when the cached catalog is still current.
pub async fn fetch_remote_catalog(url: &str, cache_dir: &Path) -> Result<Option<RemoteCatalog>> {
let client = reqwest::Client::builder().build()?;
let etag_path = cache_dir.join(ETAG_FILENAME);
let mut request = client.get(url).timeout(Duration::from_secs(15)).header(
@@ -153,7 +159,7 @@ pub async fn refresh_remote_catalog(url: &str, cache_dir: &Path) -> Result<bool>
let response = request.send().await?.error_for_status()?;
if response.status() == reqwest::StatusCode::NOT_MODIFIED {
return Ok(false);
return Ok(None);
}
if response
.content_length()
@@ -175,16 +181,22 @@ pub async fn refresh_remote_catalog(url: &str, cache_dir: &Path) -> Result<bool>
}
body.extend_from_slice(&chunk);
}
let content = std::str::from_utf8(&body).context("canonical model catalog is not UTF-8")?;
let registry = super::models_dev::from_models_dev(content)?;
Ok(Some(RemoteCatalog { body, etag }))
}
std::fs::create_dir_all(cache_dir)?;
atomic_write(cache_dir.join(CATALOG_FILENAME), &body)?;
if let Some(etag) = etag {
atomic_write(etag_path, etag.as_bytes())?;
impl RemoteCatalog {
pub fn install(self, cache_dir: &Path) -> Result<()> {
let content =
std::str::from_utf8(&self.body).context("canonical model catalog is not UTF-8")?;
let registry = super::models_dev::from_models_dev(content)?;
std::fs::create_dir_all(cache_dir)?;
atomic_write(cache_dir.join(CATALOG_FILENAME), &self.body)?;
if let Some(etag) = self.etag {
atomic_write(cache_dir.join(ETAG_FILENAME), etag.as_bytes())?;
}
activate(registry)
}
activate(registry)?;
Ok(true)
}
fn atomic_write(destination: PathBuf, content: &[u8]) -> Result<()> {
+12 -2
View File
@@ -1,5 +1,5 @@
use crate::config::paths::Paths;
use goose_providers::canonical::{load_cached_catalog, refresh_remote_catalog};
use goose_providers::canonical::{fetch_remote_catalog, load_cached_catalog};
use std::path::PathBuf;
const CATALOG_URL: &str = "https://models.dev/api.json";
@@ -15,8 +15,18 @@ pub fn initialize() {
}
tokio::spawn(async move {
if let Err(error) = refresh_remote_catalog(CATALOG_URL, &cache_dir).await {
if let Err(error) = refresh(cache_dir).await {
tracing::warn!(%error, "failed to refresh remote model catalog");
}
});
}
async fn refresh(cache_dir: PathBuf) -> anyhow::Result<()> {
let Some(catalog) = fetch_remote_catalog(CATALOG_URL, &cache_dir).await? else {
return Ok(());
};
// Parsing the catalog is slow enough to stall the runtime's timers. Only
// this step goes to the blocking pool, so shutting the runtime down still
// cancels the download instead of waiting for it.
tokio::task::spawn_blocking(move || catalog.install(&cache_dir)).await?
}