Fix python example

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

examples/python/.gitignore

@@ -0,0 +1,3 @@
+__pycache__
+http.wasm
+composed.wasm

examples/python/README.md

@@ -11,21 +11,19 @@ component for serving static files.
 - [Spin v2.0+](https://developer.fermyon.com/spin/install)
 - [Rust](https://rustup.rs/)
 - [cargo-component](https://github.com/bytecodealliance/cargo-component)
-- [wasm-tools](https://github.com/bytecodealliance/wasm-tools/)
-  - Note that you'll need [this fork](https://github.com/dicej/wasm-tools/tree/wasm-compose-resource-imports) until [this PR](https://github.com/bytecodealliance/wasm-tools/pull/1261) has been merged and released.
+- [wac](https://github.com/bytecodealliance/wac)
 - [Python](https://www.python.org/downloads/) 3.11 or later
 - [pip](https://pip.pypa.io/en/stable/installation/)
-- [componentize-py](https://pypi.org/project/componentize-py/) 0.6.0
+- [componentize-py](https://pypi.org/project/componentize-py/)
 - [curl](https://curl.se/download.html) or a web browser for testing
 
 Once you have Rust, Python, and pip installed, the following should give you everything else:
 
 ```shell
 rustup target add wasm32-wasi
 cargo install cargo-component
-cargo install --locked --git https://github.com/dicej/wasm-tools \
-    --branch wasm-compose-resource-imports wasm-tools
-pip install componentize-py==0.6.0
+cargo install wac-cli
+pip install componentize-py
 ```
 
 ## Building and Running

examples/python/app.py

@@ -4,9 +4,10 @@
 from proxy import exports
 from proxy.types import Ok
 from proxy.imports import types, incoming_handler
-from proxy.imports.types import MethodGet, IncomingRequest, ResponseOutparam, OutgoingResponse, Fields, OutgoingBody
+from proxy.imports.types import Method_Get, IncomingRequest, ResponseOutparam, OutgoingResponse, Fields, OutgoingBody
 from poll_loop import Stream, Sink, PollLoop
 
+
 class IncomingHandler(exports.IncomingHandler):
     def handle(self, request: IncomingRequest, response_out: ResponseOutparam):
         # Dispatch the request using `asyncio`, backed by a custom event loop
@@ -15,26 +16,27 @@ def handle(self, request: IncomingRequest, response_out: ResponseOutparam):
         asyncio.set_event_loop(loop)
         loop.run_until_complete(handle_async(request, response_out))
 
+
 async def handle_async(request: IncomingRequest, response_out: ResponseOutparam):
     method = request.method()
     path = request.path_with_query()
 
-    if isinstance(method, MethodGet) and path == "/hello":
-        response = OutgoingResponse(200, Fields([("content-type", b"text/plain")]))
+    if isinstance(method, Method_Get) and path == "/hello":
+        response = OutgoingResponse(200, Fields(
+            [("content-type", b"text/plain")]))
         response_body = response.write()
-        
+
         ResponseOutparam.set(response_out, Ok(response))
 
         sink = Sink(response_body)
         await sink.send(b"Hello, world!")
         sink.close()
-        
-    elif isinstance(method, MethodGet):
+
+    elif isinstance(method, Method_Get):
         # Delegate to spin-fileserver component.
         incoming_handler.handle(request, response_out)
 
     else:
         response = OutgoingResponse(400, Fields([]))
         ResponseOutparam.set(response_out, Ok(response))
         OutgoingBody.finish(response.write(), None)
-        

examples/python/compose.yml

@@ -14,5 +14,5 @@ component = "spin-fileserver-example"
 source = "composed.wasm"
 files = [{ source = "../static", destination = "/" }]
 [component.spin-fileserver-example.build]
-command = "componentize-py -d ../wit -w proxy componentize app -o http.wasm && (cd .. && cargo component build --release) && RUST_LOG=error wasm-tools compose http.wasm -c compose.yml -o composed.wasm"
+command = "componentize-py -d ../wit -w proxy componentize app -o http.wasm && (cd .. && cargo component build --release) && RUST_LOG=error wac plug --plug ../../target/wasm32-wasi/release/spin_static_fs.wasm http.wasm -o composed.wasm"
 watch = ["*.py"]