raindrop-ai 0.3.0 → 0.3.1

package/dist/tracing/index.js

@@ -35,28 +35,11 @@ __export(tracing_exports, {
 });
 module.exports = __toCommonJS(tracing_exports);
 
-// src/lib/inject-als.ts
-var import_node_async_hooks = require("async_hooks");
-if (!globalThis.RAINDROP_ASYNC_LOCAL_STORAGE) {
-  globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = import_node_async_hooks.AsyncLocalStorage;
-}
-
 // src/tracing/tracer-core.ts
 var import_api5 = require("@opentelemetry/api");
 var import_exporter_trace_otlp_http = require("@opentelemetry/exporter-trace-otlp-http");
-var import_instrumentation_anthropic = require("@traceloop/instrumentation-anthropic");
-var import_instrumentation_bedrock = require("@traceloop/instrumentation-bedrock");
-var import_instrumentation_chromadb = require("@traceloop/instrumentation-chromadb");
-var import_instrumentation_cohere = require("@traceloop/instrumentation-cohere");
-var import_instrumentation_openai = require("@traceloop/instrumentation-openai");
-var import_instrumentation_pinecone = require("@traceloop/instrumentation-pinecone");
-var import_instrumentation_qdrant = require("@traceloop/instrumentation-qdrant");
-var import_instrumentation_together = require("@traceloop/instrumentation-together");
-var import_instrumentation_vertexai = require("@traceloop/instrumentation-vertexai");
-var traceloop4 = __toESM(require("@traceloop/node-server-sdk"));
-var import_weakref = require("weakref");
 
-// ../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"]));
@@ -593,6 +576,20 @@ function stringifyBounded(value, limit) {
   }
   return json.length <= max ? json : truncateToLimit(json, max);
 }
+function attrString(key, value) {
+  if (value === void 0) return void 0;
+  return { key, value: { stringValue: value } };
+}
+function attrInt(key, value) {
+  if (value === void 0) return void 0;
+  if (!Number.isFinite(value)) return void 0;
+  return { key, value: { intValue: String(Math.trunc(value)) } };
+}
+function attrDouble(key, value) {
+  if (value === void 0) return void 0;
+  if (!Number.isFinite(value)) return void 0;
+  return { key, value: { doubleValue: value } };
+}
 var LOCAL_DEBUGGER_ENV_VAR = "RAINDROP_LOCAL_DEBUGGER";
 var WORKSHOP_ENV_VAR = "RAINDROP_WORKSHOP";
 var DEFAULT_LOCAL_WORKSHOP_URL = "http://localhost:5899/v1/";
@@ -696,6 +693,7 @@ function projectIdHeaders(projectId) {
 var SHUTDOWN_DEADLINE_MS = 1e4;
 var POST_SHUTDOWN_TIMEOUT_MS = 5e3;
 var MODEL_USAGE_ATTRIBUTES = {
+  usageSource: "raindrop.usage.source",
   providerName: "gen_ai.provider.name",
   requestModel: "gen_ai.request.model",
   responseModel: "gen_ai.response.model",
@@ -704,6 +702,7 @@ 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",
+  providerReportedCost: "gen_ai.usage.provider_reported_cost",
   nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
   nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
   totalOutputTokens: "raindrop.usage.output_tokens.total",
@@ -711,6 +710,47 @@ var MODEL_USAGE_ATTRIBUTES = {
   cacheReadTokens: "raindrop.usage.input_tokens.cache_read",
   cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
 };
+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"]
+];
+function canonicalModelProvider(provider) {
+  var _a;
+  const normalizedProvider = provider.trim().toLowerCase();
+  if (normalizedProvider === "gateway") return "vercel";
+  const match = MODEL_PROVIDER_NAMES.find(
+    ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
+  );
+  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 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, 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 = {
   [MODEL_USAGE_ATTRIBUTES.requestModel]: ["ai.model.id", "ai.model"]
 };
@@ -1051,6 +1091,25 @@ function installTracingSuppressionHook() {
 }
 installTracingSuppressionHook();
 
+// src/tracing/tracer-core.ts
+var import_instrumentation_anthropic = require("@traceloop/instrumentation-anthropic");
+var import_instrumentation_bedrock = require("@traceloop/instrumentation-bedrock");
+var import_instrumentation_chromadb = require("@traceloop/instrumentation-chromadb");
+var import_instrumentation_cohere = require("@traceloop/instrumentation-cohere");
+var import_instrumentation_openai = require("@traceloop/instrumentation-openai");
+var import_instrumentation_pinecone = require("@traceloop/instrumentation-pinecone");
+var import_instrumentation_qdrant = require("@traceloop/instrumentation-qdrant");
+var import_instrumentation_together = require("@traceloop/instrumentation-together");
+var import_instrumentation_vertexai = require("@traceloop/instrumentation-vertexai");
+var traceloop4 = __toESM(require("@traceloop/node-server-sdk"));
+var import_weakref = require("weakref");
+
+// src/lib/inject-als.ts
+var import_node_async_hooks = require("async_hooks");
+if (!globalThis.RAINDROP_ASYNC_LOCAL_STORAGE) {
+  globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = import_node_async_hooks.AsyncLocalStorage;
+}
+
 // src/tracing/direct/http.ts
 function wait2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -1207,7 +1266,7 @@ function base64ToHex2(base64) {
 // package.json
 var package_default = {
   name: "raindrop-ai",
-  version: "0.3.0",
+  version: "0.3.1",
   main: "dist/index.js",
   module: "dist/index.mjs",
   types: "dist/index.d.ts",
@@ -1632,7 +1691,7 @@ var DirectTraceShipper = class {
    * so spans still appear as children in the trace tree.
    */
   sendSpan(params) {
-    var _a, _b;
+    var _a, _b, _c;
     if (!this.enabled) return;
     let traceIdB64 = params.traceId;
     let parentSpanIdB64 = params.parentSpanId;
@@ -1676,6 +1735,7 @@ var DirectTraceShipper = class {
     })) {
       attributes.push(attrString2(key, value));
     }
+    attributes.push(...(_c = params.otlpAttributes) != null ? _c : []);
     let status;
     if (params.error) {
       status = { code: 2, message: params.error };
@@ -1827,9 +1887,62 @@ var DirectTraceShipper = class {
   }
 };
 
+// src/tracing/exit-flush.ts
+var traceloop = __toESM(require("@traceloop/node-server-sdk"));
+var STATE_KEY2 = /* @__PURE__ */ Symbol.for("raindrop.tracing.exitFlushState");
+function getState2() {
+  const holder = globalThis;
+  let state = holder[STATE_KEY2];
+  if (!state) {
+    state = {
+      clientFlushers: /* @__PURE__ */ new Set(),
+      pipelineFlushNeeded: false,
+      handlerRegistered: false
+    };
+    holder[STATE_KEY2] = state;
+  }
+  return state;
+}
+function ensureExitHandler(state) {
+  if (state.handlerRegistered) return;
+  if (typeof process === "undefined" || typeof process.once !== "function") return;
+  state.handlerRegistered = true;
+  process.once("beforeExit", () => {
+    void flushAll();
+  });
+}
+function registerClientFlusher(flush) {
+  const state = getState2();
+  state.clientFlushers.add(flush);
+  ensureExitHandler(state);
+  return () => {
+    state.clientFlushers.delete(flush);
+  };
+}
+function markPipelineForExitFlush() {
+  const state = getState2();
+  state.pipelineFlushNeeded = true;
+  ensureExitHandler(state);
+}
+async function flushAll() {
+  const state = getState2();
+  const tasks = [];
+  for (const flush of state.clientFlushers) {
+    tasks.push(Promise.resolve().then(flush).catch(() => {
+    }));
+  }
+  if (state.pipelineFlushNeeded) {
+    tasks.push(
+      Promise.resolve().then(() => traceloop.forceFlush()).catch(() => {
+      })
+    );
+  }
+  await Promise.all(tasks);
+}
+
 // src/tracing/liveInteraction.ts
 var import_api3 = require("@opentelemetry/api");
-var traceloop = __toESM(require("@traceloop/node-server-sdk"));
+var traceloop2 = __toESM(require("@traceloop/node-server-sdk"));
 
 // src/tracing/subagents.ts
 var import_api2 = require("@opentelemetry/api");
@@ -2253,6 +2366,7 @@ var DirectToolSpan = class {
 };
 var LiveInteraction = class {
   constructor(context6, traceId, analytics, directShipper, routing) {
+    this.usageEmitted = false;
     this.context = context6;
     this.analytics = analytics;
     this.tracer = import_api3.trace.getTracer("traceloop.tracer");
@@ -2337,10 +2451,7 @@ var LiveInteraction = class {
         spanId: base64ToHex2(spanIdB64),
         traceFlags: import_api3.TraceFlags.SAMPLED
       };
-      const wrappedContext = import_api3.trace.setSpan(
-        import_api3.context.active(),
-        import_api3.trace.wrapSpanContext(spanContext)
-      );
+      const wrappedContext = import_api3.trace.setSpan(import_api3.context.active(), import_api3.trace.wrapSpanContext(spanContext));
       const invoke = () => this.routing ? withRoutingContext(this.routing, () => fn.apply(thisArg, args)) : fn.apply(thisArg, args);
       try {
         const result = await import_api3.context.with(wrappedContext, invoke);
@@ -2391,7 +2502,7 @@ var LiveInteraction = class {
       }
       return fn.apply(thisArg, fnArgs);
     };
-    return traceloop.withTask(
+    return traceloop2.withTask(
       {
         name: taskName,
         associationProperties: serializeAssociationProperties(properties),
@@ -2432,10 +2543,7 @@ var LiveInteraction = class {
         spanId: base64ToHex2(spanIdB64),
         traceFlags: import_api3.TraceFlags.SAMPLED
       };
-      const wrappedContext = import_api3.trace.setSpan(
-        import_api3.context.active(),
-        import_api3.trace.wrapSpanContext(spanContext)
-      );
+      const wrappedContext = import_api3.trace.setSpan(import_api3.context.active(), import_api3.trace.wrapSpanContext(spanContext));
       const invoke = () => this.routing ? withRoutingContext(this.routing, () => fn.apply(thisArg, args)) : fn.apply(thisArg, args);
       let result;
       let error;
@@ -2545,7 +2653,7 @@ var LiveInteraction = class {
         throw error;
       }
     };
-    return traceloop.withTool(
+    return traceloop2.withTool(
       {
         name: toolName,
         associationProperties: serializeAssociationProperties(properties),
@@ -2848,7 +2956,7 @@ var LiveInteraction = class {
     span.end();
   }
   async finish(resultEvent) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
     unbindRoutingContext(this.boundContext);
     this.boundContext = void 0;
     unbindSpanAttributes(this.toolEventsFrame);
@@ -2856,6 +2964,15 @@ var LiveInteraction = class {
     if (!this.traceId) {
       this.resolveLiveTraceId();
     }
+    const eventId = resultEvent.eventId || this.context.eventId;
+    if (!this.usageEmitted) {
+      (_c = this.analytics) == null ? void 0 : _c._recordModelUsage(
+        eventId,
+        (_a = resultEvent.model) != null ? _a : this.context.model,
+        (_b = resultEvent.usage) != null ? _b : this.context.usage
+      );
+      this.usageEmitted = true;
+    }
     const spanFlush = (async () => {
       var _a2;
       try {
@@ -2863,21 +2980,20 @@ var LiveInteraction = class {
       } catch (e) {
       }
     })();
-    if ((_b = (_a = this.analytics) == null ? void 0 : _a._shouldBlockFinishFlush()) != null ? _b : true) {
+    if ((_e = (_d = this.analytics) == null ? void 0 : _d._shouldBlockFinishFlush()) != null ? _e : true) {
       await spanFlush;
     } else {
       void spanFlush.catch(() => {
       });
     }
-    const eventId = resultEvent.eventId || this.context.eventId;
     try {
-      await ((_c = this.analytics) == null ? void 0 : _c._drainInFlightPartials(eventId));
+      await ((_f = this.analytics) == null ? void 0 : _f._drainInFlightPartials(eventId));
     } catch (e) {
     }
     if (this.traceId) {
       this.setProperty("trace_id", this.traceId);
     }
-    await ((_d = this.analytics) == null ? void 0 : _d._trackAiPartial({
+    await ((_g = this.analytics) == null ? void 0 : _g._trackAiPartial({
       ...resultEvent,
       eventId,
       isPending: false
@@ -2994,7 +3110,7 @@ var LiveInteraction = class {
 
 // src/tracing/liveTracer.ts
 var import_api4 = require("@opentelemetry/api");
-var traceloop2 = __toESM(require("@traceloop/node-server-sdk"));
+var traceloop3 = __toESM(require("@traceloop/node-server-sdk"));
 var LiveTracer = class {
   constructor(globalProperties, directShipper, routing) {
     this.tracer = import_api4.trace.getTracer("traceloop.tracer");
@@ -3038,7 +3154,7 @@ var LiveTracer = class {
       }
       return fn.apply(thisArg, fnArgs);
     };
-    return traceloop2.withTask(
+    return traceloop3.withTask(
       {
         name: taskName,
         associationProperties: properties,
@@ -3150,59 +3266,6 @@ var LiveTracer = class {
   }
 };
 
-// src/tracing/exit-flush.ts
-var traceloop3 = __toESM(require("@traceloop/node-server-sdk"));
-var STATE_KEY2 = /* @__PURE__ */ Symbol.for("raindrop.tracing.exitFlushState");
-function getState2() {
-  const holder = globalThis;
-  let state = holder[STATE_KEY2];
-  if (!state) {
-    state = {
-      clientFlushers: /* @__PURE__ */ new Set(),
-      pipelineFlushNeeded: false,
-      handlerRegistered: false
-    };
-    holder[STATE_KEY2] = state;
-  }
-  return state;
-}
-function ensureExitHandler(state) {
-  if (state.handlerRegistered) return;
-  if (typeof process === "undefined" || typeof process.once !== "function") return;
-  state.handlerRegistered = true;
-  process.once("beforeExit", () => {
-    void flushAll();
-  });
-}
-function registerClientFlusher(flush) {
-  const state = getState2();
-  state.clientFlushers.add(flush);
-  ensureExitHandler(state);
-  return () => {
-    state.clientFlushers.delete(flush);
-  };
-}
-function markPipelineForExitFlush() {
-  const state = getState2();
-  state.pipelineFlushNeeded = true;
-  ensureExitHandler(state);
-}
-async function flushAll() {
-  const state = getState2();
-  const tasks = [];
-  for (const flush of state.clientFlushers) {
-    tasks.push(Promise.resolve().then(flush).catch(() => {
-    }));
-  }
-  if (state.pipelineFlushNeeded) {
-    tasks.push(
-      Promise.resolve().then(() => traceloop3.forceFlush()).catch(() => {
-      })
-    );
-  }
-  await Promise.all(tasks);
-}
-
 // src/tracing/tracer-core.ts
 if (localDebuggerEnabled()) {
   if (!process.env.OTEL_EXPORTER_OTLP_PROTOCOL) {
@@ -3920,6 +3983,59 @@ var tracing = (analytics, apiUrl, writeKey, options, isDebug = false) => {
       ...frame ? { frame, frameOwner } : {}
     });
   };
+  const recordModelUsage = (params) => {
+    try {
+      const attributes = [
+        attrString(MODEL_USAGE_ATTRIBUTES.usageSource, "manual"),
+        attrString(
+          MODEL_USAGE_ATTRIBUTES.providerName,
+          canonicalModelProvider(params.usage.provider)
+        ),
+        attrString(MODEL_USAGE_ATTRIBUTES.requestModel, params.model),
+        attrString(MODEL_USAGE_ATTRIBUTES.responseModel, params.model),
+        ...buildRawModelUsageAttributes({
+          inputTokens: params.usage.inputTokens,
+          outputTokens: params.usage.outputTokens,
+          cacheReadInputTokens: params.usage.cacheReadTokens,
+          cacheWriteInputTokens: params.usage.cacheWriteTokens,
+          reasoningTokens: params.usage.reasoningTokens,
+          providerReportedCost: params.usage.providerReportedCost
+        })
+      ].filter((attribute) => attribute !== void 0);
+      if (directShipper) {
+        const timeMs = Date.now();
+        directShipper.sendSpan({
+          name: "ai.model.usage",
+          spanKind: "llm",
+          properties: { event_id: params.eventId },
+          startTimeMs: timeMs,
+          endTimeMs: timeMs,
+          durationMs: 0,
+          otlpAttributes: attributes
+        });
+        return;
+      }
+      const span = import_api5.trace.getTracer("traceloop.tracer").startSpan("ai.model.usage");
+      span.setAttribute("traceloop.span.kind", "llm");
+      span.setAttribute("traceloop.association.properties.event_id", params.eventId);
+      stampSpan(span, projectId, authHint);
+      for (const attribute of attributes) {
+        const value = attribute.value;
+        if (value.stringValue !== void 0) {
+          span.setAttribute(attribute.key, value.stringValue);
+        } else if (value.intValue !== void 0) {
+          const parsed = Number(value.intValue);
+          if (Number.isSafeInteger(parsed)) span.setAttribute(attribute.key, parsed);
+        } else if (value.doubleValue !== void 0) {
+          span.setAttribute(attribute.key, value.doubleValue);
+        } else if (value.boolValue !== void 0) {
+          span.setAttribute(attribute.key, value.boolValue);
+        }
+      }
+      span.end();
+    } catch (e) {
+    }
+  };
   return {
     /**
      * Returns instrumentation instances for your NodeSDK.
@@ -4031,6 +4147,7 @@ var tracing = (analytics, apiUrl, writeKey, options, isDebug = false) => {
     begin(traceContext) {
       return beginInteraction(traceContext);
     },
+    recordModelUsage,
     resumeSubagent(carrierOrHeaders, options2 = {}) {
       return openSubagentRun(carrierOrHeaders, options2);
     },

package/dist/tracing/index.mjs

@@ -1,6 +1,6 @@
 import {
   tracing
-} from "../chunk-5Y3LWBKV.mjs";
+} from "../chunk-4TM4IWHB.mjs";
 import "../chunk-UJCSKKID.mjs";
 
 // src/tracing/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "raindrop-ai",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
     "typescript": "^5.3.3",
     "vite": "^7.3.2",
     "vitest": "^4.0.10",
-    "@raindrop-ai/core": "0.2.0",
+    "@raindrop-ai/core": "0.2.1",
     "@raindrop-ai/redact-pii": "0.1.2",
     "@raindrop-ai/schemas": "0.1.0"
   },