braintrust 3.0.0 → 3.1.0

package/dist/index.mjs

@@ -6497,6 +6497,7 @@ function init(projectOrOptions, optionalOptions) {
     forceLogin,
     fetch: fetch2,
     metadata,
+    tags,
     gitMetadataSettings,
     projectId,
     baseExperimentId,
@@ -6609,6 +6610,10 @@ function init(projectOrOptions, optionalOptions) {
       if (metadata) {
         args["metadata"] = metadata;
       }
+      if (tags) {
+        validateTags(tags);
+        args["tags"] = tags;
+      }
       let response = null;
       while (true) {
         try {
@@ -7555,6 +7560,7 @@ function validateTags(tags) {
     if (seen.has(tag)) {
       throw new Error(`duplicate tag: ${tag}`);
     }
+    seen.add(tag);
   }
 }
 function validateAndSanitizeExperimentLogPartialArgs(event) {
@@ -9279,6 +9285,7 @@ var _exportsForTestingOnly = {
   isGeneratorFunction,
   isAsyncGeneratorFunction,
   resetIdGenStateForTests,
+  validateTags,
   isomorph: isomorph_default
   // Expose isomorph for build type detection
 };
@@ -10630,9 +10637,13 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
+        const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+          params.model,
+          aiSDK
+        );
         const result = await generateText({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools)
         });
         const gatewayInfo = extractGatewayRoutingInfo(result);
@@ -10645,7 +10656,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
         }
         span.log({
           output: await processOutput(result, options.denyOutputPaths),
-          metrics: extractTokenMetrics(result),
+          metrics: getMetrics(result),
           ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
         });
         return result;
@@ -10866,6 +10877,14 @@ var wrapModel = (model, ai) => {
 var wrapGenerateText = (generateText, options = {}, aiSDK) => {
   return makeGenerateTextWrapper("generateText", options, generateText, aiSDK);
 };
+var wrapModelAndGetMetrics = (model, aiSDK) => {
+  const wrappedModel = wrapModel(model, aiSDK);
+  const modelIsWrapped = wrappedModel?._braintrustWrapped === true;
+  return {
+    wrappedModel,
+    getMetrics: (result) => modelIsWrapped ? void 0 : extractTokenMetrics(result)
+  };
+};
 var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
   return async function generateObjectWrapper(allParams) {
     const { span_info, ...params } = allParams;
@@ -10878,9 +10897,13 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
+        const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+          params.model,
+          aiSDK
+        );
         const result = await generateObject({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools)
         });
         const output = await processOutput(result, options.denyOutputPaths);
@@ -10894,7 +10917,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
         }
         span.log({
           output,
-          metrics: extractTokenMetrics(result),
+          metrics: getMetrics(result),
           ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
         });
         return result;
@@ -10959,11 +10982,15 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
     try {
       const startTime = Date.now();
       let receivedFirst = false;
+      const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+        params.model,
+        aiSDK
+      );
       const result = withCurrent(
         span,
         () => streamText({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools),
           onChunk: (chunk) => {
             if (!receivedFirst) {
@@ -10988,7 +11015,7 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
             }
             span.log({
               output: await processOutput(event, options.denyOutputPaths),
-              metrics: extractTokenMetrics(event),
+              metrics: getMetrics(event),
               ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
             });
             span.end();
@@ -11083,11 +11110,15 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
     try {
       const startTime = Date.now();
       let receivedFirst = false;
+      const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+        params.model,
+        aiSDK
+      );
       const result = withCurrent(
         span,
         () => streamObject({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools),
           onChunk: (chunk) => {
             if (!receivedFirst) {
@@ -11112,7 +11143,7 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
             }
             span.log({
               output: await processOutput(event, options.denyOutputPaths),
-              metrics: extractTokenMetrics(event),
+              metrics: getMetrics(event),
               ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
             });
             span.end();
@@ -15706,6 +15737,7 @@ async function Eval(name, evaluator, reporterOrOpts) {
       experiment: evaluator.experimentName,
       description: evaluator.description,
       metadata: evaluator.metadata,
+      tags: evaluator.tags,
       isPublic: evaluator.isPublic,
       update: evaluator.update,
       baseExperiment: evaluator.baseExperimentName ?? defaultBaseExperiment,

package/dist/workerd.js

@@ -6429,6 +6429,7 @@ function init(projectOrOptions, optionalOptions) {
     forceLogin,
     fetch: fetch2,
     metadata,
+    tags,
     gitMetadataSettings,
     projectId,
     baseExperimentId,
@@ -6541,6 +6542,10 @@ function init(projectOrOptions, optionalOptions) {
       if (metadata) {
         args["metadata"] = metadata;
       }
+      if (tags) {
+        validateTags(tags);
+        args["tags"] = tags;
+      }
       let response = null;
       while (true) {
         try {
@@ -7487,6 +7492,7 @@ function validateTags(tags) {
     if (seen.has(tag)) {
       throw new Error(`duplicate tag: ${tag}`);
     }
+    seen.add(tag);
   }
 }
 function validateAndSanitizeExperimentLogPartialArgs(event) {
@@ -9211,6 +9217,7 @@ var _exportsForTestingOnly = {
   isGeneratorFunction,
   isAsyncGeneratorFunction,
   resetIdGenStateForTests,
+  validateTags,
   isomorph: isomorph_default
   // Expose isomorph for build type detection
 };
@@ -10559,9 +10566,13 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
+        const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+          params.model,
+          aiSDK
+        );
         const result = await generateText({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools)
         });
         const gatewayInfo = extractGatewayRoutingInfo(result);
@@ -10574,7 +10585,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
         }
         span.log({
           output: await processOutput(result, options.denyOutputPaths),
-          metrics: extractTokenMetrics(result),
+          metrics: getMetrics(result),
           ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
         });
         return result;
@@ -10795,6 +10806,14 @@ var wrapModel = (model, ai) => {
 var wrapGenerateText = (generateText, options = {}, aiSDK) => {
   return makeGenerateTextWrapper("generateText", options, generateText, aiSDK);
 };
+var wrapModelAndGetMetrics = (model, aiSDK) => {
+  const wrappedModel = wrapModel(model, aiSDK);
+  const modelIsWrapped = wrappedModel?._braintrustWrapped === true;
+  return {
+    wrappedModel,
+    getMetrics: (result) => modelIsWrapped ? void 0 : extractTokenMetrics(result)
+  };
+};
 var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
   return async function generateObjectWrapper(allParams) {
     const { span_info, ...params } = allParams;
@@ -10807,9 +10826,13 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
+        const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+          params.model,
+          aiSDK
+        );
         const result = await generateObject({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools)
         });
         const output = await processOutput(result, options.denyOutputPaths);
@@ -10823,7 +10846,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
         }
         span.log({
           output,
-          metrics: extractTokenMetrics(result),
+          metrics: getMetrics(result),
           ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
         });
         return result;
@@ -10888,11 +10911,15 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
     try {
       const startTime = Date.now();
       let receivedFirst = false;
+      const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+        params.model,
+        aiSDK
+      );
       const result = withCurrent(
         span,
         () => streamText({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools),
           onChunk: (chunk) => {
             if (!receivedFirst) {
@@ -10917,7 +10944,7 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
             }
             span.log({
               output: await processOutput(event, options.denyOutputPaths),
-              metrics: extractTokenMetrics(event),
+              metrics: getMetrics(event),
               ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
             });
             span.end();
@@ -11012,11 +11039,15 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
     try {
       const startTime = Date.now();
       let receivedFirst = false;
+      const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+        params.model,
+        aiSDK
+      );
       const result = withCurrent(
         span,
         () => streamObject({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools),
           onChunk: (chunk) => {
             if (!receivedFirst) {
@@ -11041,7 +11072,7 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
             }
             span.log({
               output: await processOutput(event, options.denyOutputPaths),
-              metrics: extractTokenMetrics(event),
+              metrics: getMetrics(event),
               ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
             });
             span.end();
@@ -15635,6 +15666,7 @@ async function Eval(name, evaluator, reporterOrOpts) {
       experiment: evaluator.experimentName,
       description: evaluator.description,
       metadata: evaluator.metadata,
+      tags: evaluator.tags,
       isPublic: evaluator.isPublic,
       update: evaluator.update,
       baseExperiment: evaluator.baseExperimentName ?? defaultBaseExperiment,

package/dist/workerd.mjs

@@ -6273,6 +6273,7 @@ function init(projectOrOptions, optionalOptions) {
     forceLogin,
     fetch: fetch2,
     metadata,
+    tags,
     gitMetadataSettings,
     projectId,
     baseExperimentId,
@@ -6385,6 +6386,10 @@ function init(projectOrOptions, optionalOptions) {
       if (metadata) {
         args["metadata"] = metadata;
       }
+      if (tags) {
+        validateTags(tags);
+        args["tags"] = tags;
+      }
       let response = null;
       while (true) {
         try {
@@ -7331,6 +7336,7 @@ function validateTags(tags) {
     if (seen.has(tag)) {
       throw new Error(`duplicate tag: ${tag}`);
     }
+    seen.add(tag);
   }
 }
 function validateAndSanitizeExperimentLogPartialArgs(event) {
@@ -9055,6 +9061,7 @@ var _exportsForTestingOnly = {
   isGeneratorFunction,
   isAsyncGeneratorFunction,
   resetIdGenStateForTests,
+  validateTags,
   isomorph: isomorph_default
   // Expose isomorph for build type detection
 };
@@ -10403,9 +10410,13 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
+        const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+          params.model,
+          aiSDK
+        );
         const result = await generateText({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools)
         });
         const gatewayInfo = extractGatewayRoutingInfo(result);
@@ -10418,7 +10429,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
         }
         span.log({
           output: await processOutput(result, options.denyOutputPaths),
-          metrics: extractTokenMetrics(result),
+          metrics: getMetrics(result),
           ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
         });
         return result;
@@ -10639,6 +10650,14 @@ var wrapModel = (model, ai) => {
 var wrapGenerateText = (generateText, options = {}, aiSDK) => {
   return makeGenerateTextWrapper("generateText", options, generateText, aiSDK);
 };
+var wrapModelAndGetMetrics = (model, aiSDK) => {
+  const wrappedModel = wrapModel(model, aiSDK);
+  const modelIsWrapped = wrappedModel?._braintrustWrapped === true;
+  return {
+    wrappedModel,
+    getMetrics: (result) => modelIsWrapped ? void 0 : extractTokenMetrics(result)
+  };
+};
 var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
   return async function generateObjectWrapper(allParams) {
     const { span_info, ...params } = allParams;
@@ -10651,9 +10670,13 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
+        const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+          params.model,
+          aiSDK
+        );
         const result = await generateObject({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools)
         });
         const output = await processOutput(result, options.denyOutputPaths);
@@ -10667,7 +10690,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
         }
         span.log({
           output,
-          metrics: extractTokenMetrics(result),
+          metrics: getMetrics(result),
           ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
         });
         return result;
@@ -10732,11 +10755,15 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
     try {
       const startTime = Date.now();
       let receivedFirst = false;
+      const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+        params.model,
+        aiSDK
+      );
       const result = withCurrent(
         span,
         () => streamText({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools),
           onChunk: (chunk) => {
             if (!receivedFirst) {
@@ -10761,7 +10788,7 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
             }
             span.log({
               output: await processOutput(event, options.denyOutputPaths),
-              metrics: extractTokenMetrics(event),
+              metrics: getMetrics(event),
               ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
             });
             span.end();
@@ -10856,11 +10883,15 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
     try {
       const startTime = Date.now();
       let receivedFirst = false;
+      const { wrappedModel, getMetrics } = wrapModelAndGetMetrics(
+        params.model,
+        aiSDK
+      );
       const result = withCurrent(
         span,
         () => streamObject({
           ...params,
-          model: wrapModel(params.model, aiSDK),
+          model: wrappedModel,
           tools: wrapTools(params.tools),
           onChunk: (chunk) => {
             if (!receivedFirst) {
@@ -10885,7 +10916,7 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
             }
             span.log({
               output: await processOutput(event, options.denyOutputPaths),
-              metrics: extractTokenMetrics(event),
+              metrics: getMetrics(event),
               ...Object.keys(resolvedMetadata).length > 0 ? { metadata: resolvedMetadata } : {}
             });
             span.end();
@@ -15479,6 +15510,7 @@ async function Eval(name, evaluator, reporterOrOpts) {
       experiment: evaluator.experimentName,
       description: evaluator.description,
       metadata: evaluator.metadata,
+      tags: evaluator.tags,
       isPublic: evaluator.isPublic,
       update: evaluator.update,
       baseExperiment: evaluator.baseExperimentName ?? defaultBaseExperiment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braintrust",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "SDK for integrating Braintrust",
   "repository": {
     "type": "git",