diff --git a/Cargo.lock b/Cargo.lock index 15f9abceb5..00ce37c3d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -760,6 +760,7 @@ dependencies = [ "imgui-glium-renderer", "imgui-winit-support", "log", + "path-absolutize", "serde", "serde_derive", "serde_json", @@ -4705,6 +4706,24 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +[[package]] +name = "path-absolutize" +version = "3.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1d4993b16f7325d90c18c3c6a3327db7808752db8d208cea0acee0abd52c52" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a81540d94551664b72b72829b12bd167c73c9d25fbac0e04fafa8023f7e4901" +dependencies = [ + "once_cell", +] + [[package]] name = "pem-rfc7468" version = "0.3.1" diff --git a/crates/programs/aichatbot-sidecar/Cargo.toml b/crates/programs/aichatbot-sidecar/Cargo.toml index d1ca414d0a..7b0c6bca3e 100644 --- a/crates/programs/aichatbot-sidecar/Cargo.toml +++ b/crates/programs/aichatbot-sidecar/Cargo.toml @@ -24,6 +24,7 @@ clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updat easyenv = "0.0.6" log = "0.4.14" dotenv = "0.15.0" +path-absolutize = "3.0.14" # Absolute paths have not stabilized in Rust yet # Async Runtime tokio = { version = "1.6.0", features = ["macros"] } diff --git a/crates/programs/aichatbot-sidecar/src/gui/gui.rs b/crates/programs/aichatbot-sidecar/src/gui/gui.rs index a20349c869..0e2536b9f4 100644 --- a/crates/programs/aichatbot-sidecar/src/gui/gui.rs +++ b/crates/programs/aichatbot-sidecar/src/gui/gui.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use eframe::egui; use log::{error, info}; -use crate::shared_state::control_state::ControlState; +use crate::shared_state::app_control_state::AppControlState; /// Initial state for the GUI pub struct AppGuiArgs { @@ -9,7 +9,7 @@ pub struct AppGuiArgs { pub save_directory: String, /// Shared state with the HTTP server and workers. - pub control_state: Arc, + pub control_state: Arc, } pub struct AppGui { @@ -20,7 +20,7 @@ pub struct AppGui { is_paused: bool, /// Shared state with the HTTP server and workers. - control_state: Arc, + control_state: Arc, } impl AppGui { diff --git a/crates/programs/aichatbot-sidecar/src/gui/launch_gui.rs b/crates/programs/aichatbot-sidecar/src/gui/launch_gui.rs index 727a58b537..16461ba72e 100644 --- a/crates/programs/aichatbot-sidecar/src/gui/launch_gui.rs +++ b/crates/programs/aichatbot-sidecar/src/gui/launch_gui.rs @@ -1,11 +1,11 @@ use crate::gui::gui::{AppGui, AppGuiArgs}; -use crate::shared_state::control_state::ControlState; +use crate::shared_state::app_control_state::AppControlState; use crate::startup_args::StartupArgs; use eframe::egui; use errors::AnyhowResult; use std::sync::Arc; -pub fn launch_gui(startup_args: StartupArgs, control_state: Arc) -> AnyhowResult<()> { +pub fn launch_gui(startup_args: StartupArgs, control_state: Arc) -> AnyhowResult<()> { // Log to stdout (if you run with `RUST_LOG=debug`). //tracing_subscriber::fmt::init(); diff --git a/crates/programs/aichatbot-sidecar/src/main.rs b/crates/programs/aichatbot-sidecar/src/main.rs index 849ce8883b..ba35e625fd 100644 --- a/crates/programs/aichatbot-sidecar/src/main.rs +++ b/crates/programs/aichatbot-sidecar/src/main.rs @@ -17,15 +17,16 @@ use async_openai::Client; use clap::{App, Arg}; use crate::gui::launch_gui::launch_gui; use crate::main_loop::main_loop; -use crate::shared_state::control_state::ControlState; +use crate::shared_state::app_control_state::AppControlState; use crate::startup_args::get_startup_args; -use crate::web_server::launch_web_server::launch_web_server; +use crate::web_server::launch_web_server::{launch_web_server, LaunchWebServerArgs}; use errors::AnyhowResult; use log::info; use std::sync::Arc; use std::thread; use std::time::Duration; use tokio::runtime::Runtime; +use crate::persistence::save_directory::SaveDirectory; #[actix_web::main] pub async fn main() -> AnyhowResult<()> { @@ -37,14 +38,15 @@ pub async fn main() -> AnyhowResult<()> { let startup_args = get_startup_args()?; - let control_state = Arc::new(ControlState::new()); + let app_control_state = Arc::new(AppControlState::new()); let openai_client = Arc::new(Client::new() .with_api_key(startup_args.openai_secret_key.clone())); - let tokio_runtime = Runtime::new()?; + let save_directory = SaveDirectory::new(&startup_args.save_directory); + info!("Starting async processes..."); tokio_runtime.spawn(async { @@ -53,20 +55,21 @@ pub async fn main() -> AnyhowResult<()> { info!("Starting web server..."); - let control_state2 = control_state.clone(); + let app_control_state2 = app_control_state.clone(); let openai_client2 = openai_client.clone(); thread::spawn(move || { - let server_future = launch_web_server( - control_state2, - openai_client2, - ); + let server_future = launch_web_server(LaunchWebServerArgs { + app_control_state: app_control_state2, + openai_client: openai_client2, + save_directory, + }); actix_web::rt::System::new().block_on(server_future) }); info!("Starting GUI ..."); - let _r = launch_gui(startup_args.clone(), control_state.clone()); + let _r = launch_gui(startup_args.clone(), app_control_state.clone()); Ok(()) } diff --git a/crates/programs/aichatbot-sidecar/src/persistence/save_directory.rs b/crates/programs/aichatbot-sidecar/src/persistence/save_directory.rs index 280a35ed2d..8a657af985 100644 --- a/crates/programs/aichatbot-sidecar/src/persistence/save_directory.rs +++ b/crates/programs/aichatbot-sidecar/src/persistence/save_directory.rs @@ -1,8 +1,21 @@ -use std::path::PathBuf; +use std::path::{Path, PathBuf}; +#[derive(Clone)] pub struct SaveDirectory { directory: PathBuf, } impl SaveDirectory { + + pub fn new>(directory: P) -> Self { + Self { + directory: directory.as_ref().to_path_buf() + } + } + + /// This is just the first directory structure, which is sequential audio files. + /// We'll be using a database and well-formed filesystem layout later. + pub fn get_audio_files_dir_v1(&self) -> PathBuf { + self.directory.join("./audio_files") + } } diff --git a/crates/programs/aichatbot-sidecar/src/shared_state/control_state.rs b/crates/programs/aichatbot-sidecar/src/shared_state/app_control_state.rs similarity index 83% rename from crates/programs/aichatbot-sidecar/src/shared_state/control_state.rs rename to crates/programs/aichatbot-sidecar/src/shared_state/app_control_state.rs index b18c3279af..6c35b943e4 100644 --- a/crates/programs/aichatbot-sidecar/src/shared_state/control_state.rs +++ b/crates/programs/aichatbot-sidecar/src/shared_state/app_control_state.rs @@ -1,16 +1,17 @@ use std::sync::{Arc, LockResult, RwLock}; use errors::{anyhow, AnyhowResult}; -pub struct ControlState { +/// User-controlled parameters that determine how the app behaves at runtime. +pub struct AppControlState { /// Whether the playback should be paused /// Unreal Engine will get this over HTTP and know whether to no-op. is_paused: Arc>, } -impl ControlState { +impl AppControlState { pub fn new() -> Self { - ControlState { + AppControlState { is_paused: Arc::new(RwLock::new(false)), } } diff --git a/crates/programs/aichatbot-sidecar/src/shared_state/mod.rs b/crates/programs/aichatbot-sidecar/src/shared_state/mod.rs index 3b54ff9e8d..9e1bf81972 100644 --- a/crates/programs/aichatbot-sidecar/src/shared_state/mod.rs +++ b/crates/programs/aichatbot-sidecar/src/shared_state/mod.rs @@ -1,2 +1,2 @@ -pub mod control_state; +pub mod app_control_state; pub mod job_state; \ No newline at end of file diff --git a/crates/programs/aichatbot-sidecar/src/startup_args.rs b/crates/programs/aichatbot-sidecar/src/startup_args.rs index 8472a2199f..ae9064fd13 100644 --- a/crates/programs/aichatbot-sidecar/src/startup_args.rs +++ b/crates/programs/aichatbot-sidecar/src/startup_args.rs @@ -1,5 +1,8 @@ -use clap::{App, Arg}; -use errors::AnyhowResult; +use std::path::PathBuf; +use clap::{App, Arg, ArgMatches}; +use log::info; +use path_absolutize::Absolutize; +use errors::{anyhow, AnyhowResult}; const DEFAULT_SAVE_DIRECTORY : &'static str = "./data"; @@ -23,25 +26,43 @@ pub fn get_startup_args() -> AnyhowResult { .required(false)) .get_matches(); - let mut maybe_save_directory = matches.value_of("directory") - .map(|val| val.trim().to_string()); - - if maybe_save_directory.is_none() { - maybe_save_directory = std::env::current_dir() - .ok() - .map(|pathbuf| pathbuf.join(DEFAULT_SAVE_DIRECTORY)) - .map(|pathbuf| std::fs::canonicalize(pathbuf).ok()) - .flatten() - .map(|pathbuf| pathbuf.to_str().map(|s| s.to_string())) - .flatten(); - } - let openai_secret_key = easyenv::get_env_string_required("OPENAI_SECRET_KEY")?; - let save_directory = maybe_save_directory.unwrap_or_else(|| DEFAULT_SAVE_DIRECTORY.to_string()); + let save_directory = get_save_directory(&matches)?; Ok(StartupArgs { save_directory, openai_secret_key, }) } + + +fn get_save_directory(matches: &ArgMatches) -> AnyhowResult { + let mut maybe_save_directory = matches.value_of("directory") + .map(|val| val.trim().to_string()) + .map(|val| PathBuf::from(val)); + + if maybe_save_directory.is_none() { + // Use the current directory + maybe_save_directory = std::env::current_dir() + .ok() + .map(|pathbuf| pathbuf.join(DEFAULT_SAVE_DIRECTORY)) + .map(|pathbuf| std::fs::canonicalize(pathbuf).ok()) + .flatten(); + } + + let save_directory = maybe_save_directory + .unwrap_or_else(|| PathBuf::from(DEFAULT_SAVE_DIRECTORY)); + + info!("Possible save directory: {:?}", save_directory); + + let save_directory= std::fs::canonicalize(save_directory) + .ok() + .map(|pathbuf| pathbuf.absolutize().ok().map(|inner| inner.to_path_buf())) + .flatten() + .map(|pathbuf| pathbuf.to_str().map(|s| s.to_string())) + .flatten() + .ok_or(anyhow!("could not construct path"))?; + + Ok(save_directory) +} \ No newline at end of file diff --git a/crates/programs/aichatbot-sidecar/src/web_server/handlers/get_next_audio_file_handler.rs b/crates/programs/aichatbot-sidecar/src/web_server/handlers/get_next_audio_file_handler.rs index 812ea0b010..50690c5212 100644 --- a/crates/programs/aichatbot-sidecar/src/web_server/handlers/get_next_audio_file_handler.rs +++ b/crates/programs/aichatbot-sidecar/src/web_server/handlers/get_next_audio_file_handler.rs @@ -4,7 +4,7 @@ use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use actix_web::web::Query; use log::{error, info}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use crate::shared_state::control_state::ControlState; +use crate::shared_state::app_control_state::AppControlState; #[derive(Deserialize)] pub struct GetNextAudioQuery { @@ -44,7 +44,7 @@ impl std::fmt::Display for GetNextAudioFileError { pub async fn get_next_audio_file_handler( _http_request: HttpRequest, - control_state: web::Data>, + control_state: web::Data>, request: Query, ) -> Result { diff --git a/crates/programs/aichatbot-sidecar/src/web_server/handlers/next_audio_file_handler.rs b/crates/programs/aichatbot-sidecar/src/web_server/handlers/next_audio_file_handler.rs index 19ed99053e..3dc74ad181 100644 --- a/crates/programs/aichatbot-sidecar/src/web_server/handlers/next_audio_file_handler.rs +++ b/crates/programs/aichatbot-sidecar/src/web_server/handlers/next_audio_file_handler.rs @@ -3,7 +3,7 @@ use actix_http::StatusCode; use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; use log::error; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use crate::shared_state::control_state::ControlState; +use crate::shared_state::app_control_state::AppControlState; #[derive(Serialize)] pub struct NextAudioFileResponse { @@ -37,7 +37,7 @@ impl std::fmt::Display for NextAudioFileError { pub async fn next_audio_file_handler( _http_request: HttpRequest, - control_state: web::Data> + control_state: web::Data> ) -> Result { let is_paused = control_state.is_paused() diff --git a/crates/programs/aichatbot-sidecar/src/web_server/handlers/openai_inference_handler.rs b/crates/programs/aichatbot-sidecar/src/web_server/handlers/openai_inference_handler.rs index f34d8f976f..7007bec19f 100644 --- a/crates/programs/aichatbot-sidecar/src/web_server/handlers/openai_inference_handler.rs +++ b/crates/programs/aichatbot-sidecar/src/web_server/handlers/openai_inference_handler.rs @@ -5,7 +5,7 @@ use async_openai::Client; use async_openai::types::CreateCompletionRequestArgs; use log::{error, info}; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use crate::shared_state::control_state::ControlState; +use crate::shared_state::app_control_state::AppControlState; #[derive(Serialize)] pub struct OpenAiInferenceResponse { @@ -39,7 +39,7 @@ impl std::fmt::Display for OpenAiInferenceError { pub async fn openai_inference_handler( _http_request: HttpRequest, - control_state: web::Data>, + control_state: web::Data>, openai_client: web::Data>, ) -> Result { diff --git a/crates/programs/aichatbot-sidecar/src/web_server/launch_web_server.rs b/crates/programs/aichatbot-sidecar/src/web_server/launch_web_server.rs index 1d0a761da2..ff97e2138c 100644 --- a/crates/programs/aichatbot-sidecar/src/web_server/launch_web_server.rs +++ b/crates/programs/aichatbot-sidecar/src/web_server/launch_web_server.rs @@ -1,7 +1,8 @@ use actix_helpers::route_builder::RouteBuilder; use actix_web::{App, HttpResponse, HttpServer, web}; use async_openai::Client; -use crate::shared_state::control_state::ControlState; +use crate::persistence::save_directory::SaveDirectory; +use crate::shared_state::app_control_state::AppControlState; use crate::web_server::handlers::get_next_audio_file_handler::get_next_audio_file_handler; use crate::web_server::handlers::next_audio_file_handler::next_audio_file_handler; use crate::web_server::handlers::openai_inference_handler::openai_inference_handler; @@ -10,20 +11,24 @@ use errors::AnyhowResult; use http_server_common::endpoints::root_index::get_root_index; use std::sync::Arc; -pub async fn launch_web_server( - control_state: Arc, - openai_client: Arc -) -> AnyhowResult<()> { +pub struct LaunchWebServerArgs { + pub app_control_state: Arc, + pub openai_client: Arc, + pub save_directory: SaveDirectory, +} + +pub async fn launch_web_server(args: LaunchWebServerArgs) -> AnyhowResult<()> { let server_state = Arc::new(ServerState { - control_state: control_state.clone(), - openai_client: openai_client.clone(), + app_control_state: args.app_control_state.clone(), + openai_client: args.openai_client.clone(), + save_directory: args.save_directory, }); HttpServer::new(move || { let app = App::new() - .app_data(web::Data::new(control_state.clone())) - .app_data(web::Data::new(openai_client.clone())) + .app_data(web::Data::new(args.app_control_state.clone())) + .app_data(web::Data::new(args.openai_client.clone())) .app_data(web::Data::new(server_state.clone())); let mut route_builder = RouteBuilder::from_app(app); diff --git a/crates/programs/aichatbot-sidecar/src/web_server/server_state.rs b/crates/programs/aichatbot-sidecar/src/web_server/server_state.rs index cce748a40c..a533ca74fa 100644 --- a/crates/programs/aichatbot-sidecar/src/web_server/server_state.rs +++ b/crates/programs/aichatbot-sidecar/src/web_server/server_state.rs @@ -1,9 +1,11 @@ use async_openai::Client; -use crate::shared_state::control_state::ControlState; +use crate::persistence::save_directory::SaveDirectory; +use crate::shared_state::app_control_state::AppControlState; use std::sync::Arc; #[derive(Clone)] pub struct ServerState { - pub control_state: Arc, + pub app_control_state: Arc, pub openai_client: Arc, + pub save_directory: SaveDirectory, } diff --git a/data/.gitkeep b/data/.gitkeep new file mode 100644 index 0000000000..e69de29bb2