notedeck

commit 2a9c5c7848b27545b42dc3e9289f20913dc1dae4
parent b8c5423edde9487d1fc308edae17c0fd445e9e5b
Author: William Casarin <jb55@jb55.com>
Date:   Mon, 14 Apr 2025 11:53:52 -0700

dave: reorganize ModelConfig

start to clean up the lib.rs a bit

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
crates/notedeck_columns/src/ui/side_panel.rs
 | 
2
+-
A
crates/notedeck_dave/src/config.rs
 | 
45
+++++++++++++++++++++++++++++++++++++++++++++
M
crates/notedeck_dave/src/lib.rs
 | 
47
++++-------------------------------------------

3 files changed, 50 insertions(+), 44 deletions(-)
diff --git a/crates/notedeck_columns/src/ui/side_panel.rs b/crates/notedeck_columns/src/ui/side_panel.rs
@@ -444,7 +444,7 @@ fn add_deck_button() -> impl Widget {
     }
 }
 
-fn wallet_button() -> impl Widget {
+fn _wallet_button() -> impl Widget {
     |ui: &mut egui::Ui| -> egui::Response {
         let img_size = 24.0;
 
diff --git a/crates/notedeck_dave/src/config.rs b/crates/notedeck_dave/src/config.rs
@@ -0,0 +1,45 @@
+use async_openai::config::OpenAIConfig;
+
+#[derive(Debug)]
+pub struct ModelConfig {
+    endpoint: Option<String>,
+    model: String,
+    api_key: Option<String>,
+}
+
+impl Default for ModelConfig {
+    fn default() -> Self {
+        ModelConfig {
+            endpoint: None,
+            model: "gpt-4o".to_string(),
+            api_key: std::env::var("OPENAI_API_KEY").ok(),
+        }
+    }
+}
+
+impl ModelConfig {
+    pub fn model(&self) -> &str {
+        &self.model
+    }
+
+    pub fn ollama() -> Self {
+        ModelConfig {
+            endpoint: std::env::var("OLLAMA_HOST").ok().map(|h| h + "/v1"),
+            model: "hhao/qwen2.5-coder-tools:latest".to_string(),
+            api_key: None,
+        }
+    }
+
+    pub fn to_api(&self) -> OpenAIConfig {
+        let mut cfg = OpenAIConfig::new();
+        if let Some(endpoint) = &self.endpoint {
+            cfg = cfg.with_api_base(endpoint.to_owned());
+        }
+
+        if let Some(api_key) = &self.api_key {
+            cfg = cfg.with_api_key(api_key.to_owned());
+        }
+
+        cfg
+    }
+}
diff --git a/crates/notedeck_dave/src/lib.rs b/crates/notedeck_dave/src/lib.rs
@@ -12,6 +12,7 @@ use async_openai::{
     Client,
 };
 use chrono::{DateTime, Duration, Local};
+use egui_wgpu::RenderState;
 use futures::StreamExt;
 use nostrdb::{Ndb, NoteKey, Transaction};
 use notedeck::AppContext;
@@ -23,12 +24,12 @@ use std::sync::mpsc::{self, Receiver};
 use std::sync::Arc;
 
 pub use avatar::DaveAvatar;
-use egui_wgpu::RenderState;
-
+pub use config::ModelConfig;
 pub use quaternion::Quaternion;
 pub use vec3::Vec3;
 
 mod avatar;
+mod config;
 mod quaternion;
 mod vec3;
 
@@ -336,46 +337,6 @@ pub struct Dave {
     model_config: ModelConfig,
 }
 
-#[derive(Debug)]
-pub struct ModelConfig {
-    endpoint: Option<String>,
-    model: String,
-    api_key: Option<String>,
-}
-
-impl Default for ModelConfig {
-    fn default() -> Self {
-        ModelConfig {
-            endpoint: None,
-            model: "gpt-4o".to_string(),
-            api_key: std::env::var("OPENAI_API_KEY").ok(),
-        }
-    }
-}
-
-impl ModelConfig {
-    pub fn ollama() -> Self {
-        ModelConfig {
-            endpoint: std::env::var("OLLAMA_HOST").ok().map(|h| h + "/v1"),
-            model: "hhao/qwen2.5-coder-tools:latest".to_string(),
-            api_key: None,
-        }
-    }
-
-    pub fn to_api(&self) -> OpenAIConfig {
-        let mut cfg = OpenAIConfig::new();
-        if let Some(endpoint) = &self.endpoint {
-            cfg = cfg.with_api_base(endpoint.to_owned());
-        }
-
-        if let Some(api_key) = &self.api_key {
-            cfg = cfg.with_api_key(api_key.to_owned());
-        }
-
-        cfg
-    }
-}
-
 impl Dave {
     pub fn avatar_mut(&mut self) -> Option<&mut DaveAvatar> {
         self.avatar.as_mut()
@@ -608,7 +569,7 @@ You are an AI agent for the nostr protocol called Dave, created by Damus. nostr 
         let ctx = ctx.clone();
         let client = self.client.clone();
         let tools = self.tools.clone();
-        let model_name = self.model_config.model.clone();
+        let model_name = self.model_config.model().to_owned();
 
         let (tx, rx) = mpsc::channel();
         self.incoming_tokens = Some(rx);