feat: refactor chat, resume into modules + color in UImain

6 files changed, 31 insertions, 19 deletions

diff --git a/src/app/init.rs b/src/app/init.rs
index 0930319..f2b1ee3 100644
--- a/src/app/init.rs
+++ b/src/app/init.rs
@@ -1,5 +1,5 @@
 use crate::app::llm::{Message, MessageType, LLM};
-use crate::app::modules::wikipedia::ask_wiki;
+use crate::app::modules::{wikipedia, resume, chat, code};
 use crate::helper::init::warn;
 use uuid::Uuid;
 use tokio::runtime::Builder;
@@ -8,23 +8,15 @@ pub struct App {
     pub messages: Vec<Message>, // History of recorded message
     pub conv_id: Uuid, // ID for retrieving and saving the history of messag
     categorize_llm: LLM,
-    chat_llm: LLM, // Configuration for the LLM that chat with you
-    resume_llm: LLM, // Configuration for the LLM that resume conversation
 }
 
 impl App {
     pub fn new() -> App {
 
-        let categorize_llm = LLM::new("config/categorize-LLM.json");
         App {
-            messages: vec![Message::new(
-                MessageType::SYSTEM,
-                categorize_llm.system_prompt.clone(),
-            )],
+            messages: Vec::new(),
             conv_id: Uuid::new_v4(),
-            categorize_llm,
-            chat_llm: LLM::new("config/chat-LLM.json"),
-            resume_llm: LLM::new("config/resume-LLM.json"),
+            categorize_llm: LLM::new("config/categorize-LLM.json"),
         }
     }
 
@@ -47,7 +39,7 @@ impl App {
 
         match result {
             Ok(msg) => {
-                let categorie = msg[0]["function"]["arguments"]["category"].clone();
+                let categorie = msg[0]["function"]["arguments"]["category_choice"].clone();
                 self.ask(&categorie.to_string().replace("\"", ""));
             },
             Err(e) => self.append_message(e.to_string(), MessageType::ASSISTANT),
@@ -62,11 +54,11 @@ impl App {
 
         let result = runtime.block_on(async {
             if mode == "resume" {
-                self.resume_llm.ask(&self.messages).await
+                resume::resume_conv(self.messages.clone()).await
             } else if mode == "wikipedia" {
-                ask_wiki(&self.messages).await
+                wikipedia::ask_wiki(&self.messages).await
             } else {
-                self.chat_llm.ask(&self.messages).await
+                chat::ask_chat(self.messages.clone()).await
             }
         });
 
@@ -82,7 +74,6 @@ impl App {
     }
 
     pub fn resume_conv(&mut self) {
-        self.append_message(self.resume_llm.system_prompt.to_string(), MessageType::USER);
         self.ask("resume"); 
     }
 }
diff --git a/src/app/modules.rs b/src/app/modules.rs
index 622d63c..d25441d 100644
--- a/src/app/modules.rs
+++ b/src/app/modules.rs
@@ -1 +1,4 @@
+pub mod chat;
+pub mod code;
+pub mod resume;
 pub mod wikipedia;
diff --git a/src/app/modules/chat.rs b/src/app/modules/chat.rs
new file mode 100644
index 0000000..ee00c98
--- /dev/null
+++ b/src/app/modules/chat.rs
@@ -0,0 +1,9 @@
+use crate::app::llm::{LLM, Message, MessageType};
+
+pub async fn ask_chat(mut messages: Vec<Message>) -> Result<String, Box<dyn std::error::Error>> {
+    let chat_llm = LLM::new("config/chat-LLM.json");
+    messages.push(Message::new(MessageType::USER, chat_llm.system_prompt.to_string()));
+  
+    let result: String = chat_llm.ask(&messages).await?;
+    Ok(result)
+}
diff --git a/src/app/modules/code.rs b/src/app/modules/code.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/app/modules/code.rs
diff --git a/src/app/modules/resume.rs b/src/app/modules/resume.rs
new file mode 100644
index 0000000..057314c
--- /dev/null
+++ b/src/app/modules/resume.rs
@@ -0,0 +1,9 @@
+use crate::app::llm::{LLM, Message, MessageType};
+
+pub async fn resume_conv(mut messages: Vec<Message>) -> Result<String, Box<dyn std::error::Error>> {
+    let resume_llm = LLM::new("config/resume-LLM.json");
+    messages.push(Message::new(MessageType::USER, resume_llm.system_prompt.to_string()));
+  
+    let result: String = resume_llm.ask(&messages).await?;
+    Ok(result)
+}
diff --git a/src/app/modules/wikipedia.rs b/src/app/modules/wikipedia.rs
index 5864df4..86177ae 100644
--- a/src/app/modules/wikipedia.rs
+++ b/src/app/modules/wikipedia.rs
@@ -76,7 +76,7 @@ async fn find_get_best_article(articles: Vec<String>, user_query: &String, best_
 
     let messages = vec![
         Message::new(MessageType::SYSTEM, best_llm.system_prompt.clone()),
-        Message::new(MessageType::USER, format!("The user's query is: {}. Here are the headings:\n{}\n\nPlease select the most relevant heading. Output the heading **only** and nothing else.", user_query, articles_headings))];
+        Message::new(MessageType::USER, format!("The user's query is: {}. Here are the headings:\n{}\n\nPlease select the most relevant heading. Output the heading only and nothing else.", user_query, articles_headings))];
     let best_article = best_llm.ask(&messages).await?;
 
     // wiki query get article content & parse
@@ -98,9 +98,9 @@ fn extract_text_from_tags(html: &str) -> String {
             // Trouver le premier groupe capturé non vide (parmi cap[1] à cap[4])
             (1..=4)
                 .filter_map(|i| cap.get(i))
-                .map(|m| m.as_str()) // &str
+                .map(|m| m.as_str())
                 .flat_map(|s| s.split_whitespace())
-                .collect::<Vec<_>>() // Vec<&str>
+                .collect::<Vec<_>>()
         })
         .collect::<Vec<_>>() // collect words
         .join(" "); // join with spaces