Add patch to support passthrough params for clients

For example, safetey mode and response_type for gemini
BoundaryML · Jun 13, 2024 · 7f77a51 · 7f77a51
1 parent 71d04fe
commit 7f77a51
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/engine/baml-runtime/src/types/expression_helper.rs b/engine/baml-runtime/src/types/expression_helper.rs
@@ -32,7 +32,19 @@ pub fn to_value(ctx: &RuntimeContext, expr: &Expression) -> Result<serde_json::V
                 .map(|(k, v)| {
                     let k = match k {
                         Expression::String(s) => s.clone(),
-                        _ => anyhow::bail!("invalid key type"),
+                        Expression::Identifier(internal_baml_core::ir::repr::Identifier::ENV(
+                            key,
+                        )) => match ctx.env.get(key) {
+                            None => anyhow::bail!("unset env variable '{}'", key),
+                            Some(val) => val.to_string(),
+                        },
+                        Expression::Identifier(
+                            internal_baml_core::ir::repr::Identifier::Local(key),
+                        ) => key.clone(),
+                        Expression::Identifier(internal_baml_core::ir::repr::Identifier::Ref(
+                            key,
+                        )) => key.join("."),
+                        _ => anyhow::bail!("invalid key {:#?}", k),
                     };
                     let v = to_value(ctx, v)?;
                     Ok((k, v))

diff --git a/engine/baml-runtime/src/types/runtime_context.rs b/engine/baml-runtime/src/types/runtime_context.rs
@@ -44,7 +44,11 @@ impl RuntimeContext {
         &self,
         expr: &Expression,
     ) -> Result<T> {
-        serde_json::from_value::<T>(super::expression_helper::to_value(self, expr)?).map_err(|e| {
+        match super::expression_helper::to_value(self, expr) {
+            Ok(v) => serde_json::from_value(v).map_err(|e| e.into()),
+            Err(e) => Err(e),
+        }
+        .map_err(|e| {
             anyhow::anyhow!(
                 "Failed to resolve expression {:?} with error: {:?}",
                 expr,

diff --git a/engine/baml-schema-wasm/src/runtime_wasm/mod.rs b/engine/baml-schema-wasm/src/runtime_wasm/mod.rs
@@ -921,7 +921,7 @@ impl WasmFunction {
             .render_prompt(&self.name, &ctx, &params, None)
             .as_ref()
             .map(|(p, scope)| (p, scope).into())
-            .map_err(|e| wasm_bindgen::JsError::new(&e.to_string()))
+            .map_err(|e| wasm_bindgen::JsError::new(format!("{e:?}").as_str()))
     }
 
     #[wasm_bindgen]