Skip to content

Commit 4b3b8d3

Browse files
committed
feat: update to output text in innerinput
1 parent 668a7c5 commit 4b3b8d3

File tree

3 files changed

+9
-26
lines changed

3 files changed

+9
-26
lines changed

llm/openai/src/client.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,15 @@ pub enum InputItem {
195195
pub enum InnerInput {
196196
TextInput(String),
197197
List(Vec<InnerInputItem>),
198-
OutputList(Vec<OutputMessageContent>),
199198
}
200199

201200
#[derive(Debug, Clone, Serialize, Deserialize)]
202201
#[serde(tag = "type")]
203202
pub enum InnerInputItem {
204203
#[serde(rename = "input_text")]
205204
TextInput { text: String },
205+
#[serde(rename = "output_text")]
206+
TextOutput { text: String },
206207
#[serde(rename = "input_image")]
207208
ImageInput {
208209
image_url: String,

llm/openai/src/conversions.rs

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,7 @@ pub fn create_request(
4343
pub fn messages_to_input_items(messages: Vec<Message>) -> Vec<InputItem> {
4444
let mut items = Vec::new();
4545
for message in messages {
46-
let item = match message.role {
47-
Role::Assistant => llm_message_to_assistant_message(message),
48-
_ => llm_message_to_other_message(message),
49-
};
50-
51-
items.push(item);
46+
items.push(llm_message_to_openai_message(message));
5247
}
5348
items
5449
}
@@ -118,11 +113,15 @@ pub fn to_openai_role_name(role: Role) -> &'static str {
118113
}
119114
}
120115

121-
pub fn llm_message_to_other_message(message: Message) -> InputItem {
116+
pub fn llm_message_to_openai_message(message: Message) -> InputItem {
122117
let mut items = Vec::new();
118+
123119
for content_part in message.content {
124120
let item = match content_part {
125-
ContentPart::Text(msg) => InnerInputItem::TextInput { text: msg },
121+
ContentPart::Text(msg) => match message.role {
122+
Role::Assistant => InnerInputItem::TextOutput { text: msg },
123+
_ => InnerInputItem::TextInput { text: msg },
124+
},
126125
ContentPart::Image(image_reference) => match image_reference {
127126
ImageReference::Url(image_url) => InnerInputItem::ImageInput {
128127
image_url: image_url.url,
@@ -159,21 +158,6 @@ pub fn llm_message_to_other_message(message: Message) -> InputItem {
159158
}
160159
}
161160

162-
pub fn llm_message_to_assistant_message(message: Message) -> InputItem {
163-
let mut items = Vec::new();
164-
165-
for content_part in message.content {
166-
if let ContentPart::Text(msg) = content_part {
167-
items.push(OutputMessageContent::Text { text: msg });
168-
}
169-
}
170-
171-
InputItem::InputMessage {
172-
role: to_openai_role_name(message.role).to_string(),
173-
content: InnerInput::OutputList(items),
174-
}
175-
}
176-
177161
pub fn parse_error_code(code: String) -> ErrorCode {
178162
if let Some(code) = <u16 as FromStr>::from_str(&code)
179163
.ok()

test/components-rust/test-llm/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,6 @@ impl Guest for Component {
621621

622622
let mut result = String::new();
623623

624-
let name = std::env::var("GOLEM_WORKER_NAME").unwrap();
625-
626624
loop {
627625
match utils::consume_next_event(&stream) {
628626
Some(delta) => {

0 commit comments

Comments
 (0)