Mike Swanson
251bb3546b
The script auto-detected PYTHON_CMD but then hardcoded `python3` for the JSON write (exit 127 on Windows where only `py` exists), and passed a Git Bash POSIX path (/d/...) to native Python (FileNotFoundError). Fixes: - use "$PYTHON_CMD" instead of hardcoded python3 - convert IDENTITY_PATH via `cygpath -m` for the interpreter (no-op elsewhere) Verified on GURU-5070: identity.json migrated correctly (py, windows/amd64, localhost Ollama, qwen3:8b). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
121 lines
3.4 KiB
Bash
Executable File
121 lines
3.4 KiB
Bash
Executable File
#!/bin/bash
|
|
# migrate-identity.sh - Auto-detect and populate identity.json with Ollama/Python config
|
|
# Run this on each machine to complete the identity.json migration
|
|
|
|
set -e
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
IDENTITY_PATH="$SCRIPT_DIR/../identity.json"
|
|
|
|
if [ ! -f "$IDENTITY_PATH" ]; then
|
|
echo "[ERROR] identity.json not found at $IDENTITY_PATH"
|
|
echo " Run onboarding first to create it."
|
|
exit 1
|
|
fi
|
|
|
|
echo "[INFO] Detecting machine configuration..."
|
|
|
|
# Detect Python
|
|
PYTHON_CMD=""
|
|
for cmd in py python3 python; do
|
|
if command -v "$cmd" >/dev/null 2>&1; then
|
|
if "$cmd" -c "import sys; sys.exit(0)" >/dev/null 2>&1; then
|
|
PYTHON_CMD="$cmd"
|
|
break
|
|
fi
|
|
fi
|
|
done
|
|
[ -z "$PYTHON_CMD" ] && PYTHON_CMD="python3"
|
|
echo " Python: $PYTHON_CMD"
|
|
|
|
# Detect platform
|
|
PLATFORM=""
|
|
case "$(uname -s)" in
|
|
Darwin) PLATFORM="macos" ;;
|
|
Linux) PLATFORM="linux" ;;
|
|
CYGWIN*|MINGW*|MSYS*) PLATFORM="windows" ;;
|
|
*) PLATFORM="unknown" ;;
|
|
esac
|
|
echo " Platform: $PLATFORM"
|
|
|
|
# Detect architecture
|
|
ARCH=""
|
|
case "$(uname -m)" in
|
|
x86_64|amd64) ARCH="amd64" ;;
|
|
arm64|aarch64) ARCH="arm64" ;;
|
|
*) ARCH="unknown" ;;
|
|
esac
|
|
echo " Architecture: $ARCH"
|
|
|
|
# Detect Ollama endpoint
|
|
OLLAMA_ENDPOINT=""
|
|
OLLAMA_FALLBACK="http://100.101.122.4:11434" # Beast via Tailscale
|
|
PROSE_MODEL="qwen3:14b" # default
|
|
|
|
if curl -s -m 2 http://localhost:11434/api/tags >/dev/null 2>&1; then
|
|
OLLAMA_ENDPOINT="http://localhost:11434"
|
|
echo " Ollama: local (localhost:11434)"
|
|
|
|
# Check if this is GURU-5070 with 12GB VRAM - use qwen3:8b
|
|
HOSTNAME=$(hostname)
|
|
if [[ "$HOSTNAME" == "GURU-5070" ]] || [[ "$HOSTNAME" == "DESKTOP-0O8A1RL" ]]; then
|
|
PROSE_MODEL="qwen3:8b"
|
|
echo " Prose model: qwen3:8b (12GB VRAM machine)"
|
|
else
|
|
echo " Prose model: qwen3:14b (default)"
|
|
fi
|
|
else
|
|
OLLAMA_ENDPOINT="$OLLAMA_FALLBACK"
|
|
echo " Ollama: remote (Beast via Tailscale)"
|
|
echo " Prose model: qwen3:14b (default)"
|
|
fi
|
|
|
|
# Build updated identity.json
|
|
echo ""
|
|
echo "[INFO] Updating identity.json..."
|
|
|
|
# Read existing, add new fields, write back.
|
|
# On Windows, native Python can't open Git Bash POSIX paths (/d/...); convert to a
|
|
# drive-letter/forward-slash path for the interpreter. No-op (falls back) elsewhere.
|
|
IDENTITY_PATH_PY=$(cygpath -m "$IDENTITY_PATH" 2>/dev/null || echo "$IDENTITY_PATH")
|
|
"$PYTHON_CMD" -c "
|
|
import json, sys
|
|
with open('$IDENTITY_PATH_PY', 'r') as f:
|
|
data = json.load(f)
|
|
|
|
# Add new fields if not present
|
|
if 'python' not in data:
|
|
data['python'] = {}
|
|
data['python']['command'] = '$PYTHON_CMD'
|
|
|
|
if 'ollama' not in data:
|
|
data['ollama'] = {}
|
|
data['ollama']['endpoint'] = '$OLLAMA_ENDPOINT'
|
|
data['ollama']['fallback'] = '$OLLAMA_FALLBACK'
|
|
data['ollama']['prose_model'] = '$PROSE_MODEL'
|
|
|
|
if 'platform' not in data:
|
|
data['platform'] = '$PLATFORM'
|
|
if 'architecture' not in data:
|
|
data['architecture'] = '$ARCH'
|
|
|
|
data['last_updated'] = '$(date -u +"%Y-%m-%dT%H:%M:%SZ")'
|
|
|
|
with open('$IDENTITY_PATH_PY', 'w') as f:
|
|
json.dump(data, f, indent=2)
|
|
f.write('\n')
|
|
|
|
print('[OK] identity.json updated')
|
|
"
|
|
|
|
echo ""
|
|
echo "[SUCCESS] Migration complete. New fields added:"
|
|
echo " python.command: $PYTHON_CMD"
|
|
echo " ollama.endpoint: $OLLAMA_ENDPOINT"
|
|
echo " ollama.fallback: $OLLAMA_FALLBACK"
|
|
echo " ollama.prose_model: $PROSE_MODEL"
|
|
echo " platform: $PLATFORM"
|
|
echo " architecture: $ARCH"
|
|
echo ""
|
|
echo "Review: cat $IDENTITY_PATH"
|