read python variable with "." notation & make it possible to register js function without server invokation

Author: marcomq

examples/plain-javascript/src/main.js

@@ -9,7 +9,7 @@ async function greet_rust() {
   outputEl.textContent = await invoke("greet_rust", { name: inputField.value });
 }
 async function greet_python() {
-  outputEl.textContent = await tauri.python.call.greet_python( inputField.value );
+  outputEl.textContent = await tauri.python.call.greet_python(inputField.value);
 }
 
 window.addEventListener("DOMContentLoaded", () => {

guest-js/index.ts

@@ -19,14 +19,15 @@ export async function runPython(code: string): Promise<string> {
 }
 
 /** 
+ * Regeisters function on server and makes it available via `call.{jsFunctionName}`
  *  @param {string} pythonFunctionCall - The python function call, can contain one dot
  *  @param {number} [numberOfArgs] - Number of arguments, used for validation in pythons, use -1 to ignore this value
  *  @param {string} [jsFunctionName] - Name that is used in javscript: "call.jsFunctionName". Must not contain dots.
  */
-export async function registerFunction(pythonFunctionCall: string, numberOfArgs?: number, jsFunctionName?: string): Promise<string> {
-  if (jsFunctionName === undefined) {
-    jsFunctionName = pythonFunctionCall;
-  }
+export async function registerFunction(
+  pythonFunctionCall: string,
+  numberOfArgs?: number,
+  jsFunctionName?: string): Promise<string> {
   if (numberOfArgs !== undefined && numberOfArgs < 0) {
     numberOfArgs = undefined;
   }
@@ -35,29 +36,50 @@ export async function registerFunction(pythonFunctionCall: string, numberOfArgs?
       pythonFunctionCall,
       numberOfArgs
     },
-  }).then((r:any) => {
-    call[jsFunctionName] = function (...args: any[]) { return callFunction(pythonFunctionCall, args) };
+  }).then((r: any) => {
+    registerJsOnly(pythonFunctionCall, jsFunctionName);
     return r.value;
   });
 }
 
+
+
+/** 
+ * No server invokation - assumes that function has already been registered server-side
+ * Makes function available as `call.{jsFunctionName}`
+ *  @param {string} pythonFunctionCall - The python function call, can contain one dot
+ *  @param {string} [jsFunctionName] - Name that is used in javscript: "call.jsFunctionName". Must not contain dots.
+ */
+export async function registerJsOnly(pythonFunctionCall: string, jsFunctionName?: string) {
+  if (jsFunctionName === undefined) {
+    jsFunctionName = pythonFunctionCall.replace(".", "_");
+  }
+  call[jsFunctionName] = function (...args: any[]) { return callFunction(pythonFunctionCall, args) };
+}
+
+/**
+ * calling previously registered function 
+ */
 export async function callFunction(functionName: string, args: any[]): Promise<string> {
   return invoke<{ value: string }>('plugin:python|call_function', {
     payload: {
       functionName,
       args,
     },
-  }).then((r:any) => {
+  }).then((r: any) => {
     return r.value;
   });
 }
 
+/**
+ * read variable name directly from python
+ */
 export async function readVariable(value: string): Promise<string> {
   return invoke<{ value: string }>('plugin:python|read_variable', {
     payload: {
       value,
     },
-  }).then((r:any) => {
+  }).then((r: any) => {
     return r.value;
   });
 }

src/py_lib.rs

@@ -117,15 +117,20 @@ pub fn call_function(payload: RunRequest) -> PyResult<Py<PyAny>> {
 pub fn read_variable(payload: StringRequest) -> PyResult<String> {
     marker::Python::with_gil(|py| -> PyResult<String> {
         let globals = GLOBALS.lock().unwrap().clone_ref(py).into_bound(py);
-        match globals.get_item(&payload.value) {
-            Ok(opt_res) => match opt_res {
-                Some(res) => Ok(res.to_string()),
-                _ => Err(pyo3::exceptions::PyException::new_err(format!(
-                    "{} not set",
-                    payload.value
-                ))),
-            },
-            Err(err) => Err(err),
+
+        let var_dot_split: Vec<&str> = payload.value.split(".").collect();
+        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())
+            } else {
+                Ok(var.to_string())
+            }
+        } else {
+            Err(pyo3::exceptions::PyException::new_err(format!(
+                "{} not set",
+                &payload.value
+            )))
         }
     })
 }