fix: add multi-turn output type for openai component

.github/workflows/ci.yaml

@@ -149,6 +149,7 @@ jobs:
           golem-cli worker invoke test:llm/ollama-1 test5
           golem-cli worker invoke test:llm/ollama-1 test6
           golem-cli worker invoke test:llm/ollama-1 test7
+          golem-cli worker invoke test:llm/ollama-1 test8
   publish-all:
     needs:
       - tests

llm/anthropic/src/conversions.rs

@@ -130,7 +130,7 @@ pub fn process_response(response: MessagesResponse) -> ChatEvent {
                         Err(e) => {
                             return ChatEvent::Error(Error {
                                 code: ErrorCode::InvalidRequest,
-                                message: format!("Failed to decode base64 image data: {}", e),
+                                message: format!("Failed to decode base64 image data: {e}"),
                                 provider_error_json: None,
                             });
                         }

llm/grok/src/conversions.rs

@@ -183,7 +183,7 @@ fn convert_content_parts(contents: Vec<ContentPart>) -> crate::client::Content {
                     let media_type = &image_source.mime_type; // This is already a string
                     result.push(crate::client::ContentPart::ImageInput {
                         image_url: crate::client::ImageUrl {
-                            url: format!("data:{};base64,{}", media_type, base64_data),
+                            url: format!("data:{media_type};base64,{base64_data}"),
                             detail: image_source.detail.map(|d| d.into()),
                         },
                     });

llm/llm/src/event_source/ndjson_stream.rs

@@ -126,7 +126,7 @@ fn try_parse_line(
             return Ok(None);
         }
 
-        trace!("Parsed NDJSON line: {}", line);
+        trace!("Parsed NDJSON line: {line}");
 
         // Create a MessageEvent with the JSON line as data
         let event = MessageEvent {

llm/llm/src/event_source/stream.rs

@@ -56,9 +56,9 @@ where
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Self::Utf8(err) => f.write_fmt(format_args!("UTF8 error: {}", err)),
-            Self::Parser(err) => f.write_fmt(format_args!("Parse error: {}", err)),
-            Self::Transport(err) => f.write_fmt(format_args!("Transport error: {}", err)),
+            Self::Utf8(err) => f.write_fmt(format_args!("UTF8 error: {err}")),
+            Self::Parser(err) => f.write_fmt(format_args!("Parse error: {err}")),
+            Self::Transport(err) => f.write_fmt(format_args!("Transport error: {err}")),
         }
     }
 }

llm/ollama/src/client.rs

@@ -335,7 +335,7 @@ pub fn image_to_base64(source: &str) -> Result<String, Box<dyn std::error::Error
 pub fn from_reqwest_error(context: &str, err: reqwest::Error) -> Error {
     Error {
         code: ErrorCode::InternalError,
-        message: format!("{}: {}", context, err),
+        message: format!("{context}: {err}"),
         provider_error_json: None,
     }
 }

llm/ollama/src/conversions.rs

@@ -214,7 +214,7 @@ pub fn process_response(response: CompletionsResponse) -> ChatEvent {
         };
 
         ChatEvent::Message(CompleteResponse {
-            id: format!("ollama-{}", timestamp),
+            id: format!("ollama-{timestamp}"),
             content,
             tool_calls,
             metadata,

llm/openai/src/client.rs

@@ -202,6 +202,8 @@ pub enum InnerInput {
 pub enum InnerInputItem {
     #[serde(rename = "input_text")]
     TextInput { text: String },
+    #[serde(rename = "output_text")]
+    TextOutput { text: String },
     #[serde(rename = "input_image")]
     ImageInput {
         image_url: String,

llm/openai/src/conversions.rs

@@ -43,16 +43,7 @@ pub fn create_request(
 pub fn messages_to_input_items(messages: Vec<Message>) -> Vec<InputItem> {
     let mut items = Vec::new();
     for message in messages {
-        let role = to_openai_role_name(message.role).to_string();
-        let mut input_items = Vec::new();
-        for content_part in message.content {
-            input_items.push(content_part_to_inner_input_item(content_part));
-        }
-
-        items.push(InputItem::InputMessage {
-            role,
-            content: InnerInput::List(input_items),
-        });
+        items.push(llm_message_to_openai_message(message));
     }
     items
 }
@@ -122,35 +113,48 @@ pub fn to_openai_role_name(role: Role) -> &'static str {
     }
 }
 
-pub fn content_part_to_inner_input_item(content_part: ContentPart) -> InnerInputItem {
-    match content_part {
-        ContentPart::Text(msg) => InnerInputItem::TextInput { text: msg },
-        ContentPart::Image(image_reference) => match image_reference {
-            ImageReference::Url(image_url) => InnerInputItem::ImageInput {
-                image_url: image_url.url,
-                detail: match image_url.detail {
-                    Some(ImageDetail::Auto) => Detail::Auto,
-                    Some(ImageDetail::Low) => Detail::Low,
-                    Some(ImageDetail::High) => Detail::High,
-                    None => Detail::default(),
-                },
+pub fn llm_message_to_openai_message(message: Message) -> InputItem {
+    let mut items = Vec::new();
+
+    for content_part in message.content {
+        let item = match content_part {
+            ContentPart::Text(msg) => match message.role {
+                Role::Assistant => InnerInputItem::TextOutput { text: msg },
+                _ => InnerInputItem::TextInput { text: msg },
             },
-            ImageReference::Inline(image_source) => {
-                let base64_data = general_purpose::STANDARD.encode(&image_source.data);
-                let mime_type = &image_source.mime_type; // This is already a string
-                let data_url = format!("data:{};base64,{}", mime_type, base64_data);
-
-                InnerInputItem::ImageInput {
-                    image_url: data_url,
-                    detail: match image_source.detail {
+            ContentPart::Image(image_reference) => match image_reference {
+                ImageReference::Url(image_url) => InnerInputItem::ImageInput {
+                    image_url: image_url.url,
+                    detail: match image_url.detail {
                         Some(ImageDetail::Auto) => Detail::Auto,
                         Some(ImageDetail::Low) => Detail::Low,
                         Some(ImageDetail::High) => Detail::High,
                         None => Detail::default(),
                     },
+                },
+                ImageReference::Inline(image_source) => {
+                    let base64_data = general_purpose::STANDARD.encode(&image_source.data);
+                    let mime_type = &image_source.mime_type; // This is already a string
+                    let data_url = format!("data:{mime_type};base64,{base64_data}");
+
+                    InnerInputItem::ImageInput {
+                        image_url: data_url,
+                        detail: match image_source.detail {
+                            Some(ImageDetail::Auto) => Detail::Auto,
+                            Some(ImageDetail::Low) => Detail::Low,
+                            Some(ImageDetail::High) => Detail::High,
+                            None => Detail::default(),
+                        },
+                    }
                 }
-            }
-        },
+            },
+        };
+        items.push(item);
+    }
+
+    InputItem::InputMessage {
+        role: to_openai_role_name(message.role).to_string(),
+        content: InnerInput::List(items),
     }
 }
 

llm/openrouter/src/conversions.rs

@@ -184,7 +184,7 @@ fn convert_content_parts(contents: Vec<ContentPart>) -> crate::client::Content {
                     let media_type = &image_source.mime_type; // This is already a string
                     result.push(crate::client::ContentPart::ImageInput {
                         image_url: crate::client::ImageUrl {
-                            url: format!("data:{};base64,{}", media_type, base64_data),
+                            url: format!("data:{media_type};base64,{base64_data}"),
                             detail: image_source.detail.map(|d| d.into()),
                         },
                     });

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

@@ -37,8 +37,8 @@ path = "wit-generated"
 
 [package.metadata.component.target.dependencies]
 "golem:llm" = { path = "wit-generated/deps/golem-llm" }
-"wasi:clocks" = { path = "wit-generated/deps/clocks" }
 "wasi:io" = { path = "wit-generated/deps/io" }
+"wasi:clocks" = { path = "wit-generated/deps/clocks" }
 "golem:rpc" = { path = "wit-generated/deps/golem-rpc" }
 "test:helper-client" = { path = "wit-generated/deps/test_helper-client" }
 "test:llm-exports" = { path = "wit-generated/deps/test_llm-exports" }