minor improvements and bugfixes (#50)

* make image parameter optional

* check job status in ssh proxy

* wait for coman sqsh upload to finish before starting job

* template local edf and sbatch files if specified

* add coman config show command that shows whole config

* warning for sqsh and ssh keys

* add cancel job action to tui

* add tui delete file option

Author: Panaetius

coman/.config/config.toml

@@ -4,12 +4,12 @@ current_system = "daint" # what system/cluster to execute commands on
 current_platform = "HPC" # what platform to execute commands on (valid: HPC, ML or CW)
 
 
-image = "ubuntu" # default docker image to use
+# image = "ubuntu" # default docker image to use
 
-command = [
-  "sleep",
-  "1",
-] # command to execute within the container, i.e. the job you want to run
+# command = [
+#   "sleep",
+#   "1",
+# ] # command to execute within the container, i.e. the job you want to run
 
 # the sbatch script you want to execute
 # this gets templated with values specified in the {{}} and {% %} expressions (see https://keats.github.io/tera/docs/#templates for

coman/src/app/messages.rs

@@ -55,6 +55,7 @@ pub enum JobMsg {
     Log(usize),
     Details(JobDetail),
     GetDetails(usize),
+    Cancel(usize),
     Switch,
     Close,
 }

coman/src/app/model.rs

@@ -342,6 +342,18 @@ where
                 });
                 None
             }
+            JobMsg::Cancel(jobid) => {
+                let background_tx = self.background_task_tx.clone();
+                let event_tx = self.user_event_tx.clone();
+                tokio::spawn(async move {
+                    background_tx.send(BackgroundTask::CancelJob(jobid)).await.unwrap();
+                    event_tx
+                        .send(UserEvent::Status(StatusEvent::Info("cancelling job...".to_owned())))
+                        .await
+                        .unwrap();
+                });
+                None
+            }
             JobMsg::Details(jobdetail) => {
                 if self.app.mounted(&Id::WorkloadList) {
                     assert!(

coman/src/app/user_events.rs

@@ -18,6 +18,8 @@ pub enum FileEvent {
     List(String, Vec<PathEntry>), // Id, Subpaths
     DownloadCurrentFile,
     DownloadSuccessful,
+    DeleteCurrentFile,
+    DeleteSuccessful(String),
 }
 
 #[derive(Debug, Eq, Clone, PartialEq, PartialOrd, Ord)]
@@ -26,13 +28,18 @@ pub enum StatusEvent {
     Info(String),
     Warning(String),
 }
+#[derive(Debug, Eq, Clone, PartialEq, PartialOrd, Ord)]
+pub enum JobEvent {
+    Cancel,
+}
 
 #[derive(Debug, Eq, Clone, PartialOrd, Ord)]
 pub enum UserEvent {
     Cscs(CscsEvent),
     File(FileEvent),
     Error(String),
     Info(String),
+    Job(JobEvent),
     Status(StatusEvent),
     SwitchedToView(View),
 }

coman/src/cli.rs

@@ -11,7 +11,13 @@ use strum::VariantNames;
 
 use crate::{
     config::{ComputePlatform, Config, get_config_dir, get_data_dir, get_project_local_config_file},
-    cscs::api_client::client::{EdfSpec as EdfSpecEnum, ScriptSpec as ScriptSpecEnum},
+    cscs::{
+        api_client::{
+            client::{EdfSpec as EdfSpecEnum, ScriptSpec as ScriptSpecEnum},
+            types::JobStatus,
+        },
+        handlers::cscs_job_details,
+    },
     util::types::DockerImageUrl,
 };
 
@@ -92,10 +98,14 @@ pub enum ConfigCommands {
         #[clap(help = "Value to set", value_parser = parse_toml_value, value_hint=ValueHint::Other)]
         value: toml_edit::Value,
     },
+    #[clap(about = "Get config values")]
     Get {
         #[clap(help = "Config key path, e.g. `cscs.current_system`", value_hint=ValueHint::Other)]
         key_path: String,
     },
+
+    #[clap(about = "Show whole currently active config")]
+    Show,
 }
 
 #[allow(clippy::large_enum_variant)]
@@ -451,6 +461,14 @@ pub(crate) async fn cli_exec_command(command: Vec<String>) -> Result<()> {
 /// Thin wrapper around iroh proxy
 pub(crate) async fn cli_proxy_command(system: String, job_id: i64) -> Result<()> {
     let data_dir = get_data_dir();
+    let job_info = cscs_job_details(job_id, Some(system.clone()), None).await?;
+    if job_info.is_none() {
+        return Err(eyre!("remote job does not exist!"));
+    } else if let Some(job_info) = job_info
+        && job_info.status == JobStatus::Running
+    {
+        return Err(eyre!("remote job is not in running state, connection not available"));
+    }
     let endpoint_id = std::fs::read_to_string(data_dir.join(format!("{}_{}.endpoint", system, job_id)))?;
     println!("{}", endpoint_id);
     iroh_ssh::api::proxy_mode(iroh_ssh::ProxyArgs { node_id: endpoint_id })

coman/src/components/context_menu.rs

@@ -8,7 +8,7 @@ use tuirealm::{
 
 use crate::app::{
     messages::{MenuMsg, Msg, View},
-    user_events::{FileEvent, UserEvent},
+    user_events::{FileEvent, JobEvent, UserEvent},
 };
 
 #[derive(MockComponent)]
@@ -24,6 +24,8 @@ impl ContextMenu {
             .add_row()
             .add_col(TextSpan::from("Switch System").fg(Color::Cyan))
             .add_row()
+            .add_col(TextSpan::from("Cancel Job").fg(Color::Cyan))
+            .add_row()
             .add_col(TextSpan::from("Quit").fg(Color::Cyan))
             .add_row()
             .build()
@@ -32,7 +34,8 @@ impl ContextMenu {
         match index {
             0 => Some(Msg::Menu(MenuMsg::CscsLogin)),
             1 => Some(Msg::Menu(MenuMsg::CscsSwitchSystem)),
-            2 => Some(Msg::AppClose),
+            2 => Some(Msg::Menu(MenuMsg::Event(UserEvent::Job(JobEvent::Cancel)))),
+            3 => Some(Msg::AppClose),
             _ => Some(Msg::Menu(MenuMsg::Closed)),
         }
     }
@@ -44,6 +47,8 @@ impl ContextMenu {
             .add_row()
             .add_col(TextSpan::from("Download").fg(Color::Cyan))
             .add_row()
+            .add_col(TextSpan::from("Delete").fg(Color::Cyan))
+            .add_row()
             .add_col(TextSpan::from("Quit").fg(Color::Cyan))
             .add_row()
             .build()
@@ -55,7 +60,8 @@ impl ContextMenu {
             2 => Some(Msg::Menu(MenuMsg::Event(UserEvent::File(
                 FileEvent::DownloadCurrentFile,
             )))),
-            3 => Some(Msg::AppClose),
+            3 => Some(Msg::Menu(MenuMsg::Event(UserEvent::File(FileEvent::DeleteCurrentFile)))),
+            4 => Some(Msg::AppClose),
             _ => Some(Msg::Menu(MenuMsg::Closed)),
         }
     }

coman/src/components/file_tree.rs

@@ -15,6 +15,7 @@ use crate::{
         user_events::{FileEvent, UserEvent},
     },
     cscs::{api_client::types::PathType, ports::BackgroundTask},
+    trace_dbg,
 };
 
 #[derive(Debug, PartialEq, PartialOrd, Ord, Eq, Clone)]
@@ -174,6 +175,27 @@ impl Component<Msg, UserEvent> for FileTree {
                 }
                 CmdResult::None
             }
+            Event::User(UserEvent::File(FileEvent::DeleteCurrentFile)) => {
+                if let State::One(StateValue::String(id)) = self.state() {
+                    let tree_tx = self.file_tree_tx.clone();
+                    let id = trace_dbg!(id);
+                    tokio::spawn(async move {
+                        tree_tx.send(BackgroundTask::DeleteFile(id)).await.unwrap();
+                    });
+                }
+                CmdResult::None
+            }
+            Event::User(UserEvent::File(FileEvent::DeleteSuccessful(id))) => {
+                let mut selected_id = id.clone();
+                let tree = self.component.tree_mut();
+                let parent = tree.root_mut().parent_mut(&id);
+                if let Some(parent) = parent {
+                    parent.remove_child(&id);
+                    selected_id = parent.id().clone();
+                }
+                self.attr(Attribute::Custom(TREE_INITIAL_NODE), AttrValue::String(selected_id));
+                CmdResult::Changed(self.component.state())
+            }
             _ => CmdResult::None,
         };
         Some(Msg::None)

coman/src/components/workload_list.rs

@@ -81,6 +81,15 @@ impl Component<Msg, UserEvent> for WorkloadList {
                 }
                 self.perform(Cmd::Change)
             }
+            Event::User(UserEvent::Job(crate::app::user_events::JobEvent::Cancel)) => {
+                if let State::One(StateValue::Usize(index)) = self.state()
+                    && !self.jobs.is_empty()
+                {
+                    let job = self.jobs[index].clone();
+                    return Some(Msg::Job(JobMsg::Cancel(job.id)));
+                }
+                CmdResult::None
+            }
             Event::Keyboard(KeyEvent { code: Key::Enter, .. }) => {
                 if let State::One(StateValue::Usize(index)) = self.state()
                     && !self.jobs.is_empty()

coman/src/config.rs

@@ -58,7 +58,7 @@ pub struct CscsConfig {
     #[serde(default)]
     pub env: HashMap<String, String>,
     #[serde(default)]
-    pub image: String,
+    pub image: Option<String>,
     #[serde(default)]
     pub edf_file_template: String,
     #[serde(default)]