fix installer for externally managed Python
This commit is contained in:
+170
-24
@@ -6,6 +6,8 @@ main_source="https://github.com/HKUDS/nanobot/archive/refs/heads/main.zip"
|
||||
install_target="$package"
|
||||
install_source="PyPI"
|
||||
dry_run="0"
|
||||
nanobot_runner=""
|
||||
nanobot_python=""
|
||||
|
||||
info() {
|
||||
printf '%s\n' "$*"
|
||||
@@ -17,12 +19,14 @@ fail() {
|
||||
}
|
||||
|
||||
install_failure_hint() {
|
||||
printf '%s\n' "Error: pip could not install nanobot from $install_source." >&2
|
||||
printf '%s\n' "If pip mentioned externally-managed-environment, install in a virtual environment or use uv/pipx." >&2
|
||||
printf '%s\n' "Error: could not install nanobot from $install_source." >&2
|
||||
printf '%s\n' "If pip mentioned externally-managed-environment, use uv, pipx, or a virtual environment instead of system pip." >&2
|
||||
printf '%s\n' "You can also run manually:" >&2
|
||||
printf ' %s\n' "$python_bin -m pip install --upgrade $install_target" >&2
|
||||
printf ' %s\n' "uv tool install --force --upgrade $install_target" >&2
|
||||
printf ' %s\n' "$python_bin -m venv ~/.nanobot/venv" >&2
|
||||
printf ' %s\n' "~/.nanobot/venv/bin/python -m pip install --upgrade $install_target" >&2
|
||||
printf '%s\n' "Then start setup with:" >&2
|
||||
printf ' %s\n' "$python_bin -m nanobot onboard --wizard" >&2
|
||||
printf ' %s\n' "nanobot onboard --wizard" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -52,6 +56,123 @@ PY
|
||||
return 1
|
||||
}
|
||||
|
||||
python_is_virtual_env() {
|
||||
"$python_bin" - <<'PY'
|
||||
import sys
|
||||
raise SystemExit(0 if sys.prefix != sys.base_prefix else 1)
|
||||
PY
|
||||
}
|
||||
|
||||
ensure_pip() {
|
||||
target_python="$1"
|
||||
if "$target_python" -m pip --version >/dev/null 2>&1; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
info "pip was not found for $target_python. Trying ensurepip..."
|
||||
"$target_python" -m ensurepip --upgrade >/dev/null 2>&1
|
||||
}
|
||||
|
||||
run_nanobot() {
|
||||
case "$nanobot_runner" in
|
||||
uv)
|
||||
uv tool run --from "$install_target" nanobot "$@"
|
||||
;;
|
||||
pipx)
|
||||
pipx run --spec "$install_target" nanobot "$@"
|
||||
;;
|
||||
python)
|
||||
"$nanobot_python" -m nanobot "$@"
|
||||
;;
|
||||
*)
|
||||
fail "nanobot was installed, but no runner was configured"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
nanobot_try_command() {
|
||||
case "$nanobot_runner" in
|
||||
uv)
|
||||
printf '%s\n' "uv tool run --from $install_target nanobot"
|
||||
;;
|
||||
pipx)
|
||||
printf '%s\n' "pipx run --spec $install_target nanobot"
|
||||
;;
|
||||
python)
|
||||
printf '%s\n' "$nanobot_python -m nanobot"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
install_with_active_python() {
|
||||
info "Detected an active virtual environment. Installing into it..."
|
||||
ensure_pip "$python_bin" || return 1
|
||||
"$python_bin" -m pip install --upgrade "$install_target" || return 1
|
||||
nanobot_runner="python"
|
||||
nanobot_python="$python_bin"
|
||||
}
|
||||
|
||||
install_with_uv() {
|
||||
info "Installing or upgrading nanobot from $install_source with uv tool..."
|
||||
uv tool install --python "$python_bin" --force --upgrade "$install_target" || return 1
|
||||
nanobot_runner="uv"
|
||||
}
|
||||
|
||||
install_with_pipx() {
|
||||
info "Installing or upgrading nanobot from $install_source with pipx..."
|
||||
pipx install --python "$python_bin" --force "$install_target" || return 1
|
||||
nanobot_runner="pipx"
|
||||
}
|
||||
|
||||
write_managed_wrapper() {
|
||||
bin_dir="${NANOBOT_BIN_DIR:-$HOME/.local/bin}"
|
||||
wrapper="$bin_dir/nanobot"
|
||||
mkdir -p "$bin_dir" || return 0
|
||||
|
||||
if [ -e "$wrapper" ] && ! grep -q "Generated by nanobot installer" "$wrapper" 2>/dev/null; then
|
||||
info "Not updating $wrapper because it already exists."
|
||||
return 0
|
||||
fi
|
||||
|
||||
cat > "$wrapper" <<EOF
|
||||
#!/bin/sh
|
||||
# Generated by nanobot installer.
|
||||
exec "$nanobot_python" -m nanobot "\$@"
|
||||
EOF
|
||||
chmod +x "$wrapper" || return 0
|
||||
|
||||
if ! command -v nanobot >/dev/null 2>&1; then
|
||||
info "Installed a nanobot launcher at $wrapper."
|
||||
info "Add $bin_dir to PATH to run nanobot directly."
|
||||
fi
|
||||
}
|
||||
|
||||
install_with_managed_venv() {
|
||||
[ -n "${HOME:-}" ] || fail "HOME is not set; cannot create a managed virtual environment"
|
||||
|
||||
venv_dir="${NANOBOT_VENV:-$HOME/.nanobot/venv}"
|
||||
venv_python="$venv_dir/bin/python"
|
||||
|
||||
if [ ! -x "$venv_python" ]; then
|
||||
info "Creating a dedicated virtual environment at $venv_dir..."
|
||||
mkdir -p "$(dirname "$venv_dir")"
|
||||
"$python_bin" -m venv "$venv_dir" || return 1
|
||||
fi
|
||||
|
||||
"$venv_python" - <<'PY' >/dev/null 2>&1 || fail "The managed venv uses Python older than 3.11. Remove it or set NANOBOT_VENV to a new path."
|
||||
import sys
|
||||
raise SystemExit(0 if sys.version_info >= (3, 11) else 1)
|
||||
PY
|
||||
|
||||
info "Installing or upgrading nanobot from $install_source in $venv_dir..."
|
||||
ensure_pip "$venv_python" || return 1
|
||||
"$venv_python" -m pip install --upgrade "$install_target" || return 1
|
||||
|
||||
nanobot_runner="python"
|
||||
nanobot_python="$venv_python"
|
||||
write_managed_wrapper
|
||||
}
|
||||
|
||||
while [ "$#" -gt 0 ]; do
|
||||
case "$1" in
|
||||
--dev)
|
||||
@@ -86,44 +207,69 @@ fi
|
||||
|
||||
info "Using Python: $("$python_bin" --version 2>&1)"
|
||||
|
||||
if ! "$python_bin" -m pip --version >/dev/null 2>&1; then
|
||||
if [ "$dry_run" = "1" ]; then
|
||||
info "Dry run: pip was not found. Install would try: $python_bin -m ensurepip --upgrade"
|
||||
else
|
||||
info "pip was not found for this Python. Trying ensurepip..."
|
||||
"$python_bin" -m ensurepip --upgrade >/dev/null 2>&1 || fail "pip is not available. Install pip for $python_bin, then rerun this command."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$dry_run" = "1" ]; then
|
||||
info "Dry run: would install or upgrade nanobot from $install_source."
|
||||
info "Dry run: would run: $python_bin -m pip install --upgrade $install_target"
|
||||
info "Dry run: if that fails because system site-packages are not writable, would retry: $python_bin -m pip install --user --upgrade $install_target"
|
||||
if python_is_virtual_env; then
|
||||
info "Dry run: active virtual environment detected; would run: $python_bin -m pip install --upgrade $install_target"
|
||||
info "Dry run: would run nanobot as: $python_bin -m nanobot"
|
||||
elif command -v uv >/dev/null 2>&1; then
|
||||
info "Dry run: would run: uv tool install --python $python_bin --force --upgrade $install_target"
|
||||
info "Dry run: would run nanobot as: uv tool run --from $install_target nanobot"
|
||||
elif command -v pipx >/dev/null 2>&1; then
|
||||
info "Dry run: would run: pipx install --python $python_bin --force $install_target"
|
||||
info "Dry run: would run nanobot as: pipx run --spec $install_target nanobot"
|
||||
else
|
||||
venv_dir="${NANOBOT_VENV:-$HOME/.nanobot/venv}"
|
||||
info "Dry run: would create or reuse a dedicated virtual environment: $venv_dir"
|
||||
info "Dry run: would run: $venv_dir/bin/python -m pip install --upgrade $install_target"
|
||||
info "Dry run: would run nanobot as: $venv_dir/bin/python -m nanobot"
|
||||
fi
|
||||
if [ "${NANOBOT_SKIP_WIZARD:-}" = "1" ]; then
|
||||
info "Dry run: would skip setup wizard because NANOBOT_SKIP_WIZARD=1."
|
||||
else
|
||||
info "Dry run: would run: $python_bin -m nanobot onboard --wizard"
|
||||
info "Dry run: would run the setup wizard."
|
||||
fi
|
||||
info "Dry run: no changes made."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
info "Installing or upgrading nanobot from $install_source..."
|
||||
if ! "$python_bin" -m pip install --upgrade "$install_target"; then
|
||||
info "Install failed. Retrying as a user install..."
|
||||
"$python_bin" -m pip install --user --upgrade "$install_target" || install_failure_hint
|
||||
if python_is_virtual_env; then
|
||||
install_with_active_python || install_failure_hint
|
||||
else
|
||||
installed="0"
|
||||
|
||||
if command -v uv >/dev/null 2>&1; then
|
||||
if install_with_uv; then
|
||||
installed="1"
|
||||
else
|
||||
info "uv tool install failed. Trying the next isolated install method..."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$installed" != "1" ] && command -v pipx >/dev/null 2>&1; then
|
||||
if install_with_pipx; then
|
||||
installed="1"
|
||||
else
|
||||
info "pipx install failed. Trying the managed virtual environment..."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$installed" != "1" ]; then
|
||||
info "Using a dedicated virtual environment to avoid system pip."
|
||||
install_with_managed_venv || install_failure_hint
|
||||
fi
|
||||
fi
|
||||
|
||||
info "Installed nanobot:"
|
||||
"$python_bin" -m nanobot --version
|
||||
run_nanobot --version
|
||||
|
||||
if [ "${NANOBOT_SKIP_WIZARD:-}" = "1" ]; then
|
||||
info "Skipping setup wizard because NANOBOT_SKIP_WIZARD=1."
|
||||
info "Run this later: $python_bin -m nanobot onboard --wizard"
|
||||
info "Run this later: $(nanobot_try_command) onboard --wizard"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
info "Starting setup wizard..."
|
||||
"$python_bin" -m nanobot onboard --wizard
|
||||
run_nanobot onboard --wizard
|
||||
|
||||
info "Done. Try: $python_bin -m nanobot agent -m \"Hello!\""
|
||||
info "Done. Try: $(nanobot_try_command) agent -m \"Hello!\""
|
||||
|
||||
Reference in New Issue
Block a user