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 error handling

Browse Source
This commit is contained in:
Hugo Larcher 2025-01-27 14:04:33 +01:00
parent 4c8bf7f5b8
commit 19bb3bf355
No known key found for this signature in database
GPG Key ID: 3DAF63124699CA2B
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
router/src/server.rs
View File

@ -1824,7 +1824,7 @@ pub async fn run(
let tokenizer: Result<Tokenizer, WebServerError> = { let tokenizer: Result<Tokenizer, WebServerError> = {
use pyo3::prelude::*; use pyo3::prelude::*;
match Python::with_gil(|py| -> PyResult<()> { let res = Python::with_gil(|py| -> PyResult<()> {
py_resolve_tokenizer(py, &tokenizer_name, revision.as_deref(), trust_remote_code)?; py_resolve_tokenizer(py, &tokenizer_name, revision.as_deref(), trust_remote_code)?;
Ok(()) Ok(())
}) })
@ -1834,13 +1834,11 @@ pub async fn run(
.or_else(|err| { .or_else(|err| {
let out = legacy_tokenizer_handle(config_filename.as_ref()); let out = legacy_tokenizer_handle(config_filename.as_ref());
out.ok_or(err) out.ok_or(err)
}) { }).map_err(|_|WebServerError::Tokenizer(
Ok(_) => {} "Unable to load tokenizer.".to_string(),
Err(_) => { ));
return Err(WebServerError::Tokenizer( if res.is_err(){
"Unable to load tokenizer.".to_string(), return res
));
}
} }
let filename = "out/tokenizer.json"; let filename = "out/tokenizer.json";
if let Ok(tok) = tokenizers::Tokenizer::from_file(filename) { if let Ok(tok) = tokenizers::Tokenizer::from_file(filename) {