Batch mirror uploads to respect commit limits

mirror_worker.py

@@ -12,7 +12,7 @@ import time
 import json
 from pathlib import Path
 
-from huggingface_hub import HfApi, hf_hub_download
+from huggingface_hub import CommitOperationAdd, HfApi, hf_hub_download
 from modelscope_hub import HubApi
 
 SOURCE_REPO = "daimonrobotics/Daimon-Infinity"
@@ -34,6 +34,31 @@ def retry(action, label: str, attempts: int = 6):
             time.sleep(min(180, 2 ** attempt * 5))
 
 
+def commit_batch(target: HfApi, batch: list[tuple[str, Path]]) -> None:
+    """Upload many staged files in one Hub commit, respecting 429 cooldowns."""
+    operations = [
+        CommitOperationAdd(path_in_repo=path, path_or_fileobj=str(local))
+        for path, local in batch
+    ]
+    for attempt in range(8):
+        try:
+            target.create_commit(
+                repo_id=DEST_REPO,
+                repo_type="dataset",
+                operations=operations,
+                commit_message=f"Mirror batch: {len(batch)} files",
+            )
+            return
+        except Exception as exc:
+            if "429" in str(exc):
+                # HF reports an hour-long repository commit cooldown.
+                time.sleep(3700)
+            elif attempt == 7:
+                raise
+            else:
+                time.sleep(min(300, 2 ** attempt * 10))
+
+
 def paginated_manifest(source: HubApi) -> list[dict]:
     """List the source tree page-by-page, reauthenticating on transient 400s."""
     items: list[dict] = []
@@ -88,6 +113,18 @@ def main() -> None:
         and (item.get("Type") or item.get("type")) != "tree"
     ]
     print(f"worker {WORKER_INDEX}/{WORKER_COUNT}: {len(selected)} files")
+    pending: list[tuple[str, Path]] = []
+    pending_bytes = 0
+
+    def flush() -> None:
+        nonlocal pending, pending_bytes
+        if not pending:
+            return
+        commit_batch(target, pending)
+        for _, local_file in pending:
+            local_file.unlink(missing_ok=True)
+        pending = []
+        pending_bytes = 0
 
     for number, item in enumerate(selected, start=1):
         path = item.get("Path") or item.get("path") or item.get("Name")
@@ -111,20 +148,16 @@ def main() -> None:
                 ),
                 f"download {path}",
             )
-            retry(
-                lambda: target.upload_file(
-                    path_or_fileobj=str(local),
-                    path_in_repo=path,
-                    repo_id=DEST_REPO,
-                    repo_type="dataset",
-                    commit_message=f"Mirror {path}",
-                ),
-                f"upload {path}",
-            )
+            pending.append((path, local))
+            pending_bytes += local.stat().st_size
             uploaded.add(path)
+            if len(pending) >= 200 or pending_bytes >= 20_000_000_000:
+                flush()
             print(f"done {number}/{len(selected)} {path}", flush=True)
         finally:
-            local.unlink(missing_ok=True)
+            # Staged files remain until their batch commit succeeds.
+            if path not in uploaded:
+                local.unlink(missing_ok=True)
             # Remove any empty nested directories left by this file.
             parent = local.parent
             while parent != WORKDIR:
@@ -134,6 +167,7 @@ def main() -> None:
                     break
                 parent = parent.parent
 
+    flush()
     shutil.rmtree(WORKDIR, ignore_errors=True)