Updated chat/oai layout

service/src/main.rs

@@ -14,7 +14,7 @@ use songbird::{SerenityInit, Songbird};
 
 use actix_cors::Cors;
 use actix_web::{HttpServer, App, web};
-use crate::bot::{commands::oai::GPTModel, handler::Handler};
+use crate::bot::handler::Handler;
 
 use dotenv::dotenv;
 
@@ -57,8 +57,9 @@ async fn main() -> std::io::Result<()> {
   let handler = match env::var("OPENAI_API_KEY") {
     Ok(token) => {
       info!("Loaded OpenAI token");
+      let default_model = env::var("OPENAI_API_MODEL").unwrap_or("gpt-3.5-turbo".to_string());
       Handler {
-        oai: Some(bot::commands::oai::OAI {
+        oai: Some(bot::oai::OAI {
           client: reqwest::Client::new(),
           base_url: "https://api.openai.com/v1".to_string(),
           service_url: "http://localhost:5000".to_string(),
@@ -66,7 +67,7 @@ async fn main() -> std::io::Result<()> {
           token,
           max_context_questions: 30,
           max_tokens: 2048,
-          default_model: GPTModel::GPT35Turbo,
+          default_model,
         })
       }
     }