add job log view in tui

Panaetius · Panaetius · commit 344a3d115879 · 2025-11-21T14:52:52.000+01:00
diff --git a/coman/src/app/ids.rs b/coman/src/app/ids.rs
@@ -2,6 +2,7 @@
 pub enum Id {
     Toolbar,
     WorkloadList,
+    WorkloadLogs,
     GlobalListener,
     Menu,
     InfoPopup,
diff --git a/coman/src/app/messages.rs b/coman/src/app/messages.rs
@@ -38,7 +38,10 @@ pub enum CscsMsg {
     SelectSystem,
     SystemSelected(String),
 }
-
+#[derive(Debug, PartialEq)]
+pub enum JobMsg {
+    ShowLog(usize),
+}
 #[derive(Debug, PartialEq)]
 pub enum Msg {
     AppClose,
@@ -50,5 +53,6 @@ pub enum Msg {
     Error(String),
     Info(String),
     Cscs(CscsMsg),
+    Job(JobMsg),
     None,
 }
diff --git a/coman/src/app/model.rs b/coman/src/app/model.rs
@@ -10,13 +10,15 @@ use crate::{
     app::{
         ids::Id,
         messages::{
-            CscsMsg, ErrorPopupMsg, InfoPopupMsg, LoginPopupMsg, MenuMsg, Msg, SystemSelectMsg,
+            CscsMsg, ErrorPopupMsg, InfoPopupMsg, JobMsg, LoginPopupMsg, MenuMsg, Msg,
+            SystemSelectMsg,
         },
         user_events::UserEvent,
     },
     components::{
         error_popup::ErrorPopup, info_popup::InfoPopup, login_popup::LoginPopup,
-        system_select_popup::SystemSelectPopup, workload_menu::WorkloadMenu,
+        system_select_popup::SystemSelectPopup, workload_log::WorkloadLog,
+        workload_menu::WorkloadMenu,
     },
     cscs::{cli::cscs_login, handlers::cscs_system_set},
     trace_dbg,
@@ -42,6 +44,10 @@ where
 
     /// Triggers async request to select current system
     pub select_system_tx: mpsc::Sender<()>,
+
+    /// Triggers watching job logs
+    /// sending None stops watching
+    pub job_log_tx: mpsc::Sender<Option<usize>>,
 }
 
 impl<T> Model<T>
@@ -53,6 +59,7 @@ where
         bridge: TerminalBridge<T>,
         error_tx: mpsc::Sender<String>,
         select_system_tx: mpsc::Sender<()>,
+        job_log_tx: mpsc::Sender<Option<usize>>,
     ) -> Self {
         Self {
             app,
@@ -61,6 +68,7 @@ where
             terminal: bridge,
             error_tx,
             select_system_tx,
+            job_log_tx,
         }
     }
 
@@ -79,7 +87,9 @@ where
                             .as_ref(),
                         )
                         .split(f.area());
-                    self.app.view(&Id::WorkloadList, f, chunks[0]);
+                    if self.app.mounted(&Id::WorkloadList) {
+                        self.app.view(&Id::WorkloadList, f, chunks[0]);
+                    }
                     self.app.view(&Id::Toolbar, f, chunks[1]);
 
                     if self.app.mounted(&Id::Menu) {
@@ -217,6 +227,28 @@ where
             }
         }
     }
+    fn handle_job_msg(&mut self, msg: JobMsg) -> Option<Msg> {
+        match msg {
+            JobMsg::ShowLog(jobid) => {
+                if self.app.mounted(&Id::WorkloadList) {
+                    assert!(self.app.umount(&Id::WorkloadList).is_ok());
+                }
+                if !self.app.mounted(&Id::WorkloadLogs) {
+                    assert!(
+                        self.app
+                            .mount(Id::WorkloadLogs, Box::new(WorkloadLog::new()), vec![])
+                            .is_ok()
+                    );
+                }
+                assert!(self.app.active(&Id::WorkloadLogs).is_ok());
+                let job_log_tx = self.job_log_tx.clone();
+                tokio::spawn(async move {
+                    job_log_tx.send(Some(jobid)).await.unwrap();
+                });
+                None
+            }
+        }
+    }
 }
 
 // Let's implement Update for model
@@ -284,6 +316,7 @@ where
                 }
                 Msg::LoginPopup(msg) => self.handle_login_popup_msg(msg),
                 Msg::SystemSelectPopup(msg) => self.handle_system_select_popup_msg(msg),
+                Msg::Job(msg) => self.handle_job_msg(msg),
                 Msg::None => None,
             }
         } else {
diff --git a/coman/src/app/user_events.rs b/coman/src/app/user_events.rs
@@ -4,6 +4,7 @@ use crate::cscs::api_client::{Job, System};
 pub enum CscsEvent {
     LoggedIn,
     GotWorkloadData(Vec<Job>),
+    GotJobLog(String),
     SelectSystemList(Vec<System>),
 }
 
diff --git a/coman/src/components/global_listener.rs b/coman/src/components/global_listener.rs
@@ -5,7 +5,7 @@ use tuirealm::{
 };
 
 use crate::app::{
-    messages::{MenuMsg, Msg, SystemSelectMsg},
+    messages::{JobMsg, MenuMsg, Msg, SystemSelectMsg},
     user_events::{CscsEvent, UserEvent},
 };
 
diff --git a/coman/src/components/mod.rs b/coman/src/components/mod.rs
@@ -5,4 +5,5 @@ pub(crate) mod login_popup;
 pub(crate) mod system_select_popup;
 pub(crate) mod toolbar;
 pub(crate) mod workload_list;
+pub(crate) mod workload_log;
 pub(crate) mod workload_menu;
diff --git a/coman/src/components/toolbar.rs b/coman/src/components/toolbar.rs
@@ -12,7 +12,7 @@ impl Toolbar {
     pub fn new() -> Self {
         Self {
             component: Label::default()
-                .text("q: quit, tab/shift+tab: change focus, x: menu, ?: help"),
+                .text("q: quit, l: logs, tab/shift+tab: change focus, x: menu, ?: help"),
         }
     }
 }
diff --git a/coman/src/components/workload_list.rs b/coman/src/components/workload_list.rs
@@ -1,19 +1,23 @@
 use tui_realm_stdlib::List;
 use tuirealm::{
-    AttrValue, Attribute, Component, Event, MockComponent,
+    AttrValue, Attribute, Component, Event, MockComponent, State, StateValue,
     command::{Cmd, CmdResult, Direction, Position},
-    event::{Key, KeyEvent},
+    event::{Key, KeyEvent, KeyModifiers},
     props::{Alignment, BorderType, Borders, Color, TableBuilder, TextSpan},
 };
 
-use crate::app::{
-    messages::Msg,
-    user_events::{CscsEvent, UserEvent},
+use crate::{
+    app::{
+        messages::{JobMsg, Msg},
+        user_events::{CscsEvent, UserEvent},
+    },
+    cscs::api_client::Job,
 };
 
 #[derive(MockComponent)]
 pub(crate) struct WorkloadList {
     component: List,
+    jobs: Vec<Job>,
 }
 
 impl Default for WorkloadList {
@@ -31,6 +35,7 @@ impl Default for WorkloadList {
                 .highlighted_str("-")
                 .rewind(true)
                 .step(4),
+            jobs: vec![],
         }
     }
 }
@@ -59,8 +64,10 @@ impl Component<Msg, UserEvent> for WorkloadList {
             }
             Event::User(UserEvent::Cscs(CscsEvent::GotWorkloadData(data))) => {
                 if data.len() == 0 {
+                    self.jobs = vec![];
                     self.attr(Attribute::Content, AttrValue::Table(vec![]));
                 } else {
+                    self.jobs = data.clone();
                     let mut table = TableBuilder::default();
                     for (idx, job) in data.iter().enumerate() {
                         if idx > 0 {
@@ -77,6 +84,18 @@ impl Component<Msg, UserEvent> for WorkloadList {
                 }
                 self.perform(Cmd::Change)
             }
+            Event::Keyboard(KeyEvent {
+                code: Key::Char('l'),
+                modifiers: KeyModifiers::NONE,
+            }) => {
+                if let State::One(StateValue::Usize(index)) = self.state()
+                    && !self.jobs.is_empty()
+                {
+                    let job = self.jobs[index].clone();
+                    return Some(Msg::Job(JobMsg::ShowLog(job.id)));
+                }
+                CmdResult::None
+            }
             _ => CmdResult::None,
         };
         Some(Msg::None)
diff --git a/coman/src/components/workload_log.rs b/coman/src/components/workload_log.rs
@@ -0,0 +1,54 @@
+use tui_realm_stdlib::{List, Textarea};
+use tuirealm::{
+    AttrValue, Attribute, Component, Event, MockComponent, State, StateValue,
+    command::{Cmd, CmdResult, Direction, Position},
+    event::{Key, KeyEvent, KeyModifiers},
+    props::{
+        Alignment, BorderType, Borders, Color, PropPayload, PropValue, TableBuilder, TextSpan,
+    },
+};
+
+use crate::app::{
+    messages::Msg,
+    user_events::{CscsEvent, UserEvent},
+};
+
+#[derive(MockComponent)]
+pub struct WorkloadLog {
+    component: Textarea,
+}
+
+impl WorkloadLog {
+    pub fn new() -> Self {
+        Self {
+            component: Textarea::default()
+                .borders(
+                    Borders::default()
+                        .modifiers(BorderType::Rounded)
+                        .color(Color::Yellow),
+                )
+                .title("Workload Log", Alignment::Center)
+                .step(4),
+        }
+    }
+}
+impl Component<Msg, UserEvent> for WorkloadLog {
+    fn on(&mut self, ev: tuirealm::Event<UserEvent>) -> Option<Msg> {
+        let _ = match ev {
+            Event::User(UserEvent::Cscs(CscsEvent::GotJobLog(log))) => {
+                self.attr(
+                    Attribute::Content,
+                    AttrValue::Payload(PropPayload::Vec(
+                        log.lines()
+                            .map(|l| TextSpan::from(l))
+                            .map(PropValue::TextSpan)
+                            .collect(),
+                    )),
+                );
+                CmdResult::None
+            }
+            _ => CmdResult::None,
+        };
+        Some(Msg::None)
+    }
+}
diff --git a/coman/src/cscs/api_client.rs b/coman/src/cscs/api_client.rs
@@ -7,7 +7,8 @@ use firecrest_client::{
         post_compute_system_job, stop_compute_system_job,
     },
     filesystem_api::{
-        post_filesystem_ops_mkdir, post_filesystem_ops_upload, put_filesystem_ops_chmod,
+        get_filesystem_ops_tail, post_filesystem_ops_mkdir, post_filesystem_ops_upload,
+        put_filesystem_ops_chmod,
     },
     status_api::{get_status_systems, get_status_userinfo},
     types::{
@@ -349,6 +350,11 @@ impl CscsApi {
             .wrap_err("couldn't upload file")?;
         Ok(())
     }
+    pub async fn tail(&self, system_name: &str, path: PathBuf, lines: usize) -> Result<String> {
+        get_filesystem_ops_tail(&self.client, system_name, path, lines)
+            .await
+            .wrap_err("couldn't tail file")
+    }
     pub async fn get_userinfo(&self, system_name: &str) -> Result<UserInfo> {
         let result = get_status_userinfo(&self.client, system_name)
             .await
diff --git a/coman/src/cscs/handlers.rs b/coman/src/cscs/handlers.rs
@@ -95,6 +95,23 @@ pub async fn cscs_job_details(job_id: i64) -> Result<Option<JobDetail>> {
     }
 }
 
+pub async fn cscs_job_log(job_id: i64) -> Result<String> {
+    match get_access_token().await {
+        Ok(access_token) => {
+            let api_client = CscsApi::new(access_token.0).unwrap();
+            let config = Config::new().unwrap();
+            let job = api_client
+                .get_job(&config.cscs.current_system, job_id)
+                .await?
+                .ok_or(Err(eyre!("couldn't find job"))?)?;
+            api_client
+                .tail(&config.cscs.current_system, PathBuf::from(job.stdout), 100)
+                .await
+        }
+        Err(e) => Err(e),
+    }
+}
+
 pub async fn cscs_job_stop(job_id: i64) -> Result<()> {
     match get_access_token().await {
         Ok(access_token) => {
diff --git a/coman/src/cscs/ports.rs b/coman/src/cscs/ports.rs
@@ -10,7 +10,7 @@ use tuirealm::{
 use crate::{
     app::user_events::{CscsEvent, UserEvent},
     cscs::{
-        handlers::{cscs_job_list, cscs_system_list},
+        handlers::{cscs_job_list, cscs_job_log, cscs_system_list},
         oauth2::{ACCESS_TOKEN_SECRET_NAME, REFRESH_TOKEN_SECRET_NAME, finish_cscs_device_login},
     },
     trace_dbg,
@@ -115,6 +115,7 @@ impl PollAsync<UserEvent> for AsyncFetchWorkloadsPort {
         }
     }
 }
+
 pub(crate) struct AsyncSelectSystemPort {
     receiver: mpsc::Receiver<()>,
 }
@@ -145,3 +146,47 @@ impl PollAsync<UserEvent> for AsyncSelectSystemPort {
         }
     }
 }
+
+pub(crate) struct AsyncJobLogPort {
+    receiver: mpsc::Receiver<Option<usize>>,
+    current_job: Option<usize>,
+}
+
+impl AsyncJobLogPort {
+    pub fn new(receiver: mpsc::Receiver<Option<usize>>) -> Self {
+        Self {
+            receiver,
+            current_job: None,
+        }
+    }
+}
+#[tuirealm::async_trait]
+impl PollAsync<UserEvent> for AsyncJobLogPort {
+    async fn poll(&mut self) -> ListenerResult<Option<Event<UserEvent>>> {
+        if self.receiver.is_closed() {
+            trace_dbg!("recv closed");
+            return Ok(None);
+        }
+        if !self.receiver.is_empty() {
+            trace_dbg!("not empty");
+            if let Some(val) = self.receiver.recv().await {
+                self.current_job = val;
+            }
+            Ok(None)
+        } else if let Some(job_id) = self.current_job {
+            trace_dbg!("get data");
+            match cscs_job_log(job_id as i64).await {
+                Ok(log) => Ok(Some(Event::User(UserEvent::Cscs(CscsEvent::GotJobLog(
+                    log,
+                ))))),
+                Err(e) => Ok(Some(Event::User(UserEvent::Error(format!(
+                    "{:?}",
+                    Err::<(), Report>(e).wrap_err("couldn't get log")
+                ))))),
+            }
+        } else {
+            trace_dbg!("nothing");
+            Ok(None)
+        }
+    }
+}
diff --git a/coman/src/main.rs b/coman/src/main.rs
diff --git a/firecrest_client/src/filesystem_api.rs b/firecrest_client/src/filesystem_api.rs

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ use crate::cscs::api_client::{Job, System};`
`4`	`4`	`pub enum CscsEvent {`
`5`	`5`	`LoggedIn,`
`6`	`6`	`GotWorkloadData(Vec<Job>),`
	`7`	`+ GotJobLog(String),`
`7`	`8`	`SelectSystemList(Vec<System>),`
`8`	`9`	`}`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ impl Toolbar {`
`12`	`12`	`pub fn new() -> Self {`
`13`	`13`	`Self {`
`14`	`14`	`component: Label::default()`
`15`		`- .text("q: quit, tab/shift+tab: change focus, x: menu, ?: help"),`
	`15`	`+ .text("q: quit, l: logs, tab/shift+tab: change focus, x: menu, ?: help"),`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`