braintrust 0.0.100 → 0.0.101

package/dist/browser.js

@@ -673,57 +673,74 @@ function castLogger(logger, asyncFlush) {
   }
   return logger;
 }
-var MaxRequestSize = 6 * 1024 * 1024;
 function constructJsonArray(items) {
   return `[${items.join(",")}]`;
 }
 function constructLogs3Data(items) {
   return `{"rows": ${constructJsonArray(items)}, "api_version": 2}`;
 }
-var DefaultBatchSize = 100;
-var NumRetries = 3;
 function now() {
   return (/* @__PURE__ */ new Date()).getTime();
 }
 var BackgroundLogger = class {
   logConn;
   items = [];
-  active_flush = Promise.resolve([]);
-  active_flush_resolved = true;
+  activeFlush = Promise.resolve();
+  activeFlushResolved = true;
+  syncFlush = false;
+  // 6 MB for the AWS lambda gateway (from our own testing).
+  maxRequestSize = 6 * 1024 * 1024;
+  defaultBatchSize = 100;
+  numRetries = 3;
   constructor(logConn) {
     this.logConn = logConn;
+    const syncFlushEnv = Number(isomorph_default.getEnv("BRAINTRUST_SYNC_FLUSH"));
+    if (!isNaN(syncFlushEnv)) {
+      this.syncFlush = Boolean(syncFlushEnv);
+    }
+    const defaultBatchSizeEnv = Number(
+      isomorph_default.getEnv("BRAINTRUST_DEFAULT_BATCH_SIZE")
+    );
+    if (!isNaN(defaultBatchSizeEnv)) {
+      this.defaultBatchSize = defaultBatchSizeEnv;
+    }
+    const maxRequestSizeEnv = Number(isomorph_default.getEnv("BRAINTRUST_MAX_REQUEST_SIZE"));
+    if (!isNaN(maxRequestSizeEnv)) {
+      this.maxRequestSize = maxRequestSizeEnv;
+    }
+    const numRetriesEnv = Number(isomorph_default.getEnv("BRAINTRUST_NUM_RETRIES"));
+    if (!isNaN(numRetriesEnv)) {
+      this.numRetries = numRetriesEnv;
+    }
     isomorph_default.processOn("beforeExit", async () => {
       await this.flush();
     });
   }
   log(items) {
     this.items.push(...items);
-    if (this.active_flush_resolved) {
-      this.active_flush_resolved = false;
-      this.active_flush = this.flush_once();
+    if (!this.syncFlush) {
+      this.triggerActiveFlush();
     }
   }
-  async flush_once(batchSize = DefaultBatchSize) {
-    this.active_flush_resolved = false;
-    const itemLazyValues = this.items;
+  async flush() {
+    if (this.syncFlush) {
+      this.triggerActiveFlush();
+    }
+    await this.activeFlush;
+  }
+  async flushOnce(args) {
+    const batchSize = args?.batchSize ?? this.defaultBatchSize;
+    const wrappedItems = this.items;
     this.items = [];
-    const allItems = await (async () => {
-      try {
-        const itemPromises = itemLazyValues.map((x) => x.get());
-        return mergeRowBatch(await Promise.all(itemPromises)).reverse();
-      } catch (e) {
-        console.warn(
-          "Encountered error when constructing records to flush:\n",
-          e
-        );
-        return [];
-      }
-    })();
-    let postPromises = [];
+    const allItems = await this.unwrapLazyValues(wrappedItems);
+    if (allItems.length === 0) {
+      return;
+    }
+    const postPromises = [];
     while (true) {
       const items = [];
       let itemsLen = 0;
-      while (items.length < batchSize && itemsLen < MaxRequestSize / 2) {
+      while (items.length < batchSize && itemsLen < this.maxRequestSize / 2) {
         let item = null;
         if (allItems.length > 0) {
           item = allItems.pop();
@@ -739,55 +756,106 @@ var BackgroundLogger = class {
       }
       postPromises.push(
         (async () => {
-          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", dataStr)).ids.map((res) => res.id);
-              } catch (e) {
-                const legacyDataS = constructJsonArray(
-                  items.map(
-                    (r) => JSON.stringify(makeLegacyEvent(JSON.parse(r)))
-                  )
-                );
-                return (await (await this.logConn.get()).post_json("logs", legacyDataS)).map((res) => res.id);
-              }
-            } catch (e) {
-              const retryingText = i + 1 === NumRetries ? "" : " Retrying";
-              const errMsg = (() => {
-                if (e instanceof FailedHTTPResponse) {
-                  return `${e.status} (${e.text}): ${e.data}`;
-                } else {
-                  return `${e}`;
-                }
-              })();
-              console.warn(
-                `log request failed. Elapsed time: ${(now() - startTime) / 1e3} seconds. Payload size: ${dataStr.length}. Error: ${errMsg}.${retryingText}`
-              );
-            }
+          try {
+            await this.submitLogsRequest(items);
+            return { type: "success" };
+          } catch (e) {
+            return { type: "error", value: e };
           }
-          console.warn(
-            `log request failed after ${NumRetries} retries. Dropping batch`
-          );
-          return [];
         })()
       );
     }
-    let ret = await Promise.all(postPromises);
+    const results = await Promise.all(postPromises);
+    const failingResultErrors = results.map((r) => r.type === "success" ? void 0 : r.value).filter((r) => r !== void 0);
+    if (failingResultErrors.length) {
+      throw new AggregateError(
+        failingResultErrors,
+        `Encountered the following errors while logging:`
+      );
+    }
     if (this.items.length > 0) {
-      this.active_flush = this.flush_once();
-    } else {
-      this.active_flush_resolved = true;
+      await this.flushOnce(args);
     }
-    return ret;
   }
-  async flush() {
-    while (true) {
-      await this.active_flush;
-      if (this.active_flush_resolved) {
-        break;
+  async unwrapLazyValues(wrappedItems) {
+    for (let i = 0; i < this.numRetries; ++i) {
+      try {
+        const itemPromises = wrappedItems.map((x) => x.get());
+        return mergeRowBatch(await Promise.all(itemPromises));
+      } catch (e) {
+        let errmsg = "Encountered error when constructing records to flush";
+        const isRetrying = i + 1 < this.numRetries;
+        if (isRetrying) {
+          errmsg += ". Retrying";
+        }
+        console.warn(errmsg);
+        if (!isRetrying && this.syncFlush) {
+          throw e;
+        } else {
+          console.warn(e);
+          await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+      }
+    }
+    console.warn(
+      `Failed to construct log records to flush after ${this.numRetries} retries. Dropping batch`
+    );
+    return [];
+  }
+  async submitLogsRequest(items) {
+    const conn = await this.logConn.get();
+    const dataStr = constructLogs3Data(items);
+    for (let i = 0; i < this.numRetries; i++) {
+      const startTime = now();
+      let error = void 0;
+      try {
+        await conn.post_json("logs3", dataStr);
+      } catch (e) {
+        try {
+          const legacyDataS = constructJsonArray(
+            items.map(
+              (r) => JSON.stringify(makeLegacyEvent(JSON.parse(r)))
+            )
+          );
+          await conn.post_json("logs", legacyDataS);
+        } catch (e2) {
+          error = e2;
+        }
+      }
+      if (error === void 0) {
+        return;
       }
+      const isRetrying = i + 1 < this.numRetries;
+      const retryingText = isRetrying ? "" : " Retrying";
+      const errorText = (() => {
+        if (error instanceof FailedHTTPResponse) {
+          return `${error.status} (${error.text}): ${error.data}`;
+        } else {
+          return `${error}`;
+        }
+      })();
+      const errMsg = `log request failed. Elapsed time: ${(now() - startTime) / 1e3} seconds. Payload size: ${dataStr.length}.${retryingText}
+Error: ${errorText}`;
+      if (!isRetrying && this.syncFlush) {
+        throw new Error(errMsg);
+      } else {
+        console.warn(errMsg);
+        if (isRetrying) {
+          await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+      }
+    }
+    console.warn(
+      `log request failed after ${this.numRetries} retries. Dropping batch`
+    );
+    return;
+  }
+  triggerActiveFlush() {
+    if (this.activeFlushResolved) {
+      this.activeFlushResolved = false;
+      this.activeFlush = this.flushOnce().finally(() => {
+        this.activeFlushResolved = true;
+      });
     }
   }
 };
@@ -1408,8 +1476,8 @@ var ObjectFetcher = class {
       const fetchedData = await this.fetchedData();
       let maxVersion = void 0;
       for (const record of fetchedData) {
-        const xactId = record[TRANSACTION_ID_FIELD];
-        if (maxVersion === void 0 || (xactId ?? xactId > maxVersion)) {
+        const xactId = String(record[TRANSACTION_ID_FIELD] ?? "0");
+        if (maxVersion === void 0 || xactId > maxVersion) {
           maxVersion = xactId;
         }
       }

package/dist/cli.js

@@ -7772,35 +7772,41 @@ var require_ansi_styles = __commonJS({
   }
 });
 
-// ../../node_modules/supports-color/node_modules/has-flag/index.js
+// ../../node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js
 var require_has_flag = __commonJS({
-  "../../node_modules/supports-color/node_modules/has-flag/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js"(exports2, module2) {
     "use strict";
-    module2.exports = (flag, argv) => {
-      argv = argv || process.argv;
+    module2.exports = (flag, argv = process.argv) => {
       const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-      const pos = argv.indexOf(prefix + flag);
-      const terminatorPos = argv.indexOf("--");
-      return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+      const position = argv.indexOf(prefix + flag);
+      const terminatorPosition = argv.indexOf("--");
+      return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
     };
   }
 });
 
-// ../../node_modules/supports-color/index.js
+// ../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js
 var require_supports_color = __commonJS({
-  "../../node_modules/supports-color/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js"(exports2, module2) {
     "use strict";
     var os2 = require("os");
+    var tty = require("tty");
     var hasFlag = require_has_flag();
-    var env = process.env;
+    var { env } = process;
     var forceColor;
-    if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false")) {
-      forceColor = false;
+    if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
+      forceColor = 0;
     } else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
-      forceColor = true;
+      forceColor = 1;
     }
     if ("FORCE_COLOR" in env) {
-      forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+      if (env.FORCE_COLOR === "true") {
+        forceColor = 1;
+      } else if (env.FORCE_COLOR === "false") {
+        forceColor = 0;
+      } else {
+        forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+      }
     }
     function translateLevel(level) {
       if (level === 0) {
@@ -7813,8 +7819,8 @@ var require_supports_color = __commonJS({
         has16m: level >= 3
       };
     }
-    function supportsColor(stream) {
-      if (forceColor === false) {
+    function supportsColor(haveStream, streamIsTTY) {
+      if (forceColor === 0) {
         return 0;
       }
       if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
@@ -7823,19 +7829,22 @@ var require_supports_color = __commonJS({
       if (hasFlag("color=256")) {
         return 2;
       }
-      if (stream && !stream.isTTY && forceColor !== true) {
+      if (haveStream && !streamIsTTY && forceColor === void 0) {
         return 0;
       }
-      const min = forceColor ? 1 : 0;
+      const min = forceColor || 0;
+      if (env.TERM === "dumb") {
+        return min;
+      }
       if (process.platform === "win32") {
         const osRelease = os2.release().split(".");
-        if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+        if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
         return 1;
       }
       if ("CI" in env) {
-        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
+        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "GITHUB_ACTIONS", "BUILDKITE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
           return 1;
         }
         return min;
@@ -7864,19 +7873,16 @@ var require_supports_color = __commonJS({
       if ("COLORTERM" in env) {
         return 1;
       }
-      if (env.TERM === "dumb") {
-        return min;
-      }
       return min;
     }
     function getSupportLevel(stream) {
-      const level = supportsColor(stream);
+      const level = supportsColor(stream, stream && stream.isTTY);
       return translateLevel(level);
     }
     module2.exports = {
       supportsColor: getSupportLevel,
-      stdout: getSupportLevel(process.stdout),
-      stderr: getSupportLevel(process.stderr)
+      stdout: translateLevel(supportsColor(true, tty.isatty(1))),
+      stderr: translateLevel(supportsColor(true, tty.isatty(2)))
     };
   }
 });
@@ -9059,7 +9065,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "braintrust",
-      version: "0.0.100",
+      version: "0.0.101",
       description: "SDK for integrating Braintrust",
       main: "./dist/index.js",
       browser: {
@@ -9102,7 +9108,7 @@ var require_package = __commonJS({
         typescript: "^5.3.3"
       },
       dependencies: {
-        "@braintrust/core": "0.0.18",
+        "@braintrust/core": "0.0.19",
         argparse: "^2.0.1",
         chalk: "^4.1.2",
         "cli-progress": "^3.12.0",
@@ -10941,57 +10947,74 @@ function logFeedbackImpl(bgLogger, parentIds, {
     bgLogger.log([record]);
   }
 }
-var MaxRequestSize = 6 * 1024 * 1024;
 function constructJsonArray(items) {
   return `[${items.join(",")}]`;
 }
 function constructLogs3Data(items) {
   return `{"rows": ${constructJsonArray(items)}, "api_version": 2}`;
 }
-var DefaultBatchSize = 100;
-var NumRetries = 3;
 function now() {
   return (/* @__PURE__ */ new Date()).getTime();
 }
 var BackgroundLogger = class {
   logConn;
   items = [];
-  active_flush = Promise.resolve([]);
-  active_flush_resolved = true;
+  activeFlush = Promise.resolve();
+  activeFlushResolved = true;
+  syncFlush = false;
+  // 6 MB for the AWS lambda gateway (from our own testing).
+  maxRequestSize = 6 * 1024 * 1024;
+  defaultBatchSize = 100;
+  numRetries = 3;
   constructor(logConn) {
     this.logConn = logConn;
+    const syncFlushEnv = Number(isomorph_default.getEnv("BRAINTRUST_SYNC_FLUSH"));
+    if (!isNaN(syncFlushEnv)) {
+      this.syncFlush = Boolean(syncFlushEnv);
+    }
+    const defaultBatchSizeEnv = Number(
+      isomorph_default.getEnv("BRAINTRUST_DEFAULT_BATCH_SIZE")
+    );
+    if (!isNaN(defaultBatchSizeEnv)) {
+      this.defaultBatchSize = defaultBatchSizeEnv;
+    }
+    const maxRequestSizeEnv = Number(isomorph_default.getEnv("BRAINTRUST_MAX_REQUEST_SIZE"));
+    if (!isNaN(maxRequestSizeEnv)) {
+      this.maxRequestSize = maxRequestSizeEnv;
+    }
+    const numRetriesEnv = Number(isomorph_default.getEnv("BRAINTRUST_NUM_RETRIES"));
+    if (!isNaN(numRetriesEnv)) {
+      this.numRetries = numRetriesEnv;
+    }
     isomorph_default.processOn("beforeExit", async () => {
       await this.flush();
     });
   }
   log(items) {
     this.items.push(...items);
-    if (this.active_flush_resolved) {
-      this.active_flush_resolved = false;
-      this.active_flush = this.flush_once();
+    if (!this.syncFlush) {
+      this.triggerActiveFlush();
+    }
+  }
+  async flush() {
+    if (this.syncFlush) {
+      this.triggerActiveFlush();
     }
+    await this.activeFlush;
   }
-  async flush_once(batchSize = DefaultBatchSize) {
-    this.active_flush_resolved = false;
-    const itemLazyValues = this.items;
+  async flushOnce(args) {
+    const batchSize = args?.batchSize ?? this.defaultBatchSize;
+    const wrappedItems = this.items;
     this.items = [];
-    const allItems = await (async () => {
-      try {
-        const itemPromises = itemLazyValues.map((x) => x.get());
-        return mergeRowBatch(await Promise.all(itemPromises)).reverse();
-      } catch (e) {
-        console.warn(
-          "Encountered error when constructing records to flush:\n",
-          e
-        );
-        return [];
-      }
-    })();
-    let postPromises = [];
+    const allItems = await this.unwrapLazyValues(wrappedItems);
+    if (allItems.length === 0) {
+      return;
+    }
+    const postPromises = [];
     while (true) {
       const items = [];
       let itemsLen = 0;
-      while (items.length < batchSize && itemsLen < MaxRequestSize / 2) {
+      while (items.length < batchSize && itemsLen < this.maxRequestSize / 2) {
         let item = null;
         if (allItems.length > 0) {
           item = allItems.pop();
@@ -11007,56 +11030,107 @@ var BackgroundLogger = class {
       }
       postPromises.push(
         (async () => {
-          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", dataStr)).ids.map((res) => res.id);
-              } catch (e) {
-                const legacyDataS = constructJsonArray(
-                  items.map(
-                    (r) => JSON.stringify(makeLegacyEvent(JSON.parse(r)))
-                  )
-                );
-                return (await (await this.logConn.get()).post_json("logs", legacyDataS)).map((res) => res.id);
-              }
-            } catch (e) {
-              const retryingText = i + 1 === NumRetries ? "" : " Retrying";
-              const errMsg = (() => {
-                if (e instanceof FailedHTTPResponse) {
-                  return `${e.status} (${e.text}): ${e.data}`;
-                } else {
-                  return `${e}`;
-                }
-              })();
-              console.warn(
-                `log request failed. Elapsed time: ${(now() - startTime) / 1e3} seconds. Payload size: ${dataStr.length}. Error: ${errMsg}.${retryingText}`
-              );
-            }
+          try {
+            await this.submitLogsRequest(items);
+            return { type: "success" };
+          } catch (e) {
+            return { type: "error", value: e };
           }
-          console.warn(
-            `log request failed after ${NumRetries} retries. Dropping batch`
-          );
-          return [];
         })()
       );
     }
-    let ret = await Promise.all(postPromises);
+    const results = await Promise.all(postPromises);
+    const failingResultErrors = results.map((r) => r.type === "success" ? void 0 : r.value).filter((r) => r !== void 0);
+    if (failingResultErrors.length) {
+      throw new AggregateError(
+        failingResultErrors,
+        `Encountered the following errors while logging:`
+      );
+    }
     if (this.items.length > 0) {
-      this.active_flush = this.flush_once();
-    } else {
-      this.active_flush_resolved = true;
+      await this.flushOnce(args);
     }
-    return ret;
   }
-  async flush() {
-    while (true) {
-      await this.active_flush;
-      if (this.active_flush_resolved) {
-        break;
+  async unwrapLazyValues(wrappedItems) {
+    for (let i = 0; i < this.numRetries; ++i) {
+      try {
+        const itemPromises = wrappedItems.map((x) => x.get());
+        return mergeRowBatch(await Promise.all(itemPromises));
+      } catch (e) {
+        let errmsg = "Encountered error when constructing records to flush";
+        const isRetrying = i + 1 < this.numRetries;
+        if (isRetrying) {
+          errmsg += ". Retrying";
+        }
+        console.warn(errmsg);
+        if (!isRetrying && this.syncFlush) {
+          throw e;
+        } else {
+          console.warn(e);
+          await new Promise((resolve2) => setTimeout(resolve2, 100));
+        }
       }
     }
+    console.warn(
+      `Failed to construct log records to flush after ${this.numRetries} retries. Dropping batch`
+    );
+    return [];
+  }
+  async submitLogsRequest(items) {
+    const conn = await this.logConn.get();
+    const dataStr = constructLogs3Data(items);
+    for (let i = 0; i < this.numRetries; i++) {
+      const startTime = now();
+      let error2 = void 0;
+      try {
+        await conn.post_json("logs3", dataStr);
+      } catch (e) {
+        try {
+          const legacyDataS = constructJsonArray(
+            items.map(
+              (r) => JSON.stringify(makeLegacyEvent(JSON.parse(r)))
+            )
+          );
+          await conn.post_json("logs", legacyDataS);
+        } catch (e2) {
+          error2 = e2;
+        }
+      }
+      if (error2 === void 0) {
+        return;
+      }
+      const isRetrying = i + 1 < this.numRetries;
+      const retryingText = isRetrying ? "" : " Retrying";
+      const errorText = (() => {
+        if (error2 instanceof FailedHTTPResponse) {
+          return `${error2.status} (${error2.text}): ${error2.data}`;
+        } else {
+          return `${error2}`;
+        }
+      })();
+      const errMsg = `log request failed. Elapsed time: ${(now() - startTime) / 1e3} seconds. Payload size: ${dataStr.length}.${retryingText}
+Error: ${errorText}`;
+      if (!isRetrying && this.syncFlush) {
+        throw new Error(errMsg);
+      } else {
+        console.warn(errMsg);
+        if (isRetrying) {
+          await new Promise((resolve2) => setTimeout(resolve2, 100));
+        }
+      }
+    }
+    console.warn(
+      `log request failed after ${this.numRetries} retries. Dropping batch`
+    );
+    return;
+  }
+  triggerActiveFlush() {
+    if (this.activeFlushResolved) {
+      this.activeFlushResolved = false;
+      this.activeFlush = this.flushOnce().finally(() => {
+        this.activeFlushResolved = true;
+      });
+    }
   }
 };
 function init(projectOrOptions, optionalOptions) {
@@ -11449,8 +11523,8 @@ var ObjectFetcher = class {
       const fetchedData = await this.fetchedData();
       let maxVersion = void 0;
       for (const record of fetchedData) {
-        const xactId = record[TRANSACTION_ID_FIELD];
-        if (maxVersion === void 0 || (xactId ?? xactId > maxVersion)) {
+        const xactId = String(record[TRANSACTION_ID_FIELD] ?? "0");
+        if (maxVersion === void 0 || xactId > maxVersion) {
           maxVersion = xactId;
         }
       }