@pydantic/genai-prices 0.0.40 → 0.0.42

package/dist/cli.js

@@ -138,14 +138,14 @@ class Ne {
       keys: []
     }, L = /^-([0-9]+(\.[0-9]+)?|\.[0-9]+)$/, U = new RegExp("^--" + h["negation-prefix"] + "(.+)");
     [].concat(s.array || []).filter(Boolean).forEach(function(e) {
-      const a = typeof e == "object" ? e.key : e, l = Object.keys(e).map(function(o) {
+      const a = typeof e == "object" ? e.key : e, c = Object.keys(e).map(function(o) {
         return {
           boolean: "bools",
           string: "strings",
           number: "numbers"
         }[o];
       }).filter(Boolean).pop();
-      l && (r[l][a] = !0), r.arrays[a] = !0, r.keys.push(a);
+      c && (r[c][a] = !0), r.arrays[a] = !0, r.keys.push(a);
     }), [].concat(s.boolean || []).filter(Boolean).forEach(function(e) {
       r.bools[e] = !0, r.keys.push(e);
     }), [].concat(s.string || []).filter(Boolean).forEach(function(e) {
@@ -174,23 +174,23 @@ class Ne {
     let F = [];
     const w = Object.assign(/* @__PURE__ */ Object.create(null), { _: [] }), ne = {};
     for (let e = 0; e < u.length; e++) {
-      const a = u[e], l = a.replace(/^-{3,}/, "---");
-      let o, t, p, c, d, v;
+      const a = u[e], c = a.replace(/^-{3,}/, "---");
+      let o, t, p, l, d, v;
       if (a !== "--" && /^-/.test(a) && H(a))
         K(a);
-      else if (l.match(/^---+(=|$)/)) {
+      else if (c.match(/^---+(=|$)/)) {
         K(a);
         continue;
       } else if (a.match(/^--.+=/) || !h["short-option-groups"] && a.match(/^-.+=/))
-        c = a.match(/^--?([^=]+)=([\s\S]*)$/), c !== null && Array.isArray(c) && c.length >= 3 && (g(c[1], r.arrays) ? e = V(e, c[1], u, c[2]) : g(c[1], r.nargs) !== !1 ? e = D(e, c[1], u, c[2]) : q(c[1], c[2], !0));
+        l = a.match(/^--?([^=]+)=([\s\S]*)$/), l !== null && Array.isArray(l) && l.length >= 3 && (g(l[1], r.arrays) ? e = V(e, l[1], u, l[2]) : g(l[1], r.nargs) !== !1 ? e = D(e, l[1], u, l[2]) : q(l[1], l[2], !0));
       else if (a.match(U) && h["boolean-negation"])
-        c = a.match(U), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], q(t, g(t, r.arrays) ? [!1] : !1));
+        l = a.match(U), l !== null && Array.isArray(l) && l.length >= 2 && (t = l[1], q(t, g(t, r.arrays) ? [!1] : !1));
       else if (a.match(/^--.+/) || !h["short-option-groups"] && a.match(/^-[^-]+/))
-        c = a.match(/^--?(.+)/), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], g(t, r.arrays) ? e = V(e, t, u) : g(t, r.nargs) !== !1 ? e = D(e, t, u) : (d = u[e + 1], d !== void 0 && (!d.match(/^-/) || d.match(L)) && !g(t, r.bools) && !g(t, r.counts) || /^(true|false)$/.test(d) ? (q(t, d), e++) : q(t, R(t))));
+        l = a.match(/^--?(.+)/), l !== null && Array.isArray(l) && l.length >= 2 && (t = l[1], g(t, r.arrays) ? e = V(e, t, u) : g(t, r.nargs) !== !1 ? e = D(e, t, u) : (d = u[e + 1], d !== void 0 && (!d.match(/^-/) || d.match(L)) && !g(t, r.bools) && !g(t, r.counts) || /^(true|false)$/.test(d) ? (q(t, d), e++) : q(t, R(t))));
       else if (a.match(/^-.\..+=/))
-        c = a.match(/^-([^=]+)=([\s\S]*)$/), c !== null && Array.isArray(c) && c.length >= 3 && q(c[1], c[2]);
+        l = a.match(/^-([^=]+)=([\s\S]*)$/), l !== null && Array.isArray(l) && l.length >= 3 && q(l[1], l[2]);
       else if (a.match(/^-.\..+/) && !a.match(L))
-        d = u[e + 1], c = a.match(/^-(.\..+)/), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], d !== void 0 && !d.match(/^-/) && !g(t, r.bools) && !g(t, r.counts) ? (q(t, d), e++) : q(t, R(t)));
+        d = u[e + 1], l = a.match(/^-(.\..+)/), l !== null && Array.isArray(l) && l.length >= 2 && (t = l[1], d !== void 0 && !d.match(/^-/) && !g(t, r.bools) && !g(t, r.counts) ? (q(t, d), e++) : q(t, R(t)));
       else if (a.match(/^-[^-]+/) && !a.match(L)) {
         p = a.slice(1, -1).split(""), o = !1;
         for (let x = 0; x < p.length; x++) {
@@ -237,26 +237,26 @@ class Ne {
       const a = $("_", e);
       (typeof a == "string" || typeof a == "number") && w._.push(a);
     }
-    function D(e, a, l, o) {
+    function D(e, a, c, o) {
       let t, p = g(a, r.nargs);
       if (p = typeof p != "number" || isNaN(p) ? 1 : p, p === 0)
         return T(o) || (B = Error(C("Argument unexpected for: %s", a))), q(a, R(a)), e;
-      let c = T(o) ? 0 : 1;
+      let l = T(o) ? 0 : 1;
       if (h["nargs-eats-options"])
-        l.length - (e + 1) + c < p && (B = Error(C("Not enough arguments following: %s", a))), c = p;
+        c.length - (e + 1) + l < p && (B = Error(C("Not enough arguments following: %s", a))), l = p;
       else {
-        for (t = e + 1; t < l.length && (!l[t].match(/^-[^0-9]/) || l[t].match(L) || H(l[t])); t++)
-          c++;
-        c < p && (B = Error(C("Not enough arguments following: %s", a)));
+        for (t = e + 1; t < c.length && (!c[t].match(/^-[^0-9]/) || c[t].match(L) || H(c[t])); t++)
+          l++;
+        l < p && (B = Error(C("Not enough arguments following: %s", a)));
       }
-      let d = Math.min(c, p);
+      let d = Math.min(l, p);
       for (!T(o) && d > 0 && (q(a, o), d--), t = e + 1; t < d + e + 1; t++)
-        q(a, l[t]);
+        q(a, c[t]);
       return e + d;
     }
-    function V(e, a, l, o) {
-      let t = [], p = o || l[e + 1];
-      const c = g(a, r.nargs);
+    function V(e, a, c, o) {
+      let t = [], p = o || c[e + 1];
+      const l = g(a, r.nargs);
       if (g(a, r.bools) && !/^(true|false)$/.test(p))
         t.push(!0);
       else if (T(p) || T(o) && /^-/.test(p) && !L.test(p) && !H(p)) {
@@ -266,28 +266,28 @@ class Ne {
         }
       } else {
         T(o) || t.push(Y(a, o, !0));
-        for (let d = e + 1; d < l.length && !(!h["greedy-arrays"] && t.length > 0 || c && typeof c == "number" && t.length >= c || (p = l[d], /^-/.test(p) && !L.test(p) && !H(p))); d++)
+        for (let d = e + 1; d < c.length && !(!h["greedy-arrays"] && t.length > 0 || l && typeof l == "number" && t.length >= l || (p = c[d], /^-/.test(p) && !L.test(p) && !H(p))); d++)
           e = d, t.push(Y(a, p, k));
       }
-      return typeof c == "number" && (c && t.length < c || isNaN(c) && t.length === 0) && (B = Error(C("Not enough arguments following: %s", a))), q(a, t), e;
+      return typeof l == "number" && (l && t.length < l || isNaN(l) && t.length === 0) && (B = Error(C("Not enough arguments following: %s", a))), q(a, t), e;
     }
-    function q(e, a, l = k) {
+    function q(e, a, c = k) {
       if (/-/.test(e) && h["camel-case-expansion"]) {
-        const p = e.split(".").map(function(c) {
-          return W(c);
+        const p = e.split(".").map(function(l) {
+          return W(l);
         }).join(".");
         se(e, p);
       }
-      const o = Y(e, a, l), t = e.split(".");
+      const o = Y(e, a, c), t = e.split(".");
       N(w, t, o), r.aliases[e] && r.aliases[e].forEach(function(p) {
-        const c = p.split(".");
-        N(w, c, o);
+        const l = p.split(".");
+        N(w, l, o);
       }), t.length > 1 && h["dot-notation"] && (r.aliases[t[0]] || []).forEach(function(p) {
-        let c = p.split(".");
+        let l = p.split(".");
         const d = [].concat(t);
-        d.shift(), c = c.concat(d), (r.aliases[e] || []).includes(c.join(".")) || N(w, c, o);
-      }), g(e, r.normalize) && !g(e, r.arrays) && [e].concat(r.aliases[e] || []).forEach(function(c) {
-        Object.defineProperty(ne, c, {
+        d.shift(), l = l.concat(d), (r.aliases[e] || []).includes(l.join(".")) || N(w, l, o);
+      }), g(e, r.normalize) && !g(e, r.arrays) && [e].concat(r.aliases[e] || []).forEach(function(l) {
+        Object.defineProperty(ne, l, {
           enumerable: !0,
           get() {
             return a;
@@ -301,8 +301,8 @@ class Ne {
     function se(e, a) {
       r.aliases[e] && r.aliases[e].length || (r.aliases[e] = [a], Q[a] = !0), r.aliases[a] && r.aliases[a].length || se(a, e);
     }
-    function Y(e, a, l) {
-      l && (a = je(a)), (g(e, r.bools) || g(e, r.counts)) && typeof a == "string" && (a = a === "true");
+    function Y(e, a, c) {
+      c && (a = je(a)), (g(e, r.bools) || g(e, r.counts)) && typeof a == "string" && (a = a === "true");
       let o = Array.isArray(a) ? a.map(function(t) {
         return $(e, t);
       }) : $(e, a);
@@ -313,15 +313,15 @@ class Ne {
     }
     function ke(e) {
       const a = /* @__PURE__ */ Object.create(null);
-      me(a, r.aliases, f), Object.keys(r.configs).forEach(function(l) {
-        const o = e[l] || a[l];
+      me(a, r.aliases, f), Object.keys(r.configs).forEach(function(c) {
+        const o = e[c] || a[c];
         if (o)
           try {
             let t = null;
-            const p = A.resolve(A.cwd(), o), c = r.configs[l];
-            if (typeof c == "function") {
+            const p = A.resolve(A.cwd(), o), l = r.configs[c];
+            if (typeof l == "function") {
               try {
-                t = c(p);
+                t = l(p);
               } catch (d) {
                 t = d;
               }
@@ -333,13 +333,13 @@ class Ne {
               t = A.require(p);
             J(t);
           } catch (t) {
-            t.name === "PermissionDenied" ? B = t : e[l] && (B = Error(C("Invalid JSON config file: %s", o)));
+            t.name === "PermissionDenied" ? B = t : e[c] && (B = Error(C("Invalid JSON config file: %s", o)));
           }
       });
     }
     function J(e, a) {
-      Object.keys(e).forEach(function(l) {
-        const o = e[l], t = a ? a + "." + l : l;
+      Object.keys(e).forEach(function(c) {
+        const o = e[c], t = a ? a + "." + c : c;
         typeof o == "object" && o !== null && !Array.isArray(o) && h["dot-notation"] ? J(o, t) : (!E(w, t.split(".")) || g(t, r.arrays) && h["combine-arrays"]) && q(t, o);
       });
     }
@@ -351,11 +351,11 @@ class Ne {
     function re(e, a) {
       if (typeof P > "u")
         return;
-      const l = typeof P == "string" ? P : "", o = A.env();
+      const c = typeof P == "string" ? P : "", o = A.env();
       Object.keys(o).forEach(function(t) {
-        if (l === "" || t.lastIndexOf(l, 0) === 0) {
-          const p = t.split("__").map(function(c, d) {
-            return d === 0 && (c = c.substring(l.length)), W(c);
+        if (c === "" || t.lastIndexOf(c, 0) === 0) {
+          const p = t.split("__").map(function(l, d) {
+            return d === 0 && (l = l.substring(c.length)), W(l);
           });
           (a && r.configs[p.join(".")] || !a) && !E(e, p) && q(p.join("."), o[t]);
         }
@@ -363,13 +363,13 @@ class Ne {
     }
     function fe(e) {
       let a;
-      const l = /* @__PURE__ */ new Set();
+      const c = /* @__PURE__ */ new Set();
       Object.keys(e).forEach(function(o) {
-        if (!l.has(o) && (a = g(o, r.coercions), typeof a == "function"))
+        if (!c.has(o) && (a = g(o, r.coercions), typeof a == "function"))
           try {
             const t = $(o, a(e[o]));
             [].concat(r.aliases[o] || [], o).forEach((p) => {
-              l.add(p), e[p] = t;
+              c.add(p), e[p] = t;
             });
           } catch (t) {
             B = t;
@@ -381,45 +381,45 @@ class Ne {
         ~a.indexOf(".") || typeof e[a] > "u" && (e[a] = void 0);
       }), e;
     }
-    function me(e, a, l, o = !1) {
-      Object.keys(l).forEach(function(t) {
-        E(e, t.split(".")) || (N(e, t.split("."), l[t]), o && (oe[t] = !0), (a[t] || []).forEach(function(p) {
-          E(e, p.split(".")) || N(e, p.split("."), l[t]);
+    function me(e, a, c, o = !1) {
+      Object.keys(c).forEach(function(t) {
+        E(e, t.split(".")) || (N(e, t.split("."), c[t]), o && (oe[t] = !0), (a[t] || []).forEach(function(p) {
+          E(e, p.split(".")) || N(e, p.split("."), c[t]);
         }));
       });
     }
     function E(e, a) {
-      let l = e;
+      let c = e;
       h["dot-notation"] || (a = [a.join(".")]), a.slice(0, -1).forEach(function(t) {
-        l = l[t] || {};
+        c = c[t] || {};
       });
       const o = a[a.length - 1];
-      return typeof l != "object" ? !1 : o in l;
+      return typeof c != "object" ? !1 : o in c;
     }
-    function N(e, a, l) {
+    function N(e, a, c) {
       let o = e;
       h["dot-notation"] || (a = [a.join(".")]), a.slice(0, -1).forEach(function(v) {
-        v = le(v), typeof o == "object" && o[v] === void 0 && (o[v] = {}), typeof o[v] != "object" || Array.isArray(o[v]) ? (Array.isArray(o[v]) ? o[v].push({}) : o[v] = [o[v], {}], o = o[v][o[v].length - 1]) : o = o[v];
+        v = ce(v), typeof o == "object" && o[v] === void 0 && (o[v] = {}), typeof o[v] != "object" || Array.isArray(o[v]) ? (Array.isArray(o[v]) ? o[v].push({}) : o[v] = [o[v], {}], o = o[v][o[v].length - 1]) : o = o[v];
       });
-      const t = le(a[a.length - 1]), p = g(a.join("."), r.arrays), c = Array.isArray(l);
+      const t = ce(a[a.length - 1]), p = g(a.join("."), r.arrays), l = Array.isArray(c);
       let d = h["duplicate-arguments-array"];
-      !d && g(t, r.nargs) && (d = !0, (!T(o[t]) && r.nargs[t] === 1 || Array.isArray(o[t]) && o[t].length === r.nargs[t]) && (o[t] = void 0)), l === Z() ? o[t] = Z(o[t]) : Array.isArray(o[t]) ? d && p && c ? o[t] = h["flatten-duplicate-arrays"] ? o[t].concat(l) : (Array.isArray(o[t][0]) ? o[t] : [o[t]]).concat([l]) : !d && !!p == !!c ? o[t] = l : o[t] = o[t].concat([l]) : o[t] === void 0 && p ? o[t] = c ? l : [l] : d && !(o[t] === void 0 || g(t, r.counts) || g(t, r.bools)) ? o[t] = [o[t], l] : o[t] = l;
+      !d && g(t, r.nargs) && (d = !0, (!T(o[t]) && r.nargs[t] === 1 || Array.isArray(o[t]) && o[t].length === r.nargs[t]) && (o[t] = void 0)), c === Z() ? o[t] = Z(o[t]) : Array.isArray(o[t]) ? d && p && l ? o[t] = h["flatten-duplicate-arrays"] ? o[t].concat(c) : (Array.isArray(o[t][0]) ? o[t] : [o[t]]).concat([c]) : !d && !!p == !!l ? o[t] = c : o[t] = o[t].concat([c]) : o[t] === void 0 && p ? o[t] = l ? c : [c] : d && !(o[t] === void 0 || g(t, r.counts) || g(t, r.bools)) ? o[t] = [o[t], c] : o[t] = c;
     }
     function qe(...e) {
       e.forEach(function(a) {
-        Object.keys(a || {}).forEach(function(l) {
-          r.aliases[l] || (r.aliases[l] = [].concat(_[l] || []), r.aliases[l].concat(l).forEach(function(o) {
+        Object.keys(a || {}).forEach(function(c) {
+          r.aliases[c] || (r.aliases[c] = [].concat(_[c] || []), r.aliases[c].concat(c).forEach(function(o) {
             if (/-/.test(o) && h["camel-case-expansion"]) {
               const t = W(o);
-              t !== l && r.aliases[l].indexOf(t) === -1 && (r.aliases[l].push(t), Q[t] = !0);
+              t !== c && r.aliases[c].indexOf(t) === -1 && (r.aliases[c].push(t), Q[t] = !0);
             }
-          }), r.aliases[l].concat(l).forEach(function(o) {
+          }), r.aliases[c].concat(c).forEach(function(o) {
             if (o.length > 1 && /[A-Z]/.test(o) && h["camel-case-expansion"]) {
               const t = Oe(o, "-");
-              t !== l && r.aliases[l].indexOf(t) === -1 && (r.aliases[l].push(t), Q[t] = !0);
+              t !== c && r.aliases[c].indexOf(t) === -1 && (r.aliases[c].push(t), Q[t] = !0);
             }
-          }), r.aliases[l].forEach(function(o) {
-            r.aliases[o] = [l].concat(r.aliases[l].filter(function(t) {
+          }), r.aliases[c].forEach(function(o) {
+            r.aliases[o] = [c].concat(r.aliases[c].filter(function(t) {
               return o !== t;
             }));
           }));
@@ -427,7 +427,7 @@ class Ne {
       });
     }
     function g(e, a) {
-      const l = [].concat(r.aliases[e] || [], e), o = Object.keys(a), t = l.find((p) => o.includes(p));
+      const c = [].concat(r.aliases[e] || [], e), o = Object.keys(a), t = c.find((p) => o.includes(p));
       return t ? a[t] : !1;
     }
     function ue(e) {
@@ -445,14 +445,14 @@ class Ne {
     function ve(e) {
       if (e.match(L) || !e.match(/^-[^-]+/))
         return !1;
-      let a = !0, l;
+      let a = !0, c;
       const o = e.slice(1).split("");
       for (let t = 0; t < o.length; t++) {
-        if (l = e.slice(t + 2), !ue(o[t])) {
+        if (c = e.slice(t + 2), !ue(o[t])) {
           a = !1;
           break;
         }
-        if (o[t + 1] && o[t + 1] === "=" || l === "-" || /[A-Za-z]/.test(o[t]) && /^-?\d+(\.\d*)?(e-?\d+)?$/.test(l) || o[t + 1] && o[t + 1].match(/\W/))
+        if (o[t + 1] && o[t + 1] === "=" || c === "-" || /[A-Za-z]/.test(o[t]) && /^-?\d+(\.\d*)?(e-?\d+)?$/.test(c) || o[t + 1] && o[t + 1].match(/\W/))
           break;
       }
       return a;
@@ -521,7 +521,7 @@ function ze(i) {
 function Z(i) {
   return i !== void 0 ? i + 1 : 1;
 }
-function le(i) {
+function ce(i) {
   return i === "__proto__" ? "___proto___" : i;
 }
 function je(i) {
@@ -536,9 +536,9 @@ function je(i) {
  * SPDX-License-Identifier: ISC
  */
 var X, ee, te;
-const ce = process && process.env && process.env.YARGS_MIN_NODE_VERSION ? Number(process.env.YARGS_MIN_NODE_VERSION) : 12, pe = (ee = (X = process == null ? void 0 : process.versions) === null || X === void 0 ? void 0 : X.node) !== null && ee !== void 0 ? ee : (te = process == null ? void 0 : process.version) === null || te === void 0 ? void 0 : te.slice(1);
-if (pe && Number(pe.match(/^([^.]+)/)[1]) < ce)
-  throw Error(`yargs parser supports a minimum Node.js version of ${ce}. Read our version support policy: https://github.com/yargs/yargs-parser#supported-nodejs-versions`);
+const le = process && process.env && process.env.YARGS_MIN_NODE_VERSION ? Number(process.env.YARGS_MIN_NODE_VERSION) : 12, pe = (ee = (X = process == null ? void 0 : process.versions) === null || X === void 0 ? void 0 : X.node) !== null && ee !== void 0 ? ee : (te = process == null ? void 0 : process.version) === null || te === void 0 ? void 0 : te.slice(1);
+if (pe && Number(pe.match(/^([^.]+)/)[1]) < le)
+  throw Error(`yargs parser supports a minimum Node.js version of ${le}. Read our version support policy: https://github.com/yargs/yargs-parser#supported-nodejs-versions`);
 const Qe = process ? process.env : {};
 new Ne({
   cwd: process.cwd,
@@ -1143,29 +1143,52 @@ const ie = [
             required: !0
           }
         ]
+      },
+      {
+        api_flavor: "anthropic",
+        root: "usage",
+        model_path: "model",
+        mappings: [
+          {
+            path: "input_tokens",
+            dest: "input_tokens",
+            required: !0
+          },
+          {
+            path: "cache_creation_input_tokens",
+            dest: "input_tokens",
+            required: !1
+          },
+          {
+            path: "cache_read_input_tokens",
+            dest: "input_tokens",
+            required: !1
+          },
+          {
+            path: "cache_creation_input_tokens",
+            dest: "cache_write_tokens",
+            required: !1
+          },
+          {
+            path: "cache_read_input_tokens",
+            dest: "cache_read_tokens",
+            required: !1
+          },
+          {
+            path: "output_tokens",
+            dest: "output_tokens",
+            required: !0
+          }
+        ]
       }
     ],
     models: [
       {
-        id: "meta.llama3-8b-instruct-v1:0",
-        match: {
-          contains: "llama3-8b-instruct-v1"
-        },
-        prices: {
-          input_mtok: 0.3,
-          output_mtok: 0.6
-        }
-      },
-      {
-        id: "nova-lite-v1",
-        name: "Nova Lite 1.0",
+        id: "amazon.nova-lite-v1:0",
+        name: "Nova Lite",
         description: "Amazon Nova Lite 1.0 is a very low-cost multimodal model from Amazon that focused on fast processing of image, video, and text inputs to generate text output. Amazon Nova Lite can handle real-time customer interactions, document analysis, and visual question-answering tasks with high accuracy.",
         match: {
-          or: [
-            {
-              contains: "nova-lite-v1"
-            }
-          ]
+          contains: "nova-lite"
         },
         prices: {
           input_mtok: 0.06,
@@ -1174,15 +1197,11 @@ const ie = [
         }
       },
       {
-        id: "nova-micro-v1",
-        name: "Nova Micro 1.0",
+        id: "amazon.nova-micro-v1:0",
+        name: "Nova Micro",
         description: "Amazon Nova Micro 1.0 is a text-only model that delivers the lowest latency responses in the Amazon Nova family of models at a very low cost. With a context length of 128K tokens and optimized for speed and cost, Amazon Nova Micro excels at tasks such as text summarization, translation, content classification, interactive chat, and brainstorming. It has  simple mathematical reasoning and coding abilities.",
         match: {
-          or: [
-            {
-              contains: "nova-micro-v1"
-            }
-          ]
+          contains: "nova-micro"
         },
         prices: {
           input_mtok: 0.035,
@@ -1191,21 +1210,315 @@ const ie = [
         }
       },
       {
-        id: "nova-pro-v1",
-        name: "Nova Pro 1.0",
+        id: "amazon.nova-premier-v1:0",
+        name: "Nova Premier",
+        match: {
+          contains: "nova-premier"
+        },
+        prices: {
+          input_mtok: 2.5,
+          cache_read_mtok: 0.625,
+          output_mtok: 12.5
+        }
+      },
+      {
+        id: "amazon.nova-pro-v1:0",
+        name: "Nova Pro",
         description: "Amazon Nova Pro 1.0 is a capable multimodal model from Amazon focused on providing a combination of accuracy, speed, and cost for a wide range of tasks. As of December 2024, it achieves state-of-the-art performance on key benchmarks including visual question answering (TextVQA) and video understanding (VATEX).",
         match: {
-          or: [
-            {
-              contains: "nova-pro-v1"
-            }
-          ]
+          contains: "nova-pro"
         },
         prices: {
           input_mtok: 0.8,
           cache_read_mtok: 0.2,
           output_mtok: 3.2
         }
+      },
+      {
+        id: "amazon.nova-sonic-v1:0",
+        name: "Nova Sonic",
+        match: {
+          contains: "nova-sonic"
+        },
+        prices: {
+          input_mtok: 0.06,
+          output_mtok: 0.24,
+          input_audio_mtok: 3.4,
+          output_audio_mtok: 13.6
+        }
+      },
+      {
+        id: "amazon.titan-embed-text-v1",
+        name: "Titan Embeddings G1 - Text",
+        match: {
+          contains: "titan-embed-text"
+        },
+        prices: {
+          input_mtok: 0.1
+        }
+      },
+      {
+        id: "amazon.titan-text-express-v1",
+        name: "Titan Text G1 - Express",
+        match: {
+          contains: "titan-text-express"
+        },
+        prices: {
+          input_mtok: 0.2,
+          output_mtok: 0.6
+        }
+      },
+      {
+        id: "amazon.titan-text-lite-v1",
+        name: "Titan Text G1 - Lite",
+        match: {
+          contains: "titan-text-lite"
+        },
+        prices: {
+          input_mtok: 0.15,
+          output_mtok: 0.2
+        }
+      },
+      {
+        id: "anthropic.claude-3-haiku-20240307-v1:0",
+        name: "Claude 3 Haiku",
+        match: {
+          contains: "claude-3-haiku-20240307"
+        },
+        prices: {
+          input_mtok: 0.25
+        }
+      },
+      {
+        id: "deepseek.r1-v1:0",
+        name: "DeepSeek-R1",
+        match: {
+          contains: "r1"
+        },
+        prices: {
+          input_mtok: 1.35,
+          output_mtok: 5.4
+        }
+      },
+      {
+        id: "meta.llama3-1-70b-instruct-v1:0",
+        name: "Llama 3.1 70B Instruct",
+        match: {
+          contains: "llama3-1-70b-instruct"
+        },
+        prices: {
+          input_mtok: 0.72,
+          output_mtok: 0.72
+        }
+      },
+      {
+        id: "meta.llama3-1-8b-instruct-v1:0",
+        name: "Llama 3.1 8B Instruct",
+        match: {
+          contains: "llama3-1-8b-instruct"
+        },
+        prices: {
+          input_mtok: 0.22,
+          output_mtok: 0.22
+        }
+      },
+      {
+        id: "meta.llama3-2-11b-instruct-v1:0",
+        name: "Llama 3.2 11B Instruct",
+        match: {
+          contains: "llama3-2-11b-instruct"
+        },
+        prices: {
+          input_mtok: 0.16,
+          output_mtok: 0.16
+        }
+      },
+      {
+        id: "meta.llama3-2-1b-instruct-v1:0",
+        name: "Llama 3.2 1B Instruct",
+        match: {
+          contains: "llama3-2-1b-instruct"
+        },
+        prices: {
+          input_mtok: 0.1,
+          output_mtok: 0.1
+        }
+      },
+      {
+        id: "meta.llama3-2-3b-instruct-v1:0",
+        name: "Llama 3.2 3B Instruct",
+        match: {
+          contains: "llama3-2-3b-instruct"
+        },
+        prices: {
+          input_mtok: 0.15,
+          output_mtok: 0.15
+        }
+      },
+      {
+        id: "meta.llama3-2-90b-instruct-v1:0",
+        name: "Llama 3.2 90B Instruct",
+        match: {
+          contains: "llama3-2-90b-instruct"
+        },
+        prices: {
+          input_mtok: 0.72,
+          output_mtok: 0.72
+        }
+      },
+      {
+        id: "meta.llama3-3-70b-instruct-v1:0",
+        name: "Llama 3.3 70B Instruct",
+        match: {
+          contains: "llama3-3-70b-instruct"
+        },
+        prices: {
+          input_mtok: 0.72,
+          output_mtok: 0.72
+        }
+      },
+      {
+        id: "meta.llama3-70b-instruct-v1:0",
+        name: "Llama 3 70B Instruct",
+        match: {
+          contains: "llama3-70b-instruct"
+        },
+        prices: {
+          input_mtok: 2.65,
+          output_mtok: 3.5
+        }
+      },
+      {
+        id: "meta.llama3-8b-instruct-v1:0",
+        name: "Llama 3 8B Instruct",
+        match: {
+          contains: "llama3-8b-instruct"
+        },
+        prices: {
+          input_mtok: 0.3,
+          output_mtok: 0.6
+        }
+      },
+      {
+        id: "meta.llama4-maverick-17b-instruct-v1:0",
+        name: "Llama 4 Maverick 17B Instruct",
+        match: {
+          contains: "llama4-maverick-17b-instruct"
+        },
+        prices: {
+          input_mtok: 0.24,
+          output_mtok: 0.97
+        }
+      },
+      {
+        id: "meta.llama4-scout-17b-instruct-v1:0",
+        name: "Llama 4 Scout 17B Instruct",
+        match: {
+          contains: "llama4-scout-17b-instruct"
+        },
+        prices: {
+          input_mtok: 0.17,
+          output_mtok: 0.66
+        }
+      },
+      {
+        id: "mistral.mistral-7b-instruct-v0:2",
+        name: "Mistral 7B Instruct",
+        match: {
+          contains: "mistral-7b-instruct"
+        },
+        prices: {
+          input_mtok: 0.15,
+          output_mtok: 0.2
+        }
+      },
+      {
+        id: "mistral.mistral-large-2402-v1:0",
+        name: "Mistral Large (24.02)",
+        match: {
+          contains: "mistral-large-2402"
+        },
+        prices: {
+          input_mtok: 4,
+          output_mtok: 12
+        }
+      },
+      {
+        id: "mistral.mistral-small-2402-v1:0",
+        name: "Mistral Small (24.02)",
+        match: {
+          contains: "mistral-small-2402"
+        },
+        prices: {
+          input_mtok: 1,
+          output_mtok: 3
+        }
+      },
+      {
+        id: "mistral.mixtral-8x7b-instruct-v0:1",
+        name: "Mixtral 8x7B Instruct",
+        match: {
+          contains: "mixtral-8x7b-instruct"
+        },
+        prices: {
+          input_mtok: 0.45,
+          output_mtok: 0.7
+        }
+      },
+      {
+        id: "mistral.pixtral-large-2502-v1:0",
+        name: "Pixtral Large (25.02)",
+        match: {
+          contains: "pixtral-large-2502"
+        },
+        prices: {
+          input_mtok: 2,
+          output_mtok: 6
+        }
+      },
+      {
+        id: "openai.gpt-oss-120b-1:0",
+        name: "gpt-oss-120b",
+        match: {
+          contains: "gpt-oss-120b"
+        },
+        prices: {
+          input_mtok: 0.15,
+          output_mtok: 0.6
+        }
+      },
+      {
+        id: "openai.gpt-oss-20b-1:0",
+        name: "gpt-oss-20b",
+        match: {
+          contains: "gpt-oss-20b"
+        },
+        prices: {
+          input_mtok: 0.07,
+          output_mtok: 0.3
+        }
+      },
+      {
+        id: "qwen.qwen3-32b-v1:0",
+        name: "Qwen3 32B (dense)",
+        match: {
+          contains: "qwen3-32b"
+        },
+        prices: {
+          input_mtok: 0.15,
+          output_mtok: 0.6
+        }
+      },
+      {
+        id: "qwen.qwen3-coder-30b-a3b-v1:0",
+        name: "Qwen3-Coder-30B-A3B-Instruct",
+        match: {
+          contains: "qwen3-coder-30b-a3b"
+        },
+        prices: {
+          input_mtok: 0.15,
+          output_mtok: 0.6
+        }
       }
     ]
   },
@@ -2984,6 +3297,43 @@ Compared to other leading proprietary and open-weights models Command A delivers
           }
         }
       },
+      {
+        id: "gemini-3-pro-preview",
+        name: "Gemini 3 Pro Preview",
+        description: "The best model in the world for multimodal understanding, and our most powerful agentic and vibe-coding model yet.",
+        match: {
+          starts_with: "gemini-3-pro-preview"
+        },
+        prices: {
+          input_mtok: {
+            base: 2,
+            tiers: [
+              {
+                start: 2e5,
+                price: 4
+              }
+            ]
+          },
+          cache_read_mtok: {
+            base: 0.2,
+            tiers: [
+              {
+                start: 2e5,
+                price: 0.4
+              }
+            ]
+          },
+          output_mtok: {
+            base: 12,
+            tiers: [
+              {
+                start: 2e5,
+                price: 18
+              }
+            ]
+          }
+        }
+      },
       {
         id: "gemini-embedding-001",
         match: {