clippy and CI

.github/workflows/ci.yml

@@ -16,9 +16,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Build
-        run: cargo build --verbose
-      - name: Run tests
-        run: cargo test --verbose
+      - uses: davidB/rust-cargo-make@v1
+      - name: Run CI flow
+        run: cargo make ci
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}

src/llm/mod.rs

@@ -2,6 +2,8 @@ pub mod bert;
 pub mod openai;
 pub mod request;
 
+use std::fmt::Display;
+
 use anyhow::Result;
 use async_openai::types::CreateChatCompletionResponse;
 use candle_core::{Device, Result as CandleResult, Tensor};
@@ -67,17 +69,6 @@ impl From<CreateChatCompletionResponse> for LLMResponse {
 }
 
 impl LLMResponse {
-    /// Get the response content from an LLMResponse
-    pub fn to_string(&self) -> String {
-        match self {
-            LLMResponse::OpenAI(response) => {
-                ToString::to_string(&response.choices[0].message.content.as_ref().unwrap())
-            }
-            LLMResponse::Bert(response) => response.iter().map(|x| x.to_string()).collect::<Vec<String>>().join(", "),
-            LLMResponse::Empty => "".to_string(),
-        }
-    }
-
     /// Get the role of the response from an LLMResponse, if supported by the LLM.
     pub fn get_role(&self) -> String {
         match self {
@@ -88,6 +79,25 @@ impl LLMResponse {
     }
 }
 
+impl Display for LLMResponse {
+    /// Display the response content from an LLMResponse
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            LLMResponse::OpenAI(response) => {
+                write!(f, "{}", response.choices[0].message.content.as_ref().unwrap())
+            }
+            LLMResponse::Bert(response) => {
+                write!(
+                    f,
+                    "{}",
+                    response.iter().map(|x| x.to_string()).collect::<Vec<String>>().join(", ")
+                )
+            }
+            LLMResponse::Empty => write!(f, ""),
+        }
+    }
+}
+
 impl Default for LLMResponse {
     /// Default LLMResponse is Empty
     fn default() -> Self {

src/prompt/mod.rs

@@ -101,8 +101,8 @@ impl<'p> TemplateEngine<'p> {
     pub fn render(&self) -> Result<Box<dyn Prompt>> {
         let rendered = self.handlebars.render_template(&self.template, &HashMap::<String, String>::new())?;
         match serde_json::from_str::<ChatPrompt>(&rendered) {
-            Ok(chat) => return Ok(Box::new(chat)),
-            Err(_) => return Ok(Box::new(rendered)),
+            Ok(chat) => Ok(Box::new(chat)),
+            Err(_) => Ok(Box::new(rendered)),
         }
     }
 
@@ -131,8 +131,8 @@ impl<'p> TemplateEngine<'p> {
     {
         let rendered = self.handlebars.render_template(&self.template, &data)?;
         match serde_json::from_str::<ChatPrompt>(&rendered) {
-            Ok(chat) => return Ok(Box::new(chat)),
-            Err(_) => return Ok(Box::new(rendered)),
+            Ok(chat) => Ok(Box::new(chat)),
+            Err(_) => Ok(Box::new(rendered)),
         }
     }