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.

Sign up for GitHub

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

Jump to bottom

feat: Support authentication with HuggingFace login #17881

Merged
merged 5 commits into from
Jul 26, 2024
Merged

feat: Support authentication with HuggingFace login #17881

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e50d1a9
feat: Support authentication with HuggingFace login
nameexhaustion Jul 26, 2024
38ad58e
c
nameexhaustion Jul 26, 2024
dfe5c16
c
nameexhaustion Jul 26, 2024
c663bc0
c
nameexhaustion Jul 26, 2024
4c91ae1
c
nameexhaustion Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 50 additions & 12 deletions crates/polars-io/src/cloud/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ use url::Url;
#[cfg(feature = "file_cache")]
use crate::file_cache::get_env_file_cache_ttl;
#[cfg(feature = "aws")]
use crate::path_utils::resolve_homedir;
#[cfg(feature = "aws")]
use crate::pl_async::with_concurrency_budget;

#[cfg(feature = "aws")]
Expand Down Expand Up @@ -211,6 +209,8 @@ fn read_config(
builder: &mut AmazonS3Builder,
items: &[(&Path, &[(&str, AmazonS3ConfigKey)])],
) -> Option<()> {
use crate::path_utils::resolve_homedir;

for (path, keys) in items {
if keys
.iter()
Expand Down Expand Up @@ -474,26 +474,64 @@ impl CloudOptions {
CloudType::Hf => {
#[cfg(feature = "http")]
{
let mut this = Self::default();
use polars_core::config;

if let Ok(v) = std::env::var("HF_TOKEN") {
this.config = Some(CloudConfig::Http {
headers: vec![("Authorization".into(), format!("Bearer {}", v))],
})
}
use crate::path_utils::resolve_homedir;

let mut this = Self::default();
let mut token = None;
let verbose = config::verbose();

for (i, (k, v)) in config.into_iter().enumerate() {
let (k, v) = (k.as_ref(), v.into());

if i == 0 && k == "token" {
this.config = Some(CloudConfig::Http {
headers: vec![("Authorization".into(), format!("Bearer {}", v))],
})
if verbose {
eprintln!("HF token sourced from storage_options");
}
token = Some(v);
} else {
polars_bail!(ComputeError: "unknown configuration key: {}", k)
polars_bail!(ComputeError: "unknown configuration key for HF: {}", k)
}
}

token = token
.or_else(|| {
let v = std::env::var("HF_TOKEN").ok();
if v.is_some() && verbose {
eprintln!("HF token sourced from HF_TOKEN env var");
}
v
})
.or_else(|| {
let hf_home = std::env::var("HF_HOME");
let hf_home = hf_home.as_deref();
let hf_home = hf_home.unwrap_or("~/.cache/huggingface");
let hf_home = resolve_homedir(std::path::Path::new(&hf_home));
let cached_token_path = hf_home.join("token");

let v = std::string::String::from_utf8(
std::fs::read(&cached_token_path).ok()?,
)
.ok()
.filter(|x| !x.is_empty());

if v.is_some() && verbose {
eprintln!(
"HF token sourced from {}",
cached_token_path.to_str().unwrap()
);
}

v
});

if let Some(v) = token {
this.config = Some(CloudConfig::Http {
headers: vec![("Authorization".into(), format!("Bearer {}", v))],
})
}

Ok(this)
}
#[cfg(not(feature = "http"))]
Expand Down