richqueue 1.3__tar.gz → 1.4__tar.gz

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

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

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

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

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

@@ -16,12 +16,12 @@ def dual_layout(function, **kwargs):
     try:
         upper.size = upper.renderable.renderable.row_count + PANEL_PADDING
     except AttributeError:
-        upper.size = 3 # + PANEL_PADDING
+        upper.size = 3  # + PANEL_PADDING
 
     try:
         lower.size = lower.renderable.renderable.row_count + PANEL_PADDING
     except AttributeError:
-        lower.size = 3 # + PANEL_PADDING
+        lower.size = 3  # + PANEL_PADDING
 
     layout.split_column(
         upper,

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

@@ -40,20 +40,22 @@ def get_layout_pair(user: str | None, **kwargs):
     hide_pending = False
 
     console_height = console.size.height
-    
+
     history_df = df[~df["job_state"].isin(["RUNNING", "PENDING"])]
 
     if n_running + n_pending > 0:
 
         running_df = df[df["job_state"].isin(["RUNNING", "PENDING"])]
 
+        active_height = n_running + n_pending + PANEL_PADDING
+
         max_rows = console_height - 2 * PANEL_PADDING
 
         if n_rows > max_rows:
 
             # hide history?
-            if n_running + n_pending + PANEL_PADDING + 1 < console_height:
-                history_limit = 0
+            if active_height < console_height - PANEL_PADDING:
+                history_limit = max(0, console_height - PANEL_PADDING - active_height)
                 running_limit = None
 
             # hide pending?
@@ -89,7 +91,13 @@ def get_layout_pair(user: str | None, **kwargs):
         running = Panel(Text("No active jobs", style="bold"), expand=False)
 
     if history_limit == 0:
-        history = Panel(Text("history hidden, resize window or use smaller --hist value", style="bold"), expand=False)
+        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),

{richqueue-1.3 → richqueue-1.4}/richqueue/table.py

@@ -213,6 +213,8 @@ def color_by_state(state):
         return "[bright_yellow]Pending"
     elif state == "MIXED":
         return "[bright_yellow]Mixed"
+    elif state == "TIMEOUT":
+        return "[bold bright_yellow]Timed Out"
     elif state == "CANCELLED":
         return "[orange3]Cancelled"
     elif state == "FAILED":

{richqueue-1.3 → richqueue-1.4}/richqueue/wisdom.py

@@ -332,8 +332,10 @@ QUOTES = [
     "THE WORLD IS YOUR HOSTAGE",  #
 ]
 
+
 def main():
-	app()
+    app()
+
 
 if __name__ == "__main__":
     app()