componentize-py 0.4.0__tar.gz → 0.4.2__tar.gz

{componentize_py-0.4.0 → componentize_py-0.4.2}/Cargo.lock

@@ -348,12 +348,13 @@ dependencies = [
 
 [[package]]
 name = "componentize-py"
-version = "0.4.0"
+version = "0.4.2"
 dependencies = [
  "anyhow",
  "async-trait",
  "bincode",
  "bytes",
+ "cap-std",
  "clap",
  "component-init",
  "componentize-py-shared",

{componentize_py-0.4.0 → componentize_py-0.4.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "componentize-py"
-version = "0.4.0"
+version = "0.4.2"
 edition = "2021"
 exclude = ["cpython"]
 
@@ -35,6 +35,7 @@ futures = "0.3.28"
 tokio = { version = "1.27.0", features = ["macros", "rt", "rt-multi-thread", "fs"] }
 bytes = "1.4.0"
 pretty_env_logger = "0.5.0"
+cap-std = "2.0.0"
 
 [build-dependencies]
 anyhow = "1.0.68"

{componentize_py-0.4.0 → componentize_py-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: componentize-py
-Version: 0.4.0
+Version: 0.4.2
 License-File: LICENSE
 Summary: Tool to package Python applications as WebAssembly components
 Keywords: webassembly,wasm,component
@@ -48,7 +48,7 @@ we'll switch.  Specifically, the remaining patches are:
 ### Prerequisites
 
 - Tools needed to build [CPython](https://github.com/python/cpython) (Make, Clang, etc.)
-- [Rust](https://rustup.rs/) stable 1.68 or later *and* nightly 2023-07-27 or later, including the `wasm32-wasi` and `wasm32-unknown-unknown` targets
+- [Rust](https://rustup.rs/) stable 1.71 or later *and* nightly 2023-07-27 or later, including the `wasm32-wasi` and `wasm32-unknown-unknown` targets
   - Note that we currently use the `-Z build-std` Cargo option to build the `componentize-py` runtime with position-independent code (which is not the default for `wasm32-wasi`) and this requires using a recent nightly build of Rust.
   
 For Rust, something like this should work once you have `rustup`:

{componentize_py-0.4.0 → componentize_py-0.4.2}/README.md

@@ -37,7 +37,7 @@ we'll switch.  Specifically, the remaining patches are:
 ### Prerequisites
 
 - Tools needed to build [CPython](https://github.com/python/cpython) (Make, Clang, etc.)
-- [Rust](https://rustup.rs/) stable 1.68 or later *and* nightly 2023-07-27 or later, including the `wasm32-wasi` and `wasm32-unknown-unknown` targets
+- [Rust](https://rustup.rs/) stable 1.71 or later *and* nightly 2023-07-27 or later, including the `wasm32-wasi` and `wasm32-unknown-unknown` targets
   - Note that we currently use the `-Z build-std` Cargo option to build the `componentize-py` runtime with position-independent code (which is not the default for `wasm32-wasi`) and this requires using a recent nightly build of Rust.
   
 For Rust, something like this should work once you have `rustup`:

{componentize_py-0.4.0 → componentize_py-0.4.2}/examples/http/README.md

@@ -14,7 +14,7 @@ which may differ from later revisions.
 ## Prerequisites
 
 * `dicej/spin` branch `wasi-http`
-* `componentize-py` 0.4.0
+* `componentize-py` 0.4.2
 * `Rust`, for installing `Spin`
 
 ```

{componentize_py-0.4.0 → componentize_py-0.4.2}/examples/matrix-math/README.md

@@ -12,7 +12,7 @@ within a guest component.
 ## Prerequisites
 
 * `wasmtime-py` 13 or later
-* `componentize-py` 0.4.0
+* `componentize-py` 0.4.2
 * `NumPy`, built for WASI
 
 Note that we must build `wasmtime-py` from source until version 13 has been

{componentize_py-0.4.0 → componentize_py-0.4.2}/examples/matrix-math/host.py

@@ -1,14 +1,24 @@
 import matrix_math
+import sys
+
 from matrix_math import Root, RootImports, imports
 from matrix_math.types import Ok, Err, Result
+from matrix_math.imports import environment
 from wasmtime import Store
-import sys
+from typing import List, Tuple
 
 class Host(imports.Host):
     def log(self, message: str) -> Result[None, str]:
         print(f"guest log: {message}")
         return Ok(None)
 
+class HostEnvironment(environment.HostEnvironment):
+    def get_environment(self) -> List[Tuple[str, str]]:
+        return []
+
+    def get_arguments(self) -> List[str]:
+        return []
+
 args = sys.argv[1:]
 if len(args) != 2:
     print("usage: python3 host.py <matrix> <matrix>", file=sys.stderr)
@@ -20,9 +30,10 @@ matrix_math = Root(
     store,
     RootImports(
         host=Host(),
+        environment=HostEnvironment(),
         # As of this writing, `wasmtime-py` does not yet support WASI Preview 2,
         # and our example won't use it at runtime anyway, so we provide `None`
-        # for all `wasi-cli` interfaces:
+        # for most `wasi-cli` interfaces:
         poll=None,
         monotonic_clock=None,
         wall_clock=None,
@@ -30,13 +41,12 @@ matrix_math = Root(
         types=None,
         preopens=None,
         random=None,
-        environment=None,
         exit=None,
         stdin=None,
         stdout=None,
         stderr=None,
         terminal_input=None,
-        terminal_output=None,        
+        terminal_output=None,
         terminal_stdin=None,
         terminal_stdout=None,
         terminal_stderr=None
@@ -49,4 +59,3 @@ if isinstance(result, Ok):
     print(f"result: {result.value}")
 else:
     print(f"eval error: {result.value}")
-

{componentize_py-0.4.0 → componentize_py-0.4.2}/pyproject.toml

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

{componentize_py-0.4.0 → componentize_py-0.4.2}/src/lib.rs

@@ -50,7 +50,7 @@ mod util;
 static NATIVE_EXTENSION_SUFFIX: &str = ".cpython-311-wasm32-wasi.so";
 
 wasmtime::component::bindgen!({
-    path: "wit/init.wit",
+    path: "wit",
     world: "init",
     async: true
 });
@@ -319,7 +319,8 @@ pub async fn componentize(
         .env("COMPONENTIZE_PY_APP_NAME", app_name)
         .env("PYTHONHOME", "/python")
         .preopened_dir(
-            Dir::from_std_file(File::open(stdlib.path())?),
+            Dir::open_ambient_dir(stdlib.path(), cap_std::ambient_authority())
+                .with_context(|| format!("unable to open {}", stdlib.path().display()))?,
             DirPerms::all(),
             FilePerms::all(),
             "python",
@@ -327,7 +328,8 @@ pub async fn componentize(
 
     for (index, path) in python_path.iter().enumerate() {
         wasi.preopened_dir(
-            Dir::from_std_file(File::open(path)?),
+            Dir::open_ambient_dir(path, cap_std::ambient_authority())
+                .with_context(|| format!("unable to open {path}"))?,
             DirPerms::all(),
             FilePerms::all(),
             &index.to_string(),

componentize_py-0.4.2/wit/deps/cli/environment.wit

@@ -0,0 +1,20 @@
+package wasi:cli
+
+interface environment {
+  /// Get the POSIX-style environment variables.
+  ///
+  /// Each environment variable is provided as a pair of string variable names
+  /// and string value.
+  ///
+  /// Morally, these are a value import, but until value imports are available
+  /// in the component model, this import function should return the same
+  /// values each time it is called.
+  get-environment: func() -> list<tuple<string, string>>
+
+  /// Get the POSIX-style arguments to the program.
+  get-arguments: func() -> list<string>
+
+  /// Return a path that programs should use as their initial current working
+  /// directory, interpreting `.` as shorthand for this.
+  initial-cwd: func() -> option<string>
+}

{componentize_py-0.4.0 → componentize_py-0.4.2}/wit/init.wit

@@ -1,6 +1,8 @@
 package componentize-py:init
 
 world init {
+    import wasi:cli/environment
+
     export exports: interface {
         record function-export {
             protocol: string,