braintrust 1.1.1 → 2.0.0

package/dist/browser.mjs

@@ -1353,6 +1353,13 @@ var SpanComponentsV4 = class _SpanComponentsV4 {
     return new _SpanComponentsV4(spanComponentsV4Schema.parse(jsonObj));
   }
 };
+function makeScorerPropagatedEvent(parent) {
+  const parentPropagatedEvent = parent ? SpanComponentsV4.fromStr(parent).data.propagated_event ?? {} : {};
+  return mergeDicts(
+    { ...parentPropagatedEvent },
+    { span_attributes: { purpose: "scorer" } }
+  );
+}
 
 // util/git_fields.ts
 function mergeGitMetadataSettings(s1, s2) {
@@ -1860,9 +1867,25 @@ var ExperimentEvent = z6.object({
   comments: z6.union([z6.array(z6.unknown()), z6.null()]).optional(),
   audit_data: z6.union([z6.array(z6.unknown()), z6.null()]).optional()
 });
+var NullableFunctionTypeEnum = z6.union([
+  z6.enum([
+    "llm",
+    "scorer",
+    "task",
+    "tool",
+    "custom_view",
+    "preprocessor",
+    "facet"
+  ]),
+  z6.null()
+]);
 var ExtendedSavedFunctionId = z6.union([
   z6.object({ type: z6.literal("function"), id: z6.string() }),
-  z6.object({ type: z6.literal("global"), name: z6.string() }),
+  z6.object({
+    type: z6.literal("global"),
+    name: z6.string(),
+    function_type: NullableFunctionTypeEnum.optional()
+  }),
   z6.object({
     type: z6.literal("slug"),
     project_id: z6.string(),
@@ -1871,7 +1894,11 @@ var ExtendedSavedFunctionId = z6.union([
 ]);
 var NullableSavedFunctionId = z6.union([
   z6.object({ type: z6.literal("function"), id: z6.string() }),
-  z6.object({ type: z6.literal("global"), name: z6.string() }),
+  z6.object({
+    type: z6.literal("global"),
+    name: z6.string(),
+    function_type: NullableFunctionTypeEnum.optional()
+  }),
   z6.null()
 ]);
 var FacetData = z6.object({
@@ -1968,7 +1995,11 @@ var PromptParserNullish = z6.union([
 ]);
 var SavedFunctionId = z6.union([
   z6.object({ type: z6.literal("function"), id: z6.string() }),
-  z6.object({ type: z6.literal("global"), name: z6.string() })
+  z6.object({
+    type: z6.literal("global"),
+    name: z6.string(),
+    function_type: NullableFunctionTypeEnum.optional()
+  })
 ]);
 var PromptDataNullish = z6.union([
   z6.object({
@@ -2115,6 +2146,7 @@ var FunctionData = z6.union([
   z6.object({
     type: z6.literal("global"),
     name: z6.string(),
+    function_type: NullableFunctionTypeEnum.optional(),
     config: z6.union([z6.object({}).partial().passthrough(), z6.null()]).optional()
   }),
   FacetData
@@ -2201,7 +2233,10 @@ var FunctionId = z6.union([
     slug: z6.string(),
     version: z6.string().optional()
   }),
-  z6.object({ global_function: z6.string() }),
+  z6.object({
+    global_function: z6.string(),
+    function_type: NullableFunctionTypeEnum.optional()
+  }),
   z6.object({
     prompt_session_id: z6.string(),
     prompt_session_function_id: z6.string(),
@@ -2412,6 +2447,7 @@ var Project = z6.object({
   id: z6.string().uuid(),
   org_id: z6.string().uuid(),
   name: z6.string(),
+  description: z6.union([z6.string(), z6.null()]).optional(),
   created: z6.union([z6.string(), z6.null()]).optional(),
   deleted_at: z6.union([z6.string(), z6.null()]).optional(),
   user_id: z6.union([z6.string(), z6.null()]).optional(),
@@ -8247,6 +8283,7 @@ async function invoke(args) {
     project_name: functionIdArgs.projectName,
     slug: functionIdArgs.slug,
     global_function: functionIdArgs.globalFunction,
+    function_type: functionIdArgs.functionType,
     prompt_session_id: functionIdArgs.promptSessionId,
     prompt_session_function_id: functionIdArgs.promptSessionFunctionId,
     version: functionIdArgs.version
@@ -9261,8 +9298,22 @@ function processInputAttachments(input) {
   return input;
 }
 
+// src/zod/utils.ts
+import { zodToJsonSchema as zodToJsonSchemaV3 } from "zod-to-json-schema";
+import * as z42 from "zod/v4";
+function isZodV4(zodObject) {
+  return typeof zodObject === "object" && zodObject !== null && "_zod" in zodObject && zodObject._zod !== void 0;
+}
+function zodToJsonSchema(schema) {
+  if (isZodV4(schema)) {
+    return z42.toJSONSchema(schema, {
+      target: "draft-7"
+    });
+  }
+  return zodToJsonSchemaV3(schema);
+}
+
 // src/wrappers/ai-sdk/ai-sdk.ts
-import { zodToJsonSchema } from "zod-to-json-schema";
 var DENY_OUTPUT_PATHS = [
   // v3
   "roundtrips[].request.body",
@@ -9338,8 +9389,14 @@ var wrapAgentStream = (stream, instance, options = {}) => {
   )({ ...instance.settings, ...params });
 };
 var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
-  const wrapper = async function(params) {
-    const { model: initialModel, provider: initialProvider } = serializeModelWithProvider(params.model);
+  const wrapper = async function(allParams) {
+    const { span_info, ...params } = allParams;
+    const {
+      metadata: spanInfoMetadata,
+      name: spanName,
+      spanAttributes: spanInfoAttrs
+    } = span_info ?? {};
+    const { model, provider } = serializeModelWithProvider(params.model);
     return traced(
       async (span) => {
         const result = await generateText({
@@ -9363,15 +9420,17 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
         return result;
       },
       {
-        name,
+        name: spanName || name,
         spanAttributes: {
-          type: "llm" /* LLM */
+          type: "llm" /* LLM */,
+          ...spanInfoAttrs
         },
         event: {
           input: processInputAttachments2(params),
           metadata: {
-            model: initialModel,
-            ...initialProvider ? { provider: initialProvider } : {},
+            ...spanInfoMetadata,
+            model,
+            ...provider ? { provider } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -9404,8 +9463,7 @@ var wrapModel = (model, ai) => {
   }
   const originalDoGenerate = resolvedModel.doGenerate.bind(resolvedModel);
   const originalDoStream = resolvedModel.doStream?.bind(resolvedModel);
-  const { model: initialModel, provider: initialProvider } = serializeModelWithProvider(resolvedModel.modelId);
-  const effectiveProvider = resolvedModel.provider || initialProvider;
+  const { model: modelId, provider } = serializeModelWithProvider(resolvedModel);
   const wrappedDoGenerate = async (options) => {
     return traced(
       async (span) => {
@@ -9418,6 +9476,9 @@ var wrapModel = (model, ai) => {
         if (gatewayInfo?.model) {
           resolvedMetadata.model = gatewayInfo.model;
         }
+        if (result.finishReason !== void 0) {
+          resolvedMetadata.finish_reason = result.finishReason;
+        }
         span.log({
           output: await processOutput(result),
           metrics: extractTokenMetrics(result),
@@ -9433,8 +9494,8 @@ var wrapModel = (model, ai) => {
         event: {
           input: processInputAttachments2(options),
           metadata: {
-            model: initialModel,
-            ...effectiveProvider ? { provider: effectiveProvider } : {},
+            model: modelId,
+            ...provider ? { provider } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -9455,8 +9516,8 @@ var wrapModel = (model, ai) => {
       event: {
         input: processInputAttachments2(options),
         metadata: {
-          model: initialModel,
-          ...effectiveProvider ? { provider: effectiveProvider } : {},
+          model: modelId,
+          ...provider ? { provider } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -9535,6 +9596,9 @@ var wrapModel = (model, ai) => {
             if (gatewayInfo?.model) {
               resolvedMetadata.model = gatewayInfo.model;
             }
+            if (chunk.finishReason !== void 0) {
+              resolvedMetadata.finish_reason = chunk.finishReason;
+            }
             span.log({
               output: await processOutput(output),
               metrics: extractTokenMetrics(output),
@@ -9570,8 +9634,14 @@ var wrapGenerateText = (generateText, options = {}, aiSDK) => {
   return makeGenerateTextWrapper("generateText", options, generateText, aiSDK);
 };
 var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
-  return async function generateObjectWrapper(params) {
-    const { model: initialModel, provider: initialProvider } = serializeModelWithProvider(params.model);
+  return async function generateObjectWrapper(allParams) {
+    const { span_info, ...params } = allParams;
+    const {
+      metadata: spanInfoMetadata,
+      name: spanName,
+      spanAttributes: spanInfoAttrs
+    } = span_info ?? {};
+    const { model, provider } = serializeModelWithProvider(params.model);
     return traced(
       async (span) => {
         const result = await generateObject({
@@ -9596,15 +9666,17 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
         return result;
       },
       {
-        name: "generateObject",
+        name: spanName || "generateObject",
         spanAttributes: {
-          type: "llm" /* LLM */
+          type: "llm" /* LLM */,
+          ...spanInfoAttrs
         },
         event: {
           input: processInputAttachments2(params),
           metadata: {
-            model: initialModel,
-            ...initialProvider ? { provider: initialProvider } : {},
+            ...spanInfoMetadata,
+            model,
+            ...provider ? { provider } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -9616,18 +9688,26 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
   };
 };
 var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
-  const wrapper = function(params) {
-    const { model: initialModel, provider: initialProvider } = serializeModelWithProvider(params.model);
+  const wrapper = function(allParams) {
+    const { span_info, ...params } = allParams;
+    const {
+      metadata: spanInfoMetadata,
+      name: spanName,
+      spanAttributes: spanInfoAttrs
+    } = span_info ?? {};
+    const { model, provider } = serializeModelWithProvider(params.model);
     const span = startSpan({
-      name,
+      name: spanName || name,
       spanAttributes: {
-        type: "llm" /* LLM */
+        type: "llm" /* LLM */,
+        ...spanInfoAttrs
       },
       event: {
         input: processInputAttachments2(params),
         metadata: {
-          model: initialModel,
-          ...initialProvider ? { provider: initialProvider } : {},
+          ...spanInfoMetadata,
+          model,
+          ...provider ? { provider } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -9725,18 +9805,26 @@ var wrapStreamText = (streamText, options = {}, aiSDK) => {
   return makeStreamTextWrapper("streamText", options, streamText, aiSDK);
 };
 var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
-  return function streamObjectWrapper(params) {
-    const { model: initialModel, provider: initialProvider } = serializeModelWithProvider(params.model);
+  return function streamObjectWrapper(allParams) {
+    const { span_info, ...params } = allParams;
+    const {
+      metadata: spanInfoMetadata,
+      name: spanName,
+      spanAttributes: spanInfoAttrs
+    } = span_info ?? {};
+    const { model, provider } = serializeModelWithProvider(params.model);
     const span = startSpan({
-      name: "streamObject",
+      name: spanName || "streamObject",
       spanAttributes: {
-        type: "llm" /* LLM */
+        type: "llm" /* LLM */,
+        ...spanInfoAttrs
       },
       event: {
         input: processInputAttachments2(params),
         metadata: {
-          model: initialModel,
-          ...initialProvider ? { provider: initialProvider } : {},
+          ...spanInfoMetadata,
+          model,
+          ...provider ? { provider } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -9964,10 +10052,15 @@ function parseGatewayModelString(modelString) {
 }
 function serializeModelWithProvider(model) {
   const modelId = typeof model === "string" ? model : model?.modelId;
+  const explicitProvider = typeof model === "object" ? model?.provider : void 0;
   if (!modelId) {
-    return { model: modelId };
+    return { model: modelId, provider: explicitProvider };
   }
-  return parseGatewayModelString(modelId);
+  const parsed = parseGatewayModelString(modelId);
+  return {
+    model: parsed.model,
+    provider: explicitProvider || parsed.provider
+  };
 }
 function extractGatewayRoutingInfo(result) {
   if (result?.steps && Array.isArray(result.steps) && result.steps.length > 0) {
@@ -10045,6 +10138,9 @@ var processInputAttachments2 = (input) => {
   if (input.tools) {
     processed.tools = processTools(input.tools);
   }
+  if (input.schema && isZodSchema(input.schema)) {
+    processed.schema = serializeZodSchema(input.schema);
+  }
   if (input.callOptionsSchema && isZodSchema(input.callOptionsSchema)) {
     processed.callOptionsSchema = serializeZodSchema(input.callOptionsSchema);
   }
@@ -14271,8 +14367,12 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                 const results = await rootSpan.traced(runScorer, {
                   name: scorerNames[score_idx],
                   spanAttributes: {
-                    type: "score" /* SCORE */
+                    type: "score" /* SCORE */,
+                    purpose: "scorer"
                   },
+                  propagatedEvent: makeScorerPropagatedEvent(
+                    await rootSpan.export()
+                  ),
                   event: { input: scoringArgs }
                 });
                 return { kind: "score", value: results };

package/dist/cli.js

@@ -1275,7 +1275,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "braintrust",
-      version: "1.1.1",
+      version: "2.0.0",
       description: "SDK for integrating Braintrust",
       repository: {
         type: "git",
@@ -1331,7 +1331,7 @@ var require_package = __commonJS({
         watch: "tsup --watch",
         clean: "rm -r dist/* && rm -r dev/dist/*",
         docs: "npx typedoc --options typedoc.json src/index.ts",
-        test: 'vitest run --exclude "src/wrappers/**/*.test.ts" --exclude "src/otel/**/*.test.ts" --exclude "smoke/**/*.test.ts"',
+        test: 'vitest run --exclude "src/wrappers/**/*.test.ts" --exclude "src/otel/**/*.test.ts" --exclude "smoke/**/*.test.ts" --exclude "src/zod/**/*.test.ts"',
         "test:api-compat": "vitest run src/api-compatibility.test.ts",
         "test:anthropic": "vitest run src/wrappers/anthropic.test.ts",
         "test:openai": "vitest run src/wrappers/oai.test.ts",
@@ -1341,6 +1341,8 @@ var require_package = __commonJS({
         "test:ai-sdk-v1": "vitest run src/wrappers/ai-sdk-v1.test.ts",
         "test:ai-sdk-v2": "vitest run src/wrappers/ai-sdk-v2.test.ts src/wrappers/ai-sdk-v1.test.ts",
         "test:ai-sdk-v3": "vitest run src/wrappers/ai-sdk-v3.test.ts",
+        "test:zod-v3": "vitest run src/zod/zod-v3-serialization.test.ts",
+        "test:zod-v4": "vitest run src/zod/zod-v4-serialization.test.ts",
         "test:mastra": "vitest run src/wrappers/mastra.test.ts",
         "test:claude-agent-sdk": "vitest run src/wrappers/claude-agent-sdk.test.ts",
         "test:output": "tsx scripts/test-output.ts --with-comparison --with-metrics --with-progress"
@@ -1384,7 +1386,8 @@ var require_package = __commonJS({
         "typedoc-plugin-markdown": "^3.17.1",
         typescript: "5.4.4",
         "vite-tsconfig-paths": "^4.3.2",
-        vitest: "^2.1.9"
+        vitest: "^2.1.9",
+        zod: "^3.25.34"
       },
       dependencies: {
         "@ai-sdk/provider": "^1.1.3",
@@ -1411,11 +1414,10 @@ var require_package = __commonJS({
         "source-map": "^0.7.4",
         "termi-link": "^1.0.1",
         uuid: "^9.0.1",
-        zod: "^3.25.34",
-        "zod-to-json-schema": "^3.22.5"
+        "zod-to-json-schema": "^3.25.0"
       },
       peerDependencies: {
-        zod: "^3.25.34"
+        zod: "^3.25.34 || ^4.0"
       }
     };
   }
@@ -2791,6 +2793,13 @@ function parseParent(parent) {
     propagated_event: parent.propagated_event
   }).toStr() : void 0;
 }
+function makeScorerPropagatedEvent(parent) {
+  const parentPropagatedEvent = parent ? SpanComponentsV4.fromStr(parent).data.propagated_event ?? {} : {};
+  return mergeDicts(
+    { ...parentPropagatedEvent },
+    { span_attributes: { purpose: "scorer" } }
+  );
+}
 
 // util/git_fields.ts
 function mergeGitMetadataSettings(s1, s2) {
@@ -3298,9 +3307,25 @@ var ExperimentEvent = import_v36.z.object({
   comments: import_v36.z.union([import_v36.z.array(import_v36.z.unknown()), import_v36.z.null()]).optional(),
   audit_data: import_v36.z.union([import_v36.z.array(import_v36.z.unknown()), import_v36.z.null()]).optional()
 });
+var NullableFunctionTypeEnum = import_v36.z.union([
+  import_v36.z.enum([
+    "llm",
+    "scorer",
+    "task",
+    "tool",
+    "custom_view",
+    "preprocessor",
+    "facet"
+  ]),
+  import_v36.z.null()
+]);
 var ExtendedSavedFunctionId = import_v36.z.union([
   import_v36.z.object({ type: import_v36.z.literal("function"), id: import_v36.z.string() }),
-  import_v36.z.object({ type: import_v36.z.literal("global"), name: import_v36.z.string() }),
+  import_v36.z.object({
+    type: import_v36.z.literal("global"),
+    name: import_v36.z.string(),
+    function_type: NullableFunctionTypeEnum.optional()
+  }),
   import_v36.z.object({
     type: import_v36.z.literal("slug"),
     project_id: import_v36.z.string(),
@@ -3309,7 +3334,11 @@ var ExtendedSavedFunctionId = import_v36.z.union([
 ]);
 var NullableSavedFunctionId = import_v36.z.union([
   import_v36.z.object({ type: import_v36.z.literal("function"), id: import_v36.z.string() }),
-  import_v36.z.object({ type: import_v36.z.literal("global"), name: import_v36.z.string() }),
+  import_v36.z.object({
+    type: import_v36.z.literal("global"),
+    name: import_v36.z.string(),
+    function_type: NullableFunctionTypeEnum.optional()
+  }),
   import_v36.z.null()
 ]);
 var FacetData = import_v36.z.object({
@@ -3406,7 +3435,11 @@ var PromptParserNullish = import_v36.z.union([
 ]);
 var SavedFunctionId = import_v36.z.union([
   import_v36.z.object({ type: import_v36.z.literal("function"), id: import_v36.z.string() }),
-  import_v36.z.object({ type: import_v36.z.literal("global"), name: import_v36.z.string() })
+  import_v36.z.object({
+    type: import_v36.z.literal("global"),
+    name: import_v36.z.string(),
+    function_type: NullableFunctionTypeEnum.optional()
+  })
 ]);
 var PromptDataNullish = import_v36.z.union([
   import_v36.z.object({
@@ -3553,6 +3586,7 @@ var FunctionData = import_v36.z.union([
   import_v36.z.object({
     type: import_v36.z.literal("global"),
     name: import_v36.z.string(),
+    function_type: NullableFunctionTypeEnum.optional(),
     config: import_v36.z.union([import_v36.z.object({}).partial().passthrough(), import_v36.z.null()]).optional()
   }),
   FacetData
@@ -3639,7 +3673,10 @@ var FunctionId = import_v36.z.union([
     slug: import_v36.z.string(),
     version: import_v36.z.string().optional()
   }),
-  import_v36.z.object({ global_function: import_v36.z.string() }),
+  import_v36.z.object({
+    global_function: import_v36.z.string(),
+    function_type: NullableFunctionTypeEnum.optional()
+  }),
   import_v36.z.object({
     prompt_session_id: import_v36.z.string(),
     prompt_session_function_id: import_v36.z.string(),
@@ -3850,6 +3887,7 @@ var Project = import_v36.z.object({
   id: import_v36.z.string().uuid(),
   org_id: import_v36.z.string().uuid(),
   name: import_v36.z.string(),
+  description: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   created: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   deleted_at: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   user_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
@@ -10727,8 +10765,12 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                 const results = await rootSpan.traced(runScorer, {
                   name: scorerNames[score_idx],
                   spanAttributes: {
-                    type: "score" /* SCORE */
+                    type: "score" /* SCORE */,
+                    purpose: "scorer"
                   },
+                  propagatedEvent: makeScorerPropagatedEvent(
+                    await rootSpan.export()
+                  ),
                   event: { input: scoringArgs }
                 });
                 return { kind: "score", value: results };
@@ -11728,8 +11770,22 @@ async function getTsModule() {
   return tsModule;
 }
 
-// src/cli/functions/upload.ts
+// src/zod/utils.ts
 var import_zod_to_json_schema = require("zod-to-json-schema");
+var z42 = __toESM(require("zod/v4"));
+function isZodV4(zodObject) {
+  return typeof zodObject === "object" && zodObject !== null && "_zod" in zodObject && zodObject._zod !== void 0;
+}
+function zodToJsonSchema(schema) {
+  if (isZodV4(schema)) {
+    return z42.toJSONSchema(schema, {
+      target: "draft-7"
+    });
+  }
+  return (0, import_zod_to_json_schema.zodToJsonSchema)(schema);
+}
+
+// src/cli/functions/upload.ts
 var import_pluralize2 = __toESM(require("pluralize"));
 var pathInfoSchema = import_v311.z.strictObject({
   url: import_v311.z.string(),
@@ -11770,8 +11826,8 @@ async function uploadHandleBundles({
             index: i
           },
           function_schema: fn.parameters || fn.returns ? {
-            parameters: fn.parameters ? (0, import_zod_to_json_schema.zodToJsonSchema)(fn.parameters) : void 0,
-            returns: fn.returns ? (0, import_zod_to_json_schema.zodToJsonSchema)(fn.returns) : void 0
+            parameters: fn.parameters ? zodToJsonSchema(fn.parameters) : void 0,
+            returns: fn.returns ? zodToJsonSchema(fn.returns) : void 0
           } : void 0,
           if_exists: fn.ifExists,
           metadata: fn.metadata
@@ -12591,7 +12647,6 @@ var evaluatorDefinitionsSchema = import_v314.z.record(
 
 // dev/server.ts
 var import_v315 = require("zod/v3");
-var import_zod_to_json_schema2 = __toESM(require("zod-to-json-schema"));
 function runDevServer(evaluators, opts) {
   const allEvaluators = Object.fromEntries(
     evaluators.map((evaluator) => [evaluator.evalName, evaluator])
@@ -12881,14 +12936,14 @@ function makeEvalParametersSchema(parameters) {
           }
         ];
       } else {
-        const schema = (0, import_zod_to_json_schema2.default)(value);
+        const schemaObj = zodToJsonSchema(value);
         return [
           name,
           {
             type: "data",
-            schema,
-            default: value.default,
-            description: value.description
+            schema: schemaObj,
+            default: schemaObj.default,
+            description: schemaObj.description
           }
         ];
       }