Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xet upload workflow #2887

Merged
merged 45 commits into from
Mar 12, 2025
Merged

Xet upload workflow #2887

merged 45 commits into from
Mar 12, 2025

Conversation

hanouticelina
Copy link
Contributor

@hanouticelina hanouticelina commented Feb 25, 2025

Partially resolves #2713

This PR contains only the Xet upload workflow implemented in xetpoc_huggingface_hub (internal).

The main branch for xet storage integration is xet-integration.

Main changes:

  • Make hf_xet available as an optional dependency via pip install huggingface_hub[hf_xet]
    Note: since it's a common part for download and upload, this has been pushed directly into the xet-integration branch.
  • Integrate changes from the xet poc for the download workflow only.
  • Add tests.

to try it in from this branch:

pip install -e ".[dev,hf_xet]"
export HF_DEBUG=1 #  if you want to set huggingface_hub logger to debug level
huggingface-cli upload --repo-type model rajatarya/xet-enable-test ~/data/yelp_sample

@HuggingFaceDocBuilderDev

The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update.

@hanouticelina hanouticelina requested review from Wauplin and bpronan March 4, 2025 15:58
@hanouticelina hanouticelina marked this pull request as ready for review March 4, 2025 15:58
Copy link
Collaborator

@bpronan bpronan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few missing doc strings, but otherwise looks great!

Copy link
Contributor

@Wauplin Wauplin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really nice! 🔥

Implementation looks good to me. I just have a question about when Xet is enabled but user is not xet authorized. Wondering when could that happen and what the expected behavior here (my understanding is that currently it fails to upload without any workaround possible).

If the server returns malformed responses or if the user is unauthorized to upload to xet storage.
[`HTTPError`](https://requests.readthedocs.io/en/latest/api/#requests.HTTPError)
If the LFS batch endpoint returned an HTTP error.
**How it works:**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
**How it works:**
**How it works:**

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel that the whole section would be better suited for https://github.com/huggingface/huggingface_hub/pull/2899/files#diff-b1fa48a1bcb46429d1a7d311268539b7fe814e4158608cce9c14d5d60a9c4a51 i.e. in official docs rather than the docstring. And keep things simple in the docstring with a "check out this guide to learn more about how it works".

Can be done in a later PR or in the docs PR directly (let's not block this one just for documentation)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, actually i put it there mainly for users who will read the code since we have a "blackbox" call to hf_xet.upload_files (same for downloading). but yes I agree it's better to have it in a documentation and then link it in the docstring. will do that in a following PR 👍

@hanouticelina
Copy link
Contributor Author

hanouticelina commented Mar 7, 2025

I just have a question about when Xet is enabled but user is not xet authorized. Wondering when could that happen and what the expected behavior here (my understanding is that currently it fails to upload without any workaround possible).

I think if xet is enabled in the repo and hf_xet is installed, then we should not fallback to http since it means that the user passed invalid credentials when calling GET /api/:repoType(models|spaces|datasets)/:namespace?/:repo/xet-write-token/:rev.
it's actually the same auth level as upload, delete and commit (see here: moon-landing/server/server.ts#L834C1-L835C1).

@Wauplin
Copy link
Contributor

Wauplin commented Mar 7, 2025

I think if xet is enabled in the repo and hf_xet is installed, then we should not fallback to http since it means that the user passed invalid credentials when calling GET /api/:repoType(models|spaces|datasets)/:namespace?/:repo/xet-write-token/:rev.
it's actually the same auth level as upload, delete and commit (see here:moon-landingserver/server.ts#L834C1-L835C1).

Ah yes, I forgot the workaround in this case would be to uninstall hf_xet if really they are not authorized to use it. But shouldn't happen except if doing something unexpected. Then it's all fine to raise the unauthorized error :)

Copy link
Contributor

@Wauplin Wauplin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥

@hanouticelina
Copy link
Contributor Author

Let's wait for a final review from @bpronan and/or @rajatarya and then I think we should be good to merge! 🙂

Copy link
Collaborator

@bpronan bpronan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@bpronan
Copy link
Collaborator

bpronan commented Mar 7, 2025

I think if xet is enabled in the repo and hf_xet is installed, then we should not fallback to http since it means that the user passed invalid credentials when calling GET /api/:repoType(models|spaces|datasets)/:namespace?/:repo/xet-write-token/:rev.
it's actually the same auth level as upload, delete and commit (see here: moon-landing/server/server.ts#L834C1-L835C1).

This is 💯 correct. The user would only see this case (xetEnabled on repo + hf_xet installed + no access) if they don't have upload/commit access on the repo in the first place. In other words, they have to have write access to the repo to upload to a xet enabled repo with hf_xet installed. The earlier call to _fetch_upload_modes would have failed already by then.

Uninstalling hf_xet shouldn't help here because they can't write to the repo anyway.

@hanouticelina
Copy link
Contributor Author

I think we can merge this one to the xet-integration branch and then we can open another PR for any xet-specific part once we merge the If-None-Match path into main.

@hanouticelina hanouticelina merged commit 86de575 into xet-integration Mar 12, 2025
20 checks passed
@hanouticelina hanouticelina deleted the xet-upload-workflow branch March 12, 2025 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants