Merge pull request #16 from hecrj/feature/settings

Settings Screen with Model Folder and Theme Selector

Author: hecrj

Cargo.lock

@@ -14,6 +14,7 @@ itertools.workspace = true
 log.workspace = true
 open.workspace = true
 rand.workspace = true
+rfd.workspace = true
 tokio.workspace = true
 tracing-subscriber.workspace = true
 
@@ -37,7 +38,7 @@ icebreaker_core.path = "./core"
 
 chrono = "0.4"
 decoder = "0.0.3"
-dirs = "6.0"
+directories = "6.0"
 function = "0.2"
 futures = "0.3"
 iced = "0.14.0-dev"
@@ -47,13 +48,15 @@ log = "0.4"
 open = "5.2"
 rand = "0.9"
 reqwest = "0.12"
+rfd = "0.15"
 scraper = "0.22"
 serde = "1.0"
 serde_json = "1.0"
 sipper = "0.1"
 thiserror = "1.0"
 tokio = "1.38"
 tokio-stream = "0.1"
+toml = "0.9"
 tracing-subscriber = "0.3"
 url = "2.5"
 uuid = "1.10"
@@ -68,10 +71,10 @@ large-enum-variant = "allow"
 
 [patch.crates-io]
 iced.git = "https://github.com/iced-rs/iced.git"
-iced.rev = "148fc77b8fbe0c8ad9b85428aa4c3bdac80c4b19"
+iced.rev = "9d56b488cc08b7365fb1839ed47ef92f3ff0fa36"
 
 iced_core.git = "https://github.com/iced-rs/iced.git"
-iced_core.rev = "148fc77b8fbe0c8ad9b85428aa4c3bdac80c4b19"
+iced_core.rev = "9d56b488cc08b7365fb1839ed47ef92f3ff0fa36"
 
 iced_palace.git = "https://github.com/hecrj/iced_palace"
 iced_palace.rev = "cb8f841b638c3886c6582e3d7f2e1de8c67e2e2b"

Cargo.toml

@@ -3,6 +3,9 @@ name = "icebreaker_core"
 version = "0.1.0"
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 chrono.workspace = true
 chrono.features = ["serde"]
@@ -26,14 +29,12 @@ uuid.workspace = true
 uuid.features = ["v4", "serde"]
 
 decoder.workspace = true
+directories.workspace = true
 function.workspace = true
 futures.workspace = true
-serde_json.workspace = true
-scraper.workspace = true
-dirs.workspace = true
-thiserror.workspace = true
 log.workspace = true
+scraper.workspace = true
+serde_json.workspace = true
 sipper.workspace = true
-
-[lints]
-workspace = true
+thiserror.workspace = true
+toml.workspace = true

assets/mcp.svg

@@ -24,7 +24,11 @@ impl Assistant {
 
     const HOST_PORT: u64 = 8080;
 
-    pub fn boot(file: model::File, backend: Backend) -> impl Straw<Self, BootEvent, Error> {
+    pub fn boot(
+        directory: model::Directory,
+        file: model::File,
+        backend: Backend,
+    ) -> impl Straw<Self, BootEvent, Error> {
         use tokio::io::{self, AsyncBufReadExt};
         use tokio::process;
         use tokio::task;
@@ -46,7 +50,7 @@ impl Assistant {
         sipper(move |sender| async move {
             let mut sender = Sender(sender);
 
-            let mut download = model::Library::download(file.clone()).pin();
+            let mut download = file.download(&directory).pin();
             let mut last_percent = None;
 
             while let Some(progress) = download.sip().await {
@@ -119,8 +123,6 @@ impl Assistant {
 
                 sender.progress("Preparing container...", 0).await;
 
-                let library = model::Library::path().await;
-
                 let command = match backend {
                     Backend::Cpu => {
                         format!(
@@ -130,7 +132,7 @@ impl Assistant {
                             filename = file.relative_path().display(),
                             container = Self::LLAMA_CPP_CONTAINER_CPU,
                             port = Self::HOST_PORT,
-                            volume = library.display(),
+                            volume = directory.path().display(),
                         )
                     }
                     Backend::Cuda => {
@@ -141,7 +143,7 @@ impl Assistant {
                             filename = file.relative_path().display(),
                             container = Self::LLAMA_CPP_CONTAINER_CUDA,
                             port = Self::HOST_PORT,
-                            volume = library.display(),
+                            volume = directory.path().display(),
                         )
                     }
                     Backend::Rocm => {
@@ -154,7 +156,7 @@ impl Assistant {
                             filename = file.relative_path().display(),
                             container = Self::LLAMA_CPP_CONTAINER_ROCM,
                             port = Self::HOST_PORT,
-                            volume = library.display(),
+                            volume = directory.path().display(),
                         )
                     }
                 };
@@ -239,6 +241,7 @@ impl Assistant {
                 async move {
                     while let Some(line) = lines.next().await {
                         if let Ok(log) = line {
+                            log::debug!("{log}");
                             sender.log(log).await;
                         }
                     }

core/Cargo.toml

@@ -1,6 +1,7 @@
 mod schema;
 
 use crate::assistant::{self, Assistant, Reply, Token};
+use crate::directory;
 use crate::model;
 use crate::plan::{self, Plan};
 use crate::Error;
@@ -339,10 +340,7 @@ impl LastOpened {
 }
 
 async fn storage_dir() -> Result<PathBuf, io::Error> {
-    let directory = dirs::data_local_dir()
-        .unwrap_or(PathBuf::from("."))
-        .join("icebreaker")
-        .join("chats");
+    let directory = directory::data().join("chats");
 
     fs::create_dir_all(&directory).await?;
 

core/src/assistant.rs

@@ -0,0 +1,19 @@
+use std::path::Path;
+use std::sync::LazyLock;
+
+pub fn config() -> &'static Path {
+    PROJECT
+        .as_ref()
+        .map(directories::ProjectDirs::config_dir)
+        .unwrap_or(Path::new("./config"))
+}
+
+pub fn data() -> &'static Path {
+    PROJECT
+        .as_ref()
+        .map(directories::ProjectDirs::data_dir)
+        .unwrap_or(Path::new("./data"))
+}
+
+static PROJECT: LazyLock<Option<directories::ProjectDirs>> =
+    LazyLock::new(|| directories::ProjectDirs::from("rs.icebreaker", "", "icebreaker"));

core/src/chat.rs

@@ -2,14 +2,17 @@ pub mod assistant;
 pub mod chat;
 pub mod model;
 pub mod plan;
+pub mod settings;
 pub mod web;
 
 pub use assistant::Assistant;
 pub use chat::Chat;
 pub use model::Model;
 pub use plan::Plan;
+pub use settings::Settings;
 pub use url::Url;
 
+mod directory;
 mod request;
 
 use std::io;
@@ -26,8 +29,12 @@ pub enum Error {
     DockerFailed(&'static str),
     #[error("executor failed: {0}")]
     ExecutorFailed(&'static str),
-    #[error("deserialization failed: {0}")]
-    SerdeFailed(Arc<serde_json::Error>),
+    #[error("JSON deserialization failed: {0}")]
+    InvalidJson(Arc<serde_json::Error>),
+    #[error("TOML deserialization failed: {0}")]
+    InvalidToml(Arc<toml::de::Error>),
+    #[error("TOML serialization impossible: {0}")]
+    ImpossibleToml(Arc<toml::ser::Error>),
     #[error("deserialization failed")]
     DecoderFailed(Arc<decoder::Error>),
     #[error("task join failed: {0}")]
@@ -50,7 +57,19 @@ impl From<io::Error> for Error {
 
 impl From<serde_json::Error> for Error {
     fn from(error: serde_json::Error) -> Self {
-        Self::SerdeFailed(Arc::new(error))
+        Self::InvalidJson(Arc::new(error))
+    }
+}
+
+impl From<toml::ser::Error> for Error {
+    fn from(error: toml::ser::Error) -> Self {
+        Self::ImpossibleToml(Arc::new(error))
+    }
+}
+
+impl From<toml::de::Error> for Error {
+    fn from(error: toml::de::Error) -> Self {
+        Self::InvalidToml(Arc::new(error))
     }
 }