huggingface/text-generation-inference
5
0
Fork 0
mirror of https://github.com/huggingface/text-generation-inference.git synced 2025-09-11 12:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: simplify logic and remove vars

Browse Source
This commit is contained in:
drbh 2024-02-01 14:24:12 +00:00
parent 57e27bcbb2
commit 9ad6b570ae
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
router/src/main.rs
View File

@ -154,16 +154,6 @@ async fn main() -> Result<(), RouterError> {
let local_path = Path::new(&tokenizer_name); let local_path = Path::new(&tokenizer_name);
let local_model = local_path.exists() && local_path.is_dir(); let local_model = local_path.exists() && local_path.is_dir();
// Load tokenizer config
// This will be used to format the chat template
if let Some(tokenizer_config_path) = tokenizer_config_path {
Some(std::path::PathBuf::from(tokenizer_config_path))
} else if local_model {
Some(local_path.join("tokenizer_config.json"))
} else {
None
};
// Shared API builder initialization // Shared API builder initialization
let api_builder = || { let api_builder = || {
let mut builder = ApiBuilder::new() let mut builder = ApiBuilder::new()
@ -234,12 +224,14 @@ async fn main() -> Result<(), RouterError> {
}; };
// Load tokenizer config if found locally, or check if we can get it from the API if needed // Load tokenizer config if found locally, or check if we can get it from the API if needed
let tokenizer_config = match tokenizer_config_full_path { let tokenizer_config = if let Some(path) = tokenizer_config_path {
Some(path) => { tracing::info!("Using local tokenizer config from user specified path");
HubTokenizerConfig::from_file(&std::path::PathBuf::from(path))
} else if local_model {
tracing::info!("Using local tokenizer config"); tracing::info!("Using local tokenizer config");
HubTokenizerConfig::from_file(&path) HubTokenizerConfig::from_file(&local_path.join("tokenizer_config.json"))
} } else {
None => match api { match api {
Some(api) => { Some(api) => {
tracing::info!("Using the Hugging Face API to retrieve tokenizer config"); tracing::info!("Using the Hugging Face API to retrieve tokenizer config");
let repo = Repo::with_revision( let repo = Repo::with_revision(
@ -260,7 +252,7 @@ async fn main() -> Result<(), RouterError> {
tracing::warn!("Could not find tokenizer config locally and no API specified"); tracing::warn!("Could not find tokenizer config locally and no API specified");
HubTokenizerConfig::default() HubTokenizerConfig::default()
} }
}, }
}; };
if tokenizer.is_none() { if tokenizer.is_none() {