include user site-packages in default Python path (#81)

* include user site-packages in default Python path

In many (most?) Python installations, this is where e.g. `pip install`'d
packages end up.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* skip non-existent directories in Python path

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* bump version to 0.13.2

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

---------

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "componentize-py"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 exclude = ["cpython"]
 

examples/cli/README.md

@@ -10,15 +10,15 @@ run a Python-based component targetting the [wasi-cli] `command` world.
 ## Prerequisites
 
 * `Wasmtime` 18.0.0 or later
-* `componentize-py` 0.13.1
+* `componentize-py` 0.13.2
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
 https://github.com/bytecodealliance/wasmtime/releases/tag/v18.0.0.
 
 ```
 cargo install --version 18.0.0 wasmtime-cli
-pip install componentize-py==0.13.1
+pip install componentize-py==0.13.2
 ```
 
 ## Running the demo

examples/http/README.md

@@ -10,15 +10,15 @@ run a Python-based component targetting the [wasi-http] `proxy` world.
 ## Prerequisites
 
 * `Wasmtime` 18.0.0 or later
-* `componentize-py` 0.13.1
+* `componentize-py` 0.13.2
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
 https://github.com/bytecodealliance/wasmtime/releases/tag/v18.0.0.
 
 ```
 cargo install --version 18.0.0 wasmtime-cli
-pip install componentize-py==0.13.1
+pip install componentize-py==0.13.2
 ```
 
 ## Running the demo

examples/matrix-math/README.md

@@ -11,7 +11,7 @@ within a guest component.
 ## Prerequisites
 
 * `wasmtime` 18.0.0 or later
-* `componentize-py` 0.13.1
+* `componentize-py` 0.13.2
 * `NumPy`, built for WASI
 
 Note that we use an unofficial build of NumPy since the upstream project does
@@ -23,7 +23,7 @@ https://github.com/bytecodealliance/wasmtime/releases/tag/v18.0.0.
 
 ```
 cargo install --version 18.0.0 wasmtime-cli
-pip install componentize-py==0.13.1
+pip install componentize-py==0.13.2
 curl -OL https://github.com/dicej/wasi-wheels/releases/download/v0.0.1/numpy-wasi.tar.gz
 tar xf numpy-wasi.tar.gz
 ```

examples/sandbox/README.md

@@ -8,10 +8,10 @@ sandboxed Python code snippets from within a Python app.
 ## Prerequisites
 
 * `wasmtime-py` 18.0.0 or later
-* `componentize-py` 0.13.1
+* `componentize-py` 0.13.2
 
 ```
-pip install componentize-py==0.13.1 wasmtime==18.0.2
+pip install componentize-py==0.13.2 wasmtime==18.0.2
 ```
 
 ## Running the demo

examples/tcp/README.md

@@ -11,15 +11,15 @@ making an outbound TCP request using `wasi-sockets`.
 ## Prerequisites
 
 * `Wasmtime` 18.0.0 or later
-* `componentize-py` 0.13.1
+* `componentize-py` 0.13.2
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
 https://github.com/bytecodealliance/wasmtime/releases/tag/v18.0.0.
 
 ```
 cargo install --version 18.0.0 wasmtime-cli
-pip install componentize-py==0.13.1
+pip install componentize-py==0.13.2
 ```
 
 ## Running the demo

pyproject.toml

@@ -7,7 +7,7 @@ features = ["pyo3/extension-module"]
 
 [project]
 name = "componentize-py"
-version = "0.13.1"
+version = "0.13.2"
 description = "Tool to package Python applications as WebAssembly components"
 readme = "README.md"
 license = { file = "LICENSE" }

src/command.rs

@@ -136,7 +136,7 @@ fn generate_bindings(common: Common, bindings: Bindings) -> Result<()> {
 fn componentize(common: Common, componentize: Componentize) -> Result<()> {
     let mut python_path = componentize.python_path;
 
-    if let Some(site_packages) = find_site_packages()? {
+    for site_packages in find_site_packages()? {
         python_path.push(
             site_packages
                 .to_str()
@@ -168,18 +168,18 @@ fn componentize(common: Common, componentize: Componentize) -> Result<()> {
     Ok(())
 }
 
-fn find_site_packages() -> Result<Option<PathBuf>> {
+fn find_site_packages() -> Result<Vec<PathBuf>> {
     Ok(if let Ok(env) = env::var("VIRTUAL_ENV") {
         let dir = Path::new(&env).join("lib");
 
         if let Some(site_packages) = find_dir("site-packages", &dir)? {
-            Some(site_packages)
+            vec![site_packages]
         } else {
             eprintln!(
                 "warning: site-packages directory not found under {}",
                 dir.display()
             );
-            None
+            Vec::new()
         }
     } else {
         let pipenv_packages = match process::Command::new("pipenv").arg("--venv").output() {
@@ -188,38 +188,45 @@ fn find_site_packages() -> Result<Option<PathBuf>> {
                     let dir = Path::new(str::from_utf8(&output.stdout)?.trim()).join("lib");
 
                     if let Some(site_packages) = find_dir("site-packages", &dir)? {
-                        Some(site_packages)
+                        vec![site_packages]
                     } else {
                         eprintln!(
                             "warning: site-packages directory not found under {}",
                             dir.display()
                         );
-                        None
+                        Vec::new()
                     }
                 } else {
                     // `pipenv` is in `$PATH`, but this app does not appear to be using it
-                    None
+                    Vec::new()
                 }
             }
             Err(_) => {
                 // `pipenv` is not in `$PATH -- assume this app isn't using it
-                None
+                Vec::new()
             }
         };
 
-        if pipenv_packages.is_some() {
+        if !pipenv_packages.is_empty() {
             pipenv_packages
         } else {
             // Get site packages location using the `site` module in python
             match process::Command::new("python3")
-                .args(["-c", "import site; print(site.getsitepackages()[0])"])
+                .args([
+                    "-c",
+                    "import site; \
+                     list = site.getsitepackages(); \
+                     list.insert(0, site.getusersitepackages()); \
+                     print(';'.join(list))",
+                ])
                 .output()
             {
-                Ok(output) => {
-                    let path = Path::new(str::from_utf8(&output.stdout)?.trim()).to_path_buf();
-                    Some(path)
-                }
-                Err(_) => None,
+                Ok(output) => str::from_utf8(&output.stdout)?
+                    .trim()
+                    .split(';')
+                    .map(|p| Path::new(p).to_path_buf())
+                    .collect(),
+                Err(_) => Vec::new(),
             }
         }
     })

src/lib.rs

@@ -221,6 +221,12 @@ pub async fn componentize(
     isyswasfa: Option<&str>,
     stub_wasi: bool,
 ) -> Result<()> {
+    // Remove non-existent elements from `python_path` so we don't choke on them later:
+    let python_path = &python_path
+        .iter()
+        .filter_map(|&s| Path::new(s).exists().then_some(s))
+        .collect::<Vec<_>>();
+
     // Untar the embedded copy of the Python standard library into a temporary directory
     let stdlib = tempfile::tempdir()?;