User & Content should not be Option

Author: Guantong

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "openai_api_rust"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["i@guantong.dev"]
 edition = "2021"
 license = "MIT"

README.md

@@ -64,15 +64,14 @@ fn main() {
         logit_bias: None,
         user: None,
         messages: vec![Message {
-            role: Some("user".to_string()),
-            content: Some("Hello!".to_string()),
+            role: "user".to_string(),
+            content: "Hello!".to_string(),
         }],
     };
     let rs = openai.chat_completion_create(&body);
     let choice = rs.unwrap().choices;
     let message = &choice[0].message.as_ref().unwrap();
-    let content = message.content.as_ref().unwrap();
-    assert!(content.contains("Hello"));
+    assert!(message.content.contains("Hello"));
 }
 ```
 

src/apis/chat.rs

@@ -121,14 +121,13 @@ mod tests {
 			logit_bias: None,
 			user: None,
 			messages: vec![Message {
-				role: Some("user".to_string()),
-				content: Some("Hello!".to_string()),
+				role: "user".to_string(),
+				content: "Hello!".to_string(),
 			}],
 		};
 		let rs = openai.chat_completion_create(&body);
 		let choice = rs.unwrap().choices;
 		let message = &choice[0].message.as_ref().unwrap();
-		let content = message.content.as_ref().unwrap();
-		assert!(content.contains("Hello"));
+		assert!(message.content.contains("Hello"));
 	}
 }

src/apis/completions.rs

@@ -137,8 +137,8 @@ pub struct Choice {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Message {
-	pub role: Option<String>,
-	pub content: Option<String>,
+	pub role: String,
+	pub content: String,
 }
 
 pub trait CompletionsApi {