only tokenizer class instead of hole struct

This commit is contained in:
ErikKaumk 2024-07-11 15:40:30 +02:00
parent f965deeee7
commit 30d86ed95a
3 changed files with 5 additions and 12 deletions

View File

@ -33,15 +33,7 @@ As of release 2.1.2 this is an example of the data collected:
}, },
"ngrok": false, "ngrok": false,
"revision": null, "revision": null,
"tokenizer_config": { "tokenizer_class": "BloomTokenizerFast",
"add_bos_token": null,
"add_eos_token": null,
"bos_token": "<s>",
"chat_template": null,
"completion_template": null,
"eos_token": "</s>",
"tokenizer_class": "BloomTokenizerFast"
},
"validation_workers": 2, "validation_workers": 2,
"waiting_served_ratio": 1.2, "waiting_served_ratio": 1.2,
"docker_label": "latest", "docker_label": "latest",

View File

@ -327,6 +327,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()
}); });
let tokenizer_class = tokenizer_config.tokenizer_class.clone();
let tokenizer: Option<Tokenizer> = tokenizer_filename.and_then(|filename| { let tokenizer: Option<Tokenizer> = tokenizer_filename.and_then(|filename| {
let mut tokenizer = Tokenizer::from_file(filename).ok(); let mut tokenizer = Tokenizer::from_file(filename).ok();
@ -387,7 +388,7 @@ async fn main() -> Result<(), RouterError> {
let user_agent = if !disable_usage_stats && is_docker { let user_agent = if !disable_usage_stats && is_docker {
let reducded_args = usage_stats::Args::new( let reducded_args = usage_stats::Args::new(
config.clone(), config.clone(),
tokenizer_config.clone(), tokenizer_class,
max_concurrent_requests, max_concurrent_requests,
max_best_of, max_best_of,
max_stop_sequences, max_stop_sequences,

View File

@ -60,7 +60,7 @@ impl UsageStatsEvent {
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct Args { pub struct Args {
model_config: Option<Config>, model_config: Option<Config>,
tokenizer_config: HubTokenizerConfig, tokenizer_config: Option<String>,
max_concurrent_requests: usize, max_concurrent_requests: usize,
max_best_of: usize, max_best_of: usize,
max_stop_sequences: usize, max_stop_sequences: usize,
@ -86,7 +86,7 @@ pub struct Args {
impl Args { impl Args {
pub fn new( pub fn new(
model_config: Option<Config>, model_config: Option<Config>,
tokenizer_config: HubTokenizerConfig, tokenizer_config: Option<String>,
max_concurrent_requests: usize, max_concurrent_requests: usize,
max_best_of: usize, max_best_of: usize,
max_stop_sequences: usize, max_stop_sequences: usize,