Fix bugs in jackhammer

sodetlib/hammers/jackhammer.py

@@ -79,7 +79,7 @@ def get_docker_services():
     res = subprocess.run(shlex.split(cmd), cwd=cwd, stdout=subprocess.PIPE)
     return res.stdout.decode().split()
 
-def util_run(cmd, args=[], name=None, rm=True, **run_kwargs):
+def util_run(cmd, args=None, name=None, rm=True, allocate_tty=False, **run_kwargs):
     """
     Runs a command using subproces.run within the sodetlib util docker.
 
@@ -94,12 +94,19 @@ def util_run(cmd, args=[], name=None, rm=True, **run_kwargs):
         set and docker-compose will choose the default.
     rm : bool
         If True, will remove the container when the command has finished.
+    allocate_tty : bool
+        If True, allow docker to allocate a pseudo-TTY. Set to True for
+        interactive commands (bash, ipython). Defaults to False (--no-tty) to
+        prevent terminal corruption when running non-interactively.
     run_kwargs : Additional keyword arguments
         Any additional kwargs specified will be passed directly to the
         subprocess.run function. See the subprocess docs for allowed kwargs:
         https://docs.python.org/3/library/subprocess.html#subprocess.run
     """
-    cmd  = f'{docker_compose_cmd} run --entrypoint={cmd} '
+    if args is None:
+        args = []
+    tty_flag = '' if allocate_tty else '--no-tty '
+    cmd  = f'{docker_compose_cmd} run {tty_flag}--entrypoint={cmd} '
     if name is not None:
         cmd += f'--name={name} '
     if rm:
@@ -172,7 +179,7 @@ def get_running_dockers(get_all=True):
     return containers
 
 
-def kill_bad_dockers(slots, kill_monitor=False, names=[], images=[]):
+def kill_bad_dockers(slots, kill_monitor=False, names=None, images=None):
     """
         Kills relevant dockers for a given set of slots.
 
@@ -186,6 +193,11 @@ def kill_bad_dockers(slots, kill_monitor=False, names=[], images=[]):
             images (list of strings):
     """
 
+    if names is None:
+        names = []
+    if images is None:
+        images = []
+
     print(f"Killing bad dockers for slots {slots}")
     bad_names = names
 
@@ -292,7 +304,7 @@ def enter_pysmurf(slot, agg=False):
         util_run(
             'python3',
             args=f"/sodetlib/scripts/start_pysmurf_ipython.py -N {slot}".split(),
-            name=name, rm=False
+            name=name, rm=False, allocate_tty=True
         )
 
 def write_docker_env():
@@ -664,7 +676,7 @@ def log_func(args):
 
 # Entrypoint for jackhamer util
 def util_func(args):
-    util_run('bash', rm=(not args.detached))
+    util_run('bash', rm=(not args.detached), allocate_tty=True)
 
 
 def gui_func(args):