resolve clippy issues and add register to python source

Author: marcomq

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-python"
-version = "0.3.0"
+version = "0.3.1"
 authors = [ "Marco Mengelkoch" ]
 description = "A tauri 2 plugin to use python code in the backend."
 keywords = ["rust", "python", "tauri", "gui"]

README.md

@@ -53,9 +53,13 @@ Javascript in [examples/plain-javascript](https://github.com/marcomq/tauri-plugi
 These steps assume that you already have a basic tauri application available. Alternatively, you can immediately start with the application in "example" directory.
 
 - run `npm run tauri add python`
-- add `src-tauri/src-python/main.py` and modify it acording to your needs, for example add `def greet_python(intput): return str(input) + " from python"`
-- modify `src-tauri/src/lib.rs` and change `.plugin(tauri_plugin_python::init())` to `.plugin(tauri_plugin_python::init_and_register(["greet_python"]))`; make sure you list all python functions you 
-want to call
+- add `src-tauri/src-python/main.py` and modify it acording to your needs, for example add 
+```python
+# src-tauri/src-python/main.py
+_tauri_plugin_functions = ["greet_python"] # make "greet_python" callable from UI
+def greet_python(rust_var)
+    return str(rust_var) + " from python"
+```
 - add `"bundle": {"resources": [  "src-python/**/*"],` to `tauri.conf.json` so that python files are bundled with your application
 - add the plugin in your js, so 
    - add `import { callFunction } from 'tauri-plugin-python-api'` 
@@ -74,7 +78,6 @@ Tauri events and calling js from python is currently not supported yet. You woul
 ```python
 # src-tauri/src-python/main.py
 def greet_python(rust_var)
-    print(rust_var)
     return str(rust_var) + " from python"
 ```
 - add `.plugin(tauri_plugin_python::init_and_register(vec!["greet_python"))` to `tauri::Builder::default()`, usually in `src-tauri/src/lib.rs`. This will initialize the plugin and make the python function "greet_python" available from javascript.

examples/plain-javascript/src-tauri/src-python/main.py

@@ -1,4 +1,5 @@
-# auto loaded on startup
+# File auto loaded on startup
+_tauri_plugin_functions = ["greet_python"] # make these functions callable from UI
 
 counter = 0
 

examples/plain-javascript/src-tauri/src/lib.rs

@@ -8,7 +8,7 @@ fn greet_rust(name: &str) -> String {
 pub fn run() {
     tauri::Builder::default()
         .invoke_handler(tauri::generate_handler![greet_rust])
-        .plugin(tauri_plugin_python::init_and_register(vec!["greet_python"]))
+        .plugin(tauri_plugin_python::init())
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tauri-plugin-python-api",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "author": "Marco Mengelkoch",
   "description": "Javascript package for tauri 2 python plugin.",
   "type": "module",

src/error.rs

@@ -55,6 +55,6 @@ impl From<PyErr> for Error {
 
 impl From<tauri::Error> for Error {
     fn from(error: tauri::Error) -> Self {
-        error.into()
+        Error::String(error.to_string())
     }
 }

src/lib.rs

@@ -54,7 +54,7 @@ impl<R: Runtime, T: Manager<R>> crate::PythonExt<R> for T {
         Ok(StringResponse { value: "Ok".into() })
     }
     fn call_function(&self, payload: RunRequest) -> crate::Result<StringResponse> {
-        let py_res: String = py_lib::call_function(payload)?.into();
+        let py_res: String = py_lib::call_function(payload)?;
         Ok(StringResponse { value: py_res })
     }
     fn read_variable(&self, payload: StringRequest) -> crate::Result<StringResponse> {
@@ -115,6 +115,17 @@ pub fn init_and_register<R: Runtime>(python_functions: Vec<&'static str>) -> Tau
             for function_name in python_functions {
                 py_lib::register_function_str(function_name.into(), None).unwrap();
             }
+            let functions = py_lib::read_variable(StringRequest {
+                value: "_tauri_plugin_functions".into(),
+            })
+            .unwrap_or_default().replace("'","\"");
+
+            // 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.into(), None).unwrap();
+                }
+            }
             Ok(())
         })
         .build()

src/py_lib.rs

@@ -85,6 +85,7 @@ if len(signature({}).parameters) != {}:
                 "Number of args doesn't match signature of {fn_name}."
             ));
         }
+        // dbg!(format!("Added '{fn_name}'"));
         FUNCTION_MAP.lock().unwrap().insert(fn_name);
         Ok(())
     })
@@ -117,10 +118,8 @@ pub fn read_variable(payload: StringRequest) -> crate::Result<String> {
     rustpython_vm::Interpreter::without_stdlib(Default::default()).enter(|vm| {
         let res = GLOBALS
             .globals
-            .get_item(&payload.value, vm)
-            .unwrap()
-            .str(vm)
-            .unwrap()
+            .get_item(&payload.value, vm)?
+            .str(vm)?
             .to_string();
         Ok(res)
     })

src/py_lib_pyo3.rs

@@ -58,7 +58,7 @@ pub fn register_function_str(fn_name: String, number_of_args: Option<u8>) -> cra
         let globals = GLOBALS.lock().unwrap().clone_ref(py).into_bound(py);
 
         let fn_dot_split: Vec<&str> = fn_name.split(".").collect();
-        let app = globals.get_item(&fn_dot_split[0])?;
+        let app = globals.get_item(fn_dot_split[0])?;
         if app.is_none() {
             return Err(Error::String(format!("{} not found", &fn_name)));
         }
@@ -84,7 +84,7 @@ if len(signature({}).parameters) != {}:
             );
             let code_c = CString::new(py_analyze_sig).expect("CString::new failed");
             py.run(&code_c, Some(&globals), None)
-                .expect(&format!("Could not register '{}'. ", &fn_name));
+                .unwrap_or_else(|_| panic!("Could not register '{}'. ", &fn_name));
         }
         // dbg!("{} was inserted", &fn_name);
         FUNCTION_MAP.lock().unwrap().insert(fn_name, app.into());
@@ -118,7 +118,7 @@ pub fn read_variable(payload: StringRequest) -> crate::Result<String> {
         let globals = GLOBALS.lock().unwrap().clone_ref(py).into_bound(py);
 
         let var_dot_split: Vec<&str> = payload.value.split(".").collect();
-        let var = globals.get_item(&var_dot_split[0])?;
+        let var = globals.get_item(var_dot_split[0])?;
         if let Some(var) = var {
             if var_dot_split.len() > 1 {
                 Ok(var.getattr(var_dot_split.get(1).unwrap())?.to_string())