richqueue 1.2__tar.gz → 1.3__tar.gz

{richqueue-1.2 → richqueue-1.3}/PKG-INFO

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

{richqueue-1.2 → richqueue-1.3}/pyproject.toml

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

{richqueue-1.2 → richqueue-1.3}/richqueue/layout.py

@@ -13,8 +13,15 @@ def dual_layout(function, **kwargs):
     upper = Layout(renderable=upper, name="upper")
     lower = Layout(renderable=lower, name="lower")
 
-    upper.size = upper.renderable.renderable.row_count + PANEL_PADDING
-    lower.size = lower.renderable.renderable.row_count + PANEL_PADDING
+    try:
+        upper.size = upper.renderable.renderable.row_count + PANEL_PADDING
+    except AttributeError:
+        upper.size = 3 # + PANEL_PADDING
+
+    try:
+        lower.size = lower.renderable.renderable.row_count + PANEL_PADDING
+    except AttributeError:
+        lower.size = 3 # + PANEL_PADDING
 
     layout.split_column(
         upper,

{richqueue-1.2 → richqueue-1.3}/richqueue/slurm.py

@@ -29,54 +29,67 @@ def get_layout_pair(user: str | 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
 
-    running_df = df[df["job_state"].isin(["RUNNING", "PENDING"])]
+    console_height = console.size.height
+    
     history_df = df[~df["job_state"].isin(["RUNNING", "PENDING"])]
 
-    console_height = console.size.height
-    max_rows = console_height - 2 * PANEL_PADDING
+    if n_running + n_pending > 0:
 
-    if n_rows > max_rows:
+        running_df = df[df["job_state"].isin(["RUNNING", "PENDING"])]
 
-        # hide history?
-        if n_running + n_pending + PANEL_PADDING + 1 < console_height:
-            history_limit = 0
-            running_limit = None
+        max_rows = console_height - 2 * PANEL_PADDING
+
+        if n_rows > max_rows:
 
-        # hide pending?
-        elif n_rows - n_pending < max_rows:
-            # running_df = running_df[running_df["job_state"]=="RUNNING"]
+            # hide history?
+            if n_running + n_pending + PANEL_PADDING + 1 < console_height:
+                history_limit = 0
+                running_limit = None
+
+            # 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
+
+            # fallback clip
+            else:
+                running_limit = 5
+                history_limit = 5
+
+        else:
             running_limit = None
             history_limit = None
-            hide_pending = n_pending
 
-        # fallback clip
-        else:
-            running_limit = 5
-            history_limit = 5
+        running = Panel(
+            running_job_table(
+                running_df,
+                limit=running_limit,
+                hide_pending=hide_pending,
+                user=user,
+                **kwargs,
+            ),
+            expand=False,
+        )
 
     else:
-        running_limit = None
-        history_limit = None
-
-    running = Panel(
-        running_job_table(
-            running_df,
-            limit=running_limit,
-            hide_pending=hide_pending,
-            user=user,
-            **kwargs,
-        ),
-        expand=False,
-    )
+
+        history_limit = console_height - PANEL_PADDING - 3
+        running = Panel(Text("No active jobs", style="bold"), expand=False)
 
     if history_limit == 0:
-        history = Text("history hidden, resize window or use --hist")
+        history = Panel(Text("history hidden, resize window or use smaller --hist value", style="bold"), expand=False)
     else:
         history = Panel(
             history_job_table(history_df, limit=history_limit, user=user, **kwargs),
@@ -177,6 +190,9 @@ def get_squeue(
     # filter columns
     columns = COLUMNS["squeue"]
 
+    if not len(df):
+        return DataFrame(columns=columns)
+
     try:
         df = df[columns]
     except KeyError:
@@ -342,7 +358,16 @@ def combined_df(**kwargs) -> "DataFrame":
     """Get combined DataFrame of SLURM job information"""
     df1 = get_squeue(**kwargs)
     df2 = get_sacct(**kwargs)
-    df = concat([df1, df2], ignore_index=True)
+
+    if len(df1) and len(df2):
+        df = concat([df1, df2], ignore_index=True)
+    elif len(df1):
+        df = df1
+    elif len(df2):
+        df = df2
+    else:
+        return None
+
     df["run_time"] = add_run_time(df)
     df = df.sort_values(by="submit_time", ascending=True)
     return df