@mastra/observability 1.16.1 → 1.16.2-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @mastra/observability
 
+## 1.16.2-alpha.1
+
+### Patch Changes
+
+- Fixed cost estimates for recently added provider models, cached input tokens, and long-context requests. ([#19830](https://github.com/mastra-ai/mastra/pull/19830))
+
+- Updated dependencies [[`41a5392`](https://github.com/mastra-ai/mastra/commit/41a5392d9f6c5e18d6b227f0fc0ddf49c50774e9), [`675fbff`](https://github.com/mastra-ai/mastra/commit/675fbff84d3274391b33e852f76083c38a5514e5), [`da009e1`](https://github.com/mastra-ai/mastra/commit/da009e1aacd89ed94b8d1b2af09c9d4fe7c4db49), [`35c2181`](https://github.com/mastra-ai/mastra/commit/35c2181e6a50e47c90ba36260db7c9723d54696f), [`b4b7ea8`](https://github.com/mastra-ai/mastra/commit/b4b7ea8733f033fc441ea47ed03f6afb17ec2248), [`675fbff`](https://github.com/mastra-ai/mastra/commit/675fbff84d3274391b33e852f76083c38a5514e5), [`c328769`](https://github.com/mastra-ai/mastra/commit/c3287698ff8ef98dba86d415faa566fa3e5f4d56), [`232fcbc`](https://github.com/mastra-ai/mastra/commit/232fcbc14fce625dd672ba043329c0b732c62be2), [`3491666`](https://github.com/mastra-ai/mastra/commit/34916663c4fdd43b48c21f4ab2d5fb6dcccc94f9)]:
+  - @mastra/core@1.52.0-alpha.10
+
+## 1.16.2-alpha.0
+
+### Patch Changes
+
+- Fixed cost estimates when AI SDK provider names differ from embedded pricing data, including Vercel AI Gateway and Google Vertex. ([#19513](https://github.com/mastra-ai/mastra/pull/19513))
+
+- Updated dependencies [[`ec857fc`](https://github.com/mastra-ai/mastra/commit/ec857fc79c264b53b38e16478c789b7177f2ad59), [`e1f2fae`](https://github.com/mastra-ai/mastra/commit/e1f2faebaf048c3d4c2e2c01d293767c195d5794), [`63aa799`](https://github.com/mastra-ai/mastra/commit/63aa799c6b44eacc7806cda6846b7c5bbee06b37), [`73db8db`](https://github.com/mastra-ai/mastra/commit/73db8db90d69ab6153c7942749f624db0d96952d), [`73db8db`](https://github.com/mastra-ai/mastra/commit/73db8db90d69ab6153c7942749f624db0d96952d), [`76b7181`](https://github.com/mastra-ai/mastra/commit/76b71810366e6d90b9d3973149d1c7ba3659ffb9), [`0c0e8d7`](https://github.com/mastra-ai/mastra/commit/0c0e8d7becd4d1445c656b78d5d845f606c1ff9d), [`9f7c67a`](https://github.com/mastra-ai/mastra/commit/9f7c67abeeb52c41c51a9b5edee60b62afe7cd8d), [`3b65e68`](https://github.com/mastra-ai/mastra/commit/3b65e68d7f1c771c7a70eea42d83fefdd28cad88), [`e3868e2`](https://github.com/mastra-ai/mastra/commit/e3868e22babfffd0133771669ca724501c2dd58e)]:
+  - @mastra/core@1.52.0-alpha.5
+
 ## 1.16.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -1007,6 +1007,13 @@ var PricingModel = class {
 // src/metrics/pricing-registry.ts
 var DATA_FILE_NAME = "pricing-data.jsonl";
 var BEDROCK_GEOGRAPHY_PREFIXES = /* @__PURE__ */ new Set(["global", "us", "eu", "apac", "jp", "au"]);
+var AI_SDK_VERCEL_GATEWAY_PROVIDER_ID = "gateway";
+var VERCEL_PRICING_PROVIDER_ID = "vercel";
+var AI_SDK_PROVIDER_NAMESPACE_ALIASES = /* @__PURE__ */ new Map([
+  ["google.vertex", "google-vertex"],
+  ["vertex.anthropic", "google-vertex-anthropic"],
+  ["vertex.maas", "google-vertex"]
+]);
 var MINIFIED_METER_TO_CANONICAL = {
   it: "input_tokens",
   ot: "output_tokens",
@@ -1041,11 +1048,13 @@ var PricingRegistry = class _PricingRegistry {
     return _PricingRegistry.globalRegistry;
   }
   get(args) {
-    const variants = getModelVariants(args.model, normalizeProvider(args.provider));
-    for (const variant of variants) {
-      const key = makePricingKey({ provider: args.provider, model: variant });
-      const match = this.pricingModels.get(key);
-      if (match) return match;
+    for (const provider of getPricingProviderCandidates(args.provider, args.model)) {
+      const variants = getModelVariants(args.model, provider);
+      for (const variant of variants) {
+        const key = makePricingKey({ provider, model: variant });
+        const match = this.pricingModels.get(key);
+        if (match) return match;
+      }
     }
     return null;
   }
@@ -1125,15 +1134,41 @@ function getPackageRoot() {
   }
 }
 function makePricingKey(args) {
-  return `${normalizeProvider(args.provider)}::${normalizeKeyPart(args.model)}`;
+  return `${normalizeKeyPart(args.provider)}::${normalizeKeyPart(args.model)}`;
 }
 function normalizeKeyPart(value) {
   return value.trim().toLowerCase();
 }
-function normalizeProvider(provider) {
-  const normalized = provider.trim().toLowerCase();
-  const dotIndex = normalized.indexOf(".");
-  return dotIndex !== -1 ? normalized.substring(0, dotIndex) : normalized;
+function getPricingProviderCandidates(provider, model) {
+  const normalizedProvider = normalizeKeyPart(provider);
+  const providerCandidates = getNamespacedProviderCandidates(normalizedProvider) ?? getBaseProviderCandidates(normalizedProvider, model);
+  return [.../* @__PURE__ */ new Set([normalizedProvider, ...providerCandidates])];
+}
+function getNamespacedProviderCandidates(provider) {
+  for (const [providerNamespace, pricingProvider] of AI_SDK_PROVIDER_NAMESPACE_ALIASES) {
+    if (matchesProviderNamespace(provider, providerNamespace)) {
+      return [providerNamespace, pricingProvider];
+    }
+  }
+  return null;
+}
+function matchesProviderNamespace(provider, providerNamespace) {
+  return provider === providerNamespace || provider.startsWith(`${providerNamespace}.`);
+}
+function getBaseProviderCandidates(provider, model) {
+  const baseProvider = getBaseProvider(provider);
+  return isVercelGatewayModel(baseProvider, model) ? [baseProvider, VERCEL_PRICING_PROVIDER_ID] : [baseProvider];
+}
+function getBaseProvider(provider) {
+  const capabilitySeparator = provider.indexOf(".");
+  return capabilitySeparator === -1 ? provider : provider.substring(0, capabilitySeparator);
+}
+function isVercelGatewayModel(provider, model) {
+  return provider === AI_SDK_VERCEL_GATEWAY_PROVIDER_ID && hasCreatorModelIdShape(model);
+}
+function hasCreatorModelIdShape(model) {
+  const segments = model.split("/");
+  return segments.length === 2 && segments.every((segment) => segment.trim().length > 0);
 }
 function getModelVariants(model, provider) {
   const variants = /* @__PURE__ */ new Set();
@@ -1169,7 +1204,9 @@ function getModelVariants(model, provider) {
   return [...variants];
 }
 function stripDateSuffix(model) {
-  let stripped = model.replace(/-20\d{2}-\d{2}-\d{2}$/, "");
+  let stripped = model.replace(/@20\d{6}$/, "");
+  if (stripped !== model) return stripped;
+  stripped = model.replace(/-20\d{2}-\d{2}-\d{2}$/, "");
   if (stripped !== model) return stripped;
   stripped = model.replace(/-20\d{6}(-[a-z]+)?$/, "$1");
   if (stripped !== model) return stripped;