refactor: code refactoring

Author: pythops

src/gpt.rs src/chatgpt.rssrc/gpt.rs renamed to src/chatgpt.rs

@@ -1,19 +1,19 @@
-use crate::config::GPTConfig;
+use crate::config::ChatGPTConfig;
 use crate::llm::LLM;
 use reqwest::header::HeaderMap;
 use serde_json::{json, Value};
 use std;
 use std::collections::HashMap;
 
 #[derive(Clone, Debug)]
-pub struct GPT {
+pub struct ChatGPT {
     client: reqwest::blocking::Client,
     openai_api_key: String,
     url: String,
 }
 
-impl GPT {
-    pub fn new(config: GPTConfig) -> Self {
+impl ChatGPT {
+    pub fn new(config: ChatGPTConfig) -> Self {
         let openai_api_key = match std::env::var("OPENAI_API_KEY") {
             Ok(key) => key,
             Err(_) => config
@@ -37,7 +37,7 @@ You need to define one wether in the configuration file or as an environment var
     }
 }
 
-impl LLM for GPT {
+impl LLM for ChatGPT {
     fn ask(
         &self,
         chat_messages: Vec<HashMap<String, String>>,

src/config.rs

@@ -1,3 +1,4 @@
+use crate::llm::LLMBackend;
 use toml;
 
 use dirs;
@@ -11,36 +12,43 @@ pub struct Config {
     #[serde(default)]
     pub key_bindings: KeyBindings,
 
+    #[serde(default = "default_llm_backend")]
+    pub model: LLMBackend,
+
     #[serde(default)]
-    pub gpt: GPTConfig,
+    pub chatgpt: ChatGPTConfig,
 }
 
 pub fn default_archive_file_name() -> String {
     String::from("tenere.archive")
 }
 
+pub fn default_llm_backend() -> LLMBackend {
+    LLMBackend::ChatGPT
+}
+
 #[derive(Deserialize, Debug, Clone)]
-pub struct GPTConfig {
+pub struct ChatGPTConfig {
     pub openai_api_key: Option<String>,
 
-    #[serde(default = "GPTConfig::default_model")]
+    #[serde(default = "ChatGPTConfig::default_model")]
     pub model: String,
 
-    #[serde(default = "GPTConfig::default_url")]
+    #[serde(default = "ChatGPTConfig::default_url")]
     pub url: String,
 }
 
-impl Default for GPTConfig {
+impl Default for ChatGPTConfig {
     fn default() -> Self {
         Self {
             openai_api_key: None,
-            model: String::from("gpt-3.5-turbo"),
-            url: String::from("https://api.openai.com/v1/chat/completions"),
+            model: Self::default_model(),
+            url: Self::default_url(),
         }
     }
 }
 
-impl GPTConfig {
+impl ChatGPTConfig {
     pub fn default_model() -> String {
         String::from("gpt-3.5-turbo")
     }

src/lib.rs

@@ -6,7 +6,7 @@ pub mod tui;
 
 pub mod handler;
 
-pub mod gpt;
+pub mod chatgpt;
 
 pub mod cli;
 

src/llm.rs

@@ -1,5 +1,6 @@
+use crate::chatgpt::ChatGPT;
 use crate::config::Config;
-use crate::gpt::GPT;
+use serde::Deserialize;
 use std::collections::HashMap;
 
 use std::sync::Arc;
@@ -10,6 +11,7 @@ pub trait LLM: Send + Sync {
     ) -> Result<String, Box<dyn std::error::Error>>;
 }
 
+#[derive(Deserialize, Debug)]
 pub enum LLMBackend {
     ChatGPT,
 }
@@ -19,7 +21,7 @@ pub struct LLMModel {}
 impl LLMModel {
     pub fn init(model: LLMBackend, config: Arc<Config>) -> impl LLM {
         match model {
-            LLMBackend::ChatGPT => GPT::new(config.gpt.clone()),
+            LLMBackend::ChatGPT => ChatGPT::new(config.chatgpt.clone()),
         }
     }
 }