From 07d31c22ee408f5e54e874a7f78d83312a986201 Mon Sep 17 00:00:00 2001
From: Faiz Surani <faiz.surani@gmail.com>
Date: Wed, 24 Apr 2024 11:34:00 -0700
Subject: [PATCH] Make jobs batch by default

---
 rl/cli/main.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/rl/cli/main.py b/rl/cli/main.py
index 0e33cba..b458044 100644
--- a/rl/cli/main.py
+++ b/rl/cli/main.py
@@ -181,10 +181,10 @@ def wrapper(*args, **kwargs):
     type=str,
 )
 @click.option(
-    "--batch",
-    "-b",
+    "--interactive",
+    "-i",
     is_flag=True,
-    help="Run as a batch job, then ssh into it. This is automatically set if partition is 'owners'.",
+    help="Run job interactively, rather than via batch. Not recommended.",
 )
 @click.option(
     "--command",
@@ -207,15 +207,12 @@ def job(
     cpus: int,
     mem: str,
     time: str,
-    batch: bool,
+    interactive: bool,
     command: str | None,
     slurm_args: list[str],
 ):
-    if partition == "owners":
-        batch = True
-
-    if command is not None:
-        assert batch is True, "Command can only be passed if running as a batch job"
+    if interactive:
+        assert partition != "owners", "Cannot run interactive job on owners partition"
 
     LOG_DIR.mkdir(exist_ok=True, parents=True)
 
@@ -245,7 +242,7 @@ def job(
             ]
         )
 
-    if batch:
+    if not interactive:
         create_batch_job(common_args, name, time)
     else:
         rich.print("[green]Starting interactive job...[/green]")
@@ -255,7 +252,7 @@ def job(
                 "srun",
                 *common_args,
                 "--pty",
-                SHELL_PATH,
+                command or SHELL_PATH,
             ]
         )