Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 62cd96ea68 | |||
| 50633c5003 |
+38
-12
@@ -53,7 +53,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 "vastai-sdk @ git+https://github.com/vast-ai/vast-sdk.git@${SDK_BRANCH}"; then
|
if ! uv pip install --prerelease=allow "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
|
||||||
@@ -61,14 +61,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 "vastai-sdk==${SDK_VERSION}"; then
|
if ! uv pip install --prerelease=allow "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 vastai-sdk; then
|
if ! uv pip install --prerelease=allow vastai-sdk; then
|
||||||
report_error_and_exit "Failed to install vastai-sdk"
|
report_error_and_exit "Failed to install vastai-sdk"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -222,18 +222,44 @@ if [ "$IS_DEPLOYMENT" = "true" ]; then
|
|||||||
DEPLOY_DIR="/workspace/deployment"
|
DEPLOY_DIR="/workspace/deployment"
|
||||||
mkdir -p "$DEPLOY_DIR"
|
mkdir -p "$DEPLOY_DIR"
|
||||||
|
|
||||||
# Download deployment code via instance API key
|
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.
|
||||||
echo "Downloading deployment code..."
|
echo "Downloading deployment code..."
|
||||||
DOWNLOAD_RESPONSE=$(curl -sS \
|
RETRY=0
|
||||||
-H "Authorization: Bearer $CONTAINER_API_KEY" \
|
while true; do
|
||||||
"https://console.vast.ai/api/v0/deployment/${DEPLOYMENT_ID}/download_url/")
|
DOWNLOAD_RESPONSE=$(curl -sS \
|
||||||
DOWNLOAD_URL=$(python3 -c "import sys,json; print(json.load(sys.stdin)['download_url'])" <<< "$DOWNLOAD_RESPONSE")
|
-H "Authorization: Bearer $CONTAINER_API_KEY" \
|
||||||
|
"${VAST_API_BASE}/api/v0/deployment/${DEPLOYMENT_ID}/download_url/")
|
||||||
|
DOWNLOAD_URL=$(python3 -c "
|
||||||
|
import sys, json
|
||||||
|
try:
|
||||||
|
d = json.load(sys.stdin)
|
||||||
|
print(d.get('download_url') or '')
|
||||||
|
except: print('')
|
||||||
|
" <<< "$DOWNLOAD_RESPONSE")
|
||||||
|
|
||||||
if [ -z "$DOWNLOAD_URL" ] || [ "$DOWNLOAD_URL" = "None" ]; then
|
if [ -z "$DOWNLOAD_URL" ] || [ "$DOWNLOAD_URL" = "None" ]; then
|
||||||
report_error_and_exit "Failed to get deployment download URL"
|
RETRY=$((RETRY + 1))
|
||||||
fi
|
echo "No download URL yet (attempt $RETRY), retrying in 10s... response: $DOWNLOAD_RESPONSE"
|
||||||
|
sleep 10
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Got a URL — try the actual S3 download
|
||||||
|
HTTP_CODE=$(curl -sS -L -o "$DEPLOY_DIR/deployment.tar.gz" -w "%{http_code}" "$DOWNLOAD_URL")
|
||||||
|
if [ "$HTTP_CODE" = "200" ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
|
||||||
|
RETRY=$((RETRY + 1))
|
||||||
|
echo "S3 download returned HTTP $HTTP_CODE (attempt $RETRY), blob not yet uploaded. Retrying in 10s..."
|
||||||
|
rm -f "$DEPLOY_DIR/deployment.tar.gz"
|
||||||
|
sleep 10
|
||||||
|
done
|
||||||
|
|
||||||
curl -sS -L "$DOWNLOAD_URL" -o "$DEPLOY_DIR/deployment.tar.gz"
|
|
||||||
cd "$DEPLOY_DIR" && tar xzf deployment.tar.gz
|
cd "$DEPLOY_DIR" && tar xzf deployment.tar.gz
|
||||||
echo "Deployment code extracted."
|
echo "Deployment code extracted."
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user