Swap canonical model from openrouter to models.dev #6625

DOsinga · 2026-01-29T17:17:58Z

needing this comment suggests that we need to refactor this more either at the beginning or at the end - let's have one unit we pass around

My followup pr deletes the pricing API and replaces it with a full canonical model fetch (or at least just the fields the client needs, but gives us a place to layer on more). will keep as cost / mtokens until we render.

Copilot · 2026-01-29T18:18:52Z

The sorting logic has an issue. When comparing models with release dates, date_b.cmp(date_a) will sort lexicographically, not chronologically. Since dates are in "YYYY-MM-DD" format, this works correctly (newer dates sort first), but it would be clearer to add a comment explaining this relies on ISO 8601 date format.

-Original file line number
+Diff line change
@@ Expand Up / @@ -871,8 +871,8 @@ fn estimate_cost_usd( @@
     ) -> Option<f64> {
         let canonical_model = maybe_get_canonical_model(provider, model)?;
-        let input_cost_per_token = canonical_model.pricing.prompt?;
-        let output_cost_per_token = canonical_model.pricing.completion?;
+        let input_cost_per_token = canonical_model.cost.input? / 1_000_000.0;
+        let output_cost_per_token = canonical_model.cost.output? / 1_000_000.0;
         let input_cost = input_cost_per_token * input_tokens as f64;
         let output_cost = output_cost_per_token * output_tokens as f64;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -505,17 +505,17 @@ pub async fn get_pricing( @@
         let mut pricing_data = Vec::new();
-        if let (Some(input_cost), Some(output_cost)) = (
-            canonical_model.pricing.prompt,
-            canonical_model.pricing.completion,
-        ) {
+        if let (Some(input_cost), Some(output_cost)) =
+            (canonical_model.cost.input, canonical_model.cost.output)
+        {
             pricing_data.push(PricingData {
                 provider: query.provider.clone(),
                 model: query.model.clone(),
-                input_token_cost: input_cost,
-                output_token_cost: output_cost,
+                // Canonical model costs are per million tokens, convert to per-token
+                input_token_cost: input_cost / 1_000_000.0,
+                output_token_cost: output_cost / 1_000_000.0,
                 currency: "$".to_string(),
-                context_length: Some(canonical_model.context_length as u32),
+                context_length: Some(canonical_model.limit.context as u32),
             });
         }
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,9 +42,9 @@ pub struct ModelInfo { @@
         pub name: String,
         /// The maximum context length this model supports
         pub context_limit: usize,
-        /// Cost per token for input (optional)
+        /// Cost per token for input in USD (optional)
         pub input_token_cost: Option<f64>,
-        /// Cost per token for output (optional)
+        /// Cost per token for output in USD (optional)
         pub output_token_cost: Option<f64>,
         /// Currency for the costs (default: "$")
         pub currency: Option<String>,
@@ Expand Down Expand Up / @@ -456,15 +456,40 @@ pub trait Provider: Send + Sync { @@
             let provider_name = self.get_name();
-            let recommended_models: Vec<String> = all_models
+            // Get all text-capable models with their release dates
+            let mut models_with_dates: Vec<(String, Option<String>)> = all_models
                 .iter()
-                .filter(|model| {
-                    map_to_canonical_model(provider_name, model, registry)
-                        .and_then(|canonical_id| registry.get(&canonical_id))
-                        .map(|m| m.input_modalities.contains(&"text".to_string()))
-                        .unwrap_or(false)
+                .filter_map(|model| {
+                    let canonical_id = map_to_canonical_model(provider_name, model, registry)?;
+                    let (provider, model_name) = canonical_id.split_once('/')?;
+                    let canonical_model = registry.get(provider, model_name)?;
+                    if !canonical_model
+                        .modalities
+                        .input
+                        .contains(&crate::providers::canonical::Modality::Text)
+                    {
+                        return None;
+                    }
+                    let release_date = canonical_model.release_date.clone();
+                    Some((model.clone(), release_date))
                 })
-                .cloned()
+                .collect();
+            // Sort by release date (most recent first), then alphabetically for models without dates
+            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),
+            });
+            let recommended_models: Vec<String> = models_with_dates
+                .into_iter()
+                .map(|(name, _)| name)
                 .collect();
             if recommended_models.is_empty() {
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swap canonical model from openrouter to models.dev #6625

Diff view

Diff view

There are no files selected for viewing

DOsinga Jan 29, 2026

Uh oh!

katzdave Jan 29, 2026

Uh oh!

Copilot AI Jan 29, 2026

Uh oh!

Uh oh!

Uh oh!

Swap canonical model from openrouter to models.dev #6625

Swap canonical model from openrouter to models.dev #6625

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

DOsinga Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

katzdave Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!