Do not run with --tty when not in interactive mode

I have found that when running with nvidia the -t (--tty) option
in podman is covering up certain errors.  When we are not running
ramalama interactively, we do not need this flag set, and this
would make it easier to diagnose what is going on with users
systems.

Don't add -i unless necessary

Server should not need to be run with --interactive or --tty.

Signed-off-by: Daniel J Walsh <[email protected]>

Author: rhatdan

ramalama/engine.py

@@ -99,8 +99,9 @@ def add_env_option(self):
                 self.exec_args += ["--env", env]
 
     def add_tty_option(self):
-        if sys.stdout.isatty() or sys.stdin.isatty():
-            self.exec_args += ["-t"]
+        if self.args.subcommand != "run" or (hasattr(self.args, "ARGS") and self.args.ARGS) or not sys.stdin.isatty():
+            return
+        self.exec_args += ["-t"]
 
     def add_detach_option(self):
         if hasattr(self.args, "detach") and self.args.detach is True:

ramalama/model.py

@@ -209,9 +209,11 @@ def base(self, args, name):
             args.image = args.image.split(":")[0]
         args.image = accel_image(CONFIG, args)
         self.engine = Engine(args)
+        if args.subcommand == "run" and not (hasattr(args, "ARGS") and args.ARGS) and sys.stdin.isatty():
+            self.engine.add(["-i"])
+
         self.engine.add(
             [
-                "-i",
                 "--label",
                 "ai.ramalama",
                 "--name",

test/system/030-run.bats

@@ -23,6 +23,18 @@ EOF
 	is "$output" ".*${MODEL}" "verify model name"
 	is "$output" ".*-c 2048" "verify model name"
 	assert "$output" !~ ".*--seed" "assert seed does not show by default"
+	if is_tty; then
+	    is "$output" ".*-t -i " "run with terminal and interactive"
+	else
+	    assert "$output" !~ ".*-t -i" "assert -t -i not present without tty"
+	fi
+	run_ramalama -q --dryrun run ${MODEL} "what's up doc?"
+	is "$output" "${verify_begin}.*"
+	assert "$output" !~ ".*-t -i" "run without terminal"
+
+	run_ramalama -q --dryrun run ${MODEL} <<< "Test"
+	is "$output" "${verify_begin}.*"
+	assert "$output" !~ ".*-t -i" "run without terminal"
 
 	run_ramalama -q --dryrun run --env a=b --env test=success --name foobar ${MODEL}
 	is "$output" ".*--env a=b --env test=success" "dryrun correct with --env"

test/system/040-serve.bats

@@ -31,6 +31,8 @@ verify_begin=".*run --rm"
 	assert "$output" =~ "--network bridge.*--host 127.1.2.3" "verify --host is modified when run within container"
 	is "$output" ".*${model}" "verify model name"
 	is "$output" ".*--temp 0.8" "verify temp is set"
+	assert "$output" !~ ".*-t " "assert -t not present"
+	assert "$output" !~ ".*-i " "assert -t not present"
 
 	run_ramalama -q --dryrun serve --temp 0.1 ${model}
 	is "$output" ".*--temp 0.1" "verify temp is set"

test/system/helpers.bash

@@ -248,6 +248,10 @@ function is_darwin() {
     [ "$(uname)" == "Darwin" ]
 }
 
+function is_tty() {
+    tty -s
+}
+
 function skip_if_darwin() {
     if [[ "$(uname)" == "Darwin" ]]; then
 	skip "Not supported on darwin"