update model selections

Author: erhant

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "dkn-compute-launcher"
 edition = "2021"
-version = "0.1.18"
+version = "0.1.19"
 license = "Apache-2.0"
 readme = "README.md"
 description = "Dria Compute Node Launcher"
@@ -66,3 +66,4 @@ features = ["vendored"]
 # clippy overrides
 [lints.clippy]
 nonminimal_bool = "allow"
+uninlined_format_args = "allow"

Cargo.toml

@@ -33,7 +33,7 @@ The **Dria Compute Launcher** is a simple and efficient way to set up and run th
 
 It is packed with many features:
 
-- [x] **Settings Menu**: You can change various settings such as your wallet, ports and API keys, all without leaving the launcher. You can also open a raw text-editor in terminal.
+- [x] **Settings Menu**: You can change all settings such as your wallet, all without leaving the launcher. You can also open a raw text-editor in terminal.
 - [x] **Model Selection**: You can choose your models with a nice menu.
 - [x] **Model Benchmarking**: You can measure TPS for Ollama models to see if your machine can handle them.
 - [x] **Automatic Updates**: Launcher will automatically update a running compute node when there is an update & restart it; furthermore, it will update itself when there is a new launcher as well!
@@ -110,11 +110,9 @@ dkn-compute-launcher <some-command> --help
 
 ### Model Providers
 
-The purpose of running a Dria Compute Node is to serve LLMs to the network. These models can either be locally-hosted models via Ollama, or API-based models such as Gemini and OpenAI.
+The purpose of running a Dria Compute Node is to serve LLMs to the network. These models can either be locally-hosted models via Ollama, and more local-model providers in the future!
 
-- To serve API-based models ([OpenAI](https://openai.com/), [Gemini](https://gemini.google.com/app), [OpenRouter](https://openrouter.ai/)), you will need to get their API keys.
-
-- To serve a locally-hosted model with [Ollama](https://ollama.com/), you of course need Ollama installed, and you must make sure that your machine can handle your chosen models. See ["Measuring Local Models"](#measuring-local-models) chapter below to see the command-line tools that help you measure TPS.
+- To serve a locally-hosted model with [Ollama](https://ollama.com/), you need Ollama installed, and you must make sure that your machine can handle your chosen models. See ["Measuring Local Models"](#measuring-local-models) chapter below to see the command-line tools that help you measure TPS.
 
 ### Starting a Node
 
@@ -160,7 +158,6 @@ You will be greeted with a menu, where you can navigate with arrow keys <kbd>↑
   Port
   Models
   Ollama
-  API Keys
   Log Levels
   ✓ Save & Exit
   ✗ Abort Changes
@@ -172,7 +169,6 @@ Using this menu, you are able to change the following settings:
 - **Port**: edit your listen address port, defaults to `4001`
 - **Models**: view all models & edit the models that you want to serve
 - **Ollama**: edit host & port of the Ollama server
-- **API Keys**: change API keys for providers
 - **Log Levels**: change log-levels for modules within compute node & launcher
 
 Within a menu, you can go back by selecting <kbd>← Go Back</kbd>. Within the main menu, you can select <kbd>✓ Save & Exit</kbd> to save your changes & write them to the environment file, or you can choose <kbd>✗ Abort Changes</kbd> to abort all changes.
@@ -200,13 +196,10 @@ Click on `Edit model selection` to select models for your node.
 ```sh
 ? Select a model provider:
 > ollama
-  openai
-  gemini
-  openrouter
   ← Go Back
 ```
 
-Here, you can select a provider to choose models served by them, where you will be greeted with the following menu:
+Here, you can select a provider (currently Ollama alone) to choose models served by them, where you will be greeted with the following menu:
 
 ```sh
 > Select a model provider: ollama

README.md

@@ -58,9 +58,9 @@ pub async fn change_settings(env_path: &Path) -> eyre::Result<()> {
             Settings::Ollama => {
                 crate::settings::edit_ollama(&mut dria_env)?;
             }
-            Settings::ApiKeys => {
-                crate::settings::edit_api_keys(&mut dria_env)?;
-            }
+            // Settings::ApiKeys => {
+            //     crate::settings::edit_api_keys(&mut dria_env)?;
+            // }
             Settings::LogLevels => {
                 crate::settings::edit_log_level(&mut dria_env)?;
             }

src/commands/settings.rs

@@ -1,11 +1,11 @@
 use dkn_executor::{ollama_rs::Ollama, ModelProvider};
 use eyre::{Context, Result};
-use std::{collections::HashSet, env, path::Path};
+use std::{env, path::Path};
 use tokio::process::Command;
 use tokio_util::sync::CancellationToken;
 
 use crate::{
-    settings::{self, DriaApiKeyKind},
+    settings,
     utils::{
         check_ollama, configure_fdlimit, pull_model_with_progress, spawn_ollama, ComputeInstance,
     },
@@ -63,17 +63,17 @@ pub async fn run_compute_node(
     dria_env.ask_for_key_if_required()?;
 
     // check API keys for the providers that are used with the selected models
-    let providers = models
-        .iter()
-        .map(|model| model.provider())
-        .collect::<HashSet<_>>();
-    for api_key in DriaApiKeyKind::from_providers(providers.into_iter()) {
-        if dria_env.get(api_key.name()).is_none() {
-            log::info!("Provide {} because you are using its model", api_key);
-            let new_value = api_key.prompt_api(&dria_env)?;
-            dria_env.set(api_key.name(), new_value);
-        }
-    }
+    // let providers = models
+    //     .iter()
+    //     .map(|model| model.provider())
+    //     .collect::<HashSet<_>>();
+    // for api_key in DriaApiKeyKind::from_providers(providers.into_iter()) {
+    //     if dria_env.get(api_key.name()).is_none() {
+    //         log::info!("Provide {} because you are using its model", api_key);
+    //         let new_value = api_key.prompt_api(&dria_env)?;
+    //         dria_env.set(api_key.name(), new_value);
+    //     }
+    // }
 
     // check if Ollama is required & running, and run it if not
     let ollama_models = models

src/commands/start.rs

@@ -4,8 +4,9 @@ mod models;
 pub use models::edit_models; // used by `setup` command
 pub use models::show_model_settings_menu;
 
-mod apikey;
-pub use apikey::{edit_api_keys, DriaApiKeyKind};
+// TODO: we no longer have an API key requirement
+// mod apikey;
+// pub use apikey::{edit_api_keys, DriaApiKeyKind};
 
 mod wallet;
 pub use wallet::edit_wallet;
@@ -30,8 +31,8 @@ pub enum Settings {
     Models,
     /// Configure Ollama settings.
     Ollama,
-    /// Configure your API Keys.
-    ApiKeys,
+    // Configure your API Keys.
+    // ApiKeys,
     /// Configure log-levels.
     LogLevels,
     /// Quit settings menu.
@@ -54,7 +55,7 @@ impl std::fmt::Display for Settings {
             Self::Port => write!(f, "Port"),
             Self::Models => write!(f, "Models"),
             Self::Ollama => write!(f, "Ollama"),
-            Self::ApiKeys => write!(f, "API Keys"),
+            // Self::ApiKeys => write!(f, "API Keys"),
             Self::LogLevels => write!(f, "Log Levels"),
             Self::SaveExit => write!(f, "{}", "✓ Save & Exit".bold().green()),
             Self::Abort => write!(f, "{}", "✗ Abort Changes".bold().red()),

src/settings/mod.rs

@@ -34,8 +34,8 @@ pub fn configure_fdlimit() {
 
         // only do this if soft-limit is below the target
         if soft < target_soft {
-            if let Err(e) = rlimit::Resource::NOFILE.set(target_soft, hard) {
-                log::error!("Failed to set file-descriptor limits: {}, you may need to run as administrator!", e);
+            if let Err(err) = rlimit::Resource::NOFILE.set(target_soft, hard) {
+                log::error!("Failed to set file-descriptor limits: {err}, you may need to run as administrator!");
             } else {
                 log::warn!("Using new resource limits (soft / hard): {target_soft} / {hard}");
             }

src/utils/fdlimit.rs

@@ -81,16 +81,16 @@ impl ComputeInstance {
                _ = compute_node_update_interval.tick() => {
                   if !self.check_updates { continue; }
 
-                  if let Err(e) = self.handle_compute_update().await {
-                    log::error!("Error updating compute node: {}", e);
+                  if let Err(err) = self.handle_compute_update().await {
+                    log::error!("Error updating compute node: {err}");
                   }
               },
               // launcher self-update checks
                _ = launcher_update_interval.tick() => {
                   if !self.check_updates { continue; }
 
-                  if let Err(e) = self.handle_launcher_update().await {
-                    log::error!("Error updating launcher: {}", e);
+                  if let Err(err) = self.handle_launcher_update().await {
+                    log::error!("Error updating launcher: {err}");
                   }
               },
             }

src/utils/process.rs

@@ -63,7 +63,7 @@ where
 impl<T: Display> Display for Selectable<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Some(ref value) => write!(f, "{}", value),
+            Self::Some(ref value) => write!(f, "{value}"),
             Self::None => write!(f, "{}", DESELECT_MSG.bold()),
         }
     }