web search done right
remove lambdamart from search server config
Mikkel Denkere28de3984314
diff --git a/crates/core/src/config/mod.rs b/crates/core/src/config/mod.rsindex 32db06f8..ffebf2ad 100644--- a/crates/core/src/config/mod.rs+++ b/crates/core/src/config/mod.rs@@ -306,7 +306,6 @@ pub struct SearchServerConfig {pub shard: ShardId,pub index_path: String,pub linear_model_path: Option<String>,- pub lambda_model_path: Option<String>,pub dual_encoder_model_path: Option<String>,pub host: SocketAddr,diff --git a/crates/core/src/entrypoint/search_server.rs b/crates/core/src/entrypoint/search_server.rsindex 6630cf87..f4a2ebbf 100644--- a/crates/core/src/entrypoint/search_server.rs+++ b/crates/core/src/entrypoint/search_server.rs@@ -29,7 +29,7 @@ use crate::{index::Index,inverted_index::{self, KeyPhrase, RetrievedWebpage},models::dual_encoder::DualEncoder,- ranking::models::{lambdamart::LambdaMART, linear::LinearRegression},+ ranking::models::linear::LinearRegression,searcher::{InitialWebsiteResult, LocalSearcher, SearchGuard, SearchQuery, SearchableIndex},Result,};@@ -65,10 +65,6 @@ impl SearchService {local_searcher.set_linear_model(LinearRegression::open(model_path)?);}- if let Some(model_path) = config.lambda_model_path {- local_searcher.set_lambda_model(LambdaMART::open(model_path)?);- }-if let Some(model_path) = config.dual_encoder_model_path {local_searcher.set_dual_encoder(DualEncoder::open(model_path)?);}diff --git a/crates/core/src/searcher/local.rs b/crates/core/src/searcher/local.rsindex 21ccaa38..8d19a8a4 100644--- a/crates/core/src/searcher/local.rs+++ b/crates/core/src/searcher/local.rs@@ -26,7 +26,6 @@ use crate::index::Index;use crate::inverted_index::{InvertedIndex, KeyPhrase, RetrievedWebpage};use crate::models::dual_encoder::DualEncoder;use crate::query::Query;-use crate::ranking::models::lambdamart::LambdaMART;use crate::ranking::models::linear::LinearRegression;use crate::ranking::pipeline::{LocalRecallRankingWebpage, PrecisionRankingWebpage, RankableWebpage, RecallRankingWebpage,@@ -104,7 +103,6 @@ impl<'a> SearchGuard<'a> for LiveIndexSearchGuard<'a> {pub struct LocalSearcher<I: SearchableIndex> {index: I,linear_regression: Option<Arc<LinearRegression>>,- lambda_model: Option<Arc<LambdaMART>>,dual_encoder: Option<Arc<DualEncoder>>,collector_config: CollectorConfig,}@@ -131,7 +129,6 @@ whereLocalSearcher {index,linear_regression: None,- lambda_model: None,dual_encoder: None,collector_config: CollectorConfig::default(),}@@ -141,10 +138,6 @@ whereself.linear_regression = Some(Arc::new(model));}- pub fn set_lambda_model(&mut self, model: LambdaMART) {- self.lambda_model = Some(Arc::new(model));- }-pub fn set_dual_encoder(&mut self, dual_encoder: DualEncoder) {self.dual_encoder = Some(Arc::new(dual_encoder));}