fix: update api interface and nix configs

Author: drbh

Cargo.lock

@@ -16,7 +16,7 @@ clap-markdown = "0.1.5"
 clap_complete = "4"
 eyre = "0.6.12"
 git2 = "0.20"
-hf-hub = { git = "https://github.com/huggingface/hf-hub.git", rev = "54d70e8afc95dad00e7fcebf8e0d74a39c395856", features = ["blocking"] }
+hf-hub = { git = "https://github.com/huggingface/hf-hub.git", rev = "670b3f489cc10e1c4a7325fb8632bffbe07f0c40", features = ["blocking"] }
 itertools = "0.13"
 minijinja = "2.5"
 minijinja-embed = "2.5"

kernel-builder/Cargo.toml

@@ -7,12 +7,12 @@ pub fn api() -> Result<hf_hub::HFClientSync> {
 }
 
 /// Get a repo handle.
-pub fn repo_handle(api: &HFClientSync, repo_type: RepoType, repo_id: &str) -> HFRepositorySync {
+pub fn repo_handle<T: RepoType>(api: &HFClientSync, repo_id: &str) -> HFRepositorySync<T> {
     let parts: Vec<&str> = repo_id.splitn(2, '/').collect();
     if parts.len() == 2 {
-        api.repo(repo_type, parts[0], parts[1])
+        api.repository::<T>(parts[0], parts[1])
     } else {
-        api.repo(repo_type, "", repo_id)
+        api.repository::<T>("", repo_id)
     }
 }
 

kernel-builder/src/hf.rs

@@ -9,7 +9,7 @@ use clap::Args;
 use eyre::{bail, Context, Result};
 use hf_hub::{
     repository::{AddSource, CommitOperation},
-    RepoType,
+    RepoType, RepoTypeKernel, RepoTypeModel,
 };
 use kernels_data::metadata::Metadata;
 use walkdir::WalkDir;
@@ -29,15 +29,6 @@ pub enum RepoTypeArg {
     Kernel,
 }
 
-impl From<RepoTypeArg> for RepoType {
-    fn from(arg: RepoTypeArg) -> Self {
-        match arg {
-            RepoTypeArg::Model => RepoType::Model,
-            RepoTypeArg::Kernel => RepoType::Kernel,
-        }
-    }
-}
-
 #[derive(Debug, Args)]
 pub struct UploadArgs {
     /// Directory of the kernel build (defaults to current directory).
@@ -96,8 +87,14 @@ fn get_repo_and_branch(
 }
 
 pub fn run_upload(args: UploadArgs) -> Result<()> {
+    match args.repo_type {
+        RepoTypeArg::Model => run_upload_typed::<RepoTypeModel>(args),
+        RepoTypeArg::Kernel => run_upload_typed::<RepoTypeKernel>(args),
+    }
+}
+
+fn run_upload_typed<T: RepoType>(args: UploadArgs) -> Result<()> {
     let api = hf::api()?;
-    let repo_type: RepoType = args.repo_type.into();
     let kernel_dir = check_or_infer_kernel_dir(args.kernel_dir)?;
     let kernel_dir = fs::canonicalize(&kernel_dir)
         .wrap_err_with(|| format!("Cannot resolve kernel directory `{}`", kernel_dir.display()))?;
@@ -112,9 +109,9 @@ pub fn run_upload(args: UploadArgs) -> Result<()> {
     let (repo_id, branch) = get_repo_and_branch(&kernel_dir, args.repo_id, args.branch, &variants)?;
 
     let repo_url = api
-        .create_repo()
+        .create_repository()
         .repo_id(&repo_id)
-        .repo_type(repo_type)
+        .repo_type(T::default())
         .private(args.private)
         .exist_ok(true)
         .send()
@@ -128,7 +125,7 @@ pub fn run_upload(args: UploadArgs) -> Result<()> {
         .unwrap_or(&repo_id)
         .to_owned();
 
-    let repo = repo_handle(&api, repo_type, &repo_id);
+    let repo = repo_handle::<T>(&api, &repo_id);
 
     let is_new_version_branch = if let Some(ref branch) = branch {
         let refs = repo
@@ -240,10 +237,7 @@ pub fn run_upload(args: UploadArgs) -> Result<()> {
     if total_ops == 0 {
         eprintln!("No changes to upload.");
     } else {
-        let type_prefix = match repo_type {
-            RepoType::Kernel => "kernels/",
-            _ => "",
-        };
+        let type_prefix = T::default().url_prefix();
         let tree_path = branch
             .as_ref()
             .map_or(String::new(), |b| format!("/tree/{b}"));

kernel-builder/src/upload.rs

@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
   cargoLock = {
     lockFile = ../../../Cargo.lock;
     outputHashes = {
-      "huggingface-hub-0.0.1" = "sha256-By8b1NUPWu+XF3Om1NcEO+o2qdZUco+FxvrJGNRqxWs=";
+      "hf-hub-1.0.0" = "sha256-XJVbG/dfxeSaTvyZMqB/6oF0I5cqKXIXzG5Zq00xmnk=";
     };
   };
 

nix-builder/pkgs/kernel-abi-check/default.nix

@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage {
   cargoLock = {
     lockFile = ../../../Cargo.lock;
     outputHashes = {
-      "huggingface-hub-0.0.1" = "sha256-By8b1NUPWu+XF3Om1NcEO+o2qdZUco+FxvrJGNRqxWs=";
+      "hf-hub-1.0.0" = "sha256-XJVbG/dfxeSaTvyZMqB/6oF0I5cqKXIXzG5Zq00xmnk=";
     };
   };
 

nix-builder/pkgs/kernel-builder/default.nix

@@ -37,7 +37,7 @@ buildPythonPackage {
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ../../../../Cargo.lock;
     outputHashes = {
-      "huggingface-hub-0.0.1" = "sha256-By8b1NUPWu+XF3Om1NcEO+o2qdZUco+FxvrJGNRqxWs=";
+      "hf-hub-1.0.0" = "sha256-XJVbG/dfxeSaTvyZMqB/6oF0I5cqKXIXzG5Zq00xmnk=";
     };
   };
 

nix-builder/pkgs/python-modules/kernel-abi-check/default.nix

@@ -35,7 +35,7 @@ buildPythonPackage {
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ../../../../Cargo.lock;
     outputHashes = {
-      "huggingface-hub-0.0.1" = "sha256-By8b1NUPWu+XF3Om1NcEO+o2qdZUco+FxvrJGNRqxWs=";
+      "hf-hub-1.0.0" = "sha256-XJVbG/dfxeSaTvyZMqB/6oF0I5cqKXIXzG5Zq00xmnk=";
     };
   };