fix wasi-py-rs review comments

Author: assambar

python/examples/embedding/wasi-py-rs/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 pyo3 = { version = "0.19.0", features = ["abi3-py311"] }
-wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", branch="rust-py-example", features = ["py_main"] }
+wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", features = ["py_main"] }
 
 [build-dependencies]
-wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", branch="rust-py-example", features = ["build"] }
+wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", features = ["build"] }

python/examples/embedding/wasi-py-rs/README.md

@@ -57,14 +57,18 @@ Take a look at [Cargo.toml](./Cargo.toml) to see how to add it as a build depend
 
 ```toml
 [build-dependencies]
-wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", branch="rust-py-example", features = ["build"] }
+wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", features = ["build"] }
 ```
 
 Then, in the [build.rs](./build.rs) file we only need to add this to the `main` method:
 
 ```rs
+fn main() {
+    // ...
     use wlr_libpy::bld_cfg::configure_static_libs;
     configure_static_libs().unwrap().emit_link_flags();
+    // ...
+}
 ```
 
 This will ensure that all required libraries are downloaded and the linker is configured to use them.

python/examples/embedding/wasi-py-rs/src/bin/py-func-caller.rs

@@ -6,23 +6,7 @@ use wasi_py_rs::py_module::make_person_module;
 pub fn main() -> PyResult<()> {
     append_to_inittab!(make_person_module);
 
-    let function_code = "def my_func(*args, **kwargs):
-    import sys
-    print(f'Hello from Python (libpython3.11.a / {sys.version}) in Wasm(Rust).\\nargs=', args)
-
-    import person
-    people = []
-    for name, age, tags in args:
-        p = person.Person(name, age)
-        for t in tags:
-            p.add_tag(t)
-        people.append(p)
-
-    filtered = person.filter_by_tag(people, 'student')
-    print(f'Original people: {people}')
-    print(f'Filtered people by `student`: {filtered}')
-    ";
-
+    let function_code = include_str!("py-func.py");
     call_function(
         "my_func",
         function_code,

python/examples/embedding/wasi-py-rs/src/bin/py-func.py

@@ -0,0 +1,15 @@
+def my_func(*args, **kwargs):
+    import sys
+    print(f'Hello from Python (libpython3.11.a / {sys.version}) in Wasm(Rust).\\nargs=', args)
+
+    import person
+    people = []
+    for name, age, tags in args:
+        p = person.Person(name, age)
+        for t in tags:
+            p.add_tag(t)
+        people.append(p)
+
+    filtered = person.filter_by_tag(people, 'student')
+    print(f'Original people: {people}')
+    print(f'Filtered people by `student`: {filtered}')

python/tools/wlr-libpy/README.md

@@ -12,15 +12,17 @@ To use this feature add this to your Cargo.toml
 
 ```toml
 [build-dependencies]
-wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", branch="rust-py-example", features = ["build"] }
+wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", features = ["build"] }
 ```
 
 Then, in the `build.rs` file of your project you only need to call `configure_static_libs().unwrap().emit_link_flags()` like this:
 
 ```rs
 fn main() {
+    // ...
     use wlr_libpy::bld_cfg::configure_static_libs;
     configure_static_libs().unwrap().emit_link_flags();
+    // ...
 }
 ```
 
@@ -39,12 +41,14 @@ To use this feature add this to your Cargo.toml
 ```toml
 [dependencies]
 ...
-wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", branch="rust-py-example", features = ["py_main"] }
+wlr-libpy = { git = "https://github.com/vmware-labs/webassembly-language-runtimes.git", features = ["py_main"] }
 ```
 
 Then to call on the `Py_Main` method just do this:
 
 ```rs
+fn main() {
     use wlr_libpy::py_main::py_main;
     py_main(std::env::args().collect());
+}
 ```