Fix CI

Author: vigoo

.github/workflows/ci.yaml

@@ -63,25 +63,27 @@ jobs:
   build-test-components:
     runs-on: ubuntu-latest
     steps:
-     - uses: actions/checkout@v4
-     - uses: actions/cache@v3
-       with:
-         path: |
-           ~/.cargo/bin/
-           ~/.cargo/registry/index/
-           ~/.cargo/registry/cache/
-           ~/.cargo/git/db/
-           target/
-         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-is
-     - name: Setup Rust
-       uses: actions-rs/toolchain@v1
-       with:
-         toolchain: stable
-         override: true
-     - uses: davidB/rust-cargo-make@v1
-     - uses: cargo-bins/cargo-binstall@main
-     - name: Build all test components
-       run: cargo make build-test-components
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-is
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - uses: davidB/rust-cargo-make@v1
+      - uses: cargo-bins/cargo-binstall@main
+      - name: Install cargo-component
+        run: cargo binstall --force --locked cargo-component@0.20.0
+      - name: Build all test components
+        run: cargo make build-test-components
   publish-all:
     needs:
       - tests

Makefile.toml

@@ -221,6 +221,15 @@ rm -r llm-openrouter/wit/deps
 mkdir llm-openrouter/wit/deps/golem-llm
 cp wit/golem-llm.wit llm-openrouter/wit/deps/golem-llm/golem-llm.wit
 cp wit/deps/wasi:io llm-openrouter/wit/deps
+
+rm -r test/wit
+mkdir test/wit/deps/golem-llm
+mkdir test/wit/deps/io
+cp wit/golem-llm.wit test/wit/deps/golem-llm/golem-llm.wit
+cp wit/deps/wasi:io/error.wit test/wit/deps/io/error.wit
+cp wit/deps/wasi:io/poll.wit test/wit/deps/io/poll.wit
+cp wit/deps/wasi:io/streams.wit test/wit/deps/io/streams.wit
+cp wit/deps/wasi:io/world.wit test/wit/deps/io/world.wit
 """
 
 [tasks.check]
@@ -264,6 +273,7 @@ args = [
 ]
 
 [tasks.build-test-components]
+dependencies = ["build"]
 description = "Builds all test components with golem-cli"
 install_crate = "cargo-binstall"
 script = '''

llm-anthropic/src/bindings.rs

@@ -1,8 +1,8 @@
 // Generated by `wit-bindgen` 0.36.0. DO NOT EDIT!
 // Options used:
 //   * runtime_path: "wit_bindgen_rt"
-//   * with "golem:llm/llm@1.0.0" = "golem_llm::golem::llm::llm"
 //   * with "wasi:io/poll@0.2.0" = "golem_rust::wasm_rpc::wasi::io::poll"
+//   * with "golem:llm/llm@1.0.0" = "golem_llm::golem::llm::llm"
 //   * generate_unused_types
 use golem_rust::wasm_rpc::wasi::io::poll as __with_name0;
 use golem_llm::golem::llm::llm as __with_name1;

llm-grok/src/bindings.rs

@@ -1,8 +1,8 @@
 // Generated by `wit-bindgen` 0.36.0. DO NOT EDIT!
 // Options used:
 //   * runtime_path: "wit_bindgen_rt"
-//   * with "golem:llm/llm@1.0.0" = "golem_llm::golem::llm::llm"
 //   * with "wasi:io/poll@0.2.0" = "golem_rust::wasm_rpc::wasi::io::poll"
+//   * with "golem:llm/llm@1.0.0" = "golem_llm::golem::llm::llm"
 //   * generate_unused_types
 use golem_rust::wasm_rpc::wasi::io::poll as __with_name0;
 use golem_llm::golem::llm::llm as __with_name1;

test/components-rust/test-llm/Cargo.toml

@@ -35,7 +35,7 @@ path = "wit-generated"
 "golem:rpc/types@0.2.0" = "golem_rust::wasm_rpc::golem_rpc_0_2_x::types"
 
 [package.metadata.component.target.dependencies]
-"wasi:io" = { path = "wit-generated/deps/wasi:io" }
+"wasi:io" = { path = "wit-generated/deps/io" }
 "golem:llm" = { path = "wit-generated/deps/golem-llm" }
 "wasi:clocks" = { path = "wit-generated/deps/clocks" }
 "golem:rpc" = { path = "wit-generated/deps/golem-rpc" }

test/golem.yaml

@@ -6,7 +6,7 @@
 # See https://learn.golem.cloud/docs/app-manifest#field-reference for field reference
 
 includes:
-- common-*/golem.yaml
-- components-*/*/golem.yaml
+  - common-*/golem.yaml
+  - components-*/*/golem.yaml
 witDeps:
-- ../llm/wit/deps
+  - wit/deps

test/wit/deps/golem-llm/golem-llm.wit

@@ -0,0 +1,192 @@
+package golem:llm@1.0.0;
+
+interface llm {
+  use wasi:io/poll@0.2.0.{pollable};
+
+  // --- Roles, Error Codes, Finish Reasons ---
+
+  enum role {
+    user,
+    assistant,
+    system,
+    tool,
+  }
+
+  enum error-code {
+    invalid-request,
+    authentication-failed,
+    rate-limit-exceeded,
+    internal-error,
+    unsupported,
+    unknown,
+  }
+
+  enum finish-reason {
+    stop,
+    length,
+    tool-calls,
+    content-filter,
+    error,
+    other,
+  }
+
+  enum image-detail {
+    low,
+    high,
+    auto,
+  }
+
+  // --- Message Content ---
+
+  record image-url {
+    url: string,
+    detail: option<image-detail>,
+  }
+
+  variant content-part {
+    text(string),
+    image(image-url),
+  }
+
+  record message {
+    role: role,
+    name: option<string>,
+    content: list<content-part>,
+  }
+
+  // --- Tooling ---
+
+  record tool-definition {
+    name: string,
+    description: option<string>,
+    parameters-schema: string,
+  }
+
+  record tool-call {
+    id: string,
+    name: string,
+    arguments-json: string,
+  }
+
+  record tool-success {
+    id: string,
+    name: string,
+    result-json: string,
+    execution-time-ms: option<u32>,
+  }
+
+  record tool-failure {
+    id: string,
+    name: string,
+    error-message: string,
+    error-code: option<string>,
+  }
+
+  variant tool-result {
+    success(tool-success),
+    error(tool-failure),
+  }
+
+  // --- Configuration ---
+
+  record kv {
+    key: string,
+    value: string,
+  }
+
+  record config {
+    model: string,
+    temperature: option<f32>,
+    max-tokens: option<u32>,
+    stop-sequences: option<list<string>>,
+    tools: list<tool-definition>,
+    tool-choice: option<string>,
+    provider-options: list<kv>,
+  }
+
+  // --- Usage / Metadata ---
+
+  record usage {
+    input-tokens: option<u32>,
+    output-tokens: option<u32>,
+    total-tokens: option<u32>,
+  }
+
+  record response-metadata {
+    finish-reason: option<finish-reason>,
+    usage: option<usage>,
+    provider-id: option<string>,
+    timestamp: option<string>,
+    provider-metadata-json: option<string>,
+  }
+
+  record complete-response {
+    id: string,
+    content: list<content-part>,
+    tool-calls: list<tool-call>,
+    metadata: response-metadata,
+  }
+
+  // --- Error Handling ---
+
+  record error {
+    code: error-code,
+    message: string,
+    provider-error-json: option<string>,
+  }
+
+  // --- Chat Response Variants ---
+
+  variant chat-event {
+    message(complete-response),
+    tool-request(list<tool-call>),
+    error(error),
+  }
+
+  // --- Streaming ---
+
+  record stream-delta {
+    content: option<list<content-part>>,
+    tool-calls: option<list<tool-call>>,
+  }
+
+  variant stream-event {
+    delta(stream-delta),
+    finish(response-metadata),
+    error(error),
+  }
+
+  resource chat-stream {
+    get-next: func() -> option<list<stream-event>>;
+    blocking-get-next: func() -> list<stream-event>;
+    subscribe: func() -> pollable;
+  }
+
+  // --- Core Functions ---
+
+  send: func(
+    messages: list<message>,
+    config: config
+  ) -> chat-event;
+
+  continue: func(
+    messages: list<message>,
+    tool-results: list<tuple<tool-call, tool-result>>,
+    config: config
+  ) -> chat-event;
+
+  %stream: func(
+    messages: list<message>,
+    config: config
+  ) -> chat-stream;
+}
+
+world llm-library {
+    import wasi:io/poll@0.2.0;
+    export llm;
+}
+
+// UPDATE NOTES
+// send() and continue() returning chat-event directly as it already encodes the error
+// made continue's `tool-results` parameter get the original `tool-call` for each `tool-result` - according to OpenAI's docs the call has to be send back too
+// made the streaming API use wasi:io/poll.pollable

test/wit/deps/io/error.wit

@@ -0,0 +1,34 @@
+package wasi:io@0.2.0;
+
+
+interface error {
+    /// A resource which represents some error information.
+    ///
+    /// The only method provided by this resource is `to-debug-string`,
+    /// which provides some human-readable information about the error.
+    ///
+    /// In the `wasi:io` package, this resource is returned through the
+    /// `wasi:io/streams/stream-error` type.
+    ///
+    /// To provide more specific error information, other interfaces may
+    /// provide functions to further "downcast" this error into more specific
+    /// error information. For example, `error`s returned in streams derived
+    /// from filesystem types to be described using the filesystem's own
+    /// error-code type, using the function
+    /// `wasi:filesystem/types/filesystem-error-code`, which takes a parameter
+    /// `borrow<error>` and returns
+    /// `option<wasi:filesystem/types/error-code>`.
+    ///
+    /// The set of functions which can "downcast" an `error` into a more
+    /// concrete type is open.
+    resource error {
+        /// Returns a string that is suitable to assist humans in debugging
+        /// this error.
+        ///
+        /// WARNING: The returned string should not be consumed mechanically!
+        /// It may change across platforms, hosts, or other implementation
+        /// details. Parsing this string is a major platform-compatibility
+        /// hazard.
+        to-debug-string: func() -> string;
+    }
+}

test/wit/deps/io/poll.wit

@@ -0,0 +1,41 @@
+package wasi:io@0.2.0;
+
+/// A poll API intended to let users wait for I/O events on multiple handles
+/// at once.
+interface poll {
+    /// `pollable` represents a single I/O event which may be ready, or not.
+    resource pollable {
+
+      /// Return the readiness of a pollable. This function never blocks.
+      ///
+      /// Returns `true` when the pollable is ready, and `false` otherwise.
+      ready: func() -> bool;
+
+      /// `block` returns immediately if the pollable is ready, and otherwise
+      /// blocks until ready.
+      ///
+      /// This function is equivalent to calling `poll.poll` on a list
+      /// containing only this pollable.
+      block: func();
+    }
+
+    /// Poll for completion on a set of pollables.
+    ///
+    /// This function takes a list of pollables, which identify I/O sources of
+    /// interest, and waits until one or more of the events is ready for I/O.
+    ///
+    /// The result `list<u32>` contains one or more indices of handles in the
+    /// argument list that is ready for I/O.
+    ///
+    /// If the list contains more elements than can be indexed with a `u32`
+    /// value, this function traps.
+    ///
+    /// A timeout can be implemented by adding a pollable from the
+    /// wasi-clocks API to the list.
+    ///
+    /// This function does not return a `result`; polling in itself does not
+    /// do any I/O so it doesn't fail. If any of the I/O sources identified by
+    /// the pollables has an error, it is indicated by marking the source as
+    /// being reaedy for I/O.
+    poll: func(in: list<borrow<pollable>>) -> list<u32>;
+}