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

cargo fmt

Browse Source
This commit is contained in:
ErikKaumk 2024-07-15 09:56:25 +02:00
parent 42713cd9c4
commit af661fd788
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
router/src/lib.rs
View File

@ -57,7 +57,7 @@ pub enum ChatTemplateVersions {
use std::path::Path; use std::path::Path;
#[derive(Debug, Clone, Serialize ,Deserialize, Default)] #[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct HubTokenizerConfig { pub struct HubTokenizerConfig {
pub chat_template: Option<ChatTemplateVersions>, pub chat_template: Option<ChatTemplateVersions>,
pub completion_template: Option<String>, pub completion_template: Option<String>,

16
router/src/main.rs
View File

@ -14,6 +14,7 @@ use std::io::BufReader;
use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::net::{IpAddr, Ipv4Addr, SocketAddr};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use text_generation_router::config::Config; use text_generation_router::config::Config;
use text_generation_router::usage_stats;
use text_generation_router::{ use text_generation_router::{
server, HubModelInfo, HubPreprocessorConfig, HubProcessorConfig, HubTokenizerConfig, server, HubModelInfo, HubPreprocessorConfig, HubProcessorConfig, HubTokenizerConfig,
}; };
@ -23,7 +24,6 @@ use tower_http::cors::AllowOrigin;
use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::util::SubscriberInitExt; use tracing_subscriber::util::SubscriberInitExt;
use tracing_subscriber::{filter::LevelFilter, EnvFilter, Layer}; use tracing_subscriber::{filter::LevelFilter, EnvFilter, Layer};
use text_generation_router::usage_stats;
/// App Configuration /// App Configuration
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
@ -411,13 +411,13 @@ async fn main() -> Result<(), RouterError> {
disable_crash_reports, disable_crash_reports,
); );
Some(usage_stats::UserAgent::new(reducded_args)) Some(usage_stats::UserAgent::new(reducded_args))
} } else {
else {
None None
}; };
if let Some(ref ua) = user_agent { if let Some(ref ua) = user_agent {
let start_event = usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Start); let start_event =
usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Start);
tokio::spawn(async move { tokio::spawn(async move {
start_event.send().await; start_event.send().await;
}); });
@ -460,7 +460,8 @@ async fn main() -> Result<(), RouterError> {
match result { match result {
Ok(_) => { Ok(_) => {
if let Some(ref ua) = user_agent { if let Some(ref ua) = user_agent {
let stop_event = usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Stop); let stop_event =
usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Stop);
stop_event.send().await; stop_event.send().await;
}; };
Ok(()) Ok(())
@ -468,7 +469,10 @@ async fn main() -> Result<(), RouterError> {
Err(e) => { Err(e) => {
if let Some(ref ua) = user_agent { if let Some(ref ua) = user_agent {
if !disable_crash_reports { if !disable_crash_reports {
let error_event = usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Error(e.to_string())); let error_event = usage_stats::UsageStatsEvent::new(
ua.clone(),
usage_stats::EventType::Error(e.to_string()),
);
error_event.send().await; error_event.send().await;
} }
}; };

9
router/src/usage_stats.rs
View File

@ -1,8 +1,8 @@
use crate::config::Config; use crate::config::Config;
use reqwest::header::HeaderMap; use reqwest::header::HeaderMap;
use serde::Serialize; use serde::Serialize;
use uuid::Uuid;
use std::{fmt, process::Command, time::Duration}; use std::{fmt, process::Command, time::Duration};
use uuid::Uuid;
const TELEMETRY_URL: &str = "https://huggingface.co/api/telemetry/tgi"; const TELEMETRY_URL: &str = "https://huggingface.co/api/telemetry/tgi";
@ -48,7 +48,8 @@ impl UsageStatsEvent {
headers.insert("Content-Type", "application/json".parse().unwrap()); headers.insert("Content-Type", "application/json".parse().unwrap());
let body = serde_json::to_string(&self).unwrap(); let body = serde_json::to_string(&self).unwrap();
let client = reqwest::Client::new(); let client = reqwest::Client::new();
let _ = client.post(TELEMETRY_URL) let _ = client
.post(TELEMETRY_URL)
.body(body) .body(body)
.timeout(Duration::from_secs(5)) .timeout(Duration::from_secs(5))
.send() .send()
@ -56,7 +57,6 @@ impl UsageStatsEvent {
} }
} }
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct Args { pub struct Args {
model_config: Option<Config>, model_config: Option<Config>,
@ -164,7 +164,8 @@ impl SystemInfo {
let cpu_type = system.cpus()[0].brand().to_string(); let cpu_type = system.cpus()[0].brand().to_string();
let total_memory = system.total_memory(); let total_memory = system.total_memory();
let architecture = std::env::consts::ARCH.to_string(); let architecture = std::env::consts::ARCH.to_string();
let platform = format!("{}-{}-{}", let platform = format!(
"{}-{}-{}",
std::env::consts::OS, std::env::consts::OS,
std::env::consts::FAMILY, std::env::consts::FAMILY,
std::env::consts::ARCH std::env::consts::ARCH