Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e42afd187a | |||
| 98a3182079 | |||
| 83c31e25a9 | |||
| fbe1dca6fa | |||
| 4c3120dbc5 | |||
| d7d9b915f6 | |||
| 4660b337fb | |||
| 7506ecb6b5 | |||
| 50633c5003 | |||
| 2e8f18276f |
@@ -1 +1,2 @@
|
|||||||
vastai-sdk>=0.3.0
|
vastai-sdk>=0.3.0
|
||||||
|
nltk==3.9.4
|
||||||
+69
-23
@@ -12,7 +12,7 @@ fi
|
|||||||
WORKSPACE_DIR="${WORKSPACE_DIR:-/workspace}"
|
WORKSPACE_DIR="${WORKSPACE_DIR:-/workspace}"
|
||||||
|
|
||||||
SERVER_DIR="$WORKSPACE_DIR/vast-pyworker"
|
SERVER_DIR="$WORKSPACE_DIR/vast-pyworker"
|
||||||
ENV_PATH="$WORKSPACE_DIR/worker-env"
|
ENV_PATH="${ENV_PATH:-$WORKSPACE_DIR/worker-env}"
|
||||||
DEBUG_LOG="$WORKSPACE_DIR/debug.log"
|
DEBUG_LOG="$WORKSPACE_DIR/debug.log"
|
||||||
PYWORKER_LOG="$WORKSPACE_DIR/pyworker.log"
|
PYWORKER_LOG="$WORKSPACE_DIR/pyworker.log"
|
||||||
|
|
||||||
@@ -54,9 +54,12 @@ JSON
|
|||||||
}
|
}
|
||||||
|
|
||||||
function install_vastai_sdk() {
|
function install_vastai_sdk() {
|
||||||
local force_flag=""
|
local uv_flags=()
|
||||||
|
if [ "${USE_SYSTEM_PYTHON:-}" = "true" ]; then
|
||||||
|
uv_flags+=(--system --break-system-packages)
|
||||||
|
fi
|
||||||
if [ "$FORCE_UPDATE" = true ]; then
|
if [ "$FORCE_UPDATE" = true ]; then
|
||||||
force_flag="--force-reinstall"
|
uv_flags+=(--force-reinstall)
|
||||||
echo "Force reinstalling vastai-sdk"
|
echo "Force reinstalling vastai-sdk"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -66,7 +69,7 @@ function install_vastai_sdk() {
|
|||||||
echo "WARNING: Both SDK_BRANCH and SDK_VERSION are set; using SDK_BRANCH=${SDK_BRANCH}"
|
echo "WARNING: Both SDK_BRANCH and SDK_VERSION are set; using SDK_BRANCH=${SDK_BRANCH}"
|
||||||
fi
|
fi
|
||||||
echo "Installing vastai-sdk from https://github.com/vast-ai/vast-sdk/ @ ${SDK_BRANCH}"
|
echo "Installing vastai-sdk from https://github.com/vast-ai/vast-sdk/ @ ${SDK_BRANCH}"
|
||||||
if ! uv pip install $force_flag "vastai-sdk @ git+https://github.com/vast-ai/vast-sdk.git@${SDK_BRANCH}"; then
|
if ! uv pip install "${uv_flags[@]}" "vastai-sdk @ git+https://github.com/vast-ai/vast-sdk.git@${SDK_BRANCH}"; then
|
||||||
report_error_and_exit "Failed to install vastai-sdk from vast-ai/vast-sdk@${SDK_BRANCH}"
|
report_error_and_exit "Failed to install vastai-sdk from vast-ai/vast-sdk@${SDK_BRANCH}"
|
||||||
fi
|
fi
|
||||||
return 0
|
return 0
|
||||||
@@ -74,14 +77,14 @@ function install_vastai_sdk() {
|
|||||||
|
|
||||||
if [ -n "${SDK_VERSION:-}" ]; then
|
if [ -n "${SDK_VERSION:-}" ]; then
|
||||||
echo "Installing vastai-sdk version ${SDK_VERSION}"
|
echo "Installing vastai-sdk version ${SDK_VERSION}"
|
||||||
if ! uv pip install $force_flag "vastai-sdk==${SDK_VERSION}"; then
|
if ! uv pip install "${uv_flags[@]}" "vastai-sdk==${SDK_VERSION}"; then
|
||||||
report_error_and_exit "Failed to install vastai-sdk==${SDK_VERSION}"
|
report_error_and_exit "Failed to install vastai-sdk==${SDK_VERSION}"
|
||||||
fi
|
fi
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Installing default vastai-sdk"
|
echo "Installing default vastai-sdk"
|
||||||
if ! uv pip install $force_flag vastai-sdk; then
|
if ! uv pip install "${uv_flags[@]}" vastai-sdk; then
|
||||||
report_error_and_exit "Failed to install vastai-sdk"
|
report_error_and_exit "Failed to install vastai-sdk"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -125,8 +128,21 @@ if ! grep -q "VAST" /etc/environment; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d "$ENV_PATH" ]
|
if [ "${USE_SYSTEM_PYTHON:-}" = "true" ]; then
|
||||||
then
|
echo "Using system Python: $(which python3)"
|
||||||
|
if ! which uv > /dev/null 2>&1; then
|
||||||
|
if ! curl -LsSf https://astral.sh/uv/install.sh | sh; then
|
||||||
|
report_error_and_exit "Failed to install uv package manager"
|
||||||
|
fi
|
||||||
|
if [[ -f ~/.local/bin/env ]]; then
|
||||||
|
if ! source ~/.local/bin/env; then
|
||||||
|
report_error_and_exit "Failed to source uv environment"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
install_vastai_sdk
|
||||||
|
touch ~/.no_auto_tmux
|
||||||
|
elif [ ! -d "$ENV_PATH" ]; then
|
||||||
echo "setting up venv"
|
echo "setting up venv"
|
||||||
if ! which uv; then
|
if ! which uv; then
|
||||||
if ! curl -LsSf https://astral.sh/uv/install.sh | sh; then
|
if ! curl -LsSf https://astral.sh/uv/install.sh | sh; then
|
||||||
@@ -154,7 +170,7 @@ then
|
|||||||
if [[ -n ${PYWORKER_REF:-} ]]; then
|
if [[ -n ${PYWORKER_REF:-} ]]; then
|
||||||
if [ "$FORCE_UPDATE" = true ]; then
|
if [ "$FORCE_UPDATE" = true ]; then
|
||||||
echo "Force updating to pyworker reference: $PYWORKER_REF"
|
echo "Force updating to pyworker reference: $PYWORKER_REF"
|
||||||
if ! (cd "$SERVER_DIR" && git fetch --all && git checkout "$PYWORKER_REF" && git pull); then
|
if ! (cd "$SERVER_DIR" && git checkout "$PYWORKER_REF" && git pull); then
|
||||||
report_error_and_exit "Failed to force update pyworker reference: $PYWORKER_REF"
|
report_error_and_exit "Failed to force update pyworker reference: $PYWORKER_REF"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
@@ -192,7 +208,7 @@ else
|
|||||||
report_error_and_exit "Failed to source uv environment"
|
report_error_and_exit "Failed to source uv environment"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if ! source "$WORKSPACE_DIR/worker-env/bin/activate"; then
|
if ! source "$ENV_PATH/bin/activate"; then
|
||||||
report_error_and_exit "Failed to activate existing virtual environment"
|
report_error_and_exit "Failed to activate existing virtual environment"
|
||||||
fi
|
fi
|
||||||
echo "environment activated"
|
echo "environment activated"
|
||||||
@@ -202,7 +218,6 @@ else
|
|||||||
if [ "$FORCE_UPDATE" = true ]; then
|
if [ "$FORCE_UPDATE" = true ]; then
|
||||||
echo "Performing force update on existing environment"
|
echo "Performing force update on existing environment"
|
||||||
|
|
||||||
# Update pyworker repository
|
|
||||||
if [[ -d $SERVER_DIR ]]; then
|
if [[ -d $SERVER_DIR ]]; then
|
||||||
echo "Force updating pyworker repository"
|
echo "Force updating pyworker repository"
|
||||||
if ! (cd "$SERVER_DIR" && git fetch --all); then
|
if ! (cd "$SERVER_DIR" && git fetch --all); then
|
||||||
@@ -222,7 +237,6 @@ else
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Force reinstall SDK
|
|
||||||
install_vastai_sdk
|
install_vastai_sdk
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -230,11 +244,8 @@ fi
|
|||||||
# Remove force update flag after successful update
|
# Remove force update flag after successful update
|
||||||
if [ "$FORCE_UPDATE" = true ]; then
|
if [ "$FORCE_UPDATE" = true ]; then
|
||||||
echo "Removing force update flag"
|
echo "Removing force update flag"
|
||||||
if ! rm -f "/.force_update"; then
|
rm -f "/.force_update"
|
||||||
echo "WARNING: Failed to remove /.force_update, continuing anyway"
|
echo "Force update completed successfully"
|
||||||
else
|
|
||||||
echo "Force update completed successfully"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$USE_SSL" = true ]; then
|
if [ "$USE_SSL" = true ]; then
|
||||||
@@ -272,16 +283,51 @@ EOF
|
|||||||
report_error_and_exit "Failed to generate SSL certificate request"
|
report_error_and_exit "Failed to generate SSL certificate request"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! curl --header 'Content-Type: application/octet-stream' \
|
max_retries=5
|
||||||
--data-binary @/etc/instance.csr \
|
retry_delay=2
|
||||||
-X \
|
for attempt in $(seq 1 "$max_retries"); do
|
||||||
POST "https://console.vast.ai/api/v0/sign_cert/?instance_id=$CONTAINER_ID" > /etc/instance.crt; then
|
http_code=$(curl -sS -o /etc/instance.crt -w '%{http_code}' \
|
||||||
report_error_and_exit "Failed to sign SSL certificate"
|
--header 'Content-Type: application/octet-stream' \
|
||||||
fi
|
--data-binary @/etc/instance.csr \
|
||||||
|
-X POST "https://console.vast.ai/api/v0/sign_cert/?instance_id=$CONTAINER_ID")
|
||||||
|
if [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
echo "SSL cert signing attempt $attempt/$max_retries failed (HTTP $http_code)"
|
||||||
|
if [ "$attempt" -eq "$max_retries" ]; then
|
||||||
|
report_error_and_exit "Failed to sign SSL certificate after $max_retries attempts (HTTP $http_code)"
|
||||||
|
fi
|
||||||
|
sleep "$retry_delay"
|
||||||
|
retry_delay=$((retry_delay * 2))
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export REPORT_ADDR WORKER_PORT USE_SSL UNSECURED
|
export REPORT_ADDR WORKER_PORT USE_SSL UNSECURED
|
||||||
|
|
||||||
|
# ─── SDK Deployment Mode ───────────────────────────────────────────────
|
||||||
|
if [ "$IS_DEPLOYMENT" = "true" ]; then
|
||||||
|
echo "=== SDK Deployment Mode ==="
|
||||||
|
echo "DEPLOYMENT_ID: $DEPLOYMENT_ID"
|
||||||
|
|
||||||
|
DEPLOY_DIR="/workspace/deployment"
|
||||||
|
mkdir -p "$DEPLOY_DIR"
|
||||||
|
|
||||||
|
VAST_API_BASE="${VAST_API_BASE:-https://console.vast.ai}"
|
||||||
|
|
||||||
|
# Download deployment code, retrying until the blob is available on S3.
|
||||||
|
# The s3_key exists in the DB as soon as the deployment is created, but the
|
||||||
|
# actual upload may still be in flight from the client side.
|
||||||
|
|
||||||
|
# Install SDK (uses the install_vastai_sdk function which supports SDK_BRANCH/SDK_VERSION)
|
||||||
|
install_vastai_sdk
|
||||||
|
# Run deployment in serve mode
|
||||||
|
export VAST_DEPLOYMENT_MODE=serve
|
||||||
|
echo "Starting deployment: python3 $DEPLOY_DIR/deployment.py"
|
||||||
|
serve-vast-deployment
|
||||||
|
exit $?
|
||||||
|
fi
|
||||||
|
# ─── End SDK Deployment Mode ───────────────────────────────────────────
|
||||||
|
|
||||||
if ! cd "$SERVER_DIR"; then
|
if ! cd "$SERVER_DIR"; then
|
||||||
report_error_and_exit "Failed to cd into SERVER_DIR: $SERVER_DIR"
|
report_error_and_exit "Failed to cd into SERVER_DIR: $SERVER_DIR"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user