mii/openai-api-rs
1
0
Fork 0
mirror of https://github.com/mii443/openai-api-rs.git synced 2025-08-22 15:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #96 from hanselke/main

Browse Source 
Support tool_calls in message history as well as tool role
This commit is contained in:
Dongri Jin
2024-07-17 17:39:41 +09:00
committed by GitHub
parent 1e72a90a14 4a11c78393
commit 3206b6f167
6 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -31,6 +31,8 @@ let req = ChatCompletionRequest::new(
role: chat_completion::MessageRole::user,
content: chat_completion::Content::Text(String::from("What is bitcoin?")),
name: None,
tool_calls: None,
tool_call_id: None,
}],
);
```

2
examples/chat_completion.rs
View File

@ -13,6 +13,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
role: chat_completion::MessageRole::user,
content: chat_completion::Content::Text(String::from("What is bitcoin?")),
name: None,
tool_calls: None,
tool_call_id: None,
}],
);

2
examples/function_call.rs
View File

@ -34,6 +34,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
role: chat_completion::MessageRole::user,
content: chat_completion::Content::Text(String::from("What is the price of Ethereum?")),
name: None,
tool_calls: None,
tool_call_id: None,
}],
)
.tools(vec![chat_completion::Tool {

6
examples/function_call_role.rs
View File

@ -34,6 +34,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
role: chat_completion::MessageRole::user,
content: chat_completion::Content::Text(String::from("What is the price of Ethereum?")),
name: None,
tool_calls: None,
tool_call_id: None,
}],
)
.tools(vec![chat_completion::Tool {
@ -88,6 +90,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
"What is the price of Ethereum?",
)),
name: None,
tool_calls: None,
tool_call_id: None,
},
chat_completion::ChatCompletionMessage {
role: chat_completion::MessageRole::function,
@ -96,6 +100,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
format!("{{\"price\": {}}}", price)
}),
name: Some(String::from("get_coin_price")),
tool_calls: None,
tool_call_id: None,
},
],
);

2
examples/vision.rs
View File

@ -28,6 +28,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
},
]),
name: None,
tool_calls: None,
tool_call_id: None,
}],
);

17
src/v1/chat_completion.rs
View File

@ -45,6 +45,8 @@ pub struct ChatCompletionRequest {
#[serde(skip_serializing_if = "Option::is_none")]
pub tools: Option<Vec<Tool>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub parallel_tool_calls: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")]
#[serde(serialize_with = "serialize_tool_choice")]
pub tool_choice: Option<ToolChoiceType>,
}
@ -67,6 +69,7 @@ impl ChatCompletionRequest {
user: None,
seed: None,
tools: None,
parallel_tool_calls: None,
tool_choice: None,
}
}
@ -87,6 +90,7 @@ impl_builder_methods!(
user: String,
seed: i64,
tools: Vec<Tool>,
parallel_tool_calls: bool,
tool_choice: ToolChoiceType
);
@ -97,6 +101,7 @@ pub enum MessageRole {
system,
assistant,
function,
tool,
}
#[derive(Debug, Deserialize, Clone, PartialEq, Eq)]
@ -111,7 +116,13 @@ impl serde::Serialize for Content {
S: serde::Serializer,
{
match *self {
Content::Text(ref text) => serializer.serialize_str(text),
Content::Text(ref text) => {
if text.is_empty() {
serializer.serialize_none()
} else {
serializer.serialize_str(text)
}
}
Content::ImageUrl(ref image_url) => image_url.serialize(serializer),
}
}
@ -146,6 +157,10 @@ pub struct ChatCompletionMessage {
pub content: Content,
#[serde(skip_serializing_if = "Option::is_none")]
pub name: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub tool_calls: Option<Vec<ToolCall>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub tool_call_id: Option<String>,
}
#[derive(Debug, Deserialize, Serialize)]