From bdb8b9447f4fe4856c7258ad2a77f601ad0dd157 Mon Sep 17 00:00:00 2001 From: Meng Zhang Date: Sat, 27 May 2023 22:54:49 -0700 Subject: [PATCH] move tracing to serve.main --- crates/tabby/src/main.rs | 4 ---- crates/tabby/src/serve/completions.rs | 8 ++++---- crates/tabby/src/serve/logging.rs | 3 +++ crates/tabby/src/serve/mod.rs | 3 +++ 4 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 crates/tabby/src/serve/logging.rs diff --git a/crates/tabby/src/main.rs b/crates/tabby/src/main.rs index 3b1ec9e..3995c9a 100644 --- a/crates/tabby/src/main.rs +++ b/crates/tabby/src/main.rs @@ -1,6 +1,4 @@ -use tracing_subscriber; - use clap::{Parser, Subcommand}; #[derive(Parser)] @@ -21,8 +19,6 @@ mod serve; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); - let cli = Cli::parse(); match &cli.command { Commands::Serve(args) => { diff --git a/crates/tabby/src/serve/completions.rs b/crates/tabby/src/serve/completions.rs index d34d353..14b7899 100644 --- a/crates/tabby/src/serve/completions.rs +++ b/crates/tabby/src/serve/completions.rs @@ -4,7 +4,7 @@ use ctranslate2_bindings::{ }; use serde::{Deserialize, Serialize}; use std::sync::Arc; -use tracing::{info, span, Level}; +use tracing::{trace, span, Level}; use utoipa::ToSchema; mod languages; @@ -41,10 +41,10 @@ pub async fn completion( State(state): State>, Json(request): Json, ) -> Json { - let span = span!(Level::INFO, "completion"); + let span = span!(Level::TRACE, "completion"); let _enter = span.enter(); - info!(language = request.language, prompt = request.prompt); + trace!(language = request.language, prompt = request.prompt); let options = TextInferenceOptionsBuilder::default() .max_decoding_length(64) .sampling_temperature(0.2) @@ -52,7 +52,7 @@ pub async fn completion( .unwrap(); let text = state.engine.inference(&request.prompt, options); let filtered_text = languages::remove_stop_words(&request.language, &text); - info!(response = filtered_text); + trace!(response = filtered_text); Json(CompletionResponse { id: format!("cmpl-{}", uuid::Uuid::new_v4()), created: timestamp(), diff --git a/crates/tabby/src/serve/logging.rs b/crates/tabby/src/serve/logging.rs new file mode 100644 index 0000000..2633abb --- /dev/null +++ b/crates/tabby/src/serve/logging.rs @@ -0,0 +1,3 @@ +pub fn init() { + tracing_subscriber::fmt().init() +} diff --git a/crates/tabby/src/serve/mod.rs b/crates/tabby/src/serve/mod.rs index a3f61dc..4432922 100644 --- a/crates/tabby/src/serve/mod.rs +++ b/crates/tabby/src/serve/mod.rs @@ -14,6 +14,7 @@ use utoipa_swagger_ui::SwaggerUi; mod completions; mod events; +mod logging; #[derive(OpenApi)] #[openapi( @@ -84,6 +85,8 @@ pub struct ServeArgs { } pub async fn main(args: &ServeArgs) -> Result<(), Error> { + logging::init(); + let device = format!("{}", args.device); let options = TextInferenceEngineCreateOptionsBuilder::default() .model_path(