Adds deserializer for Content

README.md

@@ -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,
     }],
 );
 ```

examples/chat_completion.rs

@@ -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,
         }],
     );
 

examples/function_call.rs

@@ -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 {

examples/function_call_role.rs

@@ -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,
                         },
                     ],
                 );

examples/vision.rs

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

src/v1/chat_completion.rs

@@ -1,11 +1,11 @@
+use crate::impl_builder_methods;
+use crate::v1::common;
+use serde::de::{self, MapAccess, SeqAccess, Visitor};
 use serde::ser::SerializeMap;
-use serde::{Deserialize, Serialize, Serializer};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
 use std::collections::HashMap;
-
-use crate::impl_builder_methods;
-use crate::v1::common;
-
+use std::fmt;
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub enum ToolChoiceType {
     None,
@@ -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,9 +101,10 @@ pub enum MessageRole {
     system,
     assistant,
     function,
+    tool,
 }
 
-#[derive(Debug, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Content {
     Text(String),
     ImageUrl(Vec<ImageUrl>),
@@ -111,12 +116,75 @@ 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),
         }
     }
 }
 
+impl<'de> Deserialize<'de> for Content {
+    fn deserialize<D>(deserializer: D) -> Result<Content, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct ContentVisitor;
+
+        impl<'de> Visitor<'de> for ContentVisitor {
+            type Value = Content;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("a valid content type")
+            }
+
+            fn visit_str<E>(self, value: &str) -> Result<Content, E>
+            where
+                E: de::Error,
+            {
+                Ok(Content::Text(value.to_string()))
+            }
+
+            fn visit_seq<A>(self, seq: A) -> Result<Content, A::Error>
+            where
+                A: SeqAccess<'de>,
+            {
+                let image_urls: Vec<ImageUrl> =
+                    Deserialize::deserialize(de::value::SeqAccessDeserializer::new(seq))?;
+                Ok(Content::ImageUrl(image_urls))
+            }
+
+            fn visit_map<M>(self, map: M) -> Result<Content, M::Error>
+            where
+                M: MapAccess<'de>,
+            {
+                let image_urls: Vec<ImageUrl> =
+                    Deserialize::deserialize(de::value::MapAccessDeserializer::new(map))?;
+                Ok(Content::ImageUrl(image_urls))
+            }
+
+            fn visit_none<E>(self) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Content::Text(String::new()))
+            }
+
+            fn visit_unit<E>(self) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Content::Text(String::new()))
+            }
+        }
+
+        deserializer.deserialize_any(ContentVisitor)
+    }
+}
 #[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
 #[allow(non_camel_case_types)]
 pub enum ContentType {
@@ -146,6 +214,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)]