braintrust 0.0.98 → 0.0.100

package/dist/browser.js

@@ -233,10 +233,11 @@ function isEmpty(a) {
   return a === void 0 || a === null;
 }
 var LazyValue = class {
+  callable;
+  value = {
+    hasComputed: false
+  };
   constructor(callable) {
-    this.value = {
-      hasComputed: false
-    };
     this.callable = callable;
   }
   async get() {
@@ -250,8 +251,11 @@ var LazyValue = class {
 
 // src/logger.ts
 var NoopSpan = class {
+  id;
+  span_id;
+  root_span_id;
+  kind = "span";
   constructor() {
-    this.kind = "span";
     this.id = "";
     this.span_id = "";
     this.root_span_id = "";
@@ -275,15 +279,22 @@ var NoopSpan = class {
 };
 var NOOP_SPAN = new NoopSpan();
 var BraintrustState = class {
+  id;
+  currentExperiment;
+  // Note: the value of IsAsyncFlush doesn't really matter here, since we
+  // (safely) dynamically cast it whenever retrieving the logger.
+  currentLogger;
+  currentSpan;
+  appUrl = null;
+  loginToken = null;
+  orgId = null;
+  orgName = null;
+  logUrl = null;
+  loggedIn = false;
+  gitMetadataSettings;
+  _apiConn = null;
+  _logConn = null;
   constructor() {
-    this.appUrl = null;
-    this.loginToken = null;
-    this.orgId = null;
-    this.orgName = null;
-    this.logUrl = null;
-    this.loggedIn = false;
-    this._apiConn = null;
-    this._logConn = null;
     this.id = v4_default();
     this.currentExperiment = void 0;
     this.currentLogger = void 0;
@@ -330,6 +341,9 @@ function _internalSetInitialState() {
 }
 var _internalGetGlobalState = () => _state;
 var FailedHTTPResponse = class extends Error {
+  status;
+  text;
+  data;
   constructor(status, text, data = null) {
     super(`${status}: ${text}`);
     this.status = status;
@@ -349,6 +363,9 @@ async function checkResponse(resp) {
   }
 }
 var HTTPConnection = class _HTTPConnection {
+  base_url;
+  token;
+  headers;
   constructor(base_url) {
     this.base_url = base_url;
     this.token = null;
@@ -500,9 +517,13 @@ function logFeedbackImpl(bgLogger, parentIds, {
   }
 }
 var Logger = class {
+  lazyMetadata;
+  logOptions;
+  bgLogger;
+  lastStartTime;
+  // For type identification.
+  kind = "logger";
   constructor(lazyMetadata, logOptions = {}) {
-    // For type identification.
-    this.kind = "logger";
     this.lazyMetadata = lazyMetadata;
     this.logOptions = logOptions;
     const logConn = new LazyValue(
@@ -536,9 +557,19 @@ var Logger = class {
    * @param event.metadata: (Optional) a dictionary with additional data about the test example, model outputs, or just about anything else that's relevant, that you can use to help find and analyze examples later. For example, you could log the `prompt`, example's `id`, or anything else that would be useful to slice/dice later. The values in `metadata` can be any JSON-serializable type, but its keys must be strings.
    * @param event.metrics: (Optional) a dictionary of metrics to log. The following keys are populated automatically: "start", "end".
    * @param event.id: (Optional) a unique identifier for the event. If you don't provide one, BrainTrust will generate one for you.
+   * @param options Additional logging options
+   * @param options.allowLogConcurrentWithActiveSpan in rare cases where you need to log at the top level separately from an active span on the logger, set this to true.
    * :returns: The `id` of the logged event.
    */
-  log(event) {
+  log(event, options) {
+    if (!options?.allowLogConcurrentWithActiveSpan) {
+      const checkCurrentSpan = currentSpan();
+      if (checkCurrentSpan instanceof SpanImpl && checkCurrentSpan.parentObject === this) {
+        throw new Error(
+          "Cannot run toplevel Logger.log method while there is an active span. To log to the span, use Span.log"
+        );
+      }
+    }
     const span = this.startSpan({ startTime: this.lastStartTime, event });
     this.lastStartTime = span.end();
     const ret = span.id;
@@ -597,6 +628,7 @@ var Logger = class {
   startSpan(args) {
     const { name, ...argsRest } = args ?? {};
     return new SpanImpl({
+      parentObject: this,
       parentIds: new LazyValue(() => this.lazyParentIds()),
       bgLogger: this.bgLogger,
       name: name ?? "root",
@@ -654,10 +686,11 @@ function now() {
   return (/* @__PURE__ */ new Date()).getTime();
 }
 var BackgroundLogger = class {
+  logConn;
+  items = [];
+  active_flush = Promise.resolve([]);
+  active_flush_resolved = true;
   constructor(logConn) {
-    this.items = [];
-    this.active_flush = Promise.resolve([]);
-    this.active_flush_resolved = true;
     this.logConn = logConn;
     isomorph_default.processOn("beforeExit", async () => {
       await this.flush();
@@ -706,12 +739,12 @@ var BackgroundLogger = class {
       }
       postPromises.push(
         (async () => {
-          const dataS = constructLogs3Data(items);
+          const dataStr = constructLogs3Data(items);
           for (let i = 0; i < NumRetries; i++) {
             const startTime = now();
             try {
               try {
-                return (await (await this.logConn.get()).post_json("logs3", dataS)).ids.map((res) => res.id);
+                return (await (await this.logConn.get()).post_json("logs3", dataStr)).ids.map((res) => res.id);
               } catch (e) {
                 const legacyDataS = constructJsonArray(
                   items.map(
@@ -730,7 +763,7 @@ var BackgroundLogger = class {
                 }
               })();
               console.warn(
-                `log request failed. Elapsed time: ${(now() - startTime) / 1e3} seconds. Payload size: ${dataS.length}. Error: ${errMsg}.${retryingText}`
+                `log request failed. Elapsed time: ${(now() - startTime) / 1e3} seconds. Payload size: ${dataStr.length}. Error: ${errMsg}.${retryingText}`
               );
             }
           }
@@ -1098,9 +1131,12 @@ async function login(options = {}) {
       }
     };
     var checkUpdatedParam = checkUpdatedParam2;
-    ;
     checkUpdatedParam2("appUrl", options.appUrl, _state.appUrl);
-    checkUpdatedParam2("apiKey", options.apiKey ? HTTPConnection.sanitize_token(options.apiKey) : void 0, _state.loginToken);
+    checkUpdatedParam2(
+      "apiKey",
+      options.apiKey ? HTTPConnection.sanitize_token(options.apiKey) : void 0,
+      _state.loginToken
+    );
     checkUpdatedParam2("orgName", options.orgName, _state.orgName);
     return;
   }
@@ -1321,8 +1357,8 @@ var ObjectFetcher = class {
     this.objectType = objectType;
     this.pinnedVersion = pinnedVersion;
     this.mutateRecord = mutateRecord;
-    this._fetchedData = void 0;
   }
+  _fetchedData = void 0;
   get id() {
     throw new Error("ObjectFetcher subclasses must have an 'id' attribute");
   }
@@ -1382,10 +1418,14 @@ var ObjectFetcher = class {
   }
 };
 var Experiment = class extends ObjectFetcher {
+  lazyMetadata;
+  dataset;
+  bgLogger;
+  lastStartTime;
+  // For type identification.
+  kind = "experiment";
   constructor(lazyMetadata, dataset) {
     super("experiment", void 0);
-    // For type identification.
-    this.kind = "experiment";
     this.lazyMetadata = lazyMetadata;
     this.dataset = dataset;
     const logConn = new LazyValue(
@@ -1426,9 +1466,19 @@ var Experiment = class extends ObjectFetcher {
    * @param event.id: (Optional) a unique identifier for the event. If you don't provide one, BrainTrust will generate one for you.
    * @param event.dataset_record_id: (Optional) the id of the dataset record that this event is associated with. This field is required if and only if the experiment is associated with a dataset.
    * @param event.inputs: (Deprecated) the same as `input` (will be removed in a future version).
+   * @param options Additional logging options
+   * @param options.allowLogConcurrentWithActiveSpan in rare cases where you need to log at the top level separately from an active span on the experiment, set this to true.
    * :returns: The `id` of the logged event.
    */
-  log(event) {
+  log(event, options) {
+    if (!options?.allowLogConcurrentWithActiveSpan) {
+      const checkCurrentSpan = currentSpan();
+      if (checkCurrentSpan instanceof SpanImpl && checkCurrentSpan.parentObject === this) {
+        throw new Error(
+          "Cannot run toplevel Experiment.log method while there is an active span. To log to the span, use Span.log"
+        );
+      }
+    }
     event = validateAndSanitizeExperimentLogFullArgs(event, !!this.dataset);
     const span = this.startSpan({ startTime: this.lastStartTime, event });
     this.lastStartTime = span.end();
@@ -1470,6 +1520,7 @@ var Experiment = class extends ObjectFetcher {
   startSpan(args) {
     const { name, ...argsRest } = args ?? {};
     return new SpanImpl({
+      parentObject: this,
       parentIds: new LazyValue(() => this.lazyParentIds()),
       bgLogger: this.bgLogger,
       name: name ?? "root",
@@ -1624,10 +1675,21 @@ var ReadonlyExperiment = class extends ObjectFetcher {
 };
 var executionCounter = 0;
 var SpanImpl = class _SpanImpl {
+  bgLogger;
+  // `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.
+  parentObject;
+  // These fields are logged to every span row.
+  parentIds;
+  rowIds;
+  kind = "span";
   // root_experiment should only be specified for a root span. parent_span
   // should only be specified for non-root spans.
   constructor(args) {
-    this.kind = "span";
     this.loggedEndTime = void 0;
     this.bgLogger = args.bgLogger;
     const callerLocation = isomorph_default.getCallerLocation();
@@ -1655,6 +1717,7 @@ var SpanImpl = class _SpanImpl {
       },
       created: (/* @__PURE__ */ new Date()).toISOString()
     };
+    this.parentObject = args.parentObject;
     this.parentIds = args.parentIds;
     const id = args.event?.id ?? v4_default();
     const span_id = v4_default();
@@ -1726,6 +1789,7 @@ var SpanImpl = class _SpanImpl {
   }
   startSpan(args) {
     return new _SpanImpl({
+      parentObject: this.parentObject,
       parentIds: this.parentIds,
       bgLogger: this.bgLogger,
       parentSpanInfo: {
@@ -1751,6 +1815,8 @@ var SpanImpl = class _SpanImpl {
   }
 };
 var Dataset = class extends ObjectFetcher {
+  lazyMetadata;
+  bgLogger;
   constructor(lazyMetadata, pinnedVersion, legacy) {
     const isLegacyDataset = legacy ?? DEFAULT_IS_LEGACY_DATASET;
     if (isLegacyDataset) {
@@ -2111,6 +2177,9 @@ function wrapEmbeddings(create) {
   };
 }
 var WrapperStream = class {
+  span;
+  iter;
+  startTime;
   constructor(span, startTime, iter) {
     this.span = span;
     this.iter = iter;