Switch archive uploads to git ssh by default

scripts/pipeline03_upload_to_huggingface.py

@@ -4,6 +4,7 @@ import argparse
 import json
 import os
 import shutil
+import subprocess
 import sys
 import tarfile
 import time
@@ -27,6 +28,7 @@ DEFAULT_RAW_METADATA_DIR = REPO_ROOT / "raw_metadata"
 DEFAULT_ARCHIVE_DIR = REPO_ROOT / "archives"
 DEFAULT_PROGRESS_PATH = REPO_ROOT / "archive_upload_progress.json"
 DEFAULT_STATS_NPZ = REPO_ROOT / "stats.npz"
+DEFAULT_GIT_CLONE_DIR = DEFAULT_ARCHIVE_DIR / ".hf_git_repo"
 DEFAULT_TARGET_BYTES = 14 * 1024 * 1024 * 1024
 COMPLETE_MARKER_NAME = ".complete"
 
@@ -47,6 +49,8 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument("--target-bytes", type=int, default=DEFAULT_TARGET_BYTES)
     parser.add_argument("--require-target-bytes", action="store_true")
     parser.add_argument("--dry-run", action="store_true")
+    parser.add_argument("--upload-mode", choices=["git-ssh", "api"], default=os.environ.get("HF_UPLOAD_MODE", "git-ssh"))
+    parser.add_argument("--git-clone-dir", type=Path, default=DEFAULT_GIT_CLONE_DIR)
     parser.add_argument("--token", default=os.environ.get("HF_TOKEN") or os.environ.get("HUGGINGFACE_HUB_TOKEN"))
     return parser.parse_args()
 
@@ -134,6 +138,64 @@ def upload_archive(api: HfApi, repo_id: str, repo_type: str, archive_path: Path)
     )
 
 
+def repo_git_url(repo_id: str, repo_type: str) -> str:
+    prefix = ""
+    if repo_type == "dataset":
+        prefix = "datasets/"
+    elif repo_type == "space":
+        prefix = "spaces/"
+    return f"git@hf.co:{prefix}{repo_id}"
+
+
+def run_git(command: Sequence[str], cwd: Path) -> str:
+    result = subprocess.run(command, cwd=str(cwd), capture_output=True, text=True)
+    if result.returncode != 0:
+        raise RuntimeError((result.stderr or result.stdout or f"git command failed: {' '.join(command)}").strip())
+    return (result.stdout or result.stderr or "").strip()
+
+
+def ensure_git_upload_repo(clone_dir: Path, repo_id: str, repo_type: str) -> Path:
+    remote_url = repo_git_url(repo_id, repo_type)
+    clone_dir.parent.mkdir(parents=True, exist_ok=True)
+    if not (clone_dir / '.git').exists():
+        subprocess.run(["git", "clone", remote_url, str(clone_dir)], check=True, capture_output=True, text=True)
+    else:
+        configured = run_git(["git", "remote", "get-url", "origin"], clone_dir)
+        if configured != remote_url:
+            raise RuntimeError(f"Git upload clone remote mismatch: {configured} != {remote_url}")
+        run_git(["git", "fetch", "origin"], clone_dir)
+        run_git(["git", "reset", "--hard", "origin/main"], clone_dir)
+    run_git(["git", "lfs", "install", "--local"], clone_dir)
+    try:
+        run_git(["git", "config", "user.name"], clone_dir)
+    except Exception:
+        run_git(["git", "config", "user.name", os.environ.get("HF_GIT_USER_NAME", "sf895")], clone_dir)
+    try:
+        run_git(["git", "config", "user.email"], clone_dir)
+    except Exception:
+        run_git(["git", "config", "user.email", os.environ.get("HF_GIT_USER_EMAIL", "sf895@rutgers.edu")], clone_dir)
+    return clone_dir
+
+
+def list_repo_files_via_git(clone_dir: Path, repo_id: str, repo_type: str) -> List[str]:
+    repo_dir = ensure_git_upload_repo(clone_dir, repo_id, repo_type)
+    return [path.name for path in repo_dir.iterdir() if path.is_file()]
+
+
+def upload_archive_via_git(clone_dir: Path, repo_id: str, repo_type: str, archive_path: Path) -> None:
+    repo_dir = ensure_git_upload_repo(clone_dir, repo_id, repo_type)
+    target_path = repo_dir / archive_path.name
+    shutil.copy2(archive_path, target_path)
+    run_git(["git", "add", archive_path.name], repo_dir)
+    diff_result = subprocess.run(["git", "diff", "--cached", "--quiet", "--", archive_path.name], cwd=str(repo_dir))
+    if diff_result.returncode == 0:
+        return
+    if diff_result.returncode != 1:
+        raise RuntimeError(f"git diff --cached failed for {archive_path.name}")
+    run_git(["git", "commit", "-m", f"Add {archive_path.name}"], repo_dir)
+    run_git(["git", "push", "origin", "main"], repo_dir)
+
+
 def cleanup_local_assets(
     video_ids: Sequence[str],
     dataset_dir: Path,
@@ -168,11 +230,14 @@ def format_size(num_bytes: int) -> str:
 def main() -> None:
     args = parse_args()
     progress = load_progress(args.progress_path)
-    api = HfApi(token=args.token)
+    api = HfApi(token=args.token) if args.upload_mode == "api" else None
     args.dataset_dir.mkdir(parents=True, exist_ok=True)
 
     try:
-        repo_files = api.list_repo_files(repo_id=args.repo_id, repo_type=args.repo_type)
+        if args.upload_mode == "api":
+            repo_files = api.list_repo_files(repo_id=args.repo_id, repo_type=args.repo_type)
+        else:
+            repo_files = list_repo_files_via_git(args.git_clone_dir, args.repo_id, args.repo_type)
     except Exception:
         repo_files = []
 
@@ -213,7 +278,10 @@ def main() -> None:
         )
         try:
             create_tar_archive(archive_path, args.dataset_dir, batch_names)
-            upload_archive(api, args.repo_id, args.repo_type, archive_path)
+            if args.upload_mode == "api":
+                upload_archive(api, args.repo_id, args.repo_type, archive_path)
+            else:
+                upload_archive_via_git(args.git_clone_dir, args.repo_id, args.repo_type, archive_path)
         except Exception as exc:
             update_many_video_stats(
                 args.stats_npz,