refactor delete consts.rs

src/bot.rs

@@ -1,9 +1,5 @@
-use crate::{consts, gpt};
-use std::{collections::VecDeque, sync::Arc};
+use crate::{gpt, types};
 use teloxide::{prelude::*, utils::command::BotCommands};
-use tokio::sync::RwLock;
-
-pub type Messages = Arc<RwLock<VecDeque<Message>>>;
 
 #[derive(BotCommands, Clone)]
 #[command(
@@ -27,7 +23,7 @@ pub enum Command {
 
 pub async fn handle_commands(
     bot: Bot,
-    messages: Messages,
+    messages: types::Messages,
     msg: Message,
     cmd: Command,
 ) -> ResponseResult<()> {
@@ -57,9 +53,9 @@ pub async fn handle_commands(
     Ok(())
 }
 
-pub async fn handle_messages(messages: Messages, msg: Message) -> ResponseResult<()> {
+pub async fn handle_messages(messages: types::Messages, msg: Message) -> ResponseResult<()> {
     let mut messages_lock = messages.write().await;
-    if messages_lock.len() == consts::STORE_CAPACITY {
+    if messages_lock.len() == types::STORE_CAPACITY {
         messages_lock.pop_front();
     }
     messages_lock.push_back(msg.clone());

src/gpt.rs

@@ -1,4 +1,4 @@
-use crate::bot::Messages;
+use crate::types::Messages;
 use async_openai::{
     config::OpenAIConfig,
     types::{
@@ -18,7 +18,7 @@ pub async fn ask(question: String) -> Result<String, Box<dyn Error>> {
         .max_tokens(512u16)
         .messages(vec![
             ChatCompletionRequestSystemMessageArgs::default()
-                .content(crate::consts::PERSONALITY)
+                .content(crate::types::PERSONALITY)
                 .build()?
                 .into(),
             ChatCompletionRequestUserMessageArgs::default()
@@ -56,11 +56,11 @@ pub async fn mediate(messages: Messages) -> Result<String, Box<dyn Error>> {
         .max_tokens(4096u16)
         .messages(vec![
             ChatCompletionRequestSystemMessageArgs::default()
-                .content(crate::consts::PERSONALITY)
+                .content(crate::types::PERSONALITY)
                 .build()?
                 .into(),
             ChatCompletionRequestSystemMessageArgs::default()
-                .content(crate::consts::MEDIATE_QUERY)
+                .content(crate::types::MEDIATE_QUERY)
                 .build()?
                 .into(),
             ChatCompletionRequestSystemMessageArgs::default()

src/lib.rs

@@ -1,3 +1,14 @@
 pub mod bot;
-pub mod consts;
 pub mod gpt;
+
+pub mod types {
+    use std::{collections::VecDeque, sync::Arc};
+    use teloxide::types::Message;
+    use tokio::sync::RwLock;
+
+    pub const PERSONALITY: &str= "Eres un asistente andaluz con jerga informal y algo irónica. Ayudas a todo aquel que te necesite, no sin antes quejarte un poco, ya que eres algo vago.";
+    pub const MEDIATE_QUERY: &str= "A partir de los siguientes mensajes, analiza una posible discusión y da la razón a alguno de los implicados, con una pequeña argumentación.";
+    pub const STORE_CAPACITY: usize = 200;
+
+    pub type Messages = Arc<RwLock<VecDeque<Message>>>;
+}

src/main.rs

@@ -1,5 +1,5 @@
 use std::{collections::VecDeque, sync::Arc};
-use telitairos_bot::{bot, consts};
+use telitairos_bot::{bot, types};
 use teloxide::prelude::*;
 use tokio::sync::RwLock;
 
@@ -10,8 +10,8 @@ async fn main() {
 
     let bot = Bot::from_env();
 
-    let messages_store: bot::Messages = Arc::new(RwLock::new(VecDeque::with_capacity(
-        crate::consts::STORE_CAPACITY,
+    let messages_store: types::Messages = Arc::new(RwLock::new(VecDeque::with_capacity(
+        crate::types::STORE_CAPACITY,
     )));
 
     let handler = dptree::entry()