richqueue 1.7__tar.gz → 1.8__tar.gz

{richqueue-1.7 → richqueue-1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richqueue
-Version: 1.7
+Version: 1.8
 Summary: RichQueue
 Project-URL: Homepage, https://github.com/mwinokan/RichQueue/issues
 Project-URL: Bug Tracker, https://github.com/mwinokan/RichQueue/issues

{richqueue-1.7 → richqueue-1.8}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 [project]
 name = "richqueue"
-version = "1.7"
+version = "1.8"
 authors = [
     { name = "Max Winokan", email = "max@winokan.com" },
 ]

{richqueue-1.7 → richqueue-1.8}/richqueue/slurm.py

@@ -33,25 +33,15 @@ def get_layout_pair(user: str | None, console_height=None, **kwargs):
 
     df = combined_df(user=user, **kwargs)
 
-    # if df is None:
-    #     running = Panel(Text("[bold]No active jobs"), expand=False)
-    # else:
-
     n_rows = len(df)
     n_running = len(df[df["job_state"] == "RUNNING"])
     n_pending = len(df[df["job_state"] == "PENDING"])
 
     hide_pending = False
 
-    # print(console_height)
-
     if console_height is None:
         console_height = console.size.height
 
-    # print(console_height)
-    # print(n_running)
-    # print(n_pending)
-
     history_df = df[~df["job_state"].isin(["RUNNING", "PENDING"])]
 
     if n_running + n_pending > 0:
@@ -71,7 +61,6 @@ def get_layout_pair(user: str | None, console_height=None, **kwargs):
 
             # hide pending?
             elif n_rows - n_pending < max_rows:
-                # running_df = running_df[running_df["job_state"]=="RUNNING"]
                 running_limit = None
                 history_limit = None
                 hide_pending = n_pending
@@ -410,15 +399,14 @@ def combined_df(**kwargs) -> "DataFrame":
 def add_run_time(df):
 
     def inner(row):
-        # print(f'{row.end_time=} {type(row.end_time)=}')
 
         if row.job_state == "PENDING":
             return ""
 
-        if isnull(row.end_time):
-            return human_timedelta(datetime.datetime.now() - row.start_time)
-        else:
-            return human_timedelta(row.end_time - row.start_time)
+        if "end_time" not in row or isnull(row.end_time):
+            row.end_time = datetime.datetime.now()
+
+        return human_timedelta(row.end_time - row.start_time)
 
     return df.apply(inner, axis=1)
 

{richqueue-1.7 → richqueue-1.8}/richqueue/table.py

@@ -38,7 +38,7 @@ def running_job_table(
 
     table = Table(title=title, box=None, header_style="")
 
-    columns = RUNNING_JOB_COLUMNS[long]
+    columns = RUNNING_JOB_COLUMNS(long, user)
 
     for col in columns:
         col_data = COLUMNS[col]
@@ -99,13 +99,15 @@ def history_job_table(
         hist_string = f"last {hist} {hist_unit}"
 
     if not user:
-        title = f"[bold]{count} previous jobs on {METADATA['cluster_name']} ({hist_string})"
+        title = (
+            f"[bold]{count} previous jobs on {METADATA['cluster_name']} ({hist_string})"
+        )
     else:
         title = f"[bold]{user}'s {count} previous jobs on {METADATA['cluster_name']} ({hist_string})"
 
     table = Table(title=title, box=None, header_style="")
 
-    columns = HISTORY_JOB_COLUMNS[long]
+    columns = HISTORY_JOB_COLUMNS(long, user)
 
     for col in columns:
         col_data = COLUMNS[col]
@@ -283,7 +285,9 @@ def color_by_state(state):
     elif state == "IDLE":
         return "[bold bright_green]Idle"
     elif state == "PENDING":
-        return "[bright_red]Preempted"
+        return "[bright_yellow]Preempted"
+    elif state == "NODE_FAIL":
+        return "[bold bright_red]Node Failure"
     elif state == "PREEMPTED":
         return "[bright_yellow]Pending"
     elif state == "MIXED":
@@ -387,55 +391,118 @@ JOB_COLUMNS = {
     ],
 }
 
-RUNNING_JOB_COLUMNS = {
-    True: [
-        "job_id",
-        "name",
-        "node_count",
-        "cpus",
-        "submit_time",
-        "start_time",
-        "run_time",
-        "time_limit",
-        "partition",
-        "nodes",
-        "job_state",
-    ],
-    False: [
-        "job_id",
-        "name",
-        "node_count",
-        "cpus",
-        "start_time",
-        "run_time",
-        "time_limit",
-        "job_state",
-    ],
-}
 
-HISTORY_JOB_COLUMNS = {
-    True: [
-        "job_id",
-        "name",
-        # "node_count",
-        # "cpus",
-        "submit_time",
-        "start_time",
-        "run_time",
-        "partition",
-        "nodes",
-        "job_state",
-    ],
-    False: [
-        "job_id",
-        "name",
-        # "node_count",
-        # "cpus",
-        "start_time",
-        "run_time",
-        "job_state",
-    ],
-}
+def RUNNING_JOB_COLUMNS(long, user):
+    if user:
+        if long:
+            return [
+                "job_id",
+                "name",
+                "node_count",
+                "cpus",
+                "submit_time",
+                "start_time",
+                "run_time",
+                "time_limit",
+                "partition",
+                "nodes",
+                "job_state",
+            ]
+
+        else:
+            return [
+                "job_id",
+                "name",
+                "node_count",
+                "cpus",
+                "start_time",
+                "run_time",
+                "time_limit",
+                "job_state",
+            ]
+    else:
+        if long:
+            return [
+                "job_id",
+                "user_name",
+                "name",
+                "node_count",
+                "cpus",
+                "submit_time",
+                "start_time",
+                "run_time",
+                "time_limit",
+                "partition",
+                "nodes",
+                "job_state",
+            ]
+
+        else:
+            return [
+                "job_id",
+                "user_name",
+                "name",
+                "node_count",
+                "cpus",
+                "start_time",
+                "run_time",
+                "time_limit",
+                "job_state",
+            ]
+
+
+def HISTORY_JOB_COLUMNS(long, user):
+    if user:
+        if long:
+            return [
+                "job_id",
+                "name",
+                # "node_count",
+                # "cpus",
+                "submit_time",
+                "start_time",
+                "run_time",
+                "partition",
+                "nodes",
+                "job_state",
+            ]
+        else:
+            return [
+                "job_id",
+                "name",
+                # "node_count",
+                # "cpus",
+                "start_time",
+                "run_time",
+                "job_state",
+            ]
+    else:
+        if long:
+            return [
+                "job_id",
+                "user_name",
+                "name",
+                # "node_count",
+                # "cpus",
+                "submit_time",
+                "start_time",
+                "run_time",
+                "partition",
+                "nodes",
+                "job_state",
+            ]
+        else:
+            return [
+                "job_id",
+                "user_name",
+                "name",
+                # "node_count",
+                # "cpus",
+                "start_time",
+                "run_time",
+                "job_state",
+            ]
+
 
 NODE_COLUMNS = {
     True: [
@@ -585,7 +652,10 @@ COLUMNS = {
         "no_wrap": True,
     },
     "threads_per_core": {"header": "#Threads/core", "style": "magenta"},
-    "user_name": {"header": "User Group", "style": "green_yellow"},
+    "user_name": {
+        "header": "[bold underline green_yellow]User",
+        "style": "green_yellow",
+    },
 }
 
 FORMATTERS = {