format and restructure, began working on schedule
This commit is contained in:
19
src/main.rs
19
src/main.rs
@@ -16,7 +16,7 @@ mod error;
|
||||
pub struct HttpKey;
|
||||
|
||||
impl TypeMapKey for HttpKey {
|
||||
type Value = HttpClient;
|
||||
type Value = HttpClient;
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
@@ -25,7 +25,7 @@ async fn main() {
|
||||
env_logger::init_from_env(env_logger::Env::default().filter_or("RUST_LOG", "warn,siren=info"));
|
||||
if let Err(err) = database::initialize().await {
|
||||
log::error!("Failed to initialize database: {err}");
|
||||
return;
|
||||
return;
|
||||
};
|
||||
|
||||
let token: String = env::var("DISCORD_TOKEN").expect("Expected a token in the environment");
|
||||
@@ -51,16 +51,15 @@ async fn main() {
|
||||
let handler = match env::var("OPENAI_API_KEY") {
|
||||
Ok(token) => {
|
||||
log::info!("OpenAI functionality enabled");
|
||||
let default_model = env::var("OPENAI_API_MODEL").unwrap_or("gpt-3.5-turbo".to_string());
|
||||
let default_model = env::var("OPENAI_API_MODEL").unwrap_or("gpt-4o-mini".to_string());
|
||||
Handler {
|
||||
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(),
|
||||
max_attempts: 5,
|
||||
// max_attempts: 5,
|
||||
token,
|
||||
max_context_questions: 30,
|
||||
max_tokens: 2048,
|
||||
max_conversation_history: 30,
|
||||
max_tokens: 8192,
|
||||
default_model,
|
||||
}),
|
||||
}
|
||||
@@ -82,7 +81,11 @@ async fn main() {
|
||||
.await
|
||||
.expect("Error creating client");
|
||||
|
||||
let _shard_manager = Arc::clone(&client.shard_manager);
|
||||
// Handle shutdown signals
|
||||
let shard_manager = Arc::clone(&client.shard_manager);
|
||||
tokio::spawn(async move {
|
||||
shard_manager.shutdown_all().await;
|
||||
});
|
||||
|
||||
// Start listening for events by starting a single shard
|
||||
if let Err(why) = client.start_autosharded().await {
|
||||
|
||||
Reference in New Issue
Block a user