@pydantic/genai-prices 0.0.23 → 0.0.24

package/dist/index.d.cts

@@ -1,3 +1,9 @@
+export declare interface ArrayMatch {
+    field: string;
+    match: MatchLogic;
+    type: 'array-match';
+}
+
 export declare function calcPrice(usage: Usage, modelId: string, options?: PriceOptions): PriceCalculationResult;
 
 export declare interface ConditionalPrice {
@@ -5,6 +11,8 @@ export declare interface ConditionalPrice {
     prices: ModelPrice;
 }
 
+export declare type ExtractPath = (ArrayMatch | string)[] | string;
+
 export declare function extractUsage(provider: Provider, responseData: unknown, apiFlavor?: string): [string, Usage];
 
 export declare function findProvider(options: ProviderFindOptions): Provider | undefined;
@@ -140,13 +148,13 @@ export declare interface Usage {
 export declare interface UsageExtractor {
     api_flavor: string;
     mappings: UsageExtractorMapping[];
-    model_path: string | string[];
-    root: string | string[];
+    model_path: ExtractPath;
+    root: ExtractPath;
 }
 
 export declare interface UsageExtractorMapping {
     dest: 'cache_audio_read_tokens' | 'cache_read_tokens' | 'cache_write_tokens' | 'input_audio_tokens' | 'input_tokens' | 'output_audio_tokens' | 'output_tokens';
-    path: string | string[];
+    path: ExtractPath;
     required: boolean;
 }
 

package/dist/index.d.ts

@@ -1,3 +1,9 @@
+export declare interface ArrayMatch {
+    field: string;
+    match: MatchLogic;
+    type: 'array-match';
+}
+
 export declare function calcPrice(usage: Usage, modelId: string, options?: PriceOptions): PriceCalculationResult;
 
 export declare interface ConditionalPrice {
@@ -5,6 +11,8 @@ export declare interface ConditionalPrice {
     prices: ModelPrice;
 }
 
+export declare type ExtractPath = (ArrayMatch | string)[] | string;
+
 export declare function extractUsage(provider: Provider, responseData: unknown, apiFlavor?: string): [string, Usage];
 
 export declare function findProvider(options: ProviderFindOptions): Provider | undefined;
@@ -140,13 +148,13 @@ export declare interface Usage {
 export declare interface UsageExtractor {
     api_flavor: string;
     mappings: UsageExtractorMapping[];
-    model_path: string | string[];
-    root: string | string[];
+    model_path: ExtractPath;
+    root: ExtractPath;
 }
 
 export declare interface UsageExtractorMapping {
     dest: 'cache_audio_read_tokens' | 'cache_read_tokens' | 'cache_write_tokens' | 'input_audio_tokens' | 'input_tokens' | 'output_audio_tokens' | 'output_tokens';
-    path: string | string[];
+    path: ExtractPath;
     required: boolean;
 }
 

package/dist/index.js

@@ -1,4 +1,4 @@
-const f = [
+const w = [
   {
     id: "anthropic",
     name: "Anthropic",
@@ -1519,8 +1519,8 @@ Compared to other leading proprietary and open-weights models Command A delivers
     extractors: [
       {
         api_flavor: "default",
-        root: "UsageMetadata",
-        model_path: "model",
+        root: "usageMetadata",
+        model_path: "modelVersion",
         mappings: [
           {
             path: "promptTokenCount",
@@ -1528,10 +1528,35 @@ Compared to other leading proprietary and open-weights models Command A delivers
             required: !0
           },
           {
-            path: "cachedContentTokenCount",
+            path: [
+              "cacheTokensDetails",
+              {
+                type: "array-match",
+                field: "modality",
+                match: {
+                  equals: "TEXT"
+                }
+              },
+              "tokenCount"
+            ],
             dest: "cache_read_tokens",
             required: !1
           },
+          {
+            path: [
+              "cacheTokensDetails",
+              {
+                type: "array-match",
+                field: "modality",
+                match: {
+                  equals: "AUDIO"
+                }
+              },
+              "tokenCount"
+            ],
+            dest: "cache_audio_read_tokens",
+            required: !1
+          },
           {
             path: "candidatesTokenCount",
             dest: "output_tokens",
@@ -10856,23 +10881,23 @@ Compared to other leading proprietary and open-weights models Command A delivers
     ]
   }
 ];
-function x(t, e) {
+function y(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, m = Math.min(e, o);
-  a += m * t.base / 1e6;
+  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;
   for (let r = 0; r < i.length; r++) {
-    const s = i[r], n = i[r + 1]?.start ?? 1 / 0, u = Math.max(0, Math.min(e, n) - s.start);
+    const s = i[r], m = i[r + 1]?.start ?? 1 / 0, u = Math.max(0, Math.min(e, m) - s.start);
     u > 0 && (a += u * s.price / 1e6);
   }
   return a;
 }
-function l(t, e, a) {
-  return t === void 0 || e === void 0 ? 0 : typeof t == "number" ? t * e / 1e6 : x(t, e);
+function p(t, e, a) {
+  return t === void 0 || e === void 0 ? 0 : typeof t == "number" ? t * e / 1e6 : y(t, e);
 }
-function B(t, e) {
+function M(t, e) {
   let a = 0, i = 0;
-  a += l(e.input_mtok, t.input_tokens), a += l(e.cache_write_mtok, t.cache_write_tokens), a += l(e.cache_read_mtok, t.cache_read_tokens), a += l(e.input_audio_mtok, t.input_audio_tokens), a += l(e.cache_audio_read_mtok, t.cache_audio_read_tokens), i += l(e.output_mtok, t.output_tokens), i += l(e.output_audio_mtok, t.output_audio_tokens), e.requests_kcount !== void 0 && (a += e.requests_kcount / 1e3);
+  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 {
     input_price: a,
@@ -10880,7 +10905,7 @@ function B(t, e) {
     total_price: o
   };
 }
-function y(t, e) {
+function I(t, e) {
   if (!Array.isArray(t.prices))
     return t.prices;
   for (let a = t.prices.length - 1; a >= 0; a--) {
@@ -10891,150 +10916,167 @@ function y(t, e) {
       if (e >= new Date(o.start_date))
         return i.prices;
     } else {
-      const m = e.toISOString().slice(11, 19), r = o.start_time, s = o.end_time;
+      const n = e.toISOString().slice(11, 19), r = o.start_time, s = o.end_time;
       if (s < r) {
-        if (m >= r || m < s)
+        if (n >= r || n < s)
           return i.prices;
-      } else if (m >= r && m < s)
+      } else if (n >= r && n < s)
         return i.prices;
     }
   }
   return t.prices[0].prices;
 }
-function d(t, e) {
-  return "or" in t ? t.or.some((a) => d(a, e)) : "and" in t ? t.and.every((a) => d(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 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 M(t, e) {
+function P(t, e) {
   const a = e.toLowerCase().trim(), i = t.find((o) => o.id === a);
-  return i || t.find((o) => o.provider_match && d(o.provider_match, a));
+  return i || t.find((o) => o.provider_match && h(o.provider_match, a));
 }
-function w(t, { modelId: e, providerApiUrl: a, providerId: i }) {
+function v(t, { modelId: e, providerApiUrl: a, providerId: i }) {
   if (i)
-    return M(t, i);
+    return P(t, i);
   if (a)
     return t.find((o) => new RegExp(o.api_pattern).test(a));
   if (e)
-    return t.find((o) => o.model_match && d(o.model_match, e));
+    return t.find((o) => o.model_match && h(o.model_match, e));
 }
-function I(t, e) {
-  return t.find((a) => d(a.match, e));
+function L(t, e) {
+  return t.find((a) => h(a.match, e));
 }
-const P = "https://raw.githubusercontent.com/pydantic/genai-prices/main/prices/data.json";
-let h = f, g = Promise.resolve(f), q = null;
-function L(t) {
-  "then" in t ? (g = t, t.then((e) => {
-    h = e;
-  })) : (g = Promise.resolve(t), h = t);
+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);
 }
-function T(t) {
-  q = t;
+function S(t) {
+  b = t;
 }
-function R(t) {
+function z(t) {
   t({
-    onCalc: T,
-    remoteDataUrl: P,
-    setProviderData: L
+    onCalc: S,
+    remoteDataUrl: T,
+    setProviderData: G
   });
 }
-function A() {
-  return g;
+function N() {
+  return q;
 }
-function C(t, e, a) {
-  q?.();
-  const i = e.toLowerCase().trim(), o = a?.provider ?? w(h, { modelId: i, providerApiUrl: a?.providerApiUrl, providerId: a?.providerId });
+function Q(t, e, a) {
+  b?.();
+  const i = e.toLowerCase().trim(), o = a?.provider ?? v(_, { modelId: i, providerApiUrl: a?.providerApiUrl, providerId: a?.providerId });
   if (!o) return null;
-  const m = I(o.models, i);
-  if (!m) return null;
-  const r = a?.timestamp ?? /* @__PURE__ */ new Date(), s = y(m, r), n = B(t, s);
+  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);
   return {
     auto_update_timestamp: void 0,
-    model: m,
+    model: n,
     model_price: s,
     provider: o,
-    ...n
+    ...m
   };
 }
-function z(t) {
-  return q?.(), w(h, t);
+function E(t) {
+  return b?.(), v(_, t);
 }
-function N(t, e, a) {
+function O(t, e, a) {
   if (!t.extractors)
     throw new Error("No extraction logic defined for this provider");
   let i;
   if (a) {
-    const n = t.extractors.find((u) => u.api_flavor === a);
-    if (n)
-      i = n;
+    const m = t.extractors.find((u) => u.api_flavor === a);
+    if (m)
+      i = m;
     else {
-      const u = t.extractors.map((p) => p.api_flavor).join(", ");
+      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 (!b.guard(e))
+  if (!k.guard(e))
     throw new Error(`Expected response data to be a mapping object, got ${c(e)}`);
-  const o = _(i.model_path, e, G, !0, []), m = v(i.root), r = _(m, e, b, !0, []), s = {};
-  for (const n of i.mappings) {
-    const u = _(n.path, r, S, n.required, m);
+  const o = g(i.model_path, e, A, !0, []), 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);
     if (u !== null) {
-      const p = s[n.dest] ?? 0;
-      s[n.dest] = p + u;
+      const l = s[m.dest] ?? 0;
+      s[m.dest] = l + u;
     }
   }
   if (!Object.keys(s).length)
     throw new Error(`No usage information found at ${JSON.stringify(i.root)}`);
   return [o, s];
 }
-function _(t, e, a, i, o) {
-  const [m, ...r] = v(t).reverse();
-  if (typeof m != "string")
-    throw new Error(`Expected last step of path to be a string, got ${c(m)}`);
-  let s = e;
+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)}`);
   r.reverse();
-  const n = [];
-  for (const p of r) {
-    n.push(p), s = s[p];
-    const k = c(s);
-    if (k === "undefined") {
-      if (i)
-        throw new Error(`Missing value at \`${[...o, ...n].join(".")}\``);
-      return null;
-    } else if (k !== "mapping")
-      throw new Error(`Expected \`${[...o, ...n].join(".")}\` value to be a mapping, got ${k}`);
+  let s = e;
+  const m = [];
+  for (const l of r) {
+    if (m.push(l), typeof l == "object")
+      if (Array.isArray(s))
+        s = R(l, s);
+      else
+        throw new Error(`Expected \`${d(o, m)}\` value to be a mapping, got ${c(s)}`);
+    else if (k.guard(s))
+      s = s[l];
+    else
+      throw new Error(`Expected \`${d(o, m)}\` value to be a mapping, got ${c(s)}`);
+    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)}\``);
+      } else
+        return null;
   }
-  const u = s[m];
+  if (!k.guard(s))
+    throw new Error(`Expected \`${d(o, m)}\` value to be a mapping, got ${c(s)}`);
+  const u = s[n];
   if (typeof u > "u") {
     if (i)
-      throw n.push(m), new Error(`Missing value at \`${[...o, ...n].join(".")}\``);
+      throw m.push(n), new Error(`Missing value at \`${d(o, m)}\``);
     return null;
   }
   if (a.guard(u))
     return u;
-  throw n.push(m), new Error(`Expected \`${[...o, ...n].join(".")}\` value to be a ${a.name}, got ${c(u)}`);
+  throw m.push(n), new Error(`Expected \`${d(o, m)}\` value to be a ${a.name}, got ${c(u)}`);
+}
+function R(t, e) {
+  for (const a of e)
+    if (k.guard(a)) {
+      const i = a[t.field];
+      if (typeof i == "string" && h(t.match, i))
+        return a;
+    }
 }
-function v(t) {
+function x(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 b = {
+const k = {
   guard: (t) => c(t) === "mapping",
   name: "mapping"
-}, G = {
+}, A = {
   guard: (t) => typeof t == "string",
   name: "string"
-}, S = {
+}, C = {
   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);
 export {
-  P as REMOTE_DATA_JSON_URL,
-  C as calcPrice,
-  N as extractUsage,
-  z as findProvider,
-  R as updatePrices,
-  A as waitForUpdate
+  T as REMOTE_DATA_JSON_URL,
+  Q as calcPrice,
+  O as extractUsage,
+  E as findProvider,
+  z as updatePrices,
+  N as waitForUpdate
 };

package/package.json

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