Create hfupload.py

hfupload.py

@@ -0,0 +1,167 @@
+#!/usr/bin/env python3
+
+# HF Token 从环境变量 HF_TOKEN 读取（由 modal_jupyter.py 通过 modal.Secret 注入）。
+# 如果不在 Modal 环境中运行，请先设置：
+# export HF_TOKEN="hf_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+import argparse
+import os
+import subprocess
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from datetime import datetime
+from pathlib import Path
+
+from huggingface_hub import HfApi, hf_hub_url, login
+
+
+SCRIPT_DIR = Path(__file__).resolve().parent
+UPLOAD_DIR = SCRIPT_DIR / "upload"
+REPO_ID = "ACCC1380/private-model"
+
+
+def create_backup_archive(backup_dir: Path) -> Path:
+    backup_dir = backup_dir.expanduser().resolve()
+
+    if not backup_dir.exists():
+        raise FileNotFoundError(f"备份目录不存在: {backup_dir}")
+    if not backup_dir.is_dir():
+        raise NotADirectoryError(f"指定路径不是目录: {backup_dir}")
+    if backup_dir == backup_dir.parent:
+        raise ValueError("不支持直接打包文件系统根目录")
+    if backup_dir == UPLOAD_DIR.resolve():
+        raise ValueError("备份目录不能是脚本的 upload 输出目录")
+
+    UPLOAD_DIR.mkdir(parents=True, exist_ok=True)
+
+    timelapse = datetime.now().strftime("%Y%m%d_%H%M%S")
+    archive_path = UPLOAD_DIR / f"{backup_dir.name}_{timelapse}.tar"
+
+    print(f"开始打包目录: {backup_dir}")
+    print(f"归档文件: {archive_path}")
+
+    tar_command = ["tar", "-cvf", str(archive_path)]
+
+    # 如果备份目录包含脚本的 upload 目录，则排除它，避免归档包含自身。
+    try:
+        upload_relative_path = UPLOAD_DIR.resolve().relative_to(backup_dir)
+    except ValueError:
+        pass
+    else:
+        exclude_path = (Path(backup_dir.name) / upload_relative_path).as_posix()
+        tar_command.extend(["--exclude", exclude_path])
+
+    tar_command.extend(["-C", str(backup_dir.parent), backup_dir.name])
+    subprocess.run(tar_command, check=True)
+
+    print("目录打包完成")
+    return archive_path
+
+
+def collect_upload_files() -> list[Path]:
+    """收集 upload 目录中已有的全部文件。"""
+    UPLOAD_DIR.mkdir(parents=True, exist_ok=True)
+    return sorted(path for path in UPLOAD_DIR.rglob("*") if path.is_file())
+
+
+def upload_file(api: HfApi, file_in_folder: Path, repo_id: str) -> str:
+    # 仓库路径和 URL 在 Windows/Linux 上均使用正斜杠。
+    path_in_repo = file_in_folder.relative_to(SCRIPT_DIR).as_posix()
+
+    try:
+        api.upload_file(
+            path_or_fileobj=file_in_folder,
+            path_in_repo=path_in_repo,
+            repo_id=repo_id,
+            repo_type="dataset",
+        )
+    except Exception as exc:
+        raise RuntimeError(f"文件 {file_in_folder} 上传失败: {exc}") from exc
+
+    return hf_hub_url(
+        repo_id=repo_id,
+        filename=path_in_repo,
+        repo_type="dataset",
+        revision="main",
+    )
+
+
+def huggingface_upload(local_files: list[Path], repo_id: str) -> bool:
+    hf_token = os.environ.get("HF_TOKEN", "")
+    if not hf_token:
+        print(
+            'Error: HF_TOKEN 环境变量未设置。请设置后重试：'
+            'export HF_TOKEN="hf_xxx"'
+        )
+        return False
+
+    login(token=hf_token)
+    api = HfApi()
+    print("HfApi 类已实例化")
+    print("开始上传文件...")
+
+    upload_tasks = []
+    upload_failed = False
+
+    with ThreadPoolExecutor(max_workers=15) as executor:
+        for local_file in local_files:
+            local_file = Path(local_file).resolve()
+            if not local_file.is_file():
+                print(f"Error: File {local_file} does not exist")
+                upload_failed = True
+                continue
+
+            upload_tasks.append(
+                executor.submit(upload_file, api, local_file, repo_id)
+            )
+
+        for task in as_completed(upload_tasks):
+            try:
+                direct_url = task.result()
+                print("文件上传完成")
+                print(f"响应:{direct_url}")
+            except Exception as exc:
+                upload_failed = True
+                print(f"上传失败: {exc}")
+
+    return not upload_failed
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description="上传 upload 目录中的文件；也可选择先打包指定目录"
+    )
+    parser.add_argument(
+        "--backup-dir",
+        type=Path,
+        default=None,
+        help="可选：先使用 tar -cvf 打包该目录，再上传生成的归档",
+    )
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = parse_args()
+
+    if args.backup_dir is not None:
+        try:
+            archive_path = create_backup_archive(args.backup_dir)
+        except (OSError, ValueError, subprocess.CalledProcessError) as exc:
+            print(f"打包失败: {exc}")
+            return 1
+
+        # 传入 --backup-dir 时，只上传本次生成的归档。
+        local_files = [archive_path]
+    else:
+        # 裸跑时不打包，直接上传 upload/ 中已有的文件。
+        local_files = collect_upload_files()
+        if not local_files:
+            print(f"没有可上传的文件: {UPLOAD_DIR}")
+            return 1
+
+        print(f"找到 {len(local_files)} 个待上传文件")
+
+    return 0 if huggingface_upload(local_files, REPO_ID) else 1
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())