feat: ran llm-test and clippy

Author: iambenkay

.gitignore

@@ -4,3 +4,4 @@ openapi
 target
 tmp
 components
+run.sh

llm-anthropic/src/bindings.rs

@@ -1,15 +1,12 @@
-// Generated by `wit-bindgen` 0.41.0. DO NOT EDIT!
+// 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"
 //   * generate_unused_types
 use golem_llm::golem::llm::llm as __with_name0;
 #[cfg(target_arch = "wasm32")]
-#[unsafe(
-    link_section = "component-type:wit-bindgen:0.41.0:golem:llm-anthropic@1.0.0:llm-library:encoded world"
-)]
+#[link_section = "component-type:wit-bindgen:0.36.0:golem:llm-anthropic@1.0.0:llm-library:encoded world"]
 #[doc(hidden)]
-#[allow(clippy::octal_escapes)]
 pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 1762] = *b"\
 \0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xe0\x0c\x01A\x02\x01\
 A\x02\x01BO\x01m\x04\x04user\x09assistant\x06system\x04tool\x04\0\x04role\x03\0\0\
@@ -46,8 +43,8 @@ ng-get-next\x01B\x01p\x15\x01@\x02\x08messages\xc3\0\x06config)\06\x04\0\x04send
 \0\x06config)\06\x04\0\x08continue\x01G\x01i=\x01@\x02\x08messages\xc3\0\x06conf\
 ig)\0\xc8\0\x04\0\x06stream\x01I\x04\0\x13golem:llm/llm@1.0.0\x05\0\x04\0%golem:\
 llm-anthropic/llm-library@1.0.0\x04\0\x0b\x11\x01\0\x0bllm-library\x03\0\0\0G\x09\
-producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rus\
-t\x060.41.0";
+producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.220.0\x10wit-bindgen-rus\
+t\x060.36.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {

llm-bedrock/src/client.rs

@@ -1,10 +1,11 @@
 use crate::{
-    conversions::{self, from_sdk_error, BedrockInput},
+    conversions::{self, from_converse_sdk_error, from_converse_stream_sdk_error, BedrockInput},
     stream::BedrockChatStream,
 };
 use aws_config::BehaviorVersion;
 use aws_sdk_bedrockruntime::{
     self as bedrock,
+    config::{AsyncSleep, Sleep},
     operation::{
         converse::builders::ConverseFluentBuilder,
         converse_stream::builders::ConverseStreamFluentBuilder,
@@ -16,6 +17,7 @@ use golem_llm::{
     config::{get_config_key, get_config_key_or_none},
     golem::llm::llm,
 };
+use log::trace;
 
 #[derive(Debug)]
 pub struct Bedrock {
@@ -35,6 +37,7 @@ impl Bedrock {
                 .region(environment.aws_region())
                 .http_client(wasi_http)
                 .credentials_provider(environment.aws_credentials())
+                .sleep_impl(TokioSleep)
                 .load()
                 .await;
             let client = bedrock::Client::new(&sdk_config);
@@ -57,13 +60,14 @@ impl Bedrock {
 
         let runtime = get_async_runtime();
 
+        trace!("Sending request to AWS Bedrock: {input:?}");
         runtime.block_on(async {
             let model_id = input.model_id.clone();
             let response = self
                 .init_converse(input)
                 .send()
                 .await
-                .map_err(|e| from_sdk_error(model_id, e));
+                .map_err(|e| from_converse_sdk_error(model_id, e));
 
             if let Err(err) = response {
                 return llm::ChatEvent::Error(err);
@@ -95,15 +99,16 @@ impl Bedrock {
         let input = bedrock_input.unwrap();
 
         let runtime = get_async_runtime();
-
+        trace!("Sending request to AWS Bedrock: {input:?}");
         runtime.block_on(async {
             let model_id = input.model_id.clone();
             let response = self
                 .init_converse_stream(input)
                 .send()
                 .await
-                .map_err(|e| from_sdk_error(model_id, e));
+                .map_err(|e| from_converse_stream_sdk_error(model_id, e));
 
+            trace!("Creating AWS Bedrock event stream");
             match response {
                 Ok(response) => BedrockChatStream::new(response.stream),
                 Err(error) => BedrockChatStream::failed(error),
@@ -172,6 +177,17 @@ impl BedrockEnvironment {
 
 pub fn get_async_runtime() -> tokio::runtime::Runtime {
     tokio::runtime::Builder::new_current_thread()
+        .enable_time()
         .build()
         .unwrap()
 }
+
+#[derive(Debug, Clone)]
+struct TokioSleep;
+impl AsyncSleep for TokioSleep {
+    fn sleep(&self, duration: std::time::Duration) -> Sleep {
+        Sleep::new(Box::pin(async move {
+            tokio::time::sleep(duration).await;
+        }))
+    }
+}

llm-bedrock/src/conversions.rs

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use aws_sdk_bedrockruntime::{
     self as bedrock,
     error::SdkError,
-    operation::converse,
+    operation::{converse, converse_stream},
     types::{
         ContentBlockDeltaEvent, ContentBlockStartEvent, ConversationRole,
         ConverseStreamMetadataEvent, ConverseStreamOutput, ImageBlock, ImageFormat,
@@ -34,7 +34,7 @@ impl BedrockInput {
             messages_to_bedrock_message_groups(messages)?;
 
         if let Some(tool_results) = tool_results {
-            user_messages.push(tool_call_results_to_bedrock_tool_results(tool_results));
+            user_messages.extend(tool_call_results_to_bedrock_tools(tool_results)?);
         }
 
         let options = config
@@ -62,12 +62,22 @@ impl BedrockInput {
     }
 }
 
-fn tool_call_results_to_bedrock_tool_results(
+fn tool_call_results_to_bedrock_tools(
     results: Vec<(llm::ToolCall, llm::ToolResult)>,
-) -> bedrock::types::Message {
+) -> Result<Vec<bedrock::types::Message>, llm::Error> {
+    let mut tool_calls: Vec<bedrock::types::ContentBlock> = vec![];
     let mut tool_results: Vec<bedrock::types::ContentBlock> = vec![];
 
     for (tool_call, tool_result) in results {
+        tool_calls.push(bedrock::types::ContentBlock::ToolUse(
+            bedrock::types::ToolUseBlock::builder()
+                .tool_use_id(tool_call.id.clone())
+                .name(tool_call.name)
+                .input(json_str_to_smithy_document(&tool_call.arguments_json)?)
+                .build()
+                .unwrap(),
+        ));
+
         tool_results.push(bedrock::types::ContentBlock::ToolResult(
             bedrock::types::ToolResultBlock::builder()
                 .tool_use_id(tool_call.id)
@@ -82,11 +92,18 @@ fn tool_call_results_to_bedrock_tool_results(
         ));
     }
 
-    bedrock::types::Message::builder()
-        .role(ConversationRole::User)
-        .set_content(Some(tool_results))
-        .build()
-        .unwrap()
+    Ok(vec![
+        bedrock::types::Message::builder()
+            .role(ConversationRole::Assistant)
+            .set_content(Some(tool_calls))
+            .build()
+            .unwrap(),
+        bedrock::types::Message::builder()
+            .role(ConversationRole::User)
+            .set_content(Some(tool_results))
+            .build()
+            .unwrap(),
+    ])
 }
 
 fn tool_defs_to_bedrock_tool_config(
@@ -549,10 +566,24 @@ fn serde_json_to_smithy_document(value: serde_json::Value) -> Document {
     }
 }
 
-pub fn from_sdk_error<U, V>(model_id: String, sdk_error: SdkError<U, V>) -> llm::Error {
+pub fn from_converse_sdk_error(
+    model_id: String,
+    sdk_error: SdkError<converse::ConverseError>,
+) -> llm::Error {
+    llm::Error {
+        code: llm::ErrorCode::InternalError,
+        message: format!("Error calling Bedrock model {model_id}: {sdk_error:?}",),
+        provider_error_json: None,
+    }
+}
+
+pub fn from_converse_stream_sdk_error(
+    model_id: String,
+    sdk_error: SdkError<converse_stream::ConverseStreamError>,
+) -> llm::Error {
     llm::Error {
         code: llm::ErrorCode::InternalError,
-        message: format!("Error calling Bedrock model {}: {}", model_id, sdk_error),
+        message: format!("Error calling Bedrock model {model_id}: {sdk_error:?}",),
         provider_error_json: None,
     }
 }

llm-bedrock/src/stream.rs

@@ -1,11 +1,10 @@
-use std::cell::{RefCell, RefMut};
-
 use aws_sdk_bedrockruntime::{
     self as bedrock, primitives::event_stream::EventReceiver,
     types::error::ConverseStreamOutputError,
 };
 use golem_llm::golem::llm::llm;
-use golem_rust::wasm_rpc::Pollable;
+use golem_rust::wasm_rpc::wasi::io::poll::Pollable;
+use std::cell::{RefCell, RefMut};
 
 use crate::{
     client::get_async_runtime,
@@ -72,7 +71,10 @@ impl llm::GuestChatStream for BedrockChatStream {
                 let token = stream.recv().await;
 
                 match token {
-                    Ok(Some(output)) => converse_stream_output_to_stream_event(output),
+                    Ok(Some(output)) => {
+                        log::trace!("Processing bedrock stream event: {output:?}");
+                        converse_stream_output_to_stream_event(output)
+                    }
                     Ok(None) => {
                         self.set_finished();
                         Some(vec![])

llm-grok/src/bindings.rs

@@ -1,15 +1,12 @@
-// Generated by `wit-bindgen` 0.41.0. DO NOT EDIT!
+// 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"
 //   * generate_unused_types
 use golem_llm::golem::llm::llm as __with_name0;
 #[cfg(target_arch = "wasm32")]
-#[unsafe(
-    link_section = "component-type:wit-bindgen:0.41.0:golem:llm-grok@1.0.0:llm-library:encoded world"
-)]
+#[link_section = "component-type:wit-bindgen:0.36.0:golem:llm-grok@1.0.0:llm-library:encoded world"]
 #[doc(hidden)]
-#[allow(clippy::octal_escapes)]
 pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 1757] = *b"\
 \0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xdb\x0c\x01A\x02\x01\
 A\x02\x01BO\x01m\x04\x04user\x09assistant\x06system\x04tool\x04\0\x04role\x03\0\0\
@@ -46,8 +43,8 @@ ng-get-next\x01B\x01p\x15\x01@\x02\x08messages\xc3\0\x06config)\06\x04\0\x04send
 \0\x06config)\06\x04\0\x08continue\x01G\x01i=\x01@\x02\x08messages\xc3\0\x06conf\
 ig)\0\xc8\0\x04\0\x06stream\x01I\x04\0\x13golem:llm/llm@1.0.0\x05\0\x04\0\x20gol\
 em:llm-grok/llm-library@1.0.0\x04\0\x0b\x11\x01\0\x0bllm-library\x03\0\0\0G\x09p\
-roducers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rust\
-\x060.41.0";
+roducers\x01\x0cprocessed-by\x02\x0dwit-component\x070.220.0\x10wit-bindgen-rust\
+\x060.36.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {

llm-ollama/src/bindings.rs

@@ -1,15 +1,12 @@
-// Generated by `wit-bindgen` 0.41.0. DO NOT EDIT!
+// 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"
 //   * generate_unused_types
 use golem_llm::golem::llm::llm as __with_name0;
 #[cfg(target_arch = "wasm32")]
-#[unsafe(
-    link_section = "component-type:wit-bindgen:0.41.0:golem:llm-ollama@1.0.0:llm-library:encoded world"
-)]
+#[link_section = "component-type:wit-bindgen:0.36.0:golem:llm-ollama@1.0.0:llm-library:encoded world"]
 #[doc(hidden)]
-#[allow(clippy::octal_escapes)]
 pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 1759] = *b"\
 \0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xdd\x0c\x01A\x02\x01\
 A\x02\x01BO\x01m\x04\x04user\x09assistant\x06system\x04tool\x04\0\x04role\x03\0\0\
@@ -46,8 +43,8 @@ ng-get-next\x01B\x01p\x15\x01@\x02\x08messages\xc3\0\x06config)\06\x04\0\x04send
 \0\x06config)\06\x04\0\x08continue\x01G\x01i=\x01@\x02\x08messages\xc3\0\x06conf\
 ig)\0\xc8\0\x04\0\x06stream\x01I\x04\0\x13golem:llm/llm@1.0.0\x05\0\x04\0\"golem\
 :llm-ollama/llm-library@1.0.0\x04\0\x0b\x11\x01\0\x0bllm-library\x03\0\0\0G\x09p\
-roducers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rust\
-\x060.41.0";
+roducers\x01\x0cprocessed-by\x02\x0dwit-component\x070.220.0\x10wit-bindgen-rust\
+\x060.36.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {

llm-openai/src/bindings.rs

@@ -1,15 +1,12 @@
-// Generated by `wit-bindgen` 0.41.0. DO NOT EDIT!
+// 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"
 //   * generate_unused_types
 use golem_llm::golem::llm::llm as __with_name0;
 #[cfg(target_arch = "wasm32")]
-#[unsafe(
-    link_section = "component-type:wit-bindgen:0.41.0:golem:llm-openai@1.0.0:llm-library:encoded world"
-)]
+#[link_section = "component-type:wit-bindgen:0.36.0:golem:llm-openai@1.0.0:llm-library:encoded world"]
 #[doc(hidden)]
-#[allow(clippy::octal_escapes)]
 pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 1759] = *b"\
 \0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xdd\x0c\x01A\x02\x01\
 A\x02\x01BO\x01m\x04\x04user\x09assistant\x06system\x04tool\x04\0\x04role\x03\0\0\
@@ -46,8 +43,8 @@ ng-get-next\x01B\x01p\x15\x01@\x02\x08messages\xc3\0\x06config)\06\x04\0\x04send
 \0\x06config)\06\x04\0\x08continue\x01G\x01i=\x01@\x02\x08messages\xc3\0\x06conf\
 ig)\0\xc8\0\x04\0\x06stream\x01I\x04\0\x13golem:llm/llm@1.0.0\x05\0\x04\0\"golem\
 :llm-openai/llm-library@1.0.0\x04\0\x0b\x11\x01\0\x0bllm-library\x03\0\0\0G\x09p\
-roducers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rust\
-\x060.41.0";
+roducers\x01\x0cprocessed-by\x02\x0dwit-component\x070.220.0\x10wit-bindgen-rust\
+\x060.36.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {

llm-openrouter/src/bindings.rs

@@ -1,15 +1,12 @@
-// Generated by `wit-bindgen` 0.41.0. DO NOT EDIT!
+// 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"
 //   * generate_unused_types
 use golem_llm::golem::llm::llm as __with_name0;
 #[cfg(target_arch = "wasm32")]
-#[unsafe(
-    link_section = "component-type:wit-bindgen:0.41.0:golem:llm-openrouter@1.0.0:llm-library:encoded world"
-)]
+#[link_section = "component-type:wit-bindgen:0.36.0:golem:llm-openrouter@1.0.0:llm-library:encoded world"]
 #[doc(hidden)]
-#[allow(clippy::octal_escapes)]
 pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 1763] = *b"\
 \0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xe1\x0c\x01A\x02\x01\
 A\x02\x01BO\x01m\x04\x04user\x09assistant\x06system\x04tool\x04\0\x04role\x03\0\0\
@@ -46,8 +43,8 @@ ng-get-next\x01B\x01p\x15\x01@\x02\x08messages\xc3\0\x06config)\06\x04\0\x04send
 \0\x06config)\06\x04\0\x08continue\x01G\x01i=\x01@\x02\x08messages\xc3\0\x06conf\
 ig)\0\xc8\0\x04\0\x06stream\x01I\x04\0\x13golem:llm/llm@1.0.0\x05\0\x04\0&golem:\
 llm-openrouter/llm-library@1.0.0\x04\0\x0b\x11\x01\0\x0bllm-library\x03\0\0\0G\x09\
-producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rus\
-t\x060.41.0";
+producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.220.0\x10wit-bindgen-rus\
+t\x060.36.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {