remove dbg and fix

Author: marcomq

Cargo.toml

@@ -18,7 +18,7 @@ thiserror = "2"
 async-trait = "0.1"
 
 lazy_static = "1.5.0"
-async_py = { version = "0.2.0", default-features = false }
+async_py = { version = "0.2.1", default-features = false }
 tokio = { version = "1", features = ["full"] }
 serde_json = "1.0.136"
 dunce = "1.0.5"
@@ -28,7 +28,7 @@ tauri-plugin = { version = "2", features = ["build"] }
 
 [features]
 venv = []
-default = ["venv", "rustpython"] # auto load src-python/.venv
+default = ["venv", "pyo3"] # auto load src-python/.venv
 # default = ["venv", "pyo3"] # enable to use pyo3 instead of rustpython.
 rustpython = ["async_py/rustpython"]
 pyo3 = ["async_py/pyo3"]

examples/plain-javascript/src-tauri/.cargo/config.toml

@@ -1,3 +0,0 @@
-
-[env]
-PYO3_CONFIG_FILE = { value = "target/pyembed/pyo3-build-config-file.txt", relative = true }

src/lib.rs

@@ -76,7 +76,6 @@ impl<R: Runtime, T: Manager<R> + Sync> crate::PythonExt<R> for T {
             .runner()
             .read_variable(&payload.python_function_call)
             .await?;
-        dbg!(&_tmp);
         Ok(StringResponse { value: "Ok".into() })
     }
 
@@ -93,7 +92,7 @@ impl<R: Runtime, T: Manager<R> + Sync> crate::PythonExt<R> for T {
             .call_function(&function_name, payload.args)
             .await?;
         Ok(StringResponse {
-            value: py_res.to_string(),
+            value: py_res.as_str().unwrap().to_string(),
         })
     }
 
@@ -198,18 +197,15 @@ pub fn init_and_register<R: Runtime>(python_functions: Vec<&'static str>) -> Tau
                         .run_file(main_py.as_path())
                         .await
                         .expect("ERROR: Error running 'src-tauri/main.py'");
-                    let functions = runner
-                        .read_variable("_tauri_plugin_functions")
-                        .await
-                        .unwrap_or_default()
-                        .as_str()
-                        .unwrap()
-                        .replace("'", "\""); // python arrays are serialized usings ' instead of "
                     register_python_functions(
                         app,
                         python_functions.iter().map(|s| s.to_string()).collect(),
                     ).await;
-                    if let Ok(python_functions) = serde_json::from_str::<Vec<String>>(&functions) {
+                    let functions = runner
+                        .read_variable("_tauri_plugin_functions")
+                        .await
+                        .unwrap_or_default();
+                    if let Ok(python_functions) = serde_json::from_value(functions) {
                         register_python_functions(app, python_functions).await;
                     }
                 });

src/models.rs

@@ -11,19 +11,6 @@ pub struct StringRequest {
     pub value: String,
 }
 
-#[cfg(feature = "pyo3")]
-#[derive(Debug, Serialize, Deserialize, pyo3::IntoPyObject)]
-#[serde(untagged)]
-pub enum JsMany {
-    Bool(bool),
-    Number(u64),
-    Float(f64),
-    String(String),
-    StringVec(Vec<String>),
-    FloatVec(Vec<f64>),
-}
-
-#[cfg(not(feature = "pyo3"))]
 use serde_json::Value as JsMany;
 
 #[derive(Debug, Deserialize, Serialize)]