@pydantic/genai-prices 0.0.34 → 0.0.36

package/dist/index.js

@@ -1,4 +1,4 @@
-const w = [
+const x = [
   {
     id: "anthropic",
     name: "Anthropic",
@@ -1701,6 +1701,43 @@ Compared to other leading proprietary and open-weights models Command A delivers
             required: !1
           }
         ]
+      },
+      {
+        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: [
@@ -5466,7 +5503,14 @@ Compared to other leading proprietary and open-weights models Command A delivers
         id: "gemini-2.5-flash",
         name: "Gemini 2.5 Flash",
         match: {
-          equals: "gemini-2.5-flash"
+          or: [
+            {
+              equals: "gemini-2.5-flash"
+            },
+            {
+              equals: "google/gemini-2.5-flash"
+            }
+          ]
         },
         prices: {
           input_mtok: 0.3,
@@ -5805,6 +5849,48 @@ Compared to other leading proprietary and open-weights models Command A delivers
         },
         prices: {}
       },
+      {
+        id: "google/gemini-2.5-flash-image",
+        name: "Gemini 2.5 Flash Image (Nano Banana)",
+        match: {
+          or: [
+            {
+              equals: "google/gemini-2.5-flash-image"
+            },
+            {
+              equals: "google/gemini-2.5-flash-image-preview"
+            }
+          ]
+        },
+        prices: {
+          input_mtok: 0.3,
+          output_mtok: 2.5
+        }
+      },
+      {
+        id: "google/gemini-2.5-flash-lite",
+        name: "Gemini 2.5 Flash Lite",
+        match: {
+          equals: "google/gemini-2.5-flash-lite"
+        },
+        prices: {
+          input_mtok: 0.1,
+          cache_write_mtok: 0.183,
+          cache_read_mtok: 0.025,
+          output_mtok: 0.4
+        }
+      },
+      {
+        id: "google/gemini-2.5-flash-lite-preview-09-2025",
+        name: "Gemini 2.5 Flash Lite Preview 09-2025",
+        match: {
+          equals: "google/gemini-2.5-flash-lite-preview-09-2025"
+        },
+        prices: {
+          input_mtok: 0.1,
+          output_mtok: 0.4
+        }
+      },
       {
         id: "google/gemini-2.5-flash-preview",
         match: {
@@ -5815,6 +5901,19 @@ Compared to other leading proprietary and open-weights models Command A delivers
           output_mtok: 0.6
         }
       },
+      {
+        id: "google/gemini-2.5-flash-preview-09-2025",
+        name: "Gemini 2.5 Flash Preview 09-2025",
+        match: {
+          equals: "google/gemini-2.5-flash-preview-09-2025"
+        },
+        prices: {
+          input_mtok: 0.3,
+          cache_write_mtok: 0.383,
+          cache_read_mtok: 0.075,
+          output_mtok: 2.5
+        }
+      },
       {
         id: "google/gemini-2.5-flash-preview:thinking",
         match: {
@@ -11033,31 +11132,45 @@ Compared to other leading proprietary and open-weights models Command A delivers
     ]
   }
 ];
-function y(t, e) {
+function M(t, e) {
   if (e <= 0) return 0;
   let a = 0;
-  const i = [...t.tiers].sort((r, s) => r.start - s.start), o = i[0]?.start ?? e, n = Math.min(e, o);
-  a += n * t.base / 1e6;
+  const i = [...t.tiers].sort((r, s) => r.start - s.start), o = i[0]?.start ?? e, m = Math.min(e, o);
+  a += m * t.base / 1e6;
   for (let r = 0; r < i.length; r++) {
-    const s = i[r], m = i[r + 1]?.start ?? 1 / 0, u = Math.max(0, Math.min(e, m) - s.start);
+    const s = i[r], n = i[r + 1]?.start ?? 1 / 0, u = Math.max(0, Math.min(e, n) - s.start);
     u > 0 && (a += u * s.price / 1e6);
   }
   return a;
 }
 function p(t, e, a) {
-  return t === void 0 || e === void 0 ? 0 : typeof t == "number" ? t * e / 1e6 : y(t, e);
+  return t === void 0 || e === void 0 ? 0 : typeof t == "number" ? t * e / 1e6 : M(t, e);
 }
-function M(t, e) {
+function I(t, e) {
   let a = 0, i = 0;
-  a += p(e.input_mtok, t.input_tokens), a += p(e.cache_write_mtok, t.cache_write_tokens), a += p(e.cache_read_mtok, t.cache_read_tokens), a += p(e.input_audio_mtok, t.input_audio_tokens), a += p(e.cache_audio_read_mtok, t.cache_audio_read_tokens), i += p(e.output_mtok, t.output_tokens), i += p(e.output_audio_mtok, t.output_audio_tokens), e.requests_kcount !== void 0 && (a += e.requests_kcount / 1e3);
-  const o = a + i;
-  return {
+  const o = t.cache_read_tokens ?? 0, m = t.cache_write_tokens ?? 0, r = t.cache_audio_read_tokens ?? 0, s = t.output_audio_tokens ?? 0;
+  let n = t.input_audio_tokens ?? 0;
+  if (n -= r, n < 0)
+    throw new Error("cache_audio_read_tokens cannot be greater than input_audio_tokens");
+  let u = t.input_tokens ?? 0;
+  if (u -= o, u -= m, u -= n, u < 0)
+    throw new Error("Uncached text input tokens cannot be negative");
+  let l = o;
+  if (l -= r, l < 0)
+    throw new Error("cache_audio_read_tokens cannot be greater than cache_read_tokens");
+  a += p(e.input_mtok, u), a += p(e.cache_read_mtok, l), a += p(e.cache_write_mtok, m), a += p(e.input_audio_mtok, n), a += p(e.cache_audio_read_mtok, r);
+  let k = t.output_tokens ?? 0;
+  if (k -= s, k < 0)
+    throw new Error("output_audio_tokens cannot be greater than output_tokens");
+  i += p(e.output_mtok, k), i += p(e.output_audio_mtok, t.output_audio_tokens);
+  let w = a + i;
+  return e.requests_kcount !== void 0 && (w += e.requests_kcount / 1e3), {
     input_price: a,
     output_price: i,
-    total_price: o
+    total_price: w
   };
 }
-function I(t, e) {
+function P(t, e) {
   if (!Array.isArray(t.prices))
     return t.prices;
   for (let a = t.prices.length - 1; a >= 0; a--) {
@@ -11068,11 +11181,11 @@ function I(t, e) {
       if (e >= new Date(o.start_date))
         return i.prices;
     } else {
-      const n = e.toISOString().slice(11, 19), r = o.start_time, s = o.end_time;
+      const m = e.toISOString().slice(11, 19), r = o.start_time, s = o.end_time;
       if (s < r) {
-        if (n >= r || n < s)
+        if (m >= r || m < s)
           return i.prices;
-      } else if (n >= r && n < s)
+      } else if (m >= r && m < s)
         return i.prices;
     }
   }
@@ -11081,154 +11194,157 @@ function I(t, e) {
 function h(t, e) {
   return "or" in t ? t.or.some((a) => h(a, e)) : "and" in t ? t.and.every((a) => h(a, e)) : "equals" in t ? e === t.equals : "starts_with" in t ? e.startsWith(t.starts_with) : "ends_with" in t ? e.endsWith(t.ends_with) : "contains" in t ? e.includes(t.contains) : "regex" in t ? new RegExp(t.regex).test(e) : !1;
 }
-function P(t, e) {
+function L(t, e) {
   const a = e.toLowerCase().trim(), i = t.find((o) => o.id === a);
   return i || t.find((o) => o.provider_match && h(o.provider_match, a));
 }
-function v(t, { modelId: e, providerApiUrl: a, providerId: i }) {
+function B(t, { modelId: e, providerApiUrl: a, providerId: i }) {
   if (i)
-    return P(t, i);
+    return L(t, i);
   if (a)
     return t.find((o) => new RegExp(o.api_pattern).test(a));
   if (e)
     return t.find((o) => o.model_match && h(o.model_match, e));
 }
-function L(t, e) {
+function T(t, e) {
   return t.find((a) => h(a.match, e));
 }
-const T = "https://raw.githubusercontent.com/pydantic/genai-prices/main/prices/data.json";
-let _ = w, q = Promise.resolve(w), b = null;
-function G(t) {
-  "then" in t ? (q = t, t.then((e) => {
-    _ = e;
-  })) : (q = Promise.resolve(t), _ = t);
-}
+const G = "https://raw.githubusercontent.com/pydantic/genai-prices/main/prices/data.json";
+let g = x, b = Promise.resolve(x), f = null;
 function S(t) {
-  b = t;
+  "then" in t ? (b = t, t.then((e) => {
+    g = e;
+  })) : (b = Promise.resolve(t), g = t);
+}
+function A(t) {
+  f = t;
 }
-function z(t) {
+function N(t) {
   t({
-    onCalc: S,
-    remoteDataUrl: T,
-    setProviderData: G
+    onCalc: A,
+    remoteDataUrl: G,
+    setProviderData: S
   });
 }
-function N() {
-  return q;
+function Q() {
+  return b;
 }
-function Q(t, e, a) {
-  b?.();
-  const i = e.toLowerCase().trim(), o = a?.provider ?? v(_, { modelId: i, providerApiUrl: a?.providerApiUrl, providerId: a?.providerId });
+function E(t, e, a) {
+  f?.();
+  const i = e.toLowerCase().trim(), o = a?.provider ?? B(g, { modelId: i, providerApiUrl: a?.providerApiUrl, providerId: a?.providerId });
   if (!o) return null;
-  const n = L(o.models, i);
-  if (!n) return null;
-  const r = a?.timestamp ?? /* @__PURE__ */ new Date(), s = I(n, r), m = M(t, s);
+  const m = T(o.models, i);
+  if (!m) return null;
+  const r = a?.timestamp ?? /* @__PURE__ */ new Date(), s = P(m, r), n = I(t, s);
   return {
     auto_update_timestamp: void 0,
-    model: n,
+    model: m,
     model_price: s,
     provider: o,
-    ...m
+    ...n
   };
 }
-function E(t) {
-  return b?.(), v(_, t);
+function O(t) {
+  return f?.(), B(g, t);
 }
 function D(t, e, a) {
-  if (!t.extractors)
+  if (a = a ?? "default", !t.extractors)
     throw new Error("No extraction logic defined for this provider");
-  let i;
-  if (a) {
-    const m = t.extractors.find((u) => u.api_flavor === a);
-    if (m)
-      i = m;
-    else {
-      const u = t.extractors.map((l) => l.api_flavor).join(", ");
-      throw new Error(`Unknown apiFlavor '${a}', allowed values: ${u}`);
-    }
-  } else if (t.extractors.length === 1)
-    i = t.extractors[0];
-  else
-    throw new Error("No apiFlavor specified and multiple extractors available");
-  if (!k.guard(e))
+  const i = t.extractors.find((n) => n.api_flavor === a);
+  if (!i) {
+    const n = t.extractors.map((u) => u.api_flavor).join(", ");
+    throw new Error(`Unknown apiFlavor '${a}', allowed values: ${n}`);
+  }
+  if (!_.guard(e))
     throw new Error(`Expected response data to be a mapping object, got ${c(e)}`);
-  const o = g(i.model_path, e, R, !1, []), n = x(i.root), r = g(n, e, k, !0, []), s = {};
-  for (const m of i.mappings) {
-    const u = g(m.path, r, C, m.required, n);
+  const o = q(i.model_path, e, C, !1, []), m = y(i.root), r = q(m, e, _, !0, []), s = {};
+  for (const n of i.mappings) {
+    const u = q(n.path, r, z, n.required, m);
     if (u !== null) {
-      const l = s[m.dest] ?? 0;
-      s[m.dest] = l + u;
+      const l = s[n.dest] ?? 0;
+      s[n.dest] = l + u;
     }
   }
   if (!Object.keys(s).length)
     throw new Error(`No usage information found at ${JSON.stringify(i.root)}`);
   return { model: o, usage: s };
 }
-function g(t, e, a, i, o) {
-  const [n, ...r] = x(t).reverse();
-  if (typeof n != "string")
-    throw new Error(`Expected last step of path to be a string, got ${c(n)}`);
+function q(t, e, a, i, o) {
+  const [m, ...r] = y(t).reverse();
+  if (typeof m != "string")
+    throw new Error(`Expected last step of path to be a string, got ${c(m)}`);
   r.reverse();
   let s = e;
-  const m = [];
+  const n = [];
   for (const l of r) {
-    if (m.push(l), typeof l == "object")
+    if (n.push(l), typeof l == "object")
       if (Array.isArray(s))
-        s = A(l, s);
-      else
-        throw new Error(`Expected \`${d(o, m)}\` value to be a mapping, got ${c(s)}`);
-    else if (k.guard(s))
+        s = R(l, s);
+      else {
+        if (i)
+          throw new Error(`Expected \`${d(o, n)}\` value to be a mapping, got ${c(s)}`);
+        return null;
+      }
+    else if (_.guard(s))
       s = s[l];
-    else
-      throw new Error(`Expected \`${d(o, m)}\` value to be a mapping, got ${c(s)}`);
+    else {
+      if (i)
+        throw new Error(`Expected \`${d(o, n)}\` value to be a mapping, got ${c(s)}`);
+      return null;
+    }
     if (typeof s > "u")
       if (i) {
-        const B = typeof l == "object" ? "Unable to find item" : "Missing value";
-        throw new Error(`${B} at \`${d(o, m)}\``);
+        const k = typeof l == "object" ? "Unable to find item" : "Missing value";
+        throw new Error(`${k} at \`${d(o, n)}\``);
       } else
         return null;
   }
-  if (!k.guard(s))
-    throw new Error(`Expected \`${d(o, m)}\` value to be a mapping, got ${c(s)}`);
-  const u = s[n];
+  if (!_.guard(s)) {
+    if (i)
+      throw new Error(`Expected \`${d(o, n)}\` value to be a mapping, got ${c(s)}`);
+    return null;
+  }
+  const u = s[m];
   if (typeof u > "u") {
     if (i)
-      throw m.push(n), new Error(`Missing value at \`${d(o, m)}\``);
+      throw n.push(m), new Error(`Missing value at \`${d(o, n)}\``);
     return null;
   }
   if (a.guard(u))
     return u;
-  throw m.push(n), new Error(`Expected \`${d(o, m)}\` value to be a ${a.name}, got ${c(u)}`);
+  if (i)
+    throw n.push(m), new Error(`Expected \`${d(o, n)}\` value to be a ${a.name}, got ${c(u)}`);
+  return null;
 }
-function A(t, e) {
+function R(t, e) {
   for (const a of e)
-    if (k.guard(a)) {
+    if (_.guard(a)) {
       const i = a[t.field];
       if (typeof i == "string" && h(t.match, i))
         return a;
     }
 }
-function x(t) {
+function y(t) {
   return Array.isArray(t) ? [...t] : [t];
 }
 function c(t) {
   return t === null ? "null" : Array.isArray(t) ? "array" : typeof t == "object" ? "mapping" : typeof t;
 }
-const k = {
+const _ = {
   guard: (t) => c(t) === "mapping",
   name: "mapping"
-}, R = {
+}, C = {
   guard: (t) => typeof t == "string",
   name: "string"
-}, C = {
+}, z = {
   guard: (t) => typeof t == "number",
   name: "number"
-}, d = (t, e) => [...t.map(f), ...e.map(f)].join("."), f = (t) => typeof t == "string" ? t : JSON.stringify(t);
+}, d = (t, e) => [...t.map(v), ...e.map(v)].join("."), v = (t) => typeof t == "string" ? t : JSON.stringify(t);
 export {
-  T as REMOTE_DATA_JSON_URL,
-  Q as calcPrice,
+  G as REMOTE_DATA_JSON_URL,
+  E as calcPrice,
   D as extractUsage,
-  E as findProvider,
-  z as updatePrices,
-  N as waitForUpdate
+  O as findProvider,
+  N as updatePrices,
+  Q as waitForUpdate
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pydantic/genai-prices",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "Calculate prices for calling LLM inference APIs",
   "author": "Pydantic Team",
   "type": "module",