braintrust 0.0.135 → 0.0.136

package/dist/index.js

@@ -4949,9 +4949,11 @@ var require_pluralize = __commonJS({
 var src_exports = {};
 __export(src_exports, {
   BaseExperiment: () => BaseExperiment,
+  BraintrustState: () => BraintrustState,
   Dataset: () => Dataset,
   Eval: () => Eval,
   Experiment: () => Experiment,
+  LEGACY_CACHED_HEADER: () => LEGACY_CACHED_HEADER,
   LazyValue: () => LazyValue,
   Logger: () => Logger,
   NOOP_SPAN: () => NOOP_SPAN,
@@ -4976,6 +4978,7 @@ __export(src_exports, {
   loadPrompt: () => loadPrompt,
   log: () => log,
   login: () => login,
+  loginToState: () => loginToState,
   newId: () => newId,
   parseCachedHeader: () => parseCachedHeader,
   reportFailures: () => reportFailures,
@@ -13266,8 +13269,8 @@ function tryMakeUuid(s) {
 var ENCODING_VERSION_NUMBER = 1;
 var INVALID_ENCODING_ERRMSG = "SpanComponents string is not properly encoded. This may be due to a version mismatch between the SDK library used to export the span and the library used to decode it. Please make sure you are using the same SDK version across the board";
 var SpanObjectTypeV1 = /* @__PURE__ */ ((SpanObjectTypeV12) => {
-  SpanObjectTypeV12[SpanObjectTypeV12["EXPERIMENT"] = 0] = "EXPERIMENT";
-  SpanObjectTypeV12[SpanObjectTypeV12["PROJECT_LOGS"] = 1] = "PROJECT_LOGS";
+  SpanObjectTypeV12[SpanObjectTypeV12["EXPERIMENT"] = 1] = "EXPERIMENT";
+  SpanObjectTypeV12[SpanObjectTypeV12["PROJECT_LOGS"] = 2] = "PROJECT_LOGS";
   return SpanObjectTypeV12;
 })(SpanObjectTypeV1 || {});
 var SpanObjectTypeV1EnumSchema = z.nativeEnum(SpanObjectTypeV1);
@@ -13367,9 +13370,9 @@ var SpanComponentsV1 = class _SpanComponentsV1 {
   }
   objectIdFields() {
     switch (this.objectType) {
-      case 0:
-        return { experiment_id: this.objectId };
       case 1:
+        return { experiment_id: this.objectId };
+      case 2:
         return { project_id: this.objectId, log_id: "g" };
       default:
         throw new Error("Impossible");
@@ -13399,8 +13402,8 @@ var ENCODING_VERSION_NUMBER2 = 2;
 var INVALID_ENCODING_ERRMSG2 = `SpanComponents string is not properly encoded. This library only supports encoding versions up to ${ENCODING_VERSION_NUMBER2}. Please make sure the SDK library used to decode the SpanComponents is at least as new as any library used to encode it.`;
 var INTEGER_ENCODING_NUM_BYTES = 4;
 var SpanObjectTypeV2 = /* @__PURE__ */ ((SpanObjectTypeV22) => {
-  SpanObjectTypeV22[SpanObjectTypeV22["EXPERIMENT"] = 0] = "EXPERIMENT";
-  SpanObjectTypeV22[SpanObjectTypeV22["PROJECT_LOGS"] = 1] = "PROJECT_LOGS";
+  SpanObjectTypeV22[SpanObjectTypeV22["EXPERIMENT"] = 1] = "EXPERIMENT";
+  SpanObjectTypeV22[SpanObjectTypeV22["PROJECT_LOGS"] = 2] = "PROJECT_LOGS";
   return SpanObjectTypeV22;
 })(SpanObjectTypeV2 || {});
 var SpanObjectTypeV2EnumSchema = z.nativeEnum(SpanObjectTypeV2);
@@ -13571,9 +13574,9 @@ var SpanComponentsV2 = class _SpanComponentsV2 {
       );
     }
     switch (this.objectType) {
-      case 0:
-        return { experiment_id: this.objectId };
       case 1:
+        return { experiment_id: this.objectId };
+      case 2:
         return { project_id: this.objectId, log_id: "g" };
       default:
         throw new Error("Impossible");
@@ -14005,6 +14008,10 @@ var functionDataSchema = z.union([
   z.strictObject({
     type: z.literal("code"),
     data: codeBundleSchema
+  }),
+  z.strictObject({
+    type: z.literal("global"),
+    name: z.string()
   })
 ]);
 var functionSchema2 = promptSchemaObject.merge(
@@ -14093,8 +14100,6 @@ var aclObjectTypeEnum = z.enum([
   "dataset",
   "prompt",
   "prompt_session",
-  "project_score",
-  "project_tag",
   "group",
   "role",
   "org_member",
@@ -15526,9 +15531,25 @@ var NoopSpan = class {
   close(args) {
     return this.end(args);
   }
+  setAttributes(_args) {
+  }
 };
 var NOOP_SPAN = new NoopSpan();
 var BraintrustState = class {
+  constructor(loginParams) {
+    this.loginParams = loginParams;
+    this.id = (/* @__PURE__ */ new Date()).toLocaleString();
+    this.currentExperiment = void 0;
+    this.currentLogger = void 0;
+    this.currentSpan = isomorph_default.newAsyncLocalStorage();
+    const defaultGetLogConn = async () => {
+      await this.login({});
+      return this.logConn();
+    };
+    this._bgLogger = new BackgroundLogger(new LazyValue(defaultGetLogConn));
+    this.resetLoginInfo();
+    globalThis.__inherited_braintrust_state = this;
+  }
   id;
   currentExperiment;
   // Note: the value of IsAsyncFlush doesn't really matter here, since we
@@ -15539,7 +15560,7 @@ var BraintrustState = class {
   // This is preferable to replacing the whole logger, which would create the
   // possibility of multiple loggers floating around, which may not log in a
   // deterministic order.
-  _globalBgLogger;
+  _bgLogger;
   appUrl = null;
   appPublicUrl = null;
   loginToken = null;
@@ -15550,23 +15571,9 @@ var BraintrustState = class {
   gitMetadataSettings;
   _apiConn = null;
   _logConn = null;
-  constructor() {
-    this.id = v4_default();
-    this.currentExperiment = void 0;
-    this.currentLogger = void 0;
-    this.currentSpan = isomorph_default.newAsyncLocalStorage();
-    const defaultGetLogConn = async () => {
-      await login();
-      return this.logConn();
-    };
-    this._globalBgLogger = new BackgroundLogger(
-      new LazyValue(defaultGetLogConn)
-    );
-    this.resetLoginInfo();
-    globalThis.__inherited_braintrust_state = this;
-  }
   resetLoginInfo() {
     this.appUrl = null;
+    this.appPublicUrl = null;
     this.loginToken = null;
     this.orgId = null;
     this.orgName = null;
@@ -15576,6 +15583,28 @@ var BraintrustState = class {
     this._apiConn = null;
     this._logConn = null;
   }
+  copyLoginInfo(other) {
+    this.appUrl = other.appUrl;
+    this.appPublicUrl = other.appPublicUrl;
+    this.loginToken = other.loginToken;
+    this.orgId = other.orgId;
+    this.orgName = other.orgName;
+    this.logUrl = other.logUrl;
+    this.loggedIn = other.loggedIn;
+    this.gitMetadataSettings = other.gitMetadataSettings;
+    this._apiConn = other._apiConn;
+    this._logConn = other._logConn;
+  }
+  async login(loginParams) {
+    if (this.logUrl && !loginParams.forceLogin) {
+      return;
+    }
+    const newState = await loginToState({
+      ...this.loginParams,
+      ...loginParams
+    });
+    this.copyLoginInfo(newState);
+  }
   apiConn() {
     if (!this._apiConn) {
       if (!this.appUrl) {
@@ -15594,22 +15623,24 @@ var BraintrustState = class {
     }
     return this._logConn;
   }
-  globalBgLogger() {
-    return this._globalBgLogger;
+  bgLogger() {
+    return this._bgLogger;
   }
   // Should only be called by the login function.
   loginReplaceLogConn(logConn) {
-    this._globalBgLogger.internalReplaceLogConn(logConn);
+    this._bgLogger.internalReplaceLogConn(logConn);
   }
 };
-var _state;
+var _globalState;
 function _internalSetInitialState() {
-  if (_state) {
+  if (_globalState) {
     throw new Error("Cannot set initial state more than once");
   }
-  _state = globalThis.__inherited_braintrust_state || new BraintrustState();
+  _globalState = globalThis.__inherited_braintrust_state || new BraintrustState({
+    /*empty login options*/
+  });
 }
-var _internalGetGlobalState = () => _state;
+var _internalGetGlobalState = () => _globalState;
 var FailedHTTPResponse = class extends Error {
   status;
   text;
@@ -15730,7 +15761,7 @@ var HTTPConnection = class _HTTPConnection {
     return await resp.json();
   }
 };
-function logFeedbackImpl(parentObjectType, parentObjectId, {
+function logFeedbackImpl(state, parentObjectType, parentObjectId, {
   id,
   expected,
   scores,
@@ -15773,7 +15804,7 @@ function logFeedbackImpl(parentObjectType, parentObjectId, {
         [IS_MERGE_FIELD]: true
       };
     });
-    _state.globalBgLogger().log([record]);
+    state.bgLogger().log([record]);
   }
   if (!isEmpty(comment)) {
     const record = new LazyValue(async () => {
@@ -15793,10 +15824,10 @@ function logFeedbackImpl(parentObjectType, parentObjectId, {
         [AUDIT_METADATA_FIELD]: metadata
       };
     });
-    _state.globalBgLogger().log([record]);
+    state.bgLogger().log([record]);
   }
 }
-function spanComponentsToObjectIdLambda(components) {
+function spanComponentsToObjectIdLambda(state, components) {
   if (components.objectId) {
     const ret = components.objectId;
     return async () => ret;
@@ -15812,8 +15843,9 @@ function spanComponentsToObjectIdLambda(components) {
         "Impossible: computeObjectMetadataArgs not supported for experiments"
       );
     case SpanObjectTypeV2.PROJECT_LOGS:
-      const args = components.computeObjectMetadataArgs;
-      return async () => (await computeLoggerMetadata(args)).project.id;
+      return async () => (await computeLoggerMetadata(state, {
+        ...components.computeObjectMetadataArgs
+      })).project.id;
     default:
       const x = components.objectType;
       throw new Error(`Unknown object type: ${x}`);
@@ -15832,7 +15864,10 @@ function startSpanParentArgs(args) {
         `Mismatch between expected span parent object type ${args.parentObjectType} and provided type ${parentComponents.objectType}`
       );
     }
-    const parentComponentsObjectIdLambda = spanComponentsToObjectIdLambda(parentComponents);
+    const parentComponentsObjectIdLambda = spanComponentsToObjectIdLambda(
+      args.state,
+      parentComponents
+    );
     const computeParentObjectId = async () => {
       const parentComponentsObjectId = await parentComponentsObjectIdLambda();
       if (await args.parentObjectId.get() !== parentComponentsObjectId) {
@@ -15861,6 +15896,7 @@ function startSpanParentArgs(args) {
   };
 }
 var Logger = class {
+  state;
   lazyMetadata;
   _asyncFlush;
   computeMetadataArgs;
@@ -15869,13 +15905,14 @@ var Logger = class {
   calledStartSpan;
   // For type identification.
   kind = "logger";
-  constructor(lazyMetadata, logOptions = {}) {
+  constructor(state, lazyMetadata, logOptions = {}) {
     this.lazyMetadata = lazyMetadata;
     this._asyncFlush = logOptions.asyncFlush;
     this.computeMetadataArgs = logOptions.computeMetadataArgs;
     this.lastStartTime = getCurrentUnixTimestamp();
     this.lazyId = new LazyValue(async () => await this.id);
     this.calledStartSpan = false;
+    this.state = state;
   }
   get org_id() {
     return (async () => {
@@ -15967,7 +16004,9 @@ var Logger = class {
   }
   startSpanImpl(args) {
     return new SpanImpl({
+      state: this.state,
       ...startSpanParentArgs({
+        state: this.state,
         parent: args?.parent,
         parentObjectType: this.parentObjectType(),
         parentObjectId: this.lazyId,
@@ -15990,7 +16029,7 @@ var Logger = class {
    * @param event.source (Optional) the source of the feedback. Must be one of "external" (default), "app", or "api".
    */
   logFeedback(event) {
-    logFeedbackImpl(this.parentObjectType(), this.lazyId, event);
+    logFeedbackImpl(this.state, this.parentObjectType(), this.lazyId, event);
   }
   /**
    * Return a serialized representation of the logger that can be used to start subspans in other places. See `Span.start_span` for more details.
@@ -16013,7 +16052,7 @@ var Logger = class {
    * Flush any pending logs to the server.
    */
   async flush() {
-    return await _state.globalBgLogger().flush();
+    return await this.state.bgLogger().flush();
   }
   get asyncFlush() {
     return this._asyncFlush;
@@ -16378,29 +16417,27 @@ function init(projectOrOptions, optionalOptions) {
     gitMetadataSettings,
     projectId,
     baseExperimentId,
-    repoInfo: repoInfo2
+    repoInfo: repoInfo2,
+    state: stateArg
   } = options;
   if (open && update) {
     throw new Error("Cannot open and update an experiment at the same time");
   }
+  const state = stateArg ?? _globalState;
   if (open) {
     if (isEmpty(experiment)) {
       throw new Error(`Cannot open an experiment without specifying its name`);
     }
     const lazyMetadata2 = new LazyValue(
       async () => {
-        await login({
-          orgName,
-          apiKey,
-          appUrl
-        });
+        await state.login({ apiKey, appUrl, orgName });
         const args = {
           project_name: project,
           project_id: projectId,
-          org_name: _state.orgName,
+          org_name: state.orgName,
           experiment_name: experiment
         };
-        const response = await _state.apiConn().post_json("api/experiment/get", args);
+        const response = await state.apiConn().post_json("api/experiment/get", args);
         if (response.length === 0) {
           throw new Error(
             `Experiment ${experiment} not found in project ${projectId ?? project}.`
@@ -16422,20 +16459,17 @@ function init(projectOrOptions, optionalOptions) {
       }
     );
     return new ReadonlyExperiment(
+      stateArg ?? _globalState,
       lazyMetadata2
     );
   }
   const lazyMetadata = new LazyValue(
     async () => {
-      await login({
-        orgName,
-        apiKey,
-        appUrl
-      });
+      await state.login({ apiKey, appUrl, orgName });
       const args = {
         project_name: project,
         project_id: projectId,
-        org_id: _state.orgId,
+        org_id: state.orgId,
         update
       };
       if (experiment) {
@@ -16449,7 +16483,7 @@ function init(projectOrOptions, optionalOptions) {
           return repoInfo2;
         }
         let mergedGitMetadataSettings = {
-          ..._state.gitMetadataSettings || {
+          ...state.gitMetadataSettings || {
             collect: "all"
           }
         };
@@ -16484,7 +16518,7 @@ function init(projectOrOptions, optionalOptions) {
       let response = null;
       while (true) {
         try {
-          response = await _state.apiConn().post_json("api/experiment/register", args);
+          response = await state.apiConn().post_json("api/experiment/register", args);
           break;
         } catch (e) {
           if (args["base_experiment"] && `${"data" in e && e.data}`.includes("base experiment")) {
@@ -16511,9 +16545,9 @@ function init(projectOrOptions, optionalOptions) {
       };
     }
   );
-  const ret = new Experiment(lazyMetadata, dataset);
+  const ret = new Experiment(state, lazyMetadata, dataset);
   if (options.setCurrent ?? true) {
-    _state.currentExperiment = ret;
+    state.currentExperiment = ret;
   }
   return ret;
 }
@@ -16568,23 +16602,25 @@ function initDataset(projectOrOptions, optionalOptions) {
     apiKey,
     orgName,
     projectId,
-    useOutput: legacy
+    useOutput: legacy,
+    state: stateArg
   } = options;
+  const state = stateArg ?? _globalState;
   const lazyMetadata = new LazyValue(
     async () => {
-      await login({
+      await state.login({
         orgName,
         apiKey,
         appUrl
       });
       const args = {
-        org_id: _state.orgId,
+        org_id: state.orgId,
         project_name: project,
         project_id: projectId,
         dataset_name: dataset,
         description
       };
-      const response = await _state.apiConn().post_json("api/dataset/register", args);
+      const response = await state.apiConn().post_json("api/dataset/register", args);
       return {
         project: {
           id: response.project.id,
@@ -16599,7 +16635,7 @@ function initDataset(projectOrOptions, optionalOptions) {
       };
     }
   );
-  return new Dataset(lazyMetadata, version, legacy);
+  return new Dataset(stateArg ?? _globalState, lazyMetadata, version, legacy);
 }
 function withDataset(project, callback, options = {}) {
   console.warn(
@@ -16608,14 +16644,13 @@ function withDataset(project, callback, options = {}) {
   const dataset = initDataset(project, options);
   return callback(dataset);
 }
-async function computeLoggerMetadata({
+async function computeLoggerMetadata(state, {
   project_name,
   project_id
 }) {
-  await login();
-  const org_id = _state.orgId;
-  if (project_id === void 0) {
-    const response = await _state.apiConn().post_json("api/project/register", {
+  const org_id = state.orgId;
+  if (isEmpty(project_id)) {
+    const response = await state.apiConn().post_json("api/project/register", {
       project_name: project_name || GLOBAL_PROJECT,
       org_id
     });
@@ -16627,8 +16662,8 @@ async function computeLoggerMetadata({
         fullInfo: response.project
       }
     };
-  } else if (project_name === void 0) {
-    const response = await _state.apiConn().get_json("api/project", {
+  } else if (isEmpty(project_name)) {
+    const response = await state.apiConn().get_json("api/project", {
       id: project_id
     });
     return {
@@ -16654,29 +16689,31 @@ function initLogger(options = {}) {
     appUrl,
     apiKey,
     orgName,
-    forceLogin
+    forceLogin,
+    state: stateArg
   } = options || {};
   const computeMetadataArgs = {
     project_name: projectName,
     project_id: projectId
   };
+  const state = stateArg ?? _globalState;
   const lazyMetadata = new LazyValue(
     async () => {
-      await login({
+      await state.login({
         orgName,
         apiKey,
         appUrl,
         forceLogin
       });
-      return computeLoggerMetadata(computeMetadataArgs);
+      return computeLoggerMetadata(state, computeMetadataArgs);
     }
   );
-  const ret = new Logger(lazyMetadata, {
+  const ret = new Logger(state, lazyMetadata, {
     asyncFlush,
     computeMetadataArgs
   });
   if (options.setCurrent ?? true) {
-    _state.currentLogger = ret;
+    state.currentLogger = ret;
   }
   return ret;
 }
@@ -16689,7 +16726,8 @@ async function loadPrompt({
   noTrace = false,
   appUrl,
   apiKey,
-  orgName
+  orgName,
+  state: stateArg
 }) {
   if (isEmpty(projectName) && isEmpty(projectId)) {
     throw new Error("Must specify either projectName or projectId");
@@ -16697,7 +16735,8 @@ async function loadPrompt({
   if (isEmpty(slug)) {
     throw new Error("Must specify slug");
   }
-  await login({
+  const state = stateArg ?? _globalState;
+  state.login({
     orgName,
     apiKey,
     appUrl
@@ -16708,7 +16747,7 @@ async function loadPrompt({
     slug,
     version
   };
-  const response = await _state.logConn().get_json("v1/prompt", args);
+  const response = await state.logConn().get_json("v1/prompt", args);
   if (!("objects" in response) || response.objects.length === 0) {
     throw new Error(
       `Prompt ${slug} not found in ${[projectName ?? projectId]}`
@@ -16723,7 +16762,7 @@ async function loadPrompt({
 }
 async function login(options = {}) {
   let { forceLogin = false } = options || {};
-  if (_state.loggedIn && !forceLogin) {
+  if (_globalState.loggedIn && !forceLogin) {
     let checkUpdatedParam2 = function(varname, arg, orig) {
       if (!isEmpty(arg) && !isEmpty(orig) && arg !== orig) {
         throw new Error(
@@ -16732,28 +16771,32 @@ async function login(options = {}) {
       }
     };
     var checkUpdatedParam = checkUpdatedParam2;
-    checkUpdatedParam2("appUrl", options.appUrl, _state.appUrl);
+    checkUpdatedParam2("appUrl", options.appUrl, _globalState.appUrl);
     checkUpdatedParam2(
       "apiKey",
       options.apiKey ? HTTPConnection.sanitize_token(options.apiKey) : void 0,
-      _state.loginToken
+      _globalState.loginToken
     );
-    checkUpdatedParam2("orgName", options.orgName, _state.orgName);
-    return;
+    checkUpdatedParam2("orgName", options.orgName, _globalState.orgName);
+    return _globalState;
   }
+  await _globalState.login(options);
+}
+async function loginToState(options = {}) {
   const {
     appUrl = isomorph_default.getEnv("BRAINTRUST_APP_URL") || "https://www.braintrust.dev",
     apiKey = isomorph_default.getEnv("BRAINTRUST_API_KEY"),
     orgName = isomorph_default.getEnv("BRAINTRUST_ORG_NAME")
   } = options || {};
   const appPublicUrl = isomorph_default.getEnv("BRAINTRUST_APP_PUBLIC_URL") || appUrl;
-  _state.resetLoginInfo();
-  _state.appUrl = appUrl;
-  _state.appPublicUrl = appPublicUrl;
+  const state = new BraintrustState(options);
+  state.resetLoginInfo();
+  state.appUrl = appUrl;
+  state.appPublicUrl = appPublicUrl;
   let conn = null;
   if (apiKey !== void 0) {
     const resp = await checkResponse(
-      await fetch(_urljoin(_state.appUrl, `/api/apikey/login`), {
+      await fetch(_urljoin(state.appUrl, `/api/apikey/login`), {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
@@ -16764,8 +16807,8 @@ async function login(options = {}) {
       })
     );
     const info = await resp.json();
-    _check_org_info(info.org_info, orgName);
-    conn = _state.logConn();
+    _check_org_info(state, info.org_info, orgName);
+    conn = state.logConn();
     conn.set_token(apiKey);
   } else {
     throw new Error(
@@ -16776,10 +16819,11 @@ async function login(options = {}) {
     throw new Error("Conn should be set at this point (a bug)");
   }
   conn.make_long_lived();
-  _state.apiConn().set_token(apiKey);
-  _state.loginToken = conn.token;
-  _state.loggedIn = true;
-  _state.loginReplaceLogConn(conn);
+  state.apiConn().set_token(apiKey);
+  state.loginToken = conn.token;
+  state.loggedIn = true;
+  state.loginReplaceLogConn(conn);
+  return state;
 }
 function log(event) {
   console.warn(
@@ -16801,17 +16845,21 @@ async function summarize(options = {}) {
   }
   return await e.summarize(options);
 }
-function currentExperiment() {
-  return _state.currentExperiment;
+function currentExperiment(options) {
+  const state = options?.state ?? _globalState;
+  return state.currentExperiment;
 }
 function currentLogger(options) {
-  return castLogger(_state.currentLogger, options?.asyncFlush);
+  const state = options?.state ?? _globalState;
+  return castLogger(state.currentLogger, options?.asyncFlush);
 }
-function currentSpan() {
-  return _state.currentSpan.getStore() ?? NOOP_SPAN;
+function currentSpan(options) {
+  const state = options?.state ?? _globalState;
+  return state.currentSpan.getStore() ?? NOOP_SPAN;
 }
 function getSpanParentObject(options) {
-  const parentSpan = currentSpan();
+  const state = options?.state ?? _globalState;
+  const parentSpan = currentSpan({ state });
   if (!Object.is(parentSpan, NOOP_SPAN)) {
     return parentSpan;
   }
@@ -16852,10 +16900,12 @@ function traced(callback, args) {
 function startSpan(args) {
   return startSpanAndIsLogger(args).span;
 }
-async function flush() {
-  return await _state.globalBgLogger().flush();
+async function flush(options) {
+  const state = options?.state ?? _globalState;
+  return await state.bgLogger().flush();
 }
 function startSpanAndIsLogger(args) {
+  const state = args?.state ?? _globalState;
   if (args?.parent) {
     const components = SpanComponentsV2.fromStr(args?.parent);
     const parentSpanIds = components.rowIds ? {
@@ -16863,9 +16913,12 @@ function startSpanAndIsLogger(args) {
       rootSpanId: components.rowIds.rootSpanId
     } : void 0;
     const span = new SpanImpl({
+      state,
       ...args,
       parentObjectType: components.objectType,
-      parentObjectId: new LazyValue(spanComponentsToObjectIdLambda(components)),
+      parentObjectId: new LazyValue(
+        spanComponentsToObjectIdLambda(state, components)
+      ),
       parentComputeObjectMetadataArgs: components.computeObjectMetadataArgs,
       parentSpanIds
     });
@@ -16881,23 +16934,23 @@ function startSpanAndIsLogger(args) {
     return { span, isLogger: parentObject.kind === "logger" };
   }
 }
-function withCurrent(span, callback) {
-  return _state.currentSpan.run(span, () => callback(span));
+function withCurrent(span, callback, state = _globalState) {
+  return state.currentSpan.run(span, () => callback(span));
 }
-function _check_org_info(org_info, org_name) {
+function _check_org_info(state, org_info, org_name) {
   if (org_info.length === 0) {
     throw new Error("This user is not part of any organizations.");
   }
   for (const org of org_info) {
     if (org_name === void 0 || org.name === org_name) {
-      _state.orgId = org.id;
-      _state.orgName = org.name;
-      _state.logUrl = isomorph_default.getEnv("BRAINTRUST_API_URL") ?? org.api_url;
-      _state.gitMetadataSettings = org.git_metadata || void 0;
+      state.orgId = org.id;
+      state.orgName = org.name;
+      state.logUrl = isomorph_default.getEnv("BRAINTRUST_API_URL") ?? org.api_url;
+      state.gitMetadataSettings = org.git_metadata || void 0;
       break;
     }
   }
-  if (_state.orgId === void 0) {
+  if (state.orgId === void 0) {
     throw new Error(
       `Organization ${org_name} not found. Must be one of ${org_info.map((x) => x.name).join(", ")}`
     );
@@ -17056,15 +17109,17 @@ var Experiment = class extends ObjectFetcher {
   lastStartTime;
   lazyId;
   calledStartSpan;
+  state;
   // For type identification.
   kind = "experiment";
-  constructor(lazyMetadata, dataset) {
+  constructor(state, lazyMetadata, dataset) {
     super("experiment", void 0);
     this.lazyMetadata = lazyMetadata;
     this.dataset = dataset;
     this.lastStartTime = getCurrentUnixTimestamp();
     this.lazyId = new LazyValue(async () => await this.id);
     this.calledStartSpan = false;
+    this.state = state;
   }
   get id() {
     return (async () => {
@@ -17086,7 +17141,7 @@ var Experiment = class extends ObjectFetcher {
   }
   async getState() {
     await this.lazyMetadata.get();
-    return _state;
+    return this.state;
   }
   /**
    * Log a single event to the experiment. The event will be batched and uploaded behind the scenes.
@@ -17148,7 +17203,9 @@ var Experiment = class extends ObjectFetcher {
   }
   startSpanImpl(args) {
     return new SpanImpl({
+      state: this.state,
       ...startSpanParentArgs({
+        state: this.state,
         parent: args?.parent,
         parentObjectType: this.parentObjectType(),
         parentObjectId: this.lazyId,
@@ -17242,7 +17299,7 @@ var Experiment = class extends ObjectFetcher {
    * @param event.source (Optional) the source of the feedback. Must be one of "external" (default), "app", or "api".
    */
   logFeedback(event) {
-    logFeedbackImpl(this.parentObjectType(), this.lazyId, event);
+    logFeedbackImpl(this.state, this.parentObjectType(), this.lazyId, event);
   }
   /**
    * Return a serialized representation of the experiment that can be used to start subspans in other places. See `Span.start_span` for more details.
@@ -17257,7 +17314,7 @@ var Experiment = class extends ObjectFetcher {
    * Flush any pending rows to the server.
    */
   async flush() {
-    return await _state.globalBgLogger().flush();
+    return await this.state.bgLogger().flush();
   }
   /**
    * This function is deprecated. You can simply remove it from your code.
@@ -17270,8 +17327,9 @@ var Experiment = class extends ObjectFetcher {
   }
 };
 var ReadonlyExperiment = class extends ObjectFetcher {
-  constructor(lazyMetadata) {
+  constructor(state, lazyMetadata) {
     super("experiment", void 0);
+    this.state = state;
     this.lazyMetadata = lazyMetadata;
   }
   get id() {
@@ -17286,7 +17344,7 @@ var ReadonlyExperiment = class extends ObjectFetcher {
   }
   async getState() {
     await this.lazyMetadata.get();
-    return _state;
+    return this.state;
   }
   async *asDataset() {
     const records = this.fetch();
@@ -17316,9 +17374,9 @@ function newId() {
   return v4_default();
 }
 var SpanImpl = class _SpanImpl {
+  state;
   // `internalData` contains fields that are not part of the "user-sanitized"
   // set of fields which we want to log in just one of the span rows.
-  internalData;
   isMerge;
   loggedEndTime;
   // For internal use only.
@@ -17331,6 +17389,7 @@ var SpanImpl = class _SpanImpl {
   spanParents;
   kind = "span";
   constructor(args) {
+    this.state = args.state;
     const spanAttributes = args.spanAttributes ?? {};
     const event = args.event ?? {};
     const type = args.type ?? (args.parentSpanIds ? void 0 : args.defaultRootType);
@@ -17353,7 +17412,7 @@ var SpanImpl = class _SpanImpl {
       }
       return "subspan";
     })();
-    this.internalData = {
+    const internalData = {
       metrics: {
         start: args.startTime ?? getCurrentUnixTimestamp()
       },
@@ -17377,17 +17436,25 @@ var SpanImpl = class _SpanImpl {
     }
     this.isMerge = false;
     const { id: _id, ...eventRest } = event;
-    this.log(eventRest);
+    this.logInternal({ event: eventRest, internalData });
     this.isMerge = true;
   }
   get id() {
     return this._id;
   }
+  setAttributes(args) {
+    this.logInternal({ internalData: { span_attributes: args } });
+  }
   log(event) {
-    const sanitized = validateAndSanitizeExperimentLogPartialArgs(event);
-    let sanitizedAndInternalData = { ...this.internalData };
+    this.logInternal({ event });
+  }
+  logInternal({
+    event,
+    internalData
+  }) {
+    const sanitized = validateAndSanitizeExperimentLogPartialArgs(event ?? {});
+    let sanitizedAndInternalData = { ...internalData };
     mergeDicts(sanitizedAndInternalData, sanitized);
-    this.internalData = {};
     let partialRecord = {
       id: this.id,
       span_id: this.spanId,
@@ -17411,10 +17478,10 @@ var SpanImpl = class _SpanImpl {
         objectId: await this.parentObjectId.get()
       }).objectIdFields()
     });
-    _state.globalBgLogger().log([new LazyValue(computeRecord)]);
+    this.state.bgLogger().log([new LazyValue(computeRecord)]);
   }
   logFeedback(event) {
-    logFeedbackImpl(this.parentObjectType, this.parentObjectId, {
+    logFeedbackImpl(this.state, this.parentObjectType, this.parentObjectId, {
       ...event,
       id: this.id
     });
@@ -17436,8 +17503,10 @@ var SpanImpl = class _SpanImpl {
   startSpan(args) {
     const parentSpanIds = args?.parent ? void 0 : { spanId: this.spanId, rootSpanId: this.rootSpanId };
     return new _SpanImpl({
+      state: this.state,
       ...args,
       ...startSpanParentArgs({
+        state: this.state,
         parent: args?.parent,
         parentObjectType: this.parentObjectType,
         parentObjectId: this.parentObjectId,
@@ -17448,13 +17517,14 @@ var SpanImpl = class _SpanImpl {
   }
   end(args) {
     let endTime;
+    let internalData = {};
     if (!this.loggedEndTime) {
       endTime = args?.endTime ?? getCurrentUnixTimestamp();
-      this.internalData = { metrics: { end: endTime } };
+      internalData = { metrics: { end: endTime } };
     } else {
       endTime = this.loggedEndTime;
     }
-    this.log({});
+    this.logInternal({ internalData });
     return endTime;
   }
   async export() {
@@ -17477,15 +17547,14 @@ var SpanImpl = class _SpanImpl {
     }).toStr();
   }
   async flush() {
-    return await _state.globalBgLogger().flush();
+    return await this.state.bgLogger().flush();
   }
   close(args) {
     return this.end(args);
   }
 };
 var Dataset = class extends ObjectFetcher {
-  lazyMetadata;
-  constructor(lazyMetadata, pinnedVersion, legacy) {
+  constructor(state, lazyMetadata, pinnedVersion, legacy) {
     const isLegacyDataset = legacy ?? DEFAULT_IS_LEGACY_DATASET;
     if (isLegacyDataset) {
       console.warn(
@@ -17497,8 +17566,10 @@ var Dataset = class extends ObjectFetcher {
       pinnedVersion,
       (r) => ensureDatasetRecord(r, isLegacyDataset)
     );
+    this.state = state;
     this.lazyMetadata = lazyMetadata;
   }
+  lazyMetadata;
   get id() {
     return (async () => {
       return (await this.lazyMetadata.get()).dataset.id;
@@ -17516,7 +17587,7 @@ var Dataset = class extends ObjectFetcher {
   }
   async getState() {
     await this.lazyMetadata.get();
-    return _state;
+    return this.state;
   }
   /**
    * Insert a single record to the dataset. The record will be batched and uploaded behind the scenes. If you pass in an `id`,
@@ -17567,7 +17638,7 @@ var Dataset = class extends ObjectFetcher {
       created: (/* @__PURE__ */ new Date()).toISOString(),
       metadata
     }));
-    _state.globalBgLogger().log([args]);
+    this.state.bgLogger().log([args]);
     return rowId;
   }
   delete(id) {
@@ -17577,7 +17648,7 @@ var Dataset = class extends ObjectFetcher {
       created: (/* @__PURE__ */ new Date()).toISOString(),
       _object_delete: true
     }));
-    _state.globalBgLogger().log([args]);
+    this.state.bgLogger().log([args]);
     return id;
   }
   /**
@@ -17618,7 +17689,7 @@ var Dataset = class extends ObjectFetcher {
    * Flush any pending rows to the server.
    */
   async flush() {
-    return await _state.globalBgLogger().flush();
+    return await this.state.bgLogger().flush();
   }
   /**
    * This function is deprecated. You can simply remove it from your code.
@@ -17703,13 +17774,18 @@ var Prompt = class {
     if (!prompt) {
       throw new Error("Empty prompt");
     }
+    const dictArgParsed = z.record(z.unknown()).safeParse(buildArgs);
+    const variables = {
+      input: buildArgs,
+      ...dictArgParsed.success ? dictArgParsed.data : {}
+    };
     if (flavor === "chat") {
       if (prompt.type !== "chat") {
         throw new Error(
           "Prompt is a completion prompt. Use buildCompletion() instead"
         );
       }
-      const render3 = (template) => mustache_default.render(template, buildArgs, void 0, {
+      const render3 = (template) => mustache_default.render(template, variables, void 0, {
         escape: (v) => typeof v === "string" ? v : JSON.stringify(v)
       });
       const messages = (prompt.messages || []).map((m) => ({
@@ -17724,7 +17800,7 @@ var Prompt = class {
         messages,
         ...prompt.tools ? {
           tools: toolsSchema.parse(
-            JSON.parse(mustache_default.render(prompt.tools, buildArgs))
+            JSON.parse(mustache_default.render(prompt.tools, variables))
           )
         } : void 0
       };
@@ -17735,7 +17811,7 @@ var Prompt = class {
       return {
         ...params,
         ...spanInfo,
-        prompt: mustache_default.render(prompt.content, buildArgs)
+        prompt: mustache_default.render(prompt.content, variables)
       };
     } else {
       throw new Error("never!");
@@ -17812,8 +17888,9 @@ function makeEvalName(projectName, experimentName) {
   }
   return out;
 }
-function initExperiment2(projectName, options = {}) {
-  return init(projectName, {
+function initExperiment2(state, options = {}) {
+  return init({
+    state,
     ...options,
     setCurrent: false
   });
@@ -17851,7 +17928,8 @@ async function Eval(name, evaluator, reporter) {
   }
   const resolvedReporter = reporter || defaultReporter;
   try {
-    const experiment = initExperiment2(name, {
+    const experiment = initExperiment2(evaluator.state, {
+      ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: name },
       experiment: evaluator.experimentName,
       metadata: evaluator.metadata,
       isPublic: evaluator.isPublic,
@@ -17950,7 +18028,8 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
       }
       name = baseExperiment.name;
     }
-    dataResult = initExperiment2(evaluator.projectName, {
+    dataResult = initExperiment2(evaluator.state, {
+      ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: evaluator.projectName },
       experiment: name,
       open: true
     }).asDataset();
@@ -18370,20 +18449,29 @@ function wrapBetaChatCompletion(completion) {
     return ret;
   };
 }
-var X_CACHED_HEADER = "x-cached";
+var LEGACY_CACHED_HEADER = "x-cached";
+var X_CACHED_HEADER = "x-bt-cached";
 function parseCachedHeader(value) {
-  return isEmpty(value) ? void 0 : value.toLowerCase() === "true" ? 1 : 0;
+  return isEmpty(value) ? void 0 : ["true", "hit"].includes(value.toLowerCase()) ? 1 : 0;
 }
 function logHeaders(response, span) {
   const cachedHeader = response.headers.get(X_CACHED_HEADER);
   if (isEmpty(cachedHeader)) {
-    return;
-  }
-  span.log({
-    metrics: {
-      cached: parseCachedHeader(cachedHeader)
+    const legacyCacheHeader = response.headers.get(LEGACY_CACHED_HEADER);
+    if (!isEmpty(legacyCacheHeader)) {
+      span.log({
+        metrics: {
+          cached: parseCachedHeader(legacyCacheHeader)
+        }
+      });
     }
-  });
+  } else {
+    span.log({
+      metrics: {
+        cached: parseCachedHeader(cachedHeader)
+      }
+    });
+  }
 }
 function wrapChatCompletion(completion) {
   return async (allParams, options) => {
@@ -18503,7 +18591,16 @@ function postprocessStreamingResults(allResults) {
   let content = void 0;
   let tool_calls = void 0;
   let finish_reason = void 0;
+  let metrics = {};
   for (const result of allResults) {
+    if (result.usage) {
+      metrics = {
+        ...metrics,
+        tokens: result.usage.total_tokens,
+        prompt_tokens: result.usage.prompt_tokens,
+        completion_tokens: result.usage.completion_tokens
+      };
+    }
     const delta = result.choices?.[0]?.delta;
     if (!delta) {
       continue;
@@ -18531,18 +18628,21 @@ function postprocessStreamingResults(allResults) {
       }
     }
   }
-  return [
-    {
-      index: 0,
-      message: {
-        role,
-        content,
-        tool_calls
-      },
-      logprobs: null,
-      finish_reason
-    }
-  ];
+  return {
+    metrics,
+    output: [
+      {
+        index: 0,
+        message: {
+          role,
+          content,
+          tool_calls
+        },
+        logprobs: null,
+        finish_reason
+      }
+    ]
+  };
 }
 var WrapperStream = class {
   span;
@@ -18571,7 +18671,7 @@ var WrapperStream = class {
         yield item;
       }
       this.span.log({
-        output: postprocessStreamingResults(allResults)
+        ...postprocessStreamingResults(allResults)
       });
     } finally {
       this.span.end();
@@ -18631,7 +18731,7 @@ var BraintrustLanguageModelWrapper = class {
           prompt_tokens: ret.usage?.promptTokens,
           completion_tokens: ret.usage?.completionTokens,
           cached: parseCachedHeader(
-            ret.rawResponse?.headers?.[X_CACHED_HEADER]
+            ret.rawResponse?.headers?.[X_CACHED_HEADER] ?? ret.rawResponse?.headers?.[LEGACY_CACHED_HEADER]
           )
         }
       });
@@ -18725,7 +18825,7 @@ var BraintrustLanguageModelWrapper = class {
                   prompt_tokens: usage?.promptTokens,
                   completion_tokens: usage?.completionTokens,
                   cached: parseCachedHeader(
-                    ret.rawResponse?.headers?.[X_CACHED_HEADER]
+                    ret.rawResponse?.headers?.[X_CACHED_HEADER] ?? ret.rawResponse?.headers?.[LEGACY_CACHED_HEADER]
                   )
                 }
               });
@@ -18762,9 +18862,11 @@ configureNode();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseExperiment,
+  BraintrustState,
   Dataset,
   Eval,
   Experiment,
+  LEGACY_CACHED_HEADER,
   LazyValue,
   Logger,
   NOOP_SPAN,
@@ -18789,6 +18891,7 @@ configureNode();
   loadPrompt,
   log,
   login,
+  loginToState,
   newId,
   parseCachedHeader,
   reportFailures,