Stage 4

Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 authors     = ["Xavier Lau <[email protected]>"]
-build       = "build.rs"
 description = "AI with Rust."
 edition     = "2021"
 homepage    = "https://hack.ink/air"
@@ -23,9 +22,10 @@ inherits    = "dev"
 inherits = "release"
 lto      = true
 
-[build-dependencies]
-# crates.io
-vergen = { version = "8.2", features = ["build", "cargo", "git", "gitcl"] }
+[features]
+default   = []
+dev       = []
+tokenizer = ["llm_utils"]
 
 [dependencies]
 # crates.io
@@ -40,15 +40,15 @@ enigo              = { version = "0.2" }
 futures            = { version = "0.3" }
 get-selected-text  = { version = "0.1" }
 global-hotkey      = { version = "0.5" }
-# TODO?: remove it since it requires libxml2.
-llm_utils          = { version = "0.0.6" }
+llm_utils          = { version = "0.0.6", optional = true }
 reqwew             = { version = "0.2" }
 serde              = { version = "1.0", features = ["derive"] }
 thiserror          = { version = "1.0" }
 tokio              = { version = "1.38", features = ["rt-multi-thread"] }
 toml               = { version = "0.8" }
 tracing            = { version = "0.1" }
-tracing-subscriber = { version = "0.3" }
+tracing-appender   = { version = "0.2" }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 # accessibility     = { version = "0.1" }

src/component.rs

@@ -1,7 +1,5 @@
-// TODO?: refresh trait.
-
-pub mod tokenizer;
-use tokenizer::Tokenizer;
+#[cfg(feature = "tokenizer")] pub mod tokenizer;
+#[cfg(feature = "tokenizer")] use tokenizer::Tokenizer;
 
 pub mod function;
 
@@ -21,22 +19,37 @@ pub mod util;
 
 // std
 use std::sync::Arc;
+// crates.io
+use tokio::sync::Mutex;
 // self
 use crate::prelude::*;
 
 #[derive(Debug)]
 pub struct Components {
 	pub setting: Setting,
+	#[cfg(feature = "tokenizer")]
 	pub tokenizer: Tokenizer,
-	pub openai: Arc<OpenAi>,
+	pub openai: Arc<Mutex<OpenAi>>,
 }
 impl Components {
 	pub fn init() -> Result<Self> {
 		let setting = Setting::load()?;
+		#[cfg(feature = "tokenizer")]
 		let tokenizer = Tokenizer::new(setting.ai.model.as_str());
-		// TODO: no clone.
-		let openai = Arc::new(OpenAi::new(setting.ai.clone()));
+		let openai = Arc::new(Mutex::new(OpenAi::new(setting.ai.clone())));
+
+		Ok(Self {
+			setting,
+			#[cfg(feature = "tokenizer")]
+			tokenizer,
+			openai,
+		})
+	}
+
+	// TODO?: move to somewhere else.
+	pub fn reload_openai(&self) {
+		tracing::info!("reloading openai component");
 
-		Ok(Self { setting, tokenizer, openai })
+		self.openai.blocking_lock().reload(self.setting.ai.clone());
 	}
 }

src/component/openai.rs

@@ -1,5 +1,3 @@
-// std
-use std::sync::Arc;
 // crates.io
 use async_openai::{
 	config::OpenAIConfig,
@@ -11,27 +9,26 @@ use async_openai::{
 };
 use eframe::egui::WidgetText;
 use serde::{Deserialize, Serialize};
-use tokio::sync::RwLock as TokioRwLock;
 // self
 use super::setting::Ai;
 use crate::prelude::*;
 
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct OpenAi {
-	pub client: Arc<TokioRwLock<Client<OpenAIConfig>>>,
+	pub client: Client<OpenAIConfig>,
 	pub setting: Ai,
 }
 impl OpenAi {
 	pub fn new(setting: Ai) -> Self {
-		let client = Arc::new(TokioRwLock::new(Client::with_config(
+		let client = Client::with_config(
 			OpenAIConfig::new().with_api_base(&setting.api_base).with_api_key(&setting.api_key),
-		)));
+		);
 
 		Self { client, setting }
 	}
 
 	pub fn reload(&mut self, setting: Ai) {
-		*self.client.blocking_write() = Client::with_config(
+		self.client = Client::with_config(
 			OpenAIConfig::new().with_api_base(&setting.api_base).with_api_key(&setting.api_key),
 		);
 		self.setting = setting;
@@ -48,7 +45,7 @@ impl OpenAi {
 			.max_tokens(4_096_u16)
 			.messages(&msg)
 			.build()?;
-		let stream = self.client.read().await.chat().create_stream(req).await?;
+		let stream = self.client.chat().create_stream(req).await?;
 
 		Ok(stream)
 	}

src/component/setting.rs

@@ -1,15 +1,13 @@
 // std
 use std::{fs, path::PathBuf};
 // crates.io
-use app_dirs2::{AppDataType, AppInfo};
+use app_dirs2::AppDataType;
 use async_openai::config::OPENAI_API_BASE;
 use eframe::egui::WidgetText;
 use serde::{Deserialize, Serialize};
 // self
 use super::openai::Model;
-use crate::prelude::*;
-
-const APP: AppInfo = AppInfo { name: "AiR", author: "[email protected]" };
+use crate::{prelude::*, APP_INFO};
 
 #[derive(Debug, Default, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
@@ -20,7 +18,7 @@ pub struct Setting {
 }
 impl Setting {
 	pub fn path() -> Result<PathBuf> {
-		Ok(app_dirs2::get_app_root(AppDataType::UserConfig, &APP).map(|p| p.join(".airrc"))?)
+		Ok(app_dirs2::get_app_root(AppDataType::UserConfig, &APP_INFO).map(|p| p.join(".airrc"))?)
 	}
 
 	pub fn load() -> Result<Self> {
@@ -57,7 +55,6 @@ impl Default for General {
 	}
 }
 
-// TODO: support Google Gemini.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct Ai {