feat(native): Jinja - support passing Map/Seq to Python (#7125)

Author: ovr

packages/cubejs-backend-native/src/python/template/mj_value.rs

@@ -189,7 +189,7 @@ pub fn from_minijinja_value(from: &mj::value::Value) -> Result<CLRepr, mj::Error
             } else {
                 Err(mj::Error::new(
                     mj::ErrorKind::InvalidOperation,
-                    format!("Converting from {:?} to python is not supported", from),
+                    format!("Converting from {:?} to Python is not supported", from),
                 ))
             }
         }
@@ -201,9 +201,60 @@ pub fn from_minijinja_value(from: &mj::value::Value) -> Result<CLRepr, mj::Error
                 Ok(CLRepr::String(from.as_str().unwrap().to_string()))
             }
         }
+        ValueKind::Seq => {
+            let seq = if let Some(seq) = from.as_seq() {
+                seq
+            } else {
+                return Err(mj::Error::new(
+                    mj::ErrorKind::InvalidOperation,
+                    format!("Unable to convert Seq to Python"),
+                ));
+            };
+
+            let mut arr = Vec::with_capacity(seq.item_count());
+
+            for idx in 0..seq.item_count() {
+                let v = if let Some(value) = seq.get_item(idx) {
+                    from_minijinja_value(&value)?
+                } else {
+                    CLRepr::Null
+                };
+
+                arr.push(v)
+            }
+
+            Ok(CLRepr::Array(arr))
+        }
+        ValueKind::Map => {
+            let mut obj = CLReprObject::new();
+
+            for key in from.try_iter()? {
+                let value = if let Ok(v) = from.get_item(&key) {
+                    from_minijinja_value(&v)?
+                } else {
+                    CLRepr::Null
+                };
+
+                let key_str = if let Some(key) = key.as_str() {
+                    key.to_string()
+                } else {
+                    return Err(mj::Error::new(
+                        mj::ErrorKind::InvalidOperation,
+                        format!(
+                            "Unable to convert Map to Python object: key must be string, actual: {}",
+                            key.kind()
+                        ),
+                    ));
+                };
+
+                obj.insert(key_str, value);
+            }
+
+            Ok(CLRepr::Object(obj))
+        }
         other => Err(mj::Error::new(
             mj::ErrorKind::InvalidOperation,
-            format!("Converting from {:?} to python is not supported", other),
+            format!("Converting from {:?} to Python is not supported", other),
         )),
     }
 }

packages/cubejs-backend-native/test/__snapshots__/jinja.test.ts.snap

@@ -181,7 +181,10 @@ exports[`Jinja render arguments-test.yml.jinja: arguments-test.yml.jinja 1`] = `
   arg_bool_true: 1
   arg_bool_false: 0
   arg_str: hello world
-  arg_null: none"
+  arg_null: none
+  arg_seq_1: [1, 2, 3, 4, 5]
+  arg_seq_2: [5, 4, 3, 2, 1]
+  arg_sum_map: 20"
 `;
 
 exports[`Jinja render data-model.yml.jinja: data-model.yml.jinja 1`] = `

packages/cubejs-backend-native/test/jinja.test.ts

@@ -63,6 +63,8 @@ suite('Python model', () => {
       arg_sum_integers: expect.any(Object),
       arg_str: expect.any(Object),
       arg_null: expect.any(Object),
+      arg_sum_map: expect.any(Object),
+      arg_seq: expect.any(Object),
     });
   });
 });
@@ -78,6 +80,8 @@ darwinSuite('Scope Python model', () => {
       arg_sum_integers: expect.any(Object),
       arg_str: expect.any(Object),
       arg_null: expect.any(Object),
+      arg_sum_map: expect.any(Object),
+      arg_seq: expect.any(Object),
     });
   });
 });

packages/cubejs-backend-native/test/templates/arguments-test.yml.jinja

@@ -1,7 +1,14 @@
+{%- set my_sequence_1 = [1,2,3,4,5] -%}
+{%- set my_sequence_2 = [5,4,3,2,1] -%}
+{%- set my_map = {'field_a' : 5, 'field_b' : 15} -%}
+
 test:
   arg_sum_integers_int_int: {{ arg_sum_integers(1, 1) }}
   arg_sum_integers_int_float: {{ arg_sum_integers(1, 3.14) }}
   arg_bool_true: {{ arg_bool(true) }}
   arg_bool_false: {{ arg_bool(false) }}
   arg_str: {{ arg_str("hello world") }}
   arg_null: {{ arg_null(null) }}
+  arg_seq_1: {{ arg_seq(my_sequence_1) }}
+  arg_seq_2: {{ arg_seq(my_sequence_2) }}
+  arg_sum_map: {{ arg_sum_map(my_map) }}

packages/cubejs-backend-native/test/templates/scoped-utils.py

@@ -17,6 +17,14 @@ def arg_str(a):
 def arg_null(a):
   return a
 
+@context_func
+def arg_sum_map(obj):
+  return obj['field_a'] + obj['field_b']
+
+@context_func
+def arg_seq(a):
+  return a
+
 @context_func
 def load_data_sync():
    client = MyApiClient("google.com")

packages/cubejs-backend-native/test/templates/utils.py

@@ -16,6 +16,14 @@ def arg_str(a):
 def arg_null(a):
   return a
 
+@context_func
+def arg_sum_map(obj):
+  return obj['field_a'] + obj['field_b']
+
+@context_func
+def arg_seq(a):
+  return a
+
 @context_func
 def load_data_sync():
    client = MyApiClient("google.com")