Skip to content

Commit af661fd

Browse files
committed
cargo fmt
1 parent 42713cd commit af661fd

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

router/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub enum ChatTemplateVersions {
5757

5858
use std::path::Path;
5959

60-
#[derive(Debug, Clone, Serialize ,Deserialize, Default)]
60+
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
6161
pub struct HubTokenizerConfig {
6262
pub chat_template: Option<ChatTemplateVersions>,
6363
pub completion_template: Option<String>,

router/src/main.rs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use std::io::BufReader;
1414
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
1515
use std::path::{Path, PathBuf};
1616
use text_generation_router::config::Config;
17+
use text_generation_router::usage_stats;
1718
use text_generation_router::{
1819
server, HubModelInfo, HubPreprocessorConfig, HubProcessorConfig, HubTokenizerConfig,
1920
};
@@ -23,7 +24,6 @@ use tower_http::cors::AllowOrigin;
2324
use tracing_subscriber::layer::SubscriberExt;
2425
use tracing_subscriber::util::SubscriberInitExt;
2526
use tracing_subscriber::{filter::LevelFilter, EnvFilter, Layer};
26-
use text_generation_router::usage_stats;
2727

2828
/// App Configuration
2929
#[derive(Parser, Debug)]
@@ -137,7 +137,7 @@ async fn main() -> Result<(), RouterError> {
137137
disable_crash_reports,
138138
command,
139139
} = args;
140-
140+
141141
let print_schema_command = match command {
142142
Some(Commands::PrintSchema) => true,
143143
None => {
@@ -411,18 +411,18 @@ async fn main() -> Result<(), RouterError> {
411411
disable_crash_reports,
412412
);
413413
Some(usage_stats::UserAgent::new(reducded_args))
414-
}
415-
else {
414+
} else {
416415
None
417416
};
418-
417+
419418
if let Some(ref ua) = user_agent {
420-
let start_event = usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Start);
419+
let start_event =
420+
usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Start);
421421
tokio::spawn(async move {
422422
start_event.send().await;
423423
});
424-
};
425-
424+
};
425+
426426
// Run server
427427
let result = server::run(
428428
master_shard_uds_path,
@@ -456,19 +456,23 @@ async fn main() -> Result<(), RouterError> {
456456
print_schema_command,
457457
)
458458
.await;
459-
459+
460460
match result {
461461
Ok(_) => {
462462
if let Some(ref ua) = user_agent {
463-
let stop_event = usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Stop);
463+
let stop_event =
464+
usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Stop);
464465
stop_event.send().await;
465466
};
466467
Ok(())
467468
}
468469
Err(e) => {
469470
if let Some(ref ua) = user_agent {
470471
if !disable_crash_reports {
471-
let error_event = usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Error(e.to_string()));
472+
let error_event = usage_stats::UsageStatsEvent::new(
473+
ua.clone(),
474+
usage_stats::EventType::Error(e.to_string()),
475+
);
472476
error_event.send().await;
473477
}
474478
};

router/src/usage_stats.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::config::Config;
22
use reqwest::header::HeaderMap;
33
use serde::Serialize;
4-
use uuid::Uuid;
54
use std::{fmt, process::Command, time::Duration};
5+
use uuid::Uuid;
66

77
const TELEMETRY_URL: &str = "https://huggingface.co/api/telemetry/tgi";
88

@@ -24,7 +24,7 @@ impl UserAgent {
2424
}
2525

2626
#[derive(Serialize, Debug)]
27-
pub enum EventType {
27+
pub enum EventType {
2828
Start,
2929
Stop,
3030
Error(String),
@@ -48,15 +48,15 @@ impl UsageStatsEvent {
4848
headers.insert("Content-Type", "application/json".parse().unwrap());
4949
let body = serde_json::to_string(&self).unwrap();
5050
let client = reqwest::Client::new();
51-
let _ = client.post(TELEMETRY_URL)
51+
let _ = client
52+
.post(TELEMETRY_URL)
5253
.body(body)
5354
.timeout(Duration::from_secs(5))
5455
.send()
5556
.await;
5657
}
5758
}
5859

59-
6060
#[derive(Debug, Clone, Serialize)]
6161
pub struct Args {
6262
model_config: Option<Config>,
@@ -164,7 +164,8 @@ impl SystemInfo {
164164
let cpu_type = system.cpus()[0].brand().to_string();
165165
let total_memory = system.total_memory();
166166
let architecture = std::env::consts::ARCH.to_string();
167-
let platform = format!("{}-{}-{}",
167+
let platform = format!(
168+
"{}-{}-{}",
168169
std::env::consts::OS,
169170
std::env::consts::FAMILY,
170171
std::env::consts::ARCH

0 commit comments

Comments
 (0)