Make dataset wrappers path-portable

scripts/common.sh

@@ -4,11 +4,18 @@ set -euo pipefail
 SOURCE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 DATASET_ROOT="${DATASET_ROOT:-$(dirname "$SOURCE_ROOT")/osu_model_dataset}"
 
+IS_WSL=0
+if [ -r /proc/version ] && grep -qiE 'microsoft|wsl' /proc/version; then
+  IS_WSL=1
+fi
+
 if [ -z "${PYTHON:-}" ]; then
   if [ -x "$SOURCE_ROOT/.venv/bin/python" ]; then
     PYTHON="$SOURCE_ROOT/.venv/bin/python"
-  elif [ -x "$SOURCE_ROOT/.venv/Scripts/python.exe" ]; then
+  elif [ "$IS_WSL" = "0" ] && [ -x "$SOURCE_ROOT/.venv/Scripts/python.exe" ]; then
     PYTHON="$SOURCE_ROOT/.venv/Scripts/python.exe"
+  elif command -v python3 >/dev/null 2>&1; then
+    PYTHON="$(command -v python3)"
   else
     PYTHON="python"
   fi
@@ -27,7 +34,7 @@ fi
 if [ -z "${INDEXER:-}" ]; then
   if [ -x "$SOURCE_ROOT/target/release/osu_indexer" ]; then
     INDEXER="$SOURCE_ROOT/target/release/osu_indexer"
-  elif [ -x "$SOURCE_ROOT/target/release/osu_indexer.exe" ]; then
+  elif [ "$IS_WSL" = "0" ] && [ -x "$SOURCE_ROOT/target/release/osu_indexer.exe" ]; then
     INDEXER="$SOURCE_ROOT/target/release/osu_indexer.exe"
   else
     INDEXER="$SOURCE_ROOT/target/release/osu_indexer"
@@ -37,13 +44,25 @@ fi
 if [ -z "${FETCHER:-}" ]; then
   if [ -x "$SOURCE_ROOT/target/release/osu_fetcher" ]; then
     FETCHER="$SOURCE_ROOT/target/release/osu_fetcher"
-  elif [ -x "$SOURCE_ROOT/target/release/osu_fetcher.exe" ]; then
+  elif [ "$IS_WSL" = "0" ] && [ -x "$SOURCE_ROOT/target/release/osu_fetcher.exe" ]; then
     FETCHER="$SOURCE_ROOT/target/release/osu_fetcher.exe"
   else
     FETCHER="$SOURCE_ROOT/target/release/osu_fetcher"
   fi
 fi
 
+PY_SOURCE_ROOT="$SOURCE_ROOT"
+PY_DATASET_ROOT="$DATASET_ROOT"
+PY_INDEXER="$INDEXER"
+
+if command -v wslpath >/dev/null 2>&1 && [[ "$PYTHON" == *.exe ]]; then
+  PY_SOURCE_ROOT="$(wslpath -w "$SOURCE_ROOT")"
+  PY_DATASET_ROOT="$(wslpath -w "$DATASET_ROOT")"
+  if [[ "$INDEXER" == *.exe ]]; then
+    PY_INDEXER="$(wslpath -w "$INDEXER")"
+  fi
+fi
+
 prepare_dataset_root() {
   mkdir -p "$DATASET_ROOT"
   cd "$DATASET_ROOT"

scripts/compact_metadata_v1.sh

@@ -47,17 +47,17 @@ export HF_XET_CLIENT_AC_INITIAL_UPLOAD_CONCURRENCY="${HF_XET_CLIENT_AC_INITIAL_U
 export HF_XET_CLIENT_AC_MAX_UPLOAD_CONCURRENCY="${HF_XET_CLIENT_AC_MAX_UPLOAD_CONCURRENCY:-8}"
 export HF_XET_CLIENT_RETRY_MAX_DURATION="${HF_XET_CLIENT_RETRY_MAX_DURATION:-600}"
 
-"$PYTHON" "$SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$DATASET_ROOT" --max-data-files 10000
+"$PYTHON" "$PY_SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$PY_DATASET_ROOT" --max-data-files 10000
 
-"$PYTHON" "$SOURCE_ROOT/python/compact_metadata_v1.py" \
-  --repo-root "$DATASET_ROOT" \
+"$PYTHON" "$PY_SOURCE_ROOT/python/compact_metadata_v1.py" \
+  --repo-root "$PY_DATASET_ROOT" \
   --target-rows "$COMPACT_TARGET_ROWS" \
   --batch-size "$COMPACT_BATCH_SIZE" \
   --min-files "$COMPACT_MIN_FILES" \
   --workers "$COMPACT_WORKERS"
 
-"$PYTHON" "$SOURCE_ROOT/python/rebuild_latest_snapshot.py" --repo-root "$DATASET_ROOT" --workers "$LATEST_REBUILD_WORKERS"
-"$PYTHON" "$SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$DATASET_ROOT" --max-data-files 10000
+"$PYTHON" "$PY_SOURCE_ROOT/python/rebuild_latest_snapshot.py" --repo-root "$PY_DATASET_ROOT" --workers "$LATEST_REBUILD_WORKERS"
+"$PYTHON" "$PY_SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$PY_DATASET_ROOT" --max-data-files 10000
 
 if [ "$UPLOAD" = "1" ]; then
   "$HF" sync data "${BUCKET}/data" --delete

scripts/rebuild_compact_v1.sh

@@ -54,10 +54,10 @@ if [ -n "$LIMIT" ]; then
   echo "limit=${LIMIT}"
 fi
 
-"$PYTHON" "$SOURCE_ROOT/python/ingest_osz.py" archives \
+"$PYTHON" "$PY_SOURCE_ROOT/python/ingest_osz.py" archives \
   "${limit_args[@]}" \
-  --repo-root "$DATASET_ROOT" \
-  --rosu-indexer "$INDEXER" \
+  --repo-root "$PY_DATASET_ROOT" \
+  --rosu-indexer "$PY_INDEXER" \
   --ingest-batch-id "$BATCH_ID" \
   --chunk-size "$CHUNK_SIZE" \
   --no-skip-already-ingested \
@@ -65,13 +65,13 @@ fi
   --quiet-indexer \
   --no-keep-awake
 
-"$PYTHON" "$SOURCE_ROOT/python/rebuild_latest_snapshot.py" --repo-root "$DATASET_ROOT" --workers "$LATEST_REBUILD_WORKERS"
+"$PYTHON" "$PY_SOURCE_ROOT/python/rebuild_latest_snapshot.py" --repo-root "$PY_DATASET_ROOT" --workers "$LATEST_REBUILD_WORKERS"
 
-validate_args=(--repo-root "$DATASET_ROOT" --max-data-files 10000)
+validate_args=(--repo-root "$PY_DATASET_ROOT" --max-data-files 10000)
 if [ -z "$LIMIT" ]; then
   validate_args+=(--require-archive-file-match)
 fi
-"$PYTHON" "$SOURCE_ROOT/python/validate_compact_v1.py" "${validate_args[@]}"
+"$PYTHON" "$PY_SOURCE_ROOT/python/validate_compact_v1.py" "${validate_args[@]}"
 
 if [ "$UPLOAD" = "1" ]; then
   "$HF" sync data "${BUCKET}/data" --delete

scripts/remove_maps_v1.sh

@@ -40,31 +40,31 @@ export HF_XET_CLIENT_AC_INITIAL_UPLOAD_CONCURRENCY="${HF_XET_CLIENT_AC_INITIAL_U
 export HF_XET_CLIENT_AC_MAX_UPLOAD_CONCURRENCY="${HF_XET_CLIENT_AC_MAX_UPLOAD_CONCURRENCY:-8}"
 export HF_XET_CLIENT_RETRY_MAX_DURATION="${HF_XET_CLIENT_RETRY_MAX_DURATION:-600}"
 
-"$PYTHON" "$SOURCE_ROOT/python/validate_compact_v1.py" \
-  --repo-root "$DATASET_ROOT" \
+"$PYTHON" "$PY_SOURCE_ROOT/python/validate_compact_v1.py" \
+  --repo-root "$PY_DATASET_ROOT" \
   --require-archive-file-match \
   --max-data-files 10000
 
-"$PYTHON" "$SOURCE_ROOT/python/remove_maps_v1.py" \
-  --repo-root "$DATASET_ROOT" \
+"$PYTHON" "$PY_SOURCE_ROOT/python/remove_maps_v1.py" \
+  --repo-root "$PY_DATASET_ROOT" \
   --count "$REMOVE_COUNT" \
   --state-db "$STATE_DB" \
   --clear-enumerate-state \
   --workers "$REMOVE_WORKERS" \
   --summary-path "$SUMMARY"
 
-"$PYTHON" "$SOURCE_ROOT/python/rebuild_latest_snapshot.py" \
-  --repo-root "$DATASET_ROOT" \
+"$PYTHON" "$PY_SOURCE_ROOT/python/rebuild_latest_snapshot.py" \
+  --repo-root "$PY_DATASET_ROOT" \
   --workers "$LATEST_REBUILD_WORKERS"
 
-"$PYTHON" "$SOURCE_ROOT/python/validate_compact_v1.py" \
-  --repo-root "$DATASET_ROOT" \
+"$PYTHON" "$PY_SOURCE_ROOT/python/validate_compact_v1.py" \
+  --repo-root "$PY_DATASET_ROOT" \
   --require-archive-file-match \
   --max-data-files 10000 \
   --json
 
-"$PYTHON" "$SOURCE_ROOT/python/seed_fetcher_state.py" \
-  --repo-root "$DATASET_ROOT" \
+"$PYTHON" "$PY_SOURCE_ROOT/python/seed_fetcher_state.py" \
+  --repo-root "$PY_DATASET_ROOT" \
   --state-db "$STATE_DB" \
   --checkpoint-only
 

scripts/update_maps_v1.sh

@@ -68,7 +68,7 @@ cleanup_stale_lock_file() {
 }
 
 batch_archive_path_count() {
-  "$PYTHON" "$SOURCE_ROOT/python/list_batch_archives.py" --repo-root "$DATASET_ROOT" --batch-id "$BATCH_ID" | wc -l | tr -d ' '
+  "$PYTHON" "$PY_SOURCE_ROOT/python/list_batch_archives.py" --repo-root "$PY_DATASET_ROOT" --batch-id "$BATCH_ID" | wc -l | tr -d ' '
 }
 
 refuse_reused_batch_id_for_ingest() {
@@ -185,8 +185,8 @@ if [ "$HYDRATE" = "1" ]; then
   fi
 fi
 
-"$PYTHON" "$SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$DATASET_ROOT" --max-data-files 10000
-"$PYTHON" "$SOURCE_ROOT/python/seed_fetcher_state.py" --repo-root "$DATASET_ROOT" --state-db "$STATE_DB"
+"$PYTHON" "$PY_SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$PY_DATASET_ROOT" --max-data-files 10000
+"$PYTHON" "$PY_SOURCE_ROOT/python/seed_fetcher_state.py" --repo-root "$PY_DATASET_ROOT" --state-db "$STATE_DB"
 
 mkdir -p "$INPUT_DIR"
 
@@ -289,9 +289,9 @@ echo "input_archive_count=${input_count}"
 if [ "$input_count" -gt 0 ]; then
   refuse_reused_batch_id_for_ingest
 
-  "$PYTHON" "$SOURCE_ROOT/python/ingest_osz.py" "$INPUT_DIR" \
-    --repo-root "$DATASET_ROOT" \
-    --rosu-indexer "$INDEXER" \
+  "$PYTHON" "$PY_SOURCE_ROOT/python/ingest_osz.py" "$INPUT_DIR" \
+    --repo-root "$PY_DATASET_ROOT" \
+    --rosu-indexer "$PY_INDEXER" \
     --ingest-batch-id "$BATCH_ID" \
     --chunk-size "$CHUNK_SIZE" \
     --skip-already-ingested \
@@ -303,25 +303,25 @@ if [ "$input_count" -gt 0 ]; then
     if [ "$COMPACT_CLEAN_STALE_SCRATCH" = "1" ]; then
       rm -rf .scratch/metadata-compaction
     fi
-    "$PYTHON" "$SOURCE_ROOT/python/compact_metadata_v1.py" \
-      --repo-root "$DATASET_ROOT" \
+    "$PYTHON" "$PY_SOURCE_ROOT/python/compact_metadata_v1.py" \
+      --repo-root "$PY_DATASET_ROOT" \
       --target-rows "$COMPACT_TARGET_ROWS" \
       --batch-size "$COMPACT_BATCH_SIZE" \
       --min-files "$COMPACT_MIN_FILES" \
       --workers "$COMPACT_WORKERS"
   fi
 
-  "$PYTHON" "$SOURCE_ROOT/python/rebuild_latest_snapshot.py" --repo-root "$DATASET_ROOT" --workers "$LATEST_REBUILD_WORKERS"
-  "$PYTHON" "$SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$DATASET_ROOT" --max-data-files 10000
+  "$PYTHON" "$PY_SOURCE_ROOT/python/rebuild_latest_snapshot.py" --repo-root "$PY_DATASET_ROOT" --workers "$LATEST_REBUILD_WORKERS"
+  "$PYTHON" "$PY_SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$PY_DATASET_ROOT" --max-data-files 10000
 
   batch_archive_paths="$(batch_archive_path_count)"
   echo "batch_archive_paths=${batch_archive_paths}"
 else
   batch_archive_paths=0
-  "$PYTHON" "$SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$DATASET_ROOT" --max-data-files 10000
+  "$PYTHON" "$PY_SOURCE_ROOT/python/validate_compact_v1.py" --repo-root "$PY_DATASET_ROOT" --max-data-files 10000
 fi
 
-"$PYTHON" "$SOURCE_ROOT/python/seed_fetcher_state.py" --repo-root "$DATASET_ROOT" --state-db "$STATE_DB" --checkpoint-only
+"$PYTHON" "$PY_SOURCE_ROOT/python/seed_fetcher_state.py" --repo-root "$PY_DATASET_ROOT" --state-db "$STATE_DB" --checkpoint-only
 
 if [ "$UPLOAD" = "1" ]; then
   archive_file_count=0