use "wit_world" module name by default for generated bindings

Cargo.toml

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

README.md

@@ -46,8 +46,8 @@ Then, use the `hello` module produced by the command above to write your app:
 
 ```shell
 cat >app.py <<EOF
-import hello
-class Hello(hello.Hello):
+import wit_world
+class WitWorld(wit_world.WitWorld):
     def hello(self) -> str:
         return "Hello, World!"
 EOF

bundled/poll_loop.py

@@ -11,16 +11,16 @@
 import socket
 import subprocess
 
-from proxy.types import Ok, Err
-from proxy.imports import types, streams, poll, outgoing_handler
-from proxy.imports.types import (
+from wit_world.types import Ok, Err
+from wit_world.imports import types, streams, poll, outgoing_handler
+from wit_world.imports.types import (
     IncomingBody,
     OutgoingBody,
     OutgoingRequest,
     IncomingResponse,
 )
-from proxy.imports.streams import StreamError_Closed, InputStream
-from proxy.imports.poll import Pollable
+from wit_world.imports.streams import StreamError_Closed, InputStream
+from wit_world.imports.poll import Pollable
 from typing import Optional, cast
 
 # Maximum number of bytes to read at a time

examples/cli/README.md

@@ -10,15 +10,15 @@ run a Python-based component targetting the [wasi-cli] `command` world.
 ## Prerequisites
 
 * `Wasmtime` 26.0.0 or later
-* `componentize-py` 0.16.0
+* `componentize-py` 0.17.0
 
 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/v26.0.0.
 
 ```
 cargo install --version 26.0.0 wasmtime-cli
-pip install componentize-py==0.16.0
+pip install componentize-py==0.17.0
 ```
 
 ## Running the demo

examples/cli/app.py

@@ -1,6 +1,9 @@
-from command import exports
-
+from wit_world import exports
+from wit_world.imports.environment import get_arguments
+import pdb
 
 class Run(exports.Run):
     def run(self) -> None:
+        if "--pdb" in get_arguments():
+            pdb.set_trace()
         print("Hello, world!")

examples/http/README.md

@@ -10,15 +10,15 @@ run a Python-based component targetting the [wasi-http] `proxy` world.
 ## Prerequisites
 
 * `Wasmtime` 26.0.0 or later
-* `componentize-py` 0.16.0
+* `componentize-py` 0.17.0
 
 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/v26.0.0.
 
 ```
 cargo install --version 26.0.0 wasmtime-cli
-pip install componentize-py==0.16.0
+pip install componentize-py==0.17.0
 ```
 
 ## Running the demo

examples/http/app.py

@@ -9,10 +9,10 @@
 import hashlib
 import poll_loop
 
-from proxy import exports
-from proxy.types import Ok
-from proxy.imports import types
-from proxy.imports.types import (
+from wit_world import exports
+from wit_world.types import Ok
+from wit_world.imports import types
+from wit_world.imports.types import (
     Method_Get,
     Method_Post,
     Scheme,

examples/matrix-math/README.md

@@ -11,7 +11,7 @@ within a guest component.
 ## Prerequisites
 
 * `wasmtime` 26.0.0 or later
-* `componentize-py` 0.16.0
+* `componentize-py` 0.17.0
 * `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/v26.0.0.
 
 ```
 cargo install --version 26.0.0 wasmtime-cli
-pip install componentize-py==0.16.0
+pip install componentize-py==0.17.0
 curl -OL https://github.com/dicej/wasi-wheels/releases/download/v0.0.1/numpy-wasi.tar.gz
 tar xf numpy-wasi.tar.gz
 ```

examples/matrix-math/app.py

@@ -3,12 +3,12 @@
 
 import sys
 import numpy
-import matrix_math
-from matrix_math import exports
-from matrix_math.types import Err
+import wit_world
+from wit_world import exports
+from wit_world.types import Err
 
 
-class MatrixMath(matrix_math.MatrixMath):
+class WitWorld(wit_world.WitWorld):
     def multiply(self, a: list[list[float]], b: list[list[float]]) -> list[list[float]]:
         print(f"matrix_multiply received arguments {a} and {b}")
         return numpy.matmul(a, b).tolist()  # type: ignore
@@ -21,4 +21,4 @@ def run(self) -> None:
             print("usage: matrix-math <matrix> <matrix>", file=sys.stderr)
             exit(-1)
 
-        print(MatrixMath().multiply(eval(args[0]), eval(args[1])))
+        print(WitWorld().multiply(eval(args[0]), eval(args[1])))

examples/sandbox/README.md

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

examples/sandbox/guest.py

@@ -1,5 +1,5 @@
-import sandbox
-from sandbox.types import Err
+import wit_world
+from wit_world.types import Err
 import json
 
 
@@ -11,7 +11,7 @@ def handle(e: Exception) -> Err[str]:
         return Err(f"{type(e).__name__}: {message}")
 
 
-class Sandbox(sandbox.Sandbox):
+class WitWorld(wit_world.WitWorld):
     def eval(self, expression: str) -> str:
         try:
             return json.dumps(eval(expression))

examples/tcp/README.md

@@ -11,15 +11,15 @@ making an outbound TCP request using `wasi-sockets`.
 ## Prerequisites
 
 * `Wasmtime` 26.0.0 or later
-* `componentize-py` 0.16.0
+* `componentize-py` 0.17.0
 
 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/v26.0.0.
 
 ```
 cargo install --version 26.0.0 wasmtime-cli
-pip install componentize-py==0.16.0
+pip install componentize-py==0.17.0
 ```
 
 ## Running the demo

examples/tcp/app.py

@@ -2,7 +2,7 @@
 import asyncio
 import ipaddress
 from ipaddress import IPv4Address, IPv6Address
-from command import exports
+from wit_world import exports
 from typing import Tuple
 
 

pyproject.toml

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

runtime/src/lib.rs

@@ -658,9 +658,7 @@ pub extern "C" fn componentize_py_get_field<'a>(
                 .nth(field)
                 .unwrap_or(0);
 
-            unsafe { mem::transmute::<u32, i32>(value) }
-                .to_object(*py)
-                .into_bound(*py)
+            u32::cast_signed(value).to_object(*py).into_bound(*py)
         }
         Type::Option => match i32::try_from(field).unwrap() {
             DISCRIMINANT_FIELD_INDEX => if value.is_none() { 0 } else { 1 }
@@ -865,7 +863,7 @@ pub unsafe extern "C" fn componentize_py_init<'a>(
                         slice::from_raw_parts(data, len)
                             .iter()
                             .map(|v| {
-                                mem::transmute::<i32, u32>(
+                                i32::cast_unsigned(
                                     Bound::from_borrowed_ptr(*py, v.as_ptr()).extract().unwrap(),
                                 )
                             })

src/command.rs

@@ -66,6 +66,12 @@ pub struct Common {
     /// name.
     #[arg(long, value_parser = parse_key_value)]
     pub export_interface_name: Vec<(String, String)>,
+
+    /// Optional name of top-level module to use for bindings.
+    ///
+    /// If this is not specified, the module name will default to "wit_world".
+    #[arg(long)]
+    pub world_module: Option<String>,
 }
 
 #[derive(clap::Subcommand, Debug)]
@@ -126,12 +132,6 @@ pub struct Bindings {
     ///
     /// This will be created if it does not already exist.
     pub output_dir: PathBuf,
-
-    /// Optional name of top-level module to use for bindings.
-    ///
-    /// If this is not specified, the module name will be derived from the world name.
-    #[arg(long)]
-    pub world_module: Option<String>,
 }
 
 fn parse_key_value(s: &str) -> Result<(String, String), String> {
@@ -157,7 +157,7 @@ fn generate_bindings(common: Common, bindings: Bindings) -> Result<()> {
         common.world.as_deref(),
         &common.features,
         common.all_features,
-        bindings.world_module.as_deref(),
+        common.world_module.as_deref(),
         &bindings.output_dir,
         &common
             .import_interface_name
@@ -189,6 +189,7 @@ fn componentize(common: Common, componentize: Componentize) -> Result<()> {
         common.world.as_deref(),
         &common.features,
         common.all_features,
+        common.world_module.as_deref(),
         &python_path.iter().map(|s| s.as_str()).collect::<Vec<_>>(),
         &componentize
             .module_worlds
@@ -339,6 +340,7 @@ mod tests {
         let common = Common {
             wit_path: Some(wit.path().into()),
             world: None,
+            world_module: Some("bindings".into()),
             quiet: false,
             features: vec![],
             all_features: false,
@@ -347,7 +349,6 @@ mod tests {
         };
         let bindings = Bindings {
             output_dir: out_dir.path().into(),
-            world_module: None,
         };
         generate_bindings(common, bindings)?;
 
@@ -369,6 +370,7 @@ mod tests {
         let common = Common {
             wit_path: Some(wit.path().into()),
             world: None,
+            world_module: Some("bindings".into()),
             quiet: false,
             features: vec!["x".to_owned()],
             all_features: false,
@@ -377,7 +379,6 @@ mod tests {
         };
         let bindings = Bindings {
             output_dir: out_dir.path().into(),
-            world_module: None,
         };
         generate_bindings(common, bindings)?;
 
@@ -399,6 +400,7 @@ mod tests {
         let common = Common {
             wit_path: Some(wit.path().into()),
             world: None,
+            world_module: Some("bindings".into()),
             quiet: false,
             features: vec![],
             all_features: true,
@@ -407,7 +409,6 @@ mod tests {
         };
         let bindings = Bindings {
             output_dir: out_dir.path().into(),
-            world_module: None,
         };
         generate_bindings(common, bindings)?;
 
@@ -427,6 +428,7 @@ mod tests {
         let common = Common {
             wit_path: Some(wit.path().into()),
             world: None,
+            world_module: Some("bindings".into()),
             quiet: false,
             features: vec!["x".to_owned()],
             all_features: false,
@@ -435,7 +437,6 @@ mod tests {
         };
         let bindings = Bindings {
             output_dir: out_dir.path().into(),
-            world_module: None,
         };
         generate_bindings(common.clone(), bindings)?;
         fs::write(