braintrust 1.0.3 → 1.1.0-rc.16

package/dev/dist/index.d.mts

@@ -7795,6 +7795,8 @@ declare abstract class IDGenerator {
     abstract shareRootSpanId(): boolean;
 }
 
+type TemplateFormat = "mustache" | "nunjucks" | "none";
+
 interface IsoAsyncLocalStorage<T> {
     enterWith(store: T): void;
     run<R>(store: T | undefined, callback: () => R): R;
@@ -8805,6 +8807,7 @@ declare class Prompt<HasId extends boolean = true, HasVersion extends boolean =
         flavor?: Flavor;
         messages?: ChatCompletionMessageParamType[];
         strict?: boolean;
+        templateFormat?: TemplateFormat;
     }): CompiledPrompt<Flavor>;
     /**
      * This is a special build method that first resolves attachment references, and then
@@ -8818,6 +8821,7 @@ declare class Prompt<HasId extends boolean = true, HasVersion extends boolean =
         messages?: ChatCompletionMessageParamType[];
         strict?: boolean;
         state?: BraintrustState;
+        templateFormat?: TemplateFormat;
     }): Promise<CompiledPrompt<Flavor>>;
     private runBuild;
     static renderPrompt({ prompt, buildArgs, options, }: {
@@ -8826,6 +8830,7 @@ declare class Prompt<HasId extends boolean = true, HasVersion extends boolean =
         options: {
             strict?: boolean;
             messages?: ChatCompletionMessageParamType[];
+            templateFormat?: TemplateFormat;
         };
     }): PromptBlockDataType;
     private getParsedPromptData;

package/dev/dist/index.d.ts

@@ -7795,6 +7795,8 @@ declare abstract class IDGenerator {
     abstract shareRootSpanId(): boolean;
 }
 
+type TemplateFormat = "mustache" | "nunjucks" | "none";
+
 interface IsoAsyncLocalStorage<T> {
     enterWith(store: T): void;
     run<R>(store: T | undefined, callback: () => R): R;
@@ -8805,6 +8807,7 @@ declare class Prompt<HasId extends boolean = true, HasVersion extends boolean =
         flavor?: Flavor;
         messages?: ChatCompletionMessageParamType[];
         strict?: boolean;
+        templateFormat?: TemplateFormat;
     }): CompiledPrompt<Flavor>;
     /**
      * This is a special build method that first resolves attachment references, and then
@@ -8818,6 +8821,7 @@ declare class Prompt<HasId extends boolean = true, HasVersion extends boolean =
         messages?: ChatCompletionMessageParamType[];
         strict?: boolean;
         state?: BraintrustState;
+        templateFormat?: TemplateFormat;
     }): Promise<CompiledPrompt<Flavor>>;
     private runBuild;
     static renderPrompt({ prompt, buildArgs, options, }: {
@@ -8826,6 +8830,7 @@ declare class Prompt<HasId extends boolean = true, HasVersion extends boolean =
         options: {
             strict?: boolean;
             messages?: ChatCompletionMessageParamType[];
+            templateFormat?: TemplateFormat;
         };
     }): PromptBlockDataType;
     private getParsedPromptData;

package/dev/dist/index.js

@@ -2925,6 +2925,199 @@ var View = _v3.z.object({
 var _functions = require('@vercel/functions');
 var _mustache = require('mustache'); var _mustache2 = _interopRequireDefault(_mustache);
 
+// src/template/renderer.ts
+
+
+// src/template/mustache-utils.ts
+
+function lintTemplate(template, context) {
+  const variables = getMustacheVars(template);
+  for (const variable of variables) {
+    const arrPathsReplaced = variable[1].replaceAll(/\.\d+/g, ".0");
+    const fieldExists = getObjValueByPath(context, arrPathsReplaced.split(".")) !== void 0;
+    if (!fieldExists) {
+      throw new Error(`Variable '${variable[1]}' does not exist.`);
+    }
+  }
+}
+function getMustacheVars(prompt) {
+  try {
+    return _mustache2.default.parse(prompt).filter(
+      (span) => span[0] === "name" || span[0] === "&"
+    );
+  } catch (e8) {
+    return [];
+  }
+}
+
+// src/template/nunjucks-utils.ts
+var _nunjucks = require('nunjucks'); var nunjucks = _interopRequireWildcard(_nunjucks); var nunjucksNodeModule = _interopRequireWildcard(_nunjucks);
+function lintTemplate2(template, context) {
+  const env = new nunjucks.Environment(null, {
+    autoescape: true,
+    throwOnUndefined: true
+  });
+  env.renderString(template, context);
+}
+
+// src/template/nunjucks.ts
+
+var nunjucks2 = nunjucksNodeModule;
+
+// src/util.ts
+var GLOBAL_PROJECT = "Global";
+function runCatchFinally(f, catchF, finallyF) {
+  let runSyncCleanup = true;
+  try {
+    const ret = f();
+    if (ret instanceof Promise) {
+      runSyncCleanup = false;
+      return ret.catch(catchF).finally(finallyF);
+    } else {
+      return ret;
+    }
+  } catch (e) {
+    return catchF(e);
+  } finally {
+    if (runSyncCleanup) {
+      finallyF();
+    }
+  }
+}
+function getCurrentUnixTimestamp() {
+  return (/* @__PURE__ */ new Date()).getTime() / 1e3;
+}
+function isEmpty2(a) {
+  return a === void 0 || a === null;
+}
+var LazyValue = (_class2 = class {
+  
+  __init3() {this.resolvedValue = void 0}
+  __init4() {this.value = {
+    computedState: "uninitialized"
+  }}
+  constructor(callable) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);
+    this.callable = callable;
+  }
+  get() {
+    if (this.value.computedState !== "uninitialized") {
+      return this.value.val;
+    }
+    this.value = {
+      computedState: "in_progress",
+      val: this.callable().then((x) => {
+        this.value.computedState = "succeeded";
+        this.resolvedValue = x;
+        return x;
+      })
+    };
+    return this.value.val;
+  }
+  getSync() {
+    return {
+      resolved: this.value.computedState === "succeeded",
+      value: this.resolvedValue
+    };
+  }
+  // If this is true, the caller should be able to obtain the LazyValue without
+  // it throwing.
+  get hasSucceeded() {
+    return this.value.computedState === "succeeded";
+  }
+}, _class2);
+var SyncLazyValue = (_class3 = class {
+  
+  __init5() {this.value = {
+    computedState: "uninitialized"
+  }}
+  constructor(callable) {;_class3.prototype.__init5.call(this);
+    this.callable = callable;
+  }
+  get() {
+    if (this.value.computedState !== "uninitialized") {
+      return this.value.val;
+    }
+    const result = this.callable();
+    this.value = { computedState: "succeeded", val: result };
+    return result;
+  }
+  // If this is true, the caller should be able to obtain the SyncLazyValue without
+  // it throwing.
+  get hasSucceeded() {
+    return this.value.computedState === "succeeded";
+  }
+}, _class3);
+function addAzureBlobHeaders(headers, url) {
+  if (url.includes("blob.core.windows.net")) {
+    headers["x-ms-blob-type"] = "BlockBlob";
+  }
+}
+var InternalAbortError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "InternalAbortError";
+  }
+};
+
+// src/template/nunjucks-env.ts
+var createNunjucksEnv = (throwOnUndefined) => {
+  return new nunjucks2.Environment(null, {
+    autoescape: true,
+    throwOnUndefined
+  });
+};
+var nunjucksEnv = new SyncLazyValue(
+  () => createNunjucksEnv(false)
+);
+var nunjucksStrictEnv = new SyncLazyValue(
+  () => createNunjucksEnv(true)
+);
+function getNunjucksEnv(strict = false) {
+  return strict ? nunjucksStrictEnv.get() : nunjucksEnv.get();
+}
+function renderNunjucksString(template, variables, strict = false) {
+  try {
+    return getNunjucksEnv(strict).renderString(template, variables);
+  } catch (error) {
+    if (error instanceof Error && error.message.includes(
+      "Code generation from strings disallowed for this context"
+    )) {
+      throw new Error(
+        `String template rendering. Disallowed in this environment for security reasons. Try a different template renderer. Original error: ${error.message}`
+      );
+    }
+    throw error;
+  }
+}
+
+// src/template/renderer.ts
+function isTemplateFormat(v) {
+  return v === "mustache" || v === "nunjucks" || v === "none";
+}
+function parseTemplateFormat(value, defaultFormat = "mustache") {
+  return isTemplateFormat(value) ? value : defaultFormat;
+}
+function renderTemplateContent(template, variables, escape, options) {
+  const strict = !!options.strict;
+  const templateFormat = parseTemplateFormat(options.templateFormat);
+  if (templateFormat === "nunjucks") {
+    if (strict) {
+      lintTemplate2(template, variables);
+    }
+    return renderNunjucksString(template, variables, strict);
+  } else if (templateFormat === "mustache") {
+    if (strict) {
+      lintTemplate(template, variables);
+    }
+    return _mustache2.default.render(template, variables, void 0, {
+      escape
+    });
+  }
+  return template;
+}
+
+// src/logger.ts
+
 
 // src/functions/stream.ts
 
@@ -3451,123 +3644,6 @@ var PromptCache = class {
   }
 };
 
-// src/util.ts
-var GLOBAL_PROJECT = "Global";
-function runCatchFinally(f, catchF, finallyF) {
-  let runSyncCleanup = true;
-  try {
-    const ret = f();
-    if (ret instanceof Promise) {
-      runSyncCleanup = false;
-      return ret.catch(catchF).finally(finallyF);
-    } else {
-      return ret;
-    }
-  } catch (e) {
-    return catchF(e);
-  } finally {
-    if (runSyncCleanup) {
-      finallyF();
-    }
-  }
-}
-function getCurrentUnixTimestamp() {
-  return (/* @__PURE__ */ new Date()).getTime() / 1e3;
-}
-function isEmpty2(a) {
-  return a === void 0 || a === null;
-}
-var LazyValue = (_class2 = class {
-  
-  __init3() {this.resolvedValue = void 0}
-  __init4() {this.value = {
-    computedState: "uninitialized"
-  }}
-  constructor(callable) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);
-    this.callable = callable;
-  }
-  get() {
-    if (this.value.computedState !== "uninitialized") {
-      return this.value.val;
-    }
-    this.value = {
-      computedState: "in_progress",
-      val: this.callable().then((x) => {
-        this.value.computedState = "succeeded";
-        this.resolvedValue = x;
-        return x;
-      })
-    };
-    return this.value.val;
-  }
-  getSync() {
-    return {
-      resolved: this.value.computedState === "succeeded",
-      value: this.resolvedValue
-    };
-  }
-  // If this is true, the caller should be able to obtain the LazyValue without
-  // it throwing.
-  get hasSucceeded() {
-    return this.value.computedState === "succeeded";
-  }
-}, _class2);
-var SyncLazyValue = (_class3 = class {
-  
-  __init5() {this.value = {
-    computedState: "uninitialized"
-  }}
-  constructor(callable) {;_class3.prototype.__init5.call(this);
-    this.callable = callable;
-  }
-  get() {
-    if (this.value.computedState !== "uninitialized") {
-      return this.value.val;
-    }
-    const result = this.callable();
-    this.value = { computedState: "succeeded", val: result };
-    return result;
-  }
-  // If this is true, the caller should be able to obtain the SyncLazyValue without
-  // it throwing.
-  get hasSucceeded() {
-    return this.value.computedState === "succeeded";
-  }
-}, _class3);
-function addAzureBlobHeaders(headers, url) {
-  if (url.includes("blob.core.windows.net")) {
-    headers["x-ms-blob-type"] = "BlockBlob";
-  }
-}
-var InternalAbortError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "InternalAbortError";
-  }
-};
-
-// src/mustache-utils.ts
-
-function lintTemplate(template, context) {
-  const variables = getMustacheVars(template);
-  for (const variable of variables) {
-    const arrPathsReplaced = variable[1].replaceAll(/\.\d+/g, ".0");
-    const fieldExists = getObjValueByPath(context, arrPathsReplaced.split(".")) !== void 0;
-    if (!fieldExists) {
-      throw new Error(`Variable '${variable[1]}' does not exist.`);
-    }
-  }
-}
-function getMustacheVars(prompt) {
-  try {
-    return _mustache2.default.parse(prompt).filter(
-      (span) => span[0] === "name" || span[0] === "&"
-    );
-  } catch (e8) {
-    return [];
-  }
-}
-
 // src/logger.ts
 var BRAINTRUST_ATTACHMENT = BraintrustAttachmentReference.shape.type.value;
 var EXTERNAL_ATTACHMENT = ExternalAttachmentReference.shape.type.value;
@@ -7054,18 +7130,28 @@ function deserializePlainStringAsJSON(s) {
 }
 function renderTemplatedObject(obj, args, options) {
   if (typeof obj === "string") {
-    if (options.strict) {
-      lintTemplate(obj, args);
+    const strict = !!options.strict;
+    if (options.templateFormat === "nunjucks") {
+      if (strict) {
+        lintTemplate2(obj, args);
+      }
+      return renderNunjucksString(obj, args, strict);
     }
-    return _mustache2.default.render(obj, args, void 0, {
-      escape: (value) => {
-        if (typeof value === "string") {
-          return value;
-        } else {
-          return JSON.stringify(value);
-        }
+    if (options.templateFormat === "mustache") {
+      if (strict) {
+        lintTemplate(obj, args);
       }
-    });
+      return _mustache2.default.render(obj, args, void 0, {
+        escape: (value) => {
+          if (typeof value === "string") {
+            return value;
+          } else {
+            return JSON.stringify(value);
+          }
+        }
+      });
+    }
+    return obj;
   } else if (isArray(obj)) {
     return obj.map((item) => renderTemplatedObject(item, args, options));
   } else if (isObject(obj)) {
@@ -7078,7 +7164,9 @@ function renderTemplatedObject(obj, args, options) {
   }
   return obj;
 }
-function renderPromptParams(params, args, options) {
+function renderPromptParams(params, args, options = {}) {
+  const templateFormat = parseTemplateFormat(options.templateFormat);
+  const strict = !!options.strict;
   const schemaParsed = _v3.z.object({
     response_format: _v3.z.object({
       type: _v3.z.literal("json_schema"),
@@ -7089,7 +7177,10 @@ function renderPromptParams(params, args, options) {
   }).safeParse(params);
   if (schemaParsed.success) {
     const rawSchema = schemaParsed.data.response_format.json_schema.schema;
-    const templatedSchema = renderTemplatedObject(rawSchema, args, options);
+    const templatedSchema = renderTemplatedObject(rawSchema, args, {
+      strict,
+      templateFormat
+    });
     const parsedSchema = typeof templatedSchema === "string" ? deserializePlainStringAsJSON(templatedSchema).value : templatedSchema;
     return {
       ...params,
@@ -7148,7 +7239,8 @@ var Prompt2 = (_class12 = class _Prompt {
     return this.runBuild(buildArgs, {
       flavor: _nullishCoalesce(options.flavor, () => ( "chat")),
       messages: options.messages,
-      strict: options.strict
+      strict: options.strict,
+      templateFormat: options.templateFormat
     });
   }
   /**
@@ -7163,7 +7255,8 @@ var Prompt2 = (_class12 = class _Prompt {
     return this.runBuild(hydrated, {
       flavor: _nullishCoalesce(options.flavor, () => ( "chat")),
       messages: options.messages,
-      strict: options.strict
+      strict: options.strict,
+      templateFormat: options.templateFormat
     });
   }
   runBuild(buildArgs, options) {
@@ -7206,10 +7299,11 @@ var Prompt2 = (_class12 = class _Prompt {
       input: buildArgs,
       ...dictArgParsed.success ? dictArgParsed.data : {}
     };
+    const resolvedTemplateFormat = parseTemplateFormat(options.templateFormat);
     const renderedPrompt = _Prompt.renderPrompt({
       prompt,
       buildArgs,
-      options
+      options: { ...options, templateFormat: resolvedTemplateFormat }
     });
     if (flavor === "chat") {
       if (renderedPrompt.type !== "chat") {
@@ -7218,7 +7312,10 @@ var Prompt2 = (_class12 = class _Prompt {
         );
       }
       return {
-        ...renderPromptParams(params, variables, { strict: options.strict }),
+        ...renderPromptParams(params, variables, {
+          strict: options.strict,
+          templateFormat: resolvedTemplateFormat
+        }),
         ...spanInfo,
         messages: renderedPrompt.messages,
         ...renderedPrompt.tools ? {
@@ -7230,7 +7327,10 @@ var Prompt2 = (_class12 = class _Prompt {
         throw new Error(`Prompt is a chat prompt. Use flavor: 'chat' instead`);
       }
       return {
-        ...renderPromptParams(params, variables, { strict: options.strict }),
+        ...renderPromptParams(params, variables, {
+          strict: options.strict,
+          templateFormat: resolvedTemplateFormat
+        }),
         ...spanInfo,
         prompt: renderedPrompt.content
       };
@@ -7261,15 +7361,12 @@ var Prompt2 = (_class12 = class _Prompt {
       input: buildArgs,
       ...dictArgParsed.success ? dictArgParsed.data : {}
     };
+    const templateFormat = parseTemplateFormat(options.templateFormat);
     if (prompt.type === "chat") {
-      const render = (template) => {
-        if (options.strict) {
-          lintTemplate(template, variables);
-        }
-        return _mustache2.default.render(template, variables, void 0, {
-          escape
-        });
-      };
+      const render = (template) => renderTemplateContent(template, variables, escape, {
+        strict: options.strict,
+        templateFormat
+      });
       const baseMessages = (prompt.messages || []).map(
         (m) => renderMessage(render, m)
       );
@@ -7293,14 +7390,13 @@ var Prompt2 = (_class12 = class _Prompt {
           "extra messages are not supported for completion prompts"
         );
       }
-      if (options.strict) {
-        lintTemplate(prompt.content, variables);
-      }
+      const content = renderTemplateContent(prompt.content, variables, escape, {
+        strict: options.strict,
+        templateFormat
+      });
       return {
         type: "completion",
-        content: _mustache2.default.render(prompt.content, variables, void 0, {
-          escape
-        })
+        content
       };
     } else {
       const _ = prompt;