remove no-wait option

Author: memalhot

batchtools/br.py

@@ -37,7 +37,7 @@ class CreateJobCommandArgs(argparse.Namespace):
     name: str = "job"
     job_id: str = uuid.uuid5(uuid.NAMESPACE_OID, f"{os.getpid()}-{time.time()}").hex
     job_delete: bool = True
-    wait: bool = True
+    # no more wait flag exposed to users; br always waits for completion
     timeout: int = 60 * 15 * 4
     max_sec: int = 60 * 15
     gpu_numreq: int = 1
@@ -80,12 +80,7 @@ def build_parser(cls, subparsers: SubParserFactory):
             default=CreateJobCommandArgs.job_delete,
             help="Delete job on completion",
         )
-        p.add_argument(
-            "--wait",
-            action=argparse.BooleanOptionalAction,
-            default=CreateJobCommandArgs.wait,
-            help="Wait for job completion",
-        )
+        # removed --wait / --no-wait flag: br always waits for completion now
         p.add_argument(
             "--timeout",
             default=CreateJobCommandArgs.timeout,
@@ -185,10 +180,10 @@ def run(args: argparse.Namespace):
             queue_wait = None
             total_wall = None
 
-            if args.wait:
-                result_phase, run_elapsed, queue_wait, total_wall = log_job_output(
-                    job_name=job_name, wait=True, timeout=args.timeout
-                )
+            # always wait for the job to complete
+            result_phase, run_elapsed, queue_wait, total_wall = log_job_output(
+                job_name=job_name, wait=True, timeout=args.timeout
+            )
 
             if (
                 run_elapsed is not None
@@ -229,12 +224,12 @@ def run(args: argparse.Namespace):
         except oc.OpenShiftPythonException as e:
             sys.exit(f"Error occurred while creating job: {e}")
 
-        if args.job_delete and args.wait:
+        if args.job_delete:
             print(f"RUNDIR: jobs/{job_name}")
             oc_delete("job", job_name)
         else:
             print(
-                f"User specified not to wait, or not to delete, so {job_name} must be deleted by user.\n"
+                f"User specified not to delete, so {job_name} must be deleted by user.\n"
                 f"You can do this by running:\n"
                 f"  batchtools bd {job_name} OR\n"
                 f"  oc delete job {job_name}"
@@ -306,7 +301,6 @@ def log_job_output(
                 total_wall = time.monotonic() - start_poll  # fallback
             run_elapsed = total_wall - (queue_wait or 0.0)
         else:
-            # Never reached Running; keep convention for failures:
             run_elapsed = 0.0 if result_phase == "failed" else None
             if total_wall is None:
                 total_wall = 0.0