@mastra/observability 1.5.1-alpha.0 → 1.5.1

package/dist/index.js

@@ -17423,6 +17423,9 @@ var MetricsContextImpl = class {
 };
 
 // src/usage.ts
+function isDefined(value) {
+  return value != null;
+}
 function extractUsageMetrics(usage, providerMetadata) {
   if (!usage) {
     return {};
@@ -17431,31 +17434,38 @@ function extractUsageMetrics(usage, providerMetadata) {
   const outputDetails = {};
   let inputTokens = usage.inputTokens;
   const outputTokens = usage.outputTokens;
-  if (usage.cachedInputTokens) {
+  const aiSdkDetails = usage.inputTokenDetails;
+  if (isDefined(aiSdkDetails?.cacheReadTokens)) {
+    inputDetails.cacheRead = aiSdkDetails.cacheReadTokens;
+  }
+  if (isDefined(aiSdkDetails?.cacheWriteTokens)) {
+    inputDetails.cacheWrite = aiSdkDetails.cacheWriteTokens;
+  }
+  if (!isDefined(inputDetails.cacheRead) && isDefined(usage.cachedInputTokens)) {
     inputDetails.cacheRead = usage.cachedInputTokens;
   }
-  if (usage.reasoningTokens) {
+  if (isDefined(usage.reasoningTokens)) {
     outputDetails.reasoning = usage.reasoningTokens;
   }
   const anthropic = providerMetadata?.anthropic;
   if (anthropic) {
-    if (anthropic.cacheReadInputTokens) {
+    if (!isDefined(inputDetails.cacheRead) && isDefined(anthropic.cacheReadInputTokens)) {
       inputDetails.cacheRead = anthropic.cacheReadInputTokens;
     }
-    if (anthropic.cacheCreationInputTokens) {
+    if (!isDefined(inputDetails.cacheWrite) && isDefined(anthropic.cacheCreationInputTokens)) {
       inputDetails.cacheWrite = anthropic.cacheCreationInputTokens;
     }
-    if (anthropic.cacheReadInputTokens || anthropic.cacheCreationInputTokens) {
+    if (isDefined(inputDetails.cacheRead) || isDefined(inputDetails.cacheWrite)) {
       inputDetails.text = usage.inputTokens;
-      inputTokens = (usage.inputTokens ?? 0) + (anthropic.cacheReadInputTokens ?? 0) + (anthropic.cacheCreationInputTokens ?? 0);
+      inputTokens = (usage.inputTokens ?? 0) + (inputDetails.cacheRead ?? 0) + (inputDetails.cacheWrite ?? 0);
     }
   }
   const google = providerMetadata?.google;
   if (google?.usageMetadata) {
-    if (google.usageMetadata.cachedContentTokenCount) {
+    if (!isDefined(inputDetails.cacheRead) && isDefined(google.usageMetadata.cachedContentTokenCount)) {
       inputDetails.cacheRead = google.usageMetadata.cachedContentTokenCount;
     }
-    if (google.usageMetadata.thoughtsTokenCount) {
+    if (isDefined(google.usageMetadata.thoughtsTokenCount)) {
       outputDetails.reasoning = google.usageMetadata.thoughtsTokenCount;
     }
   }