From 7695a667bbf0e564f0b4040879e75beb172be640 Mon Sep 17 00:00:00 2001 From: Meng Zhang Date: Sat, 11 Nov 2023 14:20:17 -0800 Subject: [PATCH] refactor: move tabby/src/search.rs -> tabby/src/services/search.rs --- Cargo.lock | 12 ++++++++++++ crates/tabby/Cargo.toml | 1 + crates/tabby/src/main.rs | 3 ++- crates/tabby/src/serve/mod.rs | 4 ++-- crates/tabby/src/services/mod.rs | 3 +++ crates/tabby/src/{ => services}/search.rs | 0 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 crates/tabby/src/services/mod.rs rename crates/tabby/src/{ => services}/search.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 21de5d3..b180c28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1842,6 +1842,17 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-reverse-proxy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc1af9b1b483fb9f33bd1cda26b35eacf902f0d116fcf0d56075ea5e5923b935" +dependencies = [ + "hyper", + "lazy_static", + "unicase", +] + [[package]] name = "hyper-timeout" version = "0.4.1" @@ -4076,6 +4087,7 @@ dependencies = [ "futures", "http-api-bindings", "hyper", + "hyper-reverse-proxy", "lazy_static", "llama-cpp-bindings", "mime_guess", diff --git a/crates/tabby/Cargo.toml b/crates/tabby/Cargo.toml index beee031..a3684fa 100644 --- a/crates/tabby/Cargo.toml +++ b/crates/tabby/Cargo.toml @@ -46,6 +46,7 @@ regex.workspace = true llama-cpp-bindings = { path = "../llama-cpp-bindings" } futures.workspace = true async-trait.workspace = true +hyper-reverse-proxy = "0.5.1" [dependencies.uuid] version = "1.3.3" diff --git a/crates/tabby/src/main.rs b/crates/tabby/src/main.rs index e12c979..978aed9 100644 --- a/crates/tabby/src/main.rs +++ b/crates/tabby/src/main.rs @@ -1,8 +1,9 @@ mod chat; mod download; -mod search; mod serve; +mod services; + use clap::{Parser, Subcommand}; use opentelemetry::{ global, diff --git a/crates/tabby/src/serve/mod.rs b/crates/tabby/src/serve/mod.rs index 9298814..e875676 100644 --- a/crates/tabby/src/serve/mod.rs +++ b/crates/tabby/src/serve/mod.rs @@ -32,7 +32,7 @@ use self::{ engine::{create_engine, EngineInfo}, health::HealthState, }; -use crate::{chat::ChatService, fatal, search::create_code_search}; +use crate::{chat::ChatService, fatal}; #[derive(OpenApi)] #[openapi( @@ -181,7 +181,7 @@ async fn load_model(args: &ServeArgs) { } async fn api_router(args: &ServeArgs, config: &Config) -> Router { - let code = Arc::new(create_code_search()); + let code = Arc::new(crate::services::create_code_search()); let completion_state = { let ( engine, diff --git a/crates/tabby/src/services/mod.rs b/crates/tabby/src/services/mod.rs new file mode 100644 index 0000000..9675e1f --- /dev/null +++ b/crates/tabby/src/services/mod.rs @@ -0,0 +1,3 @@ +mod search; + +pub use search::*; diff --git a/crates/tabby/src/search.rs b/crates/tabby/src/services/search.rs similarity index 100% rename from crates/tabby/src/search.rs rename to crates/tabby/src/services/search.rs