Sync DeepSeek OCR HF job code

ds_batch_ocr/hf_io.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import logging
+import os
 import tarfile
 from datetime import datetime
 from pathlib import Path
-from typing import Callable, Dict, Optional
+from typing import Callable, Dict, List, Optional, Tuple
 
+from huggingface_hub import CommitOperationAdd
 from .config import ArtifactLocator
 from .dependencies import bootstrap
 
@@ -16,6 +18,65 @@ HfApi = deps["HfApi"]
 
 LOGGER = logging.getLogger(__name__)
 
+DEFAULT_CHUNK_MAX_FILES = 200
+DEFAULT_CHUNK_MAX_BYTES = 512 * 1024 * 1024
+
+
+def _read_positive_int_env(name: str, default: int) -> int:
+    raw = os.environ.get(name)
+    if not raw:
+        return default
+    try:
+        value = int(raw)
+        if value > 0:
+            return value
+    except ValueError:
+        pass
+    return default
+
+
+def _gather_files(output_dir: Path, path_in_repo: str) -> List[Tuple[Path, str, int]]:
+    base = output_dir.resolve()
+    entries: List[Tuple[Path, str, int]] = []
+    prefix = path_in_repo.strip("/")
+    for local_path in sorted(base.rglob("*")):
+        if not local_path.is_file():
+            continue
+        rel_path = local_path.relative_to(base).as_posix()
+        repo_path = f"{prefix}/{rel_path}" if prefix else rel_path
+        try:
+            size = local_path.stat().st_size
+        except OSError:
+            size = 0
+        entries.append((local_path, repo_path, size))
+    return entries
+
+
+def _make_batches(
+    files: List[Tuple[Path, str, int]],
+    max_files: int,
+    max_bytes: int,
+) -> List[List[Tuple[Path, str, int]]]:
+    if not files:
+        return []
+
+    batches: List[List[Tuple[Path, str, int]]] = []
+    current: List[Tuple[Path, str, int]] = []
+    current_bytes = 0
+
+    for entry in files:
+        current.append(entry)
+        current_bytes += max(entry[2], 0)
+        if len(current) >= max_files or current_bytes >= max_bytes:
+            batches.append(current)
+            current = []
+            current_bytes = 0
+
+    if current:
+        batches.append(current)
+
+    return batches
+
 
 def unpack_archives(target_dir: Path) -> None:
     for archive in list(target_dir.glob("**/*.tar.gz")):
@@ -140,30 +201,57 @@ def maybe_upload_dataset(
     )
 
     token = env_or_none("HF_TOKEN")
-    LOGGER.info("Ensuring %s repo exists: repo_id=%s", repo_type, repo_id)
-    create_repo(
-        repo_id=repo_id,
-        repo_type=repo_type,
-        exist_ok=True,
-        token=token,
-    )
+    api = HfApi(token=token)
+
+    max_files = _read_positive_int_env("HF_UPLOAD_CHUNK_MAX_FILES", DEFAULT_CHUNK_MAX_FILES)
+    max_bytes = _read_positive_int_env("HF_UPLOAD_CHUNK_MAX_BYTES", DEFAULT_CHUNK_MAX_BYTES)
+
+    files = _gather_files(output_dir, path_in_repo or "")
+    if not files:
+        LOGGER.info("Nothing to upload from %s", output_dir)
+        return
 
+    batches = _make_batches(files, max_files=max_files, max_bytes=max_bytes)
+    total_batches = len(batches) or 1
     LOGGER.info(
-        "Uploading assembled outputs to %s (path_in_repo=%s, revision=%s)",
+        "Uploading %s files to %s in %s commit(s)",
+        len(files),
         repo_id,
-        path_in_repo,
-        revision,
+        total_batches,
     )
-    HfApi().upload_folder(
-        folder_path=str(output_dir),
+
+    LOGGER.info("Ensuring %s repo exists: repo_id=%s", repo_type, repo_id)
+    create_repo(
         repo_id=repo_id,
         repo_type=repo_type,
-        path_in_repo=path_in_repo or "",
-        commit_message=commit_message,
-        revision=revision,
+        exist_ok=True,
         token=token,
     )
 
+    for index, batch in enumerate(batches, start=1):
+        operations = [
+            CommitOperationAdd(path_in_repo=repo_path, path_or_fileobj=local_path)
+            for local_path, repo_path, _ in batch
+        ]
+        message = commit_message
+        if total_batches > 1:
+            message = f"{commit_message} (batch {index}/{total_batches})"
+
+        LOGGER.info(
+            "Commit %s/%s | files=%s | path_in_repo=%s",
+            index,
+            total_batches,
+            len(batch),
+            path_in_repo or ".",
+        )
+        api.create_commit(
+            repo_id=repo_id,
+            repo_type=repo_type,
+            revision=revision,
+            operations=operations,
+            commit_message=message,
+        )
+
 
 def env_or_none(name: str) -> Optional[str]:
     value = os.environ.get(name)
@@ -171,9 +259,6 @@ def env_or_none(name: str) -> Optional[str]:
         value = value.strip()
     return value or None
 
-
-import os
-
 __all__ = [
     "unpack_archives",
     "download_job_artifact",