executors rfk, tidy ups and log rfks (#59)

Author: erhant

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "dkn-compute-launcher"
 edition = "2021"
-version = "0.1.14"
+version = "0.1.15"
 license = "Apache-2.0"
 readme = "README.md"
 description = "Dria Compute Node Launcher"
@@ -48,8 +48,7 @@ indicatif = "0.17.11"
 colored = "2.2.0"
 
 # requests and LLMs
-ollama-rs = { version = "0.2.5", features = ["rustls", "stream"] }
-dkn-workflows = { git = "https://github.com/firstbatchxyz/dkn-compute-node" }
+dkn-executor = { git = "https://github.com/firstbatchxyz/dkn-compute-node" }
 reqwest = { version = "0.12.12", features = ["rustls-tls", "json"] }
 
 # crypto stuff

Cargo.toml

@@ -50,6 +50,12 @@ Open a terminal and run the following command:
 curl -fsSL https://dria.co/launcher | bash
 ```
 
+You can verify the installation later with:
+
+```sh
+which dkn-compute-launcher
+```
+
 **Windows**
 
 Open a Windows terminal ([cmd.exe](https://en.wikipedia.org/wiki/Cmd.exe)) and run the following command:
@@ -58,6 +64,12 @@ Open a Windows terminal ([cmd.exe](https://en.wikipedia.org/wiki/Cmd.exe)) and r
 powershell -c "irm https://dria.co/launcher.ps1 | iex"
 ```
 
+You can verify the installation later with:
+
+```sh
+where.exe dkn-compute-launcher
+```
+
 You may need to allow network access to the launcher if Windows prompts you to do so.
 
 ### Build from Source
@@ -191,7 +203,6 @@ Click on `Edit model selection` to select models for your node.
   openai
   gemini
   openrouter
-  VLLM
   ← Go Back
 ```
 
@@ -257,6 +268,8 @@ Use the `points` command to display how much you have earned!
 dkn-compute-launcher points
 ```
 
+You can also check out your [node dashboard](https://dria.co/edge-ai) for this information.
+
 ### Updating Manually
 
 Using the `update` command you can check for updates & automatically update your compute node and launcher.
@@ -300,6 +313,62 @@ When you run a specific release your node & launcher will **not** be automatical
 > The Dria Knowledge Network always considers the latest `minor` version as the active version; therefore,
 > if the latest is `0.3.x` and you decide to run a smaller version like `0.2.x` you will most likely kept out of network due to protocol mismatch.
 
+### Running in Background
+
+#### Linux/MacOS
+
+In Linux/MacOS systems you can use [`screen`](https://gist.github.com/jctosta/af918e1618682638aa82) command to run the launcher in the background.
+
+First, create a screen with a given name (here we name it `dkn-compute-node`):
+
+```sh
+screen -S dkn-compute-node
+```
+
+Within the newly opened screen, start the node:
+
+```sh
+dkn-compute-launcher start
+```
+
+Now we will _detach_ from this screen and let it run in the background. For this, press <kbd>CTRL + A</kbd> and then press the <kbd>D</kbd> letter. You should now exit the screen, and see a `[detached]` log in the terminal that you have returned to.
+
+At a later time, you can list your screens with:
+
+```sh
+screen -list
+```
+
+You can connect to a screen via its name directly:
+
+```sh
+screen -r dkn-compute-node
+```
+
+Within the screen, you can continue to use your launcher as you would normally, or stop the node with <kbd>CTRL+C</kbd>. You can `exit` within the screen to terminate it.
+
+<!--
+TODO: test these commands and then publish them here
+#### Windows
+
+In Windows systems, you can start the launcher in background using the `start` command:
+
+```cmd
+start /B dkn-compute-launcher.exe start
+```
+
+To list running processes:
+
+```cmd
+tasklist | findstr "dkn-compute"
+```
+
+To terminate the process:
+
+```cmd
+taskkill /IM dkn-compute-launcher.exe /F
+``` -->
+
 ## Contributions
 
 Contributions are welcome! You can start by cloning the repo:
@@ -327,15 +396,16 @@ cargo doc --open --no-deps --document-private-items
 
 ## Uninstallation
 
-You can uninstall the launcher binary along with the environment files and compute node binaries with the `uninstall` command:
+You can uninstall the launcher binary along with the environment files and compute node binaries with the `uninstall` command.
+
+Make sure you backup your private key within `.env` before removing these files, so that you do not lose your hard-earned $DRIA points. We have a `--backup` option for this purpose!
 
 ```sh
 dkn-compute-launcher uninstall
-```
 
-> [!CAUTION]
->
-> Make sure you backup your private key within `.env` before removing these files, so that you do not lose your hard-earned $DRIA points!
+# will save the removed .env file to the given path
+dkn-compute-launcher uninstall --backup ./my-backup.txt
+```
 
 ## License
 

README.md

@@ -1,4 +1,3 @@
-use eyre::{eyre, Result};
 use inquire::Editor;
 use std::fs;
 use std::path::Path;
@@ -11,16 +10,13 @@ use std::path::Path;
 /// ### Errors
 /// - If the environment file does not exist
 /// - If the file could not be read
-pub fn edit_environment_file(env_path: &Path) -> Result<()> {
+pub fn edit_environment_file(env_path: &Path) -> eyre::Result<()> {
     if !env_path.exists() {
-        return Err(eyre!(
-            "Environment file does not exist: {}",
-            env_path.display()
-        ));
+        eyre::bail!("Environment file does not exist: {}", env_path.display());
     }
 
     let Ok(existing_env_content) = fs::read_to_string(env_path) else {
-        return Err(eyre!("Could not read {}", env_path.display()));
+        eyre::bail!("Could not read {}", env_path.display());
     };
 
     let Some(new_env_content) =

src/commands/editor.rs

@@ -18,11 +18,18 @@ pub fn show_info() {
     );
 
     // models
-    let model_names = dria_env.get_model_config().get_model_names();
-    if model_names.is_empty() {
+    let models = dria_env.get_models();
+    if models.is_empty() {
         eprintln!("Models: no models configured!");
     } else {
-        eprintln!("Models:\n - {}", model_names.join("\n - "));
+        eprintln!(
+            "Models:\n - {}",
+            models
+                .iter()
+                .map(|m| m.to_string())
+                .collect::<Vec<String>>()
+                .join("\n - ")
+        );
     }
 
     eprintln!("Version: {}", env!("CARGO_PKG_VERSION"));

src/commands/info.rs

@@ -1,4 +1,6 @@
 mod start;
+use std::path::PathBuf;
+
 pub use start::run_compute_node;
 
 mod editor;
@@ -42,7 +44,11 @@ pub enum Commands {
     /// Show your $DRIA points.
     Points,
     /// Uninstall the launcher & its files.
-    Uninstall,
+    Uninstall {
+        /// Backup the environment file to the given path.
+        #[arg(short, long)]
+        backup: Option<PathBuf>,
+    },
     /// Show information about the current environment.
     Info,
     /// Manually update the compute node & launcher.

src/commands/mod.rs

@@ -1,5 +1,4 @@
 use colored::Colorize;
-use eyre::eyre;
 use inquire::{Select, Text};
 
 use crate::utils::{referrals::*, DriaEnv, Selectable};
@@ -11,7 +10,7 @@ pub async fn handle_referrals() -> eyre::Result<()> {
     // ensure system is healthy
     let client = ReferralsClient::default();
     if !client.healthcheck().await {
-        return Err(eyre!("Referrals API is offline."));
+        eyre::bail!("Referrals API is offline.");
     }
 
     // get wallet secret from env

src/commands/referrals.rs

@@ -1,4 +1,3 @@
-use eyre::{eyre, Result};
 use inquire::{Confirm, Select};
 use std::path::Path;
 
@@ -11,12 +10,9 @@ use crate::{settings::*, DriaEnv};
 ///
 /// ### Errors
 /// - If the environment file is not a file
-pub async fn change_settings(env_path: &Path) -> Result<()> {
+pub async fn change_settings(env_path: &Path) -> eyre::Result<()> {
     if !env_path.exists() {
-        return Err(eyre!(
-            "Environment file does not exist: {}",
-            env_path.display()
-        ));
+        eyre::bail!("Environment file does not exist: {}", env_path.display());
     }
 
     // an environment object is created from the existing environment variables

src/commands/settings.rs

@@ -1,10 +1,7 @@
 use eyre::Result;
 use std::path::Path;
 
-use crate::{
-    settings::{self, DriaApiKeyKind},
-    utils::DriaEnv,
-};
+use crate::{settings, utils::DriaEnv};
 
 /// Asks for the following information for the user environment:
 ///
@@ -28,21 +25,6 @@ pub fn setup_environment(env_path: &Path) -> Result<()> {
     log::info!("Choose models that you would like to run.");
     settings::edit_models(&mut dria_env)?;
 
-    // ask for Jina and Serper api keys (optional)
-    for optional_api_key in DriaApiKeyKind::optional_apis() {
-        log::info!(
-            "Optionally provide {} for better performance",
-            optional_api_key
-        );
-
-        let new_value = optional_api_key.prompt_api(&dria_env)?;
-        if new_value.is_empty() {
-            continue;
-        } else {
-            dria_env.set(optional_api_key.name(), new_value);
-        }
-    }
-
     // create directories if they dont exist
     DriaEnv::new_default_file(env_path)?;
 

src/commands/setup.rs

@@ -1,4 +1,3 @@
-use eyre::{eyre, Result};
 use inquire::Select;
 use std::path::{Path, PathBuf};
 
@@ -21,9 +20,12 @@ use crate::{
 /// - If the release could not be downloaded
 /// - If the release could not be found for the given tag
 /// - If the user cancels the prompt
-pub async fn download_specific_release(exe_dir: &Path, tag: Option<&String>) -> Result<PathBuf> {
+pub async fn download_specific_release(
+    exe_dir: &Path,
+    tag: Option<&String>,
+) -> eyre::Result<PathBuf> {
     if !exe_dir.is_dir() {
-        return Err(eyre!("{} must be a directory", exe_dir.display()));
+        eyre::bail!("{} must be a directory", exe_dir.display());
     }
 
     let releases = get_releases(DriaRepository::ComputeNode).await?;