Merge pull request tjardoo#48 from tjardoo/develop

Add GH workflow cargo fmt check

Author: tjardoo

.github/workflows/cargo-build.yml

@@ -1,4 +1,4 @@
-name: Rust
+name: Cargo build
 
 on:
   push:

.github/workflows/cargo-fmt.yml

@@ -0,0 +1,20 @@
+name: Cargo fmt
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Cargo fmt
+      run: cargo fmt -- --check

rustfmt.toml

@@ -1 +1 @@
-max_width = 120
+max_width = 100

src/v1/resources/chat.rs

@@ -6,9 +6,7 @@ use std::collections::HashMap;
 use std::fmt::Display;
 use std::str::FromStr;
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionResponse {
     /// A unique identifier for the chat completion.
     pub id: String,
@@ -28,9 +26,7 @@ pub struct ChatCompletionResponse {
 }
 
 #[cfg(feature = "stream")]
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionChunkResponse {
     /// A unique identifier for the chat completion. Each chunk has the same ID.
     pub id: String,
@@ -48,9 +44,7 @@ pub struct ChatCompletionChunkResponse {
     pub object: String,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionParameters {
     /// A list of messages comprising the conversation so far.
     pub messages: Vec<ChatMessage>,
@@ -85,8 +79,7 @@ pub struct ChatCompletionParameters {
     /// An object specifying the format that the model must output.
     /// Setting to { "type": "json_object" } enables JSON mode, which guarantees the message the model generates is valid JSON.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub response_format:
-        Option<ChatCompletionResponseFormat>,
+    pub response_format: Option<ChatCompletionResponseFormat>,
     /// This feature is in Beta. If specified, our system will make a best effort to sample deterministically,
     /// such that repeated requests with the same seed and parameters should return the same result.
     /// Determinism is not guaranteed, and you should refer to the system_fingerprint response parameter to monitor changes in the backend.
@@ -118,9 +111,7 @@ pub struct ChatCompletionParameters {
     pub user: Option<String>,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionToolChoiceFunction {
     /// The type of the tool. Currently, only 'function' is supported.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -129,17 +120,13 @@ pub struct ChatCompletionToolChoiceFunction {
     pub function: ChatCompletionToolChoiceFunctionName,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionToolChoiceFunctionName {
     /// Name of the function.
     pub name: String,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionFunction {
     /// Name of the function.
     pub name: String,
@@ -150,27 +137,21 @@ pub struct ChatCompletionFunction {
     pub parameters: serde_json::Value,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionResponseFormat {
     /// The type of response format. Currently, only 'json_object' and 'text' are supported.
     pub r#type: ChatCompletionResponseFormatType,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionTool {
     /// The type of the tool. Currently, only 'function' is supported.
     pub r#type: ChatCompletionToolType,
     /// The name of the function to call.
     pub function: ChatCompletionFunction,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatMessage {
     /// The role of the author of this message.
     pub role: Role,
@@ -188,9 +169,7 @@ pub struct ChatMessage {
 }
 
 #[cfg(feature = "stream")]
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct DeltaChatMessage {
     /// The role of the author of this message.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -203,9 +182,7 @@ pub struct DeltaChatMessage {
     pub tool_calls: Option<Vec<DeltaToolCall>>,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ToolCall {
     /// The index of the tool call in the list of tool calls.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -220,9 +197,7 @@ pub struct ToolCall {
     pub function: Function,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct DeltaToolCall {
     /// The index of the tool call in the list of tool calls.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -237,19 +212,15 @@ pub struct DeltaToolCall {
     pub function: DeltaFunction,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct Function {
     /// The name of the function to call.
     pub name: String,
     /// The arguments to call the function with, as generated by the model in JSON format.
     pub arguments: String,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct DeltaFunction {
     /// The name of the function to call.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -259,9 +230,7 @@ pub struct DeltaFunction {
     pub arguments: Option<String>,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionChoice {
     /// The index of the choice in the list of choices.
     pub index: u32,
@@ -272,9 +241,7 @@ pub struct ChatCompletionChoice {
 }
 
 #[cfg(feature = "stream")]
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ChatCompletionChunkChoice {
     /// The index of the choice in the list of choices.
     pub index: u32,
@@ -286,9 +253,7 @@ pub struct ChatCompletionChunkChoice {
 }
 
 #[cfg(feature = "stream")]
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct StreamChatCompletionParameters {
     pub messages: Vec<ChatMessage>,
     pub model: String,
@@ -303,8 +268,7 @@ pub struct StreamChatCompletionParameters {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub presence_penalty: Option<f32>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub response_format:
-        Option<ChatCompletionResponseFormat>,
+    pub response_format: Option<ChatCompletionResponseFormat>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub stop: Option<StopToken>,
     pub stream: bool,
@@ -320,9 +284,7 @@ pub struct StreamChatCompletionParameters {
     pub user: Option<String>,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ImageUrl {
     /// The type of the content part.
     pub r#type: String,
@@ -333,9 +295,7 @@ pub struct ImageUrl {
     pub image_url: ImageUrlType,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct ImageUrlType {
     /// Either a URL of the image or the base64 encoded image data.
     pub url: String,
@@ -344,60 +304,46 @@ pub struct ImageUrlType {
     pub detail: Option<ImageUrlDetail>,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 #[serde(rename_all = "lowercase")]
 pub enum ImageUrlDetail {
     Auto,
     High,
     Low,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 #[serde(untagged)]
 pub enum ChatMessageContent {
     Text(String),
     ImageUrl(Vec<ImageUrl>),
     None,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub enum ChatCompletionResponseFormatType {
     #[serde(rename = "text")]
     Text,
     #[serde(rename = "json_object")]
     JsonObject,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 #[serde(rename_all = "lowercase")]
 pub enum ChatCompletionToolType {
     Function,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 #[serde(rename_all = "lowercase")]
 #[serde(untagged)]
 pub enum ChatCompletionToolChoice {
     None,
     Auto,
-    ChatCompletionToolChoiceFunction(
-        ChatCompletionToolChoiceFunction,
-    ),
+    ChatCompletionToolChoiceFunction(ChatCompletionToolChoiceFunction),
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 #[serde(rename_all = "lowercase")]
 pub enum Role {
     System,
@@ -412,9 +358,7 @@ impl Default for ChatCompletionParameters {
         ChatCompletionParameters {
             messages: vec![ChatMessage {
                 role: Role::User,
-                content: ChatMessageContent::Text(
-                    "Hello, World!".to_string(),
-                ),
+                content: ChatMessageContent::Text("Hello, World!".to_string()),
                 tool_calls: None,
                 name: None,
                 tool_call_id: None,
@@ -443,9 +387,7 @@ impl Default for ChatMessage {
     fn default() -> Self {
         ChatMessage {
             role: Role::User,
-            content: ChatMessageContent::Text(
-                "Hello, World!".to_string(),
-            ),
+            content: ChatMessageContent::Text("Hello, World!".to_string()),
             tool_calls: None,
             name: None,
             tool_call_id: None,
@@ -454,10 +396,7 @@ impl Default for ChatMessage {
 }
 
 impl Display for Role {
-    fn fmt(
-        &self,
-        f: &mut std::fmt::Formatter<'_>,
-    ) -> std::fmt::Result {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
             "{}",
@@ -489,16 +428,12 @@ impl FromStr for Role {
 
 impl DeltaFunction {
     pub fn merge(&mut self, other: &Self) {
-        if self.name.is_none()
-            && other.name.is_none() == false
-        {
+        if self.name.is_none() && other.name.is_none() == false {
             self.name = other.name.clone();
         }
 
         if let Some(arguments) = &other.arguments {
-            if let Some(self_arguments) =
-                &mut self.arguments
-            {
+            if let Some(self_arguments) = &mut self.arguments {
                 self_arguments.push_str(arguments);
             } else {
                 self.arguments = Some(arguments.clone());