AI: Rename "scrfs" to "scrfd" in config and download script #5167

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2025-10-07 22:12:37 +02:00
parent 3693db0946
commit 1eac265978
5 changed files with 37 additions and 19 deletions

View file

@ -3,6 +3,7 @@
set -euo pipefail
ONNX_VERSION=${ONNX_VERSION:-1.22.0}
TODAY=$(date -u +%Y%m%d)
TMPDIR=${TMPDIR:-/tmp}
SYSTEM=$(uname -s)
ARCH=${PHOTOPRISM_ARCH:-$(uname -m)}
@ -74,7 +75,8 @@ if [[ -z "${archive}" ]]; then
exit 1
fi
url="https://github.com/microsoft/onnxruntime/releases/download/v${ONNX_VERSION}/${archive}"
primary_url="https://dl.photoprism.app/onnx/runtime/v${ONNX_VERSION}/${archive}?${TODAY}"
fallback_url="https://github.com/microsoft/onnxruntime/releases/download/v${ONNX_VERSION}/${archive}"
package_path="${TMPDIR}/${archive}"
if [[ -f "${package_path}" ]]; then
@ -88,7 +90,13 @@ fi
if [[ ! -f "${package_path}" ]]; then
echo "Downloading ONNX Runtime ${ONNX_VERSION} (${archive})..."
curl -fsSL --retry 3 --retry-delay 2 -o "${package_path}" "${url}"
if ! curl -fsSL --retry 3 --retry-delay 2 -o "${package_path}" "${primary_url}"; then
echo "Primary download failed, trying upstream release..."
if ! curl -fsSL --retry 3 --retry-delay 2 -o "${package_path}" "${fallback_url}"; then
echo "Failed to download ONNX Runtime archive." >&2
exit 1
fi
fi
fi
echo "Verifying checksum..."

View file

@ -10,15 +10,22 @@ PRIMARY_URL="https://dl.photoprism.app/onnx/models/${MODEL_SOURCE}?${TODAY}"
FALLBACK_URL="https://raw.githubusercontent.com/laolaolulu/FaceTrain/master/model/scrfd/${MODEL_SOURCE}"
MODEL_URL=${MODEL_URL:-"${PRIMARY_URL}"}
MODELS_PATH="assets/models"
MODEL_DIR="$MODELS_PATH/scrfs"
MODEL_DIR="$MODELS_PATH/scrfd"
LEGACY_MODEL_DIR="$MODELS_PATH/scrfs"
MODEL_FILE="$MODEL_DIR/${LOCAL_MODEL_NAME}"
MODEL_TMP="/tmp/photoprism/${MODEL_SOURCE}"
MODEL_HASH="ae72185653e279aa2056b288662a19ec3519ced5426d2adeffbe058a86369a24 ${MODEL_TMP}"
MODEL_VERSION="$MODEL_DIR/version.txt"
MODEL_BACKUP="storage/backup/scrfs-${TODAY}"
MODEL_BACKUP="storage/backup/scrfd-${TODAY}"
mkdir -p /tmp/photoprism
mkdir -p storage/backup
if [[ -d "${LEGACY_MODEL_DIR}" && ! -d "${MODEL_DIR}" ]]; then
echo "Migrating legacy SCRFD directory from ${LEGACY_MODEL_DIR} to ${MODEL_DIR}."
mv "${LEGACY_MODEL_DIR}" "${MODEL_DIR}"
fi
mkdir -p "${MODEL_DIR}"
hash_file() {