forked from phoenix-oss/llama-stack-mirror
# What does this PR do? I was encountering build issues when building my `ollama` environment using `llama stack build` ```bash llama stack build --template ollama --image-type venv Traceback (most recent call last): File "/Users/farceo/dev/llama-stack/.venv/bin/llama", line 10, in <module> sys.exit(main()) ^^^^^^ File "/Users/farceo/dev/llama-stack/llama_stack/cli/llama.py", line 46, in main parser.run(args) File "/Users/farceo/dev/llama-stack/llama_stack/cli/llama.py", line 40, in run args.func(args) File "/Users/farceo/dev/llama-stack/llama_stack/cli/stack/build.py", line 77, in _run_stack_build_command return run_stack_build_command(args) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/farceo/dev/llama-stack/llama_stack/cli/stack/_build.py", line 180, in run_stack_build_command _run_stack_build_command_from_build_config( File "/Users/farceo/dev/llama-stack/llama_stack/cli/stack/_build.py", line 272, in _run_stack_build_command_from_build_config return_code = build_image( ^^^^^^^^^^^^ File "/Users/farceo/dev/llama-stack/llama_stack/distribution/build.py", line 137, in build_image return_code = run_with_pty(args) ^^^^^^^^^^^^^^^^^^ File "/Users/farceo/dev/llama-stack/llama_stack/distribution/utils/exec.py", line 22, in run_with_pty return _run_with_pty_unix(command) ^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/farceo/dev/llama-stack/llama_stack/distribution/utils/exec.py", line 53, in _run_with_pty_unix process = subprocess.Popen( ^^^^^^^^^^^^^^^^^ File "/Users/farceo/.local/share/uv/python/cpython-3.11.6-macos-aarch64-none/lib/python3.11/subprocess.py", line 1026, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/Users/farceo/.local/share/uv/python/cpython-3.11.6-macos-aarch64-none/lib/python3.11/subprocess.py", line 1950, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: '/Users/farceo/dev/llama-stack/llama_stack/distribution/build_venv.sh' make: *** [build-ollama] Error 1 ``` I also had to adjust the script when testing the `common.sh` file because it returned: ```bash > source llama_stack/distribution/common.sh llama_stack/distribution/common.sh:6: command not found: ^M llama_stack/distribution/common.sh:50: parse error near `\n' ``` On my branch, I ran: ```bash sed -i '' 's/\r$//' llama_stack/distribution/common.sh ``` And then I was able to successfully build the environment. [//]: # (If resolving an issue, uncomment and update the line below) [//]: # (Closes #[issue-number]) ## Test Plan N/A [//]: # (## Documentation) N/A --------- Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>
150 lines
4.3 KiB
Python
150 lines
4.3 KiB
Python
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
# All rights reserved.
|
|
#
|
|
# This source code is licensed under the terms described in the LICENSE file in
|
|
# the root directory of this source tree.
|
|
|
|
import errno
|
|
import logging
|
|
import os
|
|
import select
|
|
import signal
|
|
import subprocess
|
|
import sys
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
def run_with_pty(command):
|
|
if sys.platform.startswith("win"):
|
|
return _run_with_pty_win(command)
|
|
else:
|
|
return _run_with_pty_unix(command)
|
|
|
|
|
|
# run a command in a pseudo-terminal, with interrupt handling,
|
|
# useful when you want to run interactive things
|
|
def _run_with_pty_unix(command):
|
|
import pty
|
|
import termios
|
|
|
|
master, slave = pty.openpty()
|
|
|
|
old_settings = termios.tcgetattr(sys.stdin)
|
|
original_sigint = signal.getsignal(signal.SIGINT)
|
|
|
|
ctrl_c_pressed = False
|
|
process = None
|
|
|
|
def sigint_handler(signum, frame):
|
|
nonlocal ctrl_c_pressed
|
|
ctrl_c_pressed = True
|
|
log.info("\nCtrl-C detected. Aborting...")
|
|
|
|
try:
|
|
# Set up the signal handler
|
|
signal.signal(signal.SIGINT, sigint_handler)
|
|
|
|
new_settings = termios.tcgetattr(sys.stdin)
|
|
new_settings[3] = new_settings[3] & ~termios.ECHO # Disable echo
|
|
new_settings[3] = new_settings[3] & ~termios.ICANON # Disable canonical mode
|
|
termios.tcsetattr(sys.stdin, termios.TCSADRAIN, new_settings)
|
|
|
|
process = subprocess.Popen(
|
|
command,
|
|
stdin=slave,
|
|
stdout=slave,
|
|
stderr=slave,
|
|
universal_newlines=True,
|
|
preexec_fn=os.setsid,
|
|
)
|
|
|
|
# Close the slave file descriptor as it's now owned by the subprocess
|
|
os.close(slave)
|
|
|
|
def handle_io():
|
|
while not ctrl_c_pressed:
|
|
try:
|
|
rlist, _, _ = select.select([sys.stdin, master], [], [], 0.1)
|
|
|
|
if sys.stdin in rlist:
|
|
data = os.read(sys.stdin.fileno(), 1024)
|
|
if not data:
|
|
break
|
|
os.write(master, data)
|
|
|
|
if master in rlist:
|
|
data = os.read(master, 1024)
|
|
if not data:
|
|
break
|
|
sys.stdout.buffer.write(data)
|
|
sys.stdout.flush()
|
|
|
|
except KeyboardInterrupt:
|
|
# This will be raised when Ctrl+C is pressed
|
|
break
|
|
|
|
if process.poll() is not None:
|
|
break
|
|
|
|
handle_io()
|
|
except (EOFError, KeyboardInterrupt):
|
|
pass
|
|
except OSError as e:
|
|
if e.errno != errno.EIO:
|
|
raise
|
|
finally:
|
|
# Clean up
|
|
termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_settings)
|
|
signal.signal(signal.SIGINT, original_sigint)
|
|
|
|
os.close(master)
|
|
if process and process.poll() is None:
|
|
process.terminate()
|
|
process.wait()
|
|
|
|
return process.returncode
|
|
|
|
|
|
# run a command in a pseudo-terminal in windows, with interrupt handling,
|
|
def _run_with_pty_win(command):
|
|
"""
|
|
Runs a command with interactive support using subprocess directly.
|
|
"""
|
|
try:
|
|
# For shell scripts on Windows, use appropriate shell
|
|
if isinstance(command, (list, tuple)):
|
|
if command[0].endswith(".sh"):
|
|
if os.path.exists("/usr/bin/bash"): # WSL
|
|
command = ["bash"] + command
|
|
else:
|
|
# Use cmd.exe with bash while preserving all arguments
|
|
command = ["cmd.exe", "/c", "bash"] + command
|
|
|
|
process = subprocess.Popen(
|
|
command,
|
|
shell=True,
|
|
universal_newlines=True,
|
|
)
|
|
|
|
process.wait()
|
|
|
|
except Exception as e:
|
|
print(f"Error: {str(e)}")
|
|
return 1
|
|
finally:
|
|
if process and process.poll() is None:
|
|
process.terminate()
|
|
process.wait()
|
|
return process.returncode
|
|
|
|
|
|
def run_command(command):
|
|
try:
|
|
result = subprocess.run(command, capture_output=True, text=True, check=True)
|
|
print("Script Output\n", result.stdout)
|
|
return result.returncode
|
|
except subprocess.CalledProcessError as e:
|
|
print("Error running script:", e)
|
|
print("Error output:", e.stderr)
|
|
return e.returncode
|