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

delete option around usage stats arg

Browse Source
This commit is contained in:
erikkaum 2024-07-31 14:51:10 +02:00
parent e51171a18d
commit 290e7bd173
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backends/v3/src/main.rs
View File

@ -69,7 +69,7 @@ struct Args {
#[clap(default_value = "4", long, env)] #[clap(default_value = "4", long, env)]
max_client_batch_size: usize, max_client_batch_size: usize,
#[clap(default_value = "on", long, env)] #[clap(default_value = "on", long, env)]
usage_stats: Option<usage_stats::UsageStatsLevel>, usage_stats: usage_stats::UsageStatsLevel,
} }
#[derive(Debug, Subcommand)] #[derive(Debug, Subcommand)]
@ -125,8 +125,6 @@ async fn main() -> Result<(), RouterError> {
}; };
text_generation_router::logging::init_logging(otlp_endpoint, otlp_service_name, json_output); text_generation_router::logging::init_logging(otlp_endpoint, otlp_service_name, json_output);
let usage_stats_level = usage_stats.unwrap_or(usage_stats::UsageStatsLevel::On);
// Validate args // Validate args
if max_input_tokens >= max_total_tokens { if max_input_tokens >= max_total_tokens {
return Err(RouterError::ArgumentValidation( return Err(RouterError::ArgumentValidation(
@ -187,7 +185,7 @@ async fn main() -> Result<(), RouterError> {
messages_api_enabled, messages_api_enabled,
disable_grammar_support, disable_grammar_support,
max_client_batch_size, max_client_batch_size,
usage_stats_level, usage_stats,
) )
.await?; .await?;
Ok(()) Ok(())

5
launcher/src/main.rs
View File

@ -497,7 +497,7 @@ struct Args {
/// Options are "on", "off" and "no-stack" /// Options are "on", "off" and "no-stack"
/// Defaul is on. /// Defaul is on.
#[clap(default_value = "on", long, env)] #[clap(default_value = "on", long, env)]
usage_stats: Option<UsageStatsLevel>, usage_stats: UsageStatsLevel,
} }
#[derive(Debug)] #[derive(Debug)]
@ -1243,9 +1243,8 @@ fn spawn_webserver(
]; ];
// Pass usage stats flags to router // Pass usage stats flags to router
let usage_stats_level = args.usage_stats.unwrap_or(UsageStatsLevel::On);
router_args.push("--usage-stats".to_string()); router_args.push("--usage-stats".to_string());
router_args.push(usage_stats_level.to_string()); router_args.push(args.usage_stats.to_string());
// Grammar support // Grammar support
if args.disable_grammar_support { if args.disable_grammar_support {

22
router/src/server.rs
View File

@ -1778,19 +1778,17 @@ pub async fn run(
} }
Err(e) => { Err(e) => {
let description = match usage_stats_level { let description = match usage_stats_level {
usage_stats::UsageStatsLevel::On => { usage_stats::UsageStatsLevel::On => Some(e.to_string()),
Some(e.to_string()), usage_stats::UsageStatsLevel::NoStack => Some("unknow_error".to_string()),
); _ => None,
}
usage_stats::UsageStatsLevel::NoStack => {
"unknow_error".to_string()
}
}
let event =.... // Create event
event.send().await;
_ => {}
}; };
let event = usage_stats::UsageStatsEvent::new(
ua.clone(),
usage_stats::EventType::Error,
description,
);
event.send().await;
Err(e) Err(e)
} }
} }