WIP: attempt minijinja v2 upgrade

engine/baml-lib/baml-types/Cargo.toml

@@ -15,8 +15,8 @@ workspace = true
 optional = true
 
 [dependencies.minijinja]
-optional = true
-version = "1.0.16"
+#optional = true
+version = "2.1.1"
 default-features = false
 features = [
   "macros",
@@ -39,4 +39,4 @@ features = [
 [features]
 default = ["stable_sort"]
 stable_sort = ["indexmap"]
-mini-jinja = ["minijinja"]
+mini-jinja = []

engine/baml-lib/baml-types/src/minijinja.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use crate::{BamlMedia, BamlValue};
 
 impl From<BamlValue> for minijinja::Value {
@@ -56,8 +58,12 @@ impl std::fmt::Display for MinijinjaBamlImage {
 }
 
 impl minijinja::value::Object for MinijinjaBamlImage {
+    fn repr(self: &Arc<Self>) -> minijinja::value::ObjectRepr {
+        minijinja::value::ObjectRepr::Plain
+    }
+
     fn call(
-        &self,
+        self: &Arc<Self>,
         _state: &minijinja::State<'_, '_>,
         args: &[minijinja::value::Value],
     ) -> Result<minijinja::value::Value, minijinja::Error> {
@@ -66,4 +72,12 @@ impl minijinja::value::Object for MinijinjaBamlImage {
             format!("BamlImage has no callable attribute '{:#?}'", args),
         ))
     }
+
+    fn render(self: &Arc<Self>, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "{MAGIC_IMAGE_DELIMITER}:baml-start-image:{}:baml-end-image:{MAGIC_IMAGE_DELIMITER}",
+            serde_json::json!(self.image)
+        )
+    }
 }

engine/baml-lib/jinja/src/lib.rs

@@ -429,7 +429,7 @@ pub fn render_prompt(
         anyhow::bail!("args must be a map");
     }
 
-    let minijinja_args: Value = args.clone().into();
+    let minijinja_args: minijinja::Value = args.clone().into();
     let default_role = ctx.client.default_role.clone();
     let rendered = render_minijinja(
         template,