use "wit_world" module name by default for generated bindings (#150)

Previously, we used a name derived from the WIT world name, but this is more
predictable.  It can be overridden using the `--world-module` option, which now
applies to both the `bindings` and `componentize` subcommands.

I've also bumped the version to 0.17.0 since this is a breaking change.

Fixes #149

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

Author: dicej

Cargo.lock

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

Cargo.toml

@@ -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

README.md

@@ -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

bundled/poll_loop.py

@@ -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/README.md

@@ -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/cli/app.py

@@ -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/README.md

@@ -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/http/app.py

@@ -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/README.md

@@ -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])))