tmp

cube-js · Oct 26, 2023 · 035cdd9 · 035cdd9
1 parent 319825e
commit 035cdd9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/packages/cubejs-backend-native/src/template/mj_value/python.rs b/packages/cubejs-backend-native/src/template/mj_value/python.rs
@@ -225,11 +225,17 @@ impl StructObject for JinjaPythonObject {
         let obj_ref = &self.inner as &PyObject;
 
         Python::with_gil(|py| {
-            let mut fields = vec![];
-
-            if let Ok(dict_ref) = obj_ref.downcast::<PyDict>(py) {
-                for key in dict_ref.keys() {
-                    fields.push(key.to_string().into());
+            let mut fields: Vec<Arc<str>> = vec![];
+
+            match obj_ref.downcast::<PyDict>(py) {
+                Ok(dict_ref) => {
+                    for key in dict_ref.keys() {
+                        fields.push(key.to_string().into());
+                    }
+                },
+                Err(err) => {
+                    #[cfg(debug_assertions)]
+                    log::trace!("Unable to extract PyDict: {:?}", err)
                 }
             }
 

diff --git a/packages/cubejs-backend-native/test/__snapshots__/jinja.test.ts.snap b/packages/cubejs-backend-native/test/__snapshots__/jinja.test.ts.snap
@@ -242,7 +242,7 @@ exports[`Jinja (new api) render python.yml: python.yml 1`] = `
   safe_string: \\"\\"safe string\\" <>\\"
 
 dump:
-  dict_as_obj: \\"{}\\""
+  dict_as_obj: \\"{\\\\n    \\\\\\"b_attr\\\\\\": String(\\\\n        \\\\\\"value for attribute b\\\\\\",\\\\n        Normal,\\\\n    ),\\\\n    \\\\\\"a_attr\\\\\\": String(\\\\n        \\\\\\"value for attribute a\\\\\\",\\\\n        Normal,\\\\n    ),\\\\n}\\""
 `;
 
 exports[`Jinja (new api) render template_error.jinja: template_error.jinja 1`] = `

diff --git a/packages/cubejs-backend-native/test/templates/jinja-instance.py b/packages/cubejs-backend-native/test/templates/jinja-instance.py
@@ -51,9 +51,8 @@ def new_safe_string():
 
 class MyCustomObject(dict):
   def __init__(self):
-    self.attr_a = "value for attribute a"
-    self.attr_b = "value for attribute b"
-
+    self['a_attr'] = "value for attribute a"
+    self['b_attr'] = "value for attribute b"
 
 @template.function
 def new_object_from_dict():

diff --git a/packages/cubejs-backend-native/test/templates/scoped-utils.py b/packages/cubejs-backend-native/test/templates/scoped-utils.py
@@ -43,8 +43,8 @@ def new_safe_string():
 
 class MyCustomObject(dict):
   def __init__(self):
-    self.attr_a = "value for attribute a"
-    self.attr_b = "value for attribute b"
+    self['a_attr'] = "value for attribute a"
+    self['b_attr'] = "value for attribute b"
 
 @context_func
 def new_object_from_dict():