add support for stopping jobs (#3)

Panaetius · web-flow · commit a17dfc66e8a2 · 2025-11-27T09:09:01.000+01:00
* add support for stopping jobs

* rename stop to cancel
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/coman/Cargo.toml b/coman/Cargo.toml
@@ -67,6 +67,7 @@ tera = "1.20.1"
 inquire = "0.9.1"
 oci-distribution = "0.11.0"
 docker_credential = "1.3.2"
+chrono = "0.4.42"
 
 [build-dependencies]
 anyhow = "1.0.90"
diff --git a/coman/src/cli.rs b/coman/src/cli.rs
@@ -45,6 +45,8 @@ pub enum CscsJobCommands {
         #[clap(short, long, trailing_var_arg = true)]
         command: Option<Vec<String>>,
     },
+    #[clap(alias("c"))]
+    Cancel { job_id: i64 },
 }
 #[derive(Subcommand, Debug)]
 pub enum CscsSystemCommands {
diff --git a/coman/src/cscs/api_client.rs b/coman/src/cscs/api_client.rs
@@ -1,9 +1,10 @@
+use chrono::prelude::*;
 use color_eyre::eyre::{Context, Result};
 use firecrest_client::{
     client::FirecrestClient,
     compute_api::{
-        get_compute_system_job, get_compute_system_job_metadata, get_compute_system_jobs,
-        post_compute_system_job,
+        cancel_compute_system_job, get_compute_system_job, get_compute_system_job_metadata,
+        get_compute_system_jobs, post_compute_system_job,
     },
     filesystem_api::{
         post_filesystem_ops_mkdir, post_filesystem_ops_upload, put_filesystem_ops_chmod,
@@ -80,27 +81,46 @@ pub enum JobStatus {
     Cancelled,
     Failed,
 }
+impl From<String> for JobStatus {
+    fn from(value: String) -> Self {
+        match value.as_str() {
+            "RUNNING" => JobStatus::Running,
+            "FAILED" => JobStatus::Failed,
+            "COMPLETED" => JobStatus::Finished,
+            "CANCELLED" => JobStatus::Cancelled,
+            "PENDING" => JobStatus::Pending,
+            other => panic!("got job status: {}", other),
+        }
+    }
+}
 #[derive(Debug, Eq, Clone, PartialEq, PartialOrd, Ord, tabled::Tabled)]
 pub struct Job {
     pub id: usize,
     pub name: String,
     pub status: JobStatus,
     pub user: String,
+    #[tabled(display("display_option_datetime"))]
+    pub start_date: Option<DateTime<Local>>,
+    #[tabled(display("display_option_datetime"))]
+    pub end_date: Option<DateTime<Local>>,
 }
 impl From<JobModelOutput> for Job {
     fn from(value: JobModelOutput) -> Self {
         Self {
             id: value.job_id as usize,
             name: value.name,
-            status: match value.status.state.as_str() {
-                "RUNNING" => JobStatus::Running,
-                "FAILED" => JobStatus::Failed,
-                "COMPLETED" => JobStatus::Finished,
-                "CANCELLED" => JobStatus::Cancelled,
-                "PENDING" => JobStatus::Pending,
-                other => panic!("got job status: {}", other),
-            },
+            status: value.status.state.into(),
             user: value.user.unwrap_or("".to_string()),
+            start_date: value.time.start.map(|s| {
+                DateTime::from_timestamp_secs(s)
+                    .unwrap()
+                    .with_timezone(&Local)
+            }),
+            end_date: value.time.end.map(|e| {
+                DateTime::from_timestamp_secs(e)
+                    .unwrap()
+                    .with_timezone(&Local)
+            }),
         }
     }
 }
@@ -109,6 +129,10 @@ impl From<JobModelOutput> for Job {
 pub struct JobDetail {
     pub id: usize,
     pub name: String,
+    #[tabled(display("display_option_datetime"))]
+    pub start_date: Option<DateTime<Local>>,
+    #[tabled(display("display_option_datetime"))]
+    pub end_date: Option<DateTime<Local>>,
     pub status: JobStatus,
     pub status_reason: String,
     pub exit_code: i64,
@@ -117,18 +141,28 @@ pub struct JobDetail {
     pub stderr: String,
     pub stdin: String,
 }
+fn display_option_datetime(value: &Option<DateTime<Local>>) -> String {
+    match value {
+        Some(dt) => dt.to_string(),
+        None => "".to_owned(),
+    }
+}
 impl From<(JobModelOutput, JobMetadataModel)> for JobDetail {
     fn from(value: (JobModelOutput, JobMetadataModel)) -> Self {
         Self {
             id: value.0.job_id as usize,
             name: value.0.name,
-            status: match value.0.status.state.as_str() {
-                "RUNNING" => JobStatus::Running,
-                "FAILED" => JobStatus::Failed,
-                "COMPLETED" => JobStatus::Finished,
-                "CANCELLED" => JobStatus::Cancelled,
-                other => panic!("got job status: {}", other),
-            },
+            start_date: value.0.time.start.map(|s| {
+                DateTime::from_timestamp_secs(s)
+                    .unwrap()
+                    .with_timezone(&Local)
+            }),
+            end_date: value.0.time.end.map(|e| {
+                DateTime::from_timestamp_secs(e)
+                    .unwrap()
+                    .with_timezone(&Local)
+            }),
+            status: value.0.status.state.into(),
             status_reason: value.0.status.state_reason.unwrap_or("".to_owned()),
             exit_code: value.0.status.exit_code.unwrap_or(0),
             user: value.0.user.unwrap_or("".to_string()),
@@ -288,6 +322,13 @@ impl CscsApi {
         Ok(Some((job, job_metadata).into()))
     }
 
+    pub async fn cancel_job(&self, system_name: &str, job_id: i64) -> Result<()> {
+        cancel_compute_system_job(&self.client, system_name, job_id)
+            .await
+            .wrap_err("couldn't delete job")?;
+        Ok(())
+    }
+
     pub async fn mkdir(&self, system_name: &str, path: PathBuf) -> Result<()> {
         let _ = post_filesystem_ops_mkdir(&self.client, system_name, path)
             .await
diff --git a/coman/src/cscs/cli.rs b/coman/src/cscs/cli.rs
@@ -4,10 +4,10 @@ use std::path::PathBuf;
 
 use crate::{
     cscs::{
-        handlers::{cscs_job_details, cscs_job_list, cscs_start_job, cscs_system_list},
-        oauth2::{
-            CLIENT_ID_SECRET_NAME, CLIENT_SECRET_SECRET_NAME, client_credentials_login,
+        handlers::{
+            cscs_job_cancel, cscs_job_details, cscs_job_list, cscs_start_job, cscs_system_list,
         },
+        oauth2::{CLIENT_ID_SECRET_NAME, CLIENT_SECRET_SECRET_NAME, client_credentials_login},
     },
     util::{
         keyring::{Secret, get_secret, store_secret},
@@ -60,6 +60,18 @@ pub(crate) async fn cli_cscs_job_detail(job_id: i64) -> Result<()> {
             let data = &[
                 ("Id", job.id.to_string()),
                 ("Name", job.name),
+                (
+                    "Start Date",
+                    job.start_date
+                        .map(|dt| dt.to_string())
+                        .unwrap_or("".to_owned()),
+                ),
+                (
+                    "End Date",
+                    job.end_date
+                        .map(|dt| dt.to_string())
+                        .unwrap_or("".to_owned()),
+                ),
                 ("Status", job.status.to_string()),
                 ("Status Reason", job.status_reason),
                 ("Exit Code", job.exit_code.to_string()),
@@ -85,6 +97,10 @@ pub(crate) async fn cli_cscs_job_start(
     cscs_start_job(script_file, image, command).await
 }
 
+pub(crate) async fn cli_cscs_job_cancel(job_id: i64) -> Result<()> {
+    cscs_job_cancel(job_id).await
+}
+
 pub(crate) async fn cli_cscs_system_list() -> Result<()> {
     match cscs_system_list().await {
         Ok(systems) => {
diff --git a/coman/src/cscs/handlers.rs b/coman/src/cscs/handlers.rs
@@ -82,6 +82,19 @@ pub async fn cscs_job_details(job_id: i64) -> Result<Option<JobDetail>> {
     }
 }
 
+pub async fn cscs_job_cancel(job_id: i64) -> Result<()> {
+    match get_access_token().await {
+        Ok(access_token) => {
+            let api_client = CscsApi::new(access_token.0).unwrap();
+            let config = Config::new().unwrap();
+            api_client
+                .cancel_job(&config.cscs.current_system, job_id)
+                .await
+        }
+        Err(e) => Err(e),
+    }
+}
+
 pub async fn cscs_start_job(
     script_file: Option<PathBuf>,
     image: Option<DockerImageUrl>,
diff --git a/coman/src/main.rs b/coman/src/main.rs
@@ -22,8 +22,8 @@ use crate::{
     components::{global_listener::GlobalListener, toolbar::Toolbar, workload_list::WorkloadList},
     cscs::{
         cli::{
-            cli_cscs_job_detail, cli_cscs_job_list, cli_cscs_job_start, cli_cscs_login,
-            cli_cscs_system_list,
+            cli_cscs_job_cancel, cli_cscs_job_detail, cli_cscs_job_list, cli_cscs_job_start,
+            cli_cscs_login, cli_cscs_system_list,
         },
         ports::{AsyncDeviceFlowPort, AsyncFetchWorkloadsPort},
     },
@@ -62,6 +62,7 @@ async fn main() -> Result<()> {
                         image,
                         command,
                     } => cli_cscs_job_start(script_file, image, command).await?,
+                    cli::CscsJobCommands::Cancel { job_id } => cli_cscs_job_cancel(job_id).await?,
                 },
                 cli::CscsCommands::System { command } => match command {
                     cli::CscsSystemCommands::List => cli_cscs_system_list().await?,
diff --git a/firecrest_client/src/compute_api.rs b/firecrest_client/src/compute_api.rs
@@ -102,3 +102,17 @@ pub async fn get_compute_system_job_metadata(
     let model: GetJobMetadataResponse = serde_json::from_str(response.as_str())?;
     Ok(model)
 }
+
+pub async fn cancel_compute_system_job(
+    client: &FirecrestClient,
+    system_name: &str,
+    job_id: i64,
+) -> Result<()> {
+    let _ = client
+        .delete(
+            format!("compute/{system_name}/jobs/{job_id}").as_str(),
+            None,
+        )
+        .await?;
+    Ok(())
+}

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ pub enum CscsJobCommands {`
`45`	`45`	`#[clap(short, long, trailing_var_arg = true)]`
`46`	`46`	`command: Option<Vec<String>>,`
`47`	`47`	`},`
	`48`	`+ #[clap(alias("c"))]`
	`49`	`+ Cancel { job_id: i64 },`
`48`	`50`	`}`
`49`	`51`	`#[derive(Subcommand, Debug)]`
`50`	`52`	`pub enum CscsSystemCommands {`