Fix dot notation for RustPython

Author: marcomq

src/lib.rs

@@ -79,6 +79,22 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
     init_and_register(vec![])
 }
 
+fn init_python(code: String, dir: PathBuf) {
+    let path_import_and_code = format!(
+        r#"
+import sys
+sys.path.append('{}')
+{}
+"#,
+        dir.to_str().unwrap(),
+        code
+    );
+    py_lib::run_python(StringRequest {
+        value: path_import_and_code,
+    })
+    .unwrap_or_else(|e| panic!("Error '{e}' initializing main.py."));
+}
+
 /// Initializes the plugin.
 pub fn init_and_register<R: Runtime>(python_functions: Vec<&'static str>) -> TauriPlugin<R> {
     Builder::new("python")
@@ -107,7 +123,7 @@ pub fn init_and_register<R: Runtime>(python_functions: Vec<&'static str>) -> Tau
             if code.is_empty() {
                 println!("ERROR: Error reading 'src-tauri/main.py'");
             }
-            py_lib::init_python(code, dir).unwrap();
+            init_python(code, dir);
             for function_name in python_functions {
                 py_lib::register_function_str(function_name.into(), None).unwrap();
             }
@@ -117,7 +133,6 @@ pub fn init_and_register<R: Runtime>(python_functions: Vec<&'static str>) -> Tau
             .unwrap_or_default()
             .replace("'", "\""); // python arrays are serialized usings ' instead of "
 
-            // dbg!(&functions);
             if let Ok(python_functions) = serde_json::from_str::<Vec<String>>(&functions) {
                 for function_name in python_functions {
                     py_lib::register_function_str(function_name, None).unwrap();

src/py_lib.rs

@@ -3,7 +3,6 @@
 //  Licensed under MIT License, see License file for more details
 //  git clone https://github.com/marcomq/tauri-plugin-python
 
-use std::path::PathBuf;
 use std::sync::atomic::AtomicBool;
 use std::{collections::HashSet, sync::Mutex};
 
@@ -24,26 +23,6 @@ lazy_static! {
     static ref GLOBALS: rustpython_vm::scope::Scope = create_globals();
 }
 
-pub fn init_python(code: String, dir: PathBuf) -> crate::Result<()> {
-    rustpython_vm::Interpreter::without_stdlib(Default::default()).enter(|vm| {
-        vm.import("sys", 0).unwrap();
-        let path_import = format!("sys.path.append('{}')", dir.to_str().unwrap());
-        let exec_python = |code: String| {
-            let code_obj = vm
-                .compile(
-                    &code,
-                    rustpython_vm::compiler::Mode::Exec,
-                    "<embedded>".to_owned(),
-                )
-                .map_err(|err| vm.new_syntax_error(&err, Some(&code)))?;
-            vm.run_code_obj(code_obj, GLOBALS.clone())
-        };
-        exec_python(path_import)?;
-        exec_python(code)
-    })?;
-    Ok(())
-}
-
 pub fn run_python(payload: StringRequest) -> crate::Result<()> {
     rustpython_vm::Interpreter::without_stdlib(Default::default()).enter(|vm| {
         let code_obj = vm
@@ -70,9 +49,13 @@ pub fn register_function_str(
     }
     rustpython_vm::Interpreter::without_stdlib(Default::default()).enter(|vm| {
         let var_dot_split: Vec<&str> = function_name.split(".").collect();
-        let func = GLOBALS.globals.get_item(var_dot_split[0], vm)?;
+        let func = GLOBALS.globals.get_item(var_dot_split[0], vm).unwrap_or_else(|_| {
+                panic!("Cannot find '{}' in globals", var_dot_split[0]);
+            });
         if var_dot_split.len() > 1 {
-            func.get_item(var_dot_split[1], vm)?;
+            func.get_attr(&vm.ctx.new_str(var_dot_split[1]), vm).unwrap_or_else(|_| {
+                panic!("Cannot find sub function '{}' in '{}'", var_dot_split[1], var_dot_split[0]);
+            });
         }
 
         if let Some(num_args) = number_of_args {
@@ -119,7 +102,7 @@ pub fn call_function(payload: RunRequest) -> crate::Result<String> {
         let var_dot_split: Vec<&str> = function_name.split(".").collect();
         let func = GLOBALS.globals.get_item(var_dot_split[0], vm)?;
         Ok(if var_dot_split.len() > 1 {
-            func.get_item(var_dot_split[1], vm)?
+            func.get_attr(&vm.ctx.new_str(var_dot_split[1]), vm)?
         } else {
             func
         }
@@ -134,7 +117,7 @@ pub fn read_variable(payload: StringRequest) -> crate::Result<String> {
         let var_dot_split: Vec<&str> = payload.value.split(".").collect();
         let var = GLOBALS.globals.get_item(var_dot_split[0], vm)?;
         Ok(if var_dot_split.len() > 1 {
-            var.get_item(var_dot_split[1], vm)?
+            var.get_attr(&vm.ctx.new_str(var_dot_split[1]), vm)?
         } else {
             var
         }

src/py_lib_pyo3.rs

@@ -3,7 +3,6 @@
 //  Licensed under MIT License, see License file for more details
 //  git clone https://github.com/marcomq/tauri-plugin-python
 
-use std::path::PathBuf;
 use std::sync::atomic::AtomicBool;
 use std::{collections::HashMap, ffi::CString, sync::Mutex};
 
@@ -22,19 +21,6 @@ lazy_static! {
         Mutex::new(marker::Python::with_gil(|py| { PyDict::new(py).into() }));
 }
 
-pub fn init_python(code: String, dir: PathBuf) -> crate::Result<()> {
-    let c_code = CString::new(code).expect("error creating cstring from code");
-    Ok(marker::Python::with_gil(|py| -> PyResult<()> {
-        let syspath = py
-            .import("sys")?
-            .getattr("path")?
-            .downcast_into::<PyList>()?;
-        syspath.insert(0, dir.to_str())?;
-        let globals = GLOBALS.lock().unwrap().clone_ref(py).into_bound(py);
-        py.run(&c_code, Some(&globals), None)
-    })?)
-}
-
 pub fn run_python(payload: StringRequest) -> crate::Result<()> {
     marker::Python::with_gil(|py| -> crate::Result<()> {
         let globals = GLOBALS.lock().unwrap().clone_ref(py).into_bound(py);