@raindrop-ai/ai-sdk 0.3.0 → 0.3.1

package/dist/index.node.js

@@ -4,7 +4,7 @@ var async_hooks = require('async_hooks');
 
 // src/index.node.ts
 
-// ../core/dist/chunk-YUIXRQWN.js
+// ../core/dist/chunk-3V4MIA75.js
 function normalizeFeatureFlags(input) {
   if (Array.isArray(input)) {
     return Object.fromEntries(input.map((name) => [name, "true"]));
@@ -1136,6 +1136,7 @@ var EventShipper = class {
   }
 };
 var MODEL_USAGE_ATTRIBUTES = {
+  usageSource: "raindrop.usage.source",
   providerName: "gen_ai.provider.name",
   requestModel: "gen_ai.request.model",
   responseModel: "gen_ai.response.model",
@@ -1144,20 +1145,22 @@ var MODEL_USAGE_ATTRIBUTES = {
   reasoningTokens: "gen_ai.usage.reasoning_tokens",
   cacheReadInputTokens: "gen_ai.usage.cache_read_input_tokens",
   cacheWriteInputTokens: "gen_ai.usage.cache_write_input_tokens",
-  nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
-  nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
-  reasoningOutputTokens: "raindrop.usage.output_tokens.reasoning",
-  cacheReadTokens: "raindrop.usage.input_tokens.cache_read",
-  cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
-};
+  providerReportedCost: "gen_ai.usage.provider_reported_cost"};
 var MODEL_PROVIDER_NAMES = [
+  ["google.vertex.anthropic", "google-vertex"],
+  ["google.vertex_ai", "google-vertex"],
   ["google.vertex", "google-vertex"],
+  ["gcp.vertex_ai", "google-vertex"],
+  ["gcp.gemini", "google"],
+  ["google_vertexai", "google-vertex"],
   ["vertex.anthropic", "google-vertex"],
   ["amazon-bedrock", "amazon-bedrock"],
+  ["aws.bedrock", "amazon-bedrock"],
   ["bedrock", "amazon-bedrock"],
   ["anthropic", "anthropic"],
   ["openai", "openai"],
   ["google", "google"],
+  ["az.ai.openai", "azure"],
   ["azure", "azure"],
   ["openrouter", "openrouter"]
 ];
@@ -1168,60 +1171,20 @@ function canonicalModelProvider(provider) {
   const match = MODEL_PROVIDER_NAMES.find(
     ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
   );
-  return (_a = match == null ? void 0 : match[1]) != null ? _a : provider;
+  return (_a = match == null ? void 0 : match[1]) != null ? _a : normalizedProvider;
 }
 function tokenCount(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
 }
-function exclusiveTokens({
-  explicit,
-  total,
-  parts,
-  semantics
-}) {
-  if (explicit !== void 0) return explicit;
-  if (total === void 0) return void 0;
-  if (semantics === "exclusive") return total;
-  const observedParts = parts.filter((part) => part !== void 0 && part > 0);
-  if (semantics === void 0 && observedParts.length > 0) return void 0;
-  const exclusive = total - observedParts.reduce((sum, part) => sum + part, 0);
-  return exclusive >= 0 ? exclusive : void 0;
-}
-function buildModelUsageAttributes(usage) {
-  const inputTokens = tokenCount(usage.inputTokens);
-  const outputTokens = tokenCount(usage.outputTokens);
-  const explicitNonCachedInputTokens = tokenCount(usage.nonCachedInputTokens);
-  const explicitNonReasoningOutputTokens = tokenCount(usage.nonReasoningOutputTokens);
-  const reasoningTokens = tokenCount(usage.reasoningTokens);
-  const cacheReadInputTokens = tokenCount(usage.cacheReadInputTokens);
-  const cacheWriteInputTokens = tokenCount(usage.cacheWriteInputTokens);
-  const nonCachedInputTokens = exclusiveTokens({
-    explicit: explicitNonCachedInputTokens,
-    total: inputTokens,
-    parts: [cacheReadInputTokens, cacheWriteInputTokens],
-    semantics: usage.inputTokenSemantics
-  });
-  const nonReasoningOutputTokens = exclusiveTokens({
-    explicit: explicitNonReasoningOutputTokens,
-    total: outputTokens,
-    parts: [reasoningTokens],
-    semantics: usage.outputTokenSemantics
-  });
-  const exclusivePoolAttributes = nonCachedInputTokens !== void 0 && nonReasoningOutputTokens !== void 0 ? [
-    // backend consumes this complete raindrop.* set as one atomic billing-pool contract.
-    attrInt(MODEL_USAGE_ATTRIBUTES.nonCachedInputTokens, nonCachedInputTokens),
-    attrInt(MODEL_USAGE_ATTRIBUTES.nonReasoningOutputTokens, nonReasoningOutputTokens),
-    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningOutputTokens, reasoningTokens),
-    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadTokens, cacheReadInputTokens),
-    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteTokens, cacheWriteInputTokens)
-  ] : [];
+function buildRawModelUsageAttributes(usage) {
+  const providerReportedCost = typeof usage.providerReportedCost === "number" && Number.isFinite(usage.providerReportedCost) && usage.providerReportedCost >= 0 ? usage.providerReportedCost : void 0;
   return [
-    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, inputTokens),
-    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, outputTokens),
-    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, reasoningTokens),
-    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, cacheReadInputTokens),
-    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, cacheWriteInputTokens),
-    ...exclusivePoolAttributes
+    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, tokenCount(usage.inputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, tokenCount(usage.outputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, tokenCount(usage.reasoningTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, tokenCount(usage.cacheReadInputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, tokenCount(usage.cacheWriteInputTokens)),
+    attrDouble(MODEL_USAGE_ATTRIBUTES.providerReportedCost, providerReportedCost)
   ].filter((attribute) => attribute !== void 0);
 }
 var STRING_ALIASES = {
@@ -1885,7 +1848,7 @@ installTracingSuppressionHook();
 // package.json
 var package_default = {
   name: "@raindrop-ai/ai-sdk",
-  version: "0.3.0"};
+  version: "0.3.1"};
 
 // src/internal/version.ts
 var libraryName = package_default.name;
@@ -3129,29 +3092,6 @@ function firstTokenCount(...values) {
   }
   return void 0;
 }
-function flatUsageSemantics(provider) {
-  const normalizedProvider = typeof provider === "string" ? provider.trim().toLowerCase() : void 0;
-  if (normalizedProvider === "anthropic" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("anthropic.")) || normalizedProvider === "vertex.anthropic" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("vertex.anthropic."))) {
-    return {
-      inputTokenSemantics: "exclusive",
-      outputTokenSemantics: "total"
-    };
-  }
-  if (normalizedProvider === "openai" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("openai.")) || normalizedProvider === "azure" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("azure."))) {
-    return {
-      inputTokenSemantics: "total",
-      outputTokenSemantics: "total"
-    };
-  }
-  if (normalizedProvider === "google" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("google."))) {
-    return {
-      inputTokenSemantics: "total",
-      // Google v5 reports candidate output and thoughts separately.
-      outputTokenSemantics: "exclusive"
-    };
-  }
-  return {};
-}
 var CACHE_WRITE_METADATA_KEYS = [
   ["anthropic", "cacheCreationInputTokens"],
   ["openai", "cacheWriteTokens"],
@@ -3168,7 +3108,7 @@ function cacheWriteTokensFromProviderMetadata(providerMetadata) {
     })
   );
 }
-function extractUsageMetricsFromUsage(usage, provider, providerMetadata) {
+function extractUsageMetricsFromUsage(usage, _provider, providerMetadata) {
   if (!isRecord(usage)) return {};
   const inputTokenValue = usage["inputTokens"];
   const outputTokenValue = usage["outputTokens"];
@@ -3236,7 +3176,7 @@ function extractUsageMetricsFromUsage(usage, provider, providerMetadata) {
     cacheReadInputTokens,
     cachedInputTokens: cacheReadInputTokens,
     cacheWriteInputTokens,
-    ...hasStructuredUsage ? {} : flatUsageSemantics(provider)
+    ...hasStructuredUsage ? { usageSource: "ai-sdk-structured" } : {}
   };
 }
 
@@ -3588,7 +3528,8 @@ var RaindropTelemetryIntegration = class {
           attrInt("ai.usage.totalTokens", usageMetrics.totalTokens),
           attrInt("ai.usage.reasoningTokens", usageMetrics.reasoningTokens),
           attrInt("ai.usage.cachedInputTokens", usageMetrics.cachedInputTokens),
-          ...buildModelUsageAttributes(usageMetrics)
+          attrString(MODEL_USAGE_ATTRIBUTES.usageSource, usageMetrics.usageSource),
+          ...buildRawModelUsageAttributes(usageMetrics)
         );
       }
       this.emitProviderExecutedToolSpans(event, state);
@@ -4536,9 +4477,7 @@ function extractRaindropMetadata(metadata) {
     } catch (e) {
     }
   } else if (featureFlags && typeof featureFlags === "object") {
-    result.featureFlags = normalizeFeatureFlags(
-      featureFlags
-    );
+    result.featureFlags = normalizeFeatureFlags(featureFlags);
   }
   return result;
 }
@@ -4749,12 +4688,7 @@ function setupOperation(params) {
       ...attrsFromTelemetryMetadata(telemetry == null ? void 0 : telemetry.metadata),
       ...attrsFromHeaders(isRecord(arg) ? arg["headers"] : void 0),
       ...attrsFromSettings(arg),
-      ...(telemetry == null ? void 0 : telemetry.recordInputs) === false ? [] : [
-        attrString(
-          "ai.prompt",
-          safeJsonWithUint8(normalizePromptAttr(arg))
-        )
-      ]
+      ...(telemetry == null ? void 0 : telemetry.recordInputs) === false ? [] : [attrString("ai.prompt", safeJsonWithUint8(normalizePromptAttr(arg)))]
     ]
   }) : void 0;
   const rootParentForChildren = rootSpan ? { traceIdB64: rootSpan.ids.traceIdB64, spanIdB64: rootSpan.ids.spanIdB64 } : inheritedParent;
@@ -5104,7 +5038,10 @@ function wrapAISDK(aiSDK, deps) {
   }
   const useNative = deps.options.nativeTelemetry === true;
   if (useNative) {
-    const wrapTimeCtx = resolveContext(deps.options.context, { operation: "wrap", args: void 0 });
+    const wrapTimeCtx = resolveContext(deps.options.context, {
+      operation: "wrap",
+      args: void 0
+    });
     const integration = new RaindropTelemetryIntegration({
       traceShipper: deps.traceShipper,
       eventShipper: deps.eventShipper,
@@ -5349,7 +5286,13 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
         ...(telemetry == null ? void 0 : telemetry.recordInputs) === false ? [] : [
           attrString(
             "ai.prompt",
-            safeJsonWithUint8(normalizePromptAttr({ system: (_d = mergedArgs["system"]) != null ? _d : mergedArgs["instructions"], prompt: mergedArgs["prompt"], messages: mergedArgs["messages"] }))
+            safeJsonWithUint8(
+              normalizePromptAttr({
+                system: (_d = mergedArgs["system"]) != null ? _d : mergedArgs["instructions"],
+                prompt: mergedArgs["prompt"],
+                messages: mergedArgs["messages"]
+              })
+            )
           )
         ]
       ]
@@ -5563,7 +5506,13 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
         ...(telemetry == null ? void 0 : telemetry.recordInputs) === false ? [] : [
           attrString(
             "ai.prompt",
-            safeJsonWithUint8(normalizePromptAttr({ system: (_d = mergedArgs["system"]) != null ? _d : mergedArgs["instructions"], prompt: mergedArgs["prompt"], messages: mergedArgs["messages"] }))
+            safeJsonWithUint8(
+              normalizePromptAttr({
+                system: (_d = mergedArgs["system"]) != null ? _d : mergedArgs["instructions"],
+                prompt: mergedArgs["prompt"],
+                messages: mergedArgs["messages"]
+              })
+            )
           )
         ]
       ]
@@ -5940,9 +5889,19 @@ function wrapModel(args, aiSDK, outerOperationId, ctx) {
                 for (const part of content) {
                   if (isRecord(part)) {
                     if ((part["type"] === "reasoning" || part["type"] === "thinking") && typeof ((_a = part["text"]) != null ? _a : part["thinking"]) === "string") {
-                      sendLocalDebuggerLiveEvent({ traceId, type: "reasoning_delta", content: (_b = part["text"]) != null ? _b : part["thinking"], metadata: liveMeta });
+                      sendLocalDebuggerLiveEvent({
+                        traceId,
+                        type: "reasoning_delta",
+                        content: (_b = part["text"]) != null ? _b : part["thinking"],
+                        metadata: liveMeta
+                      });
                     } else if (part["type"] === "text" && typeof part["text"] === "string") {
-                      sendLocalDebuggerLiveEvent({ traceId, type: "text_delta", content: part["text"], metadata: liveMeta });
+                      sendLocalDebuggerLiveEvent({
+                        traceId,
+                        type: "text_delta",
+                        content: part["text"],
+                        metadata: liveMeta
+                      });
                     }
                   }
                 }
@@ -6023,7 +5982,10 @@ function wrapModel(args, aiSDK, outerOperationId, ctx) {
               attributes: [
                 ...((_a = ctx.telemetry) == null ? void 0 : _a.recordOutputs) === false ? [] : [
                   attrString("ai.response.finishReason", finishReason),
-                  attrString("ai.response.text", activeText.length ? capText2(activeText) : void 0),
+                  attrString(
+                    "ai.response.text",
+                    activeText.length ? capText2(activeText) : void 0
+                  ),
                   attrString(
                     "ai.response.toolCalls",
                     safeJsonWithUint8(toolCallsLocal.length ? toolCallsLocal : void 0)
@@ -6041,7 +6003,8 @@ function wrapModel(args, aiSDK, outerOperationId, ctx) {
                 ...finishReason ? [attrStringArray("gen_ai.response.finish_reasons", [finishReason])] : [],
                 attrString("gen_ai.response.id", responseId),
                 attrString(MODEL_USAGE_ATTRIBUTES.responseModel, finalResponseModelId),
-                ...buildModelUsageAttributes(usageMetrics),
+                attrString(MODEL_USAGE_ATTRIBUTES.usageSource, usageMetrics.usageSource),
+                ...buildRawModelUsageAttributes(usageMetrics),
                 ...msToFirstChunk !== void 0 ? [attrInt("ai.stream.msToFirstChunk", msToFirstChunk)] : [],
                 ...msToFinish !== void 0 ? [attrInt("ai.stream.msToFinish", msToFinish)] : [],
                 ...avgOutTokensPerSecond !== void 0 ? [attrDouble("ai.stream.avgOutputTokensPerSecond", avgOutTokensPerSecond)] : [],
@@ -6095,19 +6058,44 @@ function wrapModel(args, aiSDK, outerOperationId, ctx) {
                   if ("providerMetadata" in value) providerMetadata = value["providerMetadata"];
                   if (localDebuggerEnabled() && ctx.rootParentForChildren) {
                     const traceId = ctx.rootParentForChildren.traceIdB64;
-                    const liveMeta = getLocalDebuggerMetadata({ ...ctx.context, eventId: ctx.eventId });
+                    const liveMeta = getLocalDebuggerMetadata({
+                      ...ctx.context,
+                      eventId: ctx.eventId
+                    });
                     if (type === "text-delta") {
                       const text = typeof value["delta"] === "string" ? value["delta"] : typeof value["textDelta"] === "string" ? value["textDelta"] : typeof value["text"] === "string" ? value["text"] : void 0;
-                      if (typeof text === "string" && text) sendLocalDebuggerLiveEvent({ traceId, type: "text_delta", content: text, metadata: liveMeta });
+                      if (typeof text === "string" && text)
+                        sendLocalDebuggerLiveEvent({
+                          traceId,
+                          type: "text_delta",
+                          content: text,
+                          metadata: liveMeta
+                        });
                     } else if (type === "reasoning" || type === "reasoning-delta") {
                       const text = typeof value["delta"] === "string" ? value["delta"] : typeof value["text"] === "string" ? value["text"] : typeof value["thinking"] === "string" ? value["thinking"] : void 0;
-                      if (typeof text === "string" && text) sendLocalDebuggerLiveEvent({ traceId, type: "reasoning_delta", content: text, metadata: liveMeta });
+                      if (typeof text === "string" && text)
+                        sendLocalDebuggerLiveEvent({
+                          traceId,
+                          type: "reasoning_delta",
+                          content: text,
+                          metadata: liveMeta
+                        });
                     } else if (type === "tool-call") {
                       const toolName = typeof value["toolName"] === "string" ? value["toolName"] : "tool";
-                      sendLocalDebuggerLiveEvent({ traceId, type: "tool_start", content: toolName, metadata: { ...liveMeta, args: value["args"] } });
+                      sendLocalDebuggerLiveEvent({
+                        traceId,
+                        type: "tool_start",
+                        content: toolName,
+                        metadata: { ...liveMeta, args: value["args"] }
+                      });
                     } else if (type === "tool-result") {
                       const toolName = typeof value["toolName"] === "string" ? value["toolName"] : "tool";
-                      sendLocalDebuggerLiveEvent({ traceId, type: "tool_result", content: toolName, metadata: { ...liveMeta, result: value["result"] } });
+                      sendLocalDebuggerLiveEvent({
+                        traceId,
+                        type: "tool_result",
+                        content: toolName,
+                        metadata: { ...liveMeta, result: value["result"] }
+                      });
                     }
                   }
                 }
@@ -6187,11 +6175,7 @@ function endDoGenerateSpan(span, result, modelInfo, ctx) {
   } else {
     responseTimestampIso = (/* @__PURE__ */ new Date()).toISOString();
   }
-  const usageMetrics = extractUsageMetricsFromUsage(
-    usage,
-    modelInfo.provider,
-    providerMetadata
-  );
+  const usageMetrics = extractUsageMetricsFromUsage(usage, modelInfo.provider, providerMetadata);
   const { inputTokens, outputTokens } = usageMetrics;
   ctx.traceShipper.endSpan(span, {
     attributes: [
@@ -6212,7 +6196,8 @@ function endDoGenerateSpan(span, result, modelInfo, ctx) {
       ...finishReason ? [attrStringArray("gen_ai.response.finish_reasons", [finishReason])] : [],
       attrString("gen_ai.response.id", responseId),
       attrString(MODEL_USAGE_ATTRIBUTES.responseModel, responseModelId),
-      ...buildModelUsageAttributes(usageMetrics)
+      attrString(MODEL_USAGE_ATTRIBUTES.usageSource, usageMetrics.usageSource),
+      ...buildRawModelUsageAttributes(usageMetrics)
     ]
   });
 }

package/dist/index.node.mjs

@@ -1,4 +1,4 @@
-export { DEFAULT_MAX_TEXT_FIELD_CHARS, DEFAULT_REDACT_ATTRIBUTE_KEYS, DEFAULT_SECRET_KEY_NAMES, DETACHED_MODE, HANDOFF_ATTRIBUTE_PREFIXES, HANDOFF_ATTRIBUTE_SUFFIXES, HANDOFF_TERMINAL_CANCELLED, HANDOFF_TERMINAL_PROPERTY_KEY, REDACTED_PLACEHOLDER, RaindropTelemetryIntegration, SUBAGENT_ABORTED_OUTPUT, SUBAGENT_AGENT_ROLE, SUBAGENT_CANCELLED_OUTPUT, TOOL_EVENTS_ALLOW, TRUNCATION_MARKER, _resetParentToolContextStorage, _resetRaindropCallMetadataStorage, _resetWarnedMissingUserId, boundedStringify, capText, clearParentToolContext, createRaindropAISDK, currentSpan, defaultTransformSpan, enterParentToolContext, eventMetadata, eventMetadataFromChatRequest, fromHeaders, getContextManager, getCurrentParentToolContext, getCurrentRaindropCallMetadata, normalizeFeatureFlags, raindrop, readRaindropCallMetadataFromArgs, redactJsonAttributeValue, redactSecretsInObject, resetUnresolvedCarrierWarning, runWithParentToolContext, runWithRaindropCallMetadata, toHeaders, toLangSmithHeaders, withCurrent } from './chunk-GMY7QXIQ.mjs';
+export { DEFAULT_MAX_TEXT_FIELD_CHARS, DEFAULT_REDACT_ATTRIBUTE_KEYS, DEFAULT_SECRET_KEY_NAMES, DETACHED_MODE, HANDOFF_ATTRIBUTE_PREFIXES, HANDOFF_ATTRIBUTE_SUFFIXES, HANDOFF_TERMINAL_CANCELLED, HANDOFF_TERMINAL_PROPERTY_KEY, REDACTED_PLACEHOLDER, RaindropTelemetryIntegration, SUBAGENT_ABORTED_OUTPUT, SUBAGENT_AGENT_ROLE, SUBAGENT_CANCELLED_OUTPUT, TOOL_EVENTS_ALLOW, TRUNCATION_MARKER, _resetParentToolContextStorage, _resetRaindropCallMetadataStorage, _resetWarnedMissingUserId, boundedStringify, capText, clearParentToolContext, createRaindropAISDK, currentSpan, defaultTransformSpan, enterParentToolContext, eventMetadata, eventMetadataFromChatRequest, fromHeaders, getContextManager, getCurrentParentToolContext, getCurrentRaindropCallMetadata, normalizeFeatureFlags, raindrop, readRaindropCallMetadataFromArgs, redactJsonAttributeValue, redactSecretsInObject, resetUnresolvedCarrierWarning, runWithParentToolContext, runWithRaindropCallMetadata, toHeaders, toLangSmithHeaders, withCurrent } from './chunk-SGSAYTKI.mjs';
 import { AsyncLocalStorage } from 'async_hooks';
 
 globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = AsyncLocalStorage;