web search done right
optimizations to make discussion optic faster
Mikkel Denker68e6b66b8343
diff --git a/core/benches/search-preindexed-optic.rs b/core/benches/search-preindexed-optic.rsindex 4e3aa3e8..73d735fb 100644--- a/core/benches/search-preindexed-optic.rs+++ b/core/benches/search-preindexed-optic.rs@@ -30,9 +30,9 @@ macro_rules! bench {pub fn criterion_benchmark(c: &mut Criterion) {let index = Index::open(INDEX_PATH).unwrap();let searcher = LocalSearcher::new(index);- let optic = include_str!("../../optics/testcases/10k_short.optic");+ let optic = include_str!("../../optics/testcases/discussions.optic");- for _ in 0..10 {+ for _ in 0..10_000 {bench!("the", searcher, optic, c);bench!("dtu", searcher, optic, c);bench!("the best", searcher, optic, c);diff --git a/core/src/api/mod.rs b/core/src/api/mod.rsindex feb36918..5dd331bc 100644--- a/core/src/api/mod.rs+++ b/core/src/api/mod.rs@@ -119,7 +119,11 @@ pub async fn favicon() -> impl IntoResponse {pub async fn router(config: &FrontendConfig, counters: Counters) -> Result<Router> {let autosuggest = Autosuggest::load_csv(&config.queries_csv_path)?;- let crossencoder = CrossEncoderModel::open(&config.crossencoder_model_path)?;+ let mut cross_encoder = None;++ if let Some(path) = config.crossencoder_model_path.as_ref() {+ cross_encoder = Some(CrossEncoderModel::open(path)?);+ }let lambda_model = match &config.lambda_model_path {Some(path) => Some(LambdaMART::open(path)?),@@ -153,7 +157,7 @@ pub async fn router(config: &FrontendConfig, counters: Counters) -> Result<Routelet remote_webgraph = RemoteWebgraph::new(cluster.clone());let searcher = FrontendSearcher::new(cluster.clone(),- crossencoder,+ cross_encoder,lambda_model,qa_model,bangs,diff --git a/core/src/api/optics.rs b/core/src/api/optics.rsindex 9126a55f..9732f31a 100644--- a/core/src/api/optics.rs+++ b/core/src/api/optics.rs@@ -44,7 +44,7 @@ pub const DEFAULT_OPTICS: [OpticLink; 7] = [},OpticLink {name: "Indieweb & blogroll",- url: "https://raw.githubusercontent.com/StractOrg/sample-optics/main/indiweb_blogroll.optic",+ url: "https://raw.githubusercontent.com/StractOrg/sample-optics/main/indieweb_blogroll.optic",description: "Search only in the indieweb + a list of blogs from blogroll.org and some hand-picked blogs from hackernews.",},OpticLink {diff --git a/core/src/api/search.rs b/core/src/api/search.rsindex 020ec93f..8cd1aa22 100644--- a/core/src/api/search.rs+++ b/core/src/api/search.rs@@ -122,12 +122,20 @@ pub async fn route(if let Some(url) = ¶ms.optic {if !url.is_empty() {if let Ok(res) = reqwest::get(url).await {+ let status = res.status();if let Ok(text) = res.text().await {- match Optic::parse(&text) {- Ok(parsed_optic) => optic = Some(parsed_optic),- Err(err) => {- alerts.push(format!("Could not parse optic: {}", err));+ if status.is_success() {+ match Optic::parse(&text) {+ Ok(parsed_optic) => optic = Some(parsed_optic),+ Err(err) => {+ alerts.push(format!("Could not parse optic: {}", err));+ }}+ } else {+ alerts.push(format!(+ "HTTP error when retrieving optic: {}",+ status.as_u16()+ ));}} else {alerts.push("Could not retrieve optic as text".to_string());diff --git a/core/src/config/mod.rs b/core/src/config/mod.rsindex 188feb50..42f5a51d 100644--- a/core/src/config/mod.rs+++ b/core/src/config/mod.rs@@ -196,7 +196,7 @@ pub struct FrontendConfig {pub queries_csv_path: String,pub host: SocketAddr,pub prometheus_host: SocketAddr,- pub crossencoder_model_path: String,+ pub crossencoder_model_path: Option<String>,pub lambda_model_path: Option<String>,pub qa_model_path: Option<String>,pub with_alice: Option<bool>,diff --git a/core/src/query/intersection.rs b/core/src/query/intersection.rsindex 101e3941..558b5b40 100644--- a/core/src/query/intersection.rs+++ b/core/src/query/intersection.rs@@ -40,6 +40,13 @@ fn go_to_first_doc<TDocSet: DocSet>(docsets: &mut [TDocSet]) -> DocId {impl<TDocSet: DocSet> Intersection<TDocSet> {pub(crate) fn new(mut docsets: Vec<TDocSet>) -> Intersection<TDocSet> {+ if docsets.len() == 1 {+ return Intersection {+ docsets,+ old_idx: vec![0],+ };+ }+let mut docsets: Vec<(usize, TDocSet)> = docsets.drain(..).enumerate().collect();docsets.sort_by_key(|(_, docset)| docset.size_hint());let (tmp, mut docsets): (Vec<usize>, Vec<TDocSet>) = docsets.into_iter().unzip();@@ -63,6 +70,11 @@ impl<TDocSet: DocSet> DocSet for Intersection<TDocSet> {let (first, rest) = self.docsets.split_at_mut(1);let rarest_docset = &mut first[0];++ if rest.is_empty() {+ return rarest_docset.advance();+ }+let mut candidate = rarest_docset.advance();'outer: loop {for docset in rest.iter_mut() {@@ -78,9 +90,15 @@ impl<TDocSet: DocSet> DocSet for Intersection<TDocSet> {}fn seek(&mut self, target: DocId) -> DocId {+ let num_docsets = self.docsets.len();match self.docsets.first_mut() {Some(docset) => {docset.seek(target);++ if num_docsets == 1 {+ return docset.doc();+ }+let doc = go_to_first_doc(&mut self.docsets[..]);debug_assert!(self.docsets.iter().all(|docset| docset.doc() == doc));debug_assert!(doc >= target);diff --git a/core/src/ranking/pipeline.rs b/core/src/ranking/pipeline.rsindex 16cfc426..6caa4968 100644--- a/core/src/ranking/pipeline.rs+++ b/core/src/ranking/pipeline.rs@@ -184,6 +184,12 @@ impl<T: AsRankingWebsite, M: CrossEncoder> Scorer<T> for ReRanker<M> {}}+struct IdentityScorer;++impl<T: AsRankingWebsite> Scorer<T> for IdentityScorer {+ fn score(&self, _websites: &mut [T]) {}+}+fn calculate_score(model: &Option<Arc<LambdaMART>>,signal_coefficients: &Option<SignalCoefficient>,@@ -289,12 +295,19 @@ pub struct RankingPipeline<T: AsRankingWebsite> {impl<T: AsRankingWebsite> RankingPipeline<T> {fn create_reranking<M: CrossEncoder + 'static>(- crossencoder: Arc<M>,+ crossencoder: Option<Arc<M>>,lambda: Option<Arc<LambdaMART>>,collector_config: CollectorConfig,) -> Result<Self> {+ let scorer = match crossencoder {+ Some(cross_encoder) => {+ Box::new(ReRanker::new(cross_encoder, lambda)) as Box<dyn Scorer<T>>+ }+ None => Box::new(IdentityScorer) as Box<dyn Scorer<T>>,+ };+let stage = RankingStage {- scorer: Box::new(ReRanker::new(crossencoder, lambda)),+ scorer,stage_top_n: 20,derank_similar: true,};@@ -309,7 +322,7 @@ impl<T: AsRankingWebsite> RankingPipeline<T> {pub fn reranking_for_query<M: CrossEncoder + 'static>(query: &mut SearchQuery,- crossencoder: Arc<M>,+ crossencoder: Option<Arc<M>>,lambda: Option<Arc<LambdaMART>>,collector_config: CollectorConfig,) -> Result<Self> {@@ -432,7 +445,7 @@ mod tests {&mut SearchQuery {..Default::default()},- Arc::new(DummyCrossEncoder {}),+ Some(Arc::new(DummyCrossEncoder {})),None,CollectorConfig::default(),)@@ -463,7 +476,7 @@ mod tests {num_results,..Default::default()},- Arc::new(DummyCrossEncoder {}),+ Some(Arc::new(DummyCrossEncoder {})),None,CollectorConfig::default(),)@@ -497,7 +510,7 @@ mod tests {num_results,..Default::default()},- Arc::new(DummyCrossEncoder {}),+ Some(Arc::new(DummyCrossEncoder {})),None,CollectorConfig::default(),)@@ -511,7 +524,7 @@ mod tests {page: p,..Default::default()},- Arc::new(DummyCrossEncoder {}),+ Some(Arc::new(DummyCrossEncoder {})),None,CollectorConfig::default(),)diff --git a/core/src/searcher/frontend.rs b/core/src/searcher/frontend.rsindex f6988f47..caa5e81a 100644--- a/core/src/searcher/frontend.rs+++ b/core/src/searcher/frontend.rs@@ -52,7 +52,7 @@ use super::{pub struct FrontendSearcher {distributed_searcher: DistributedSearcher,- cross_encoder: Arc<CrossEncoderModel>,+ cross_encoder: Option<Arc<CrossEncoderModel>>,lambda_model: Option<Arc<LambdaMART>>,qa_model: Option<Arc<QaModel>>,bangs: Bangs,@@ -63,7 +63,7 @@ pub struct FrontendSearcher {impl FrontendSearcher {pub fn new(cluster: Arc<Cluster>,- cross_encoder: CrossEncoderModel,+ cross_encoder: Option<CrossEncoderModel>,lambda_model: Option<LambdaMART>,qa_model: Option<QaModel>,bangs: Bangs,@@ -72,7 +72,7 @@ impl FrontendSearcher {) -> Self {Self {distributed_searcher: DistributedSearcher::new(cluster),- cross_encoder: Arc::new(cross_encoder),+ cross_encoder: cross_encoder.map(Arc::new),lambda_model: lambda_model.map(Arc::new),qa_model: qa_model.map(Arc::new),bangs,@@ -241,7 +241,7 @@ impl FrontendSearcher {let pipeline: RankingPipeline<ScoredWebsitePointer> = RankingPipeline::reranking_for_query(&mut query,- self.cross_encoder.clone(),+ self.cross_encoder.as_ref().map(Arc::clone),self.lambda_model.clone(),self.collector_config.clone(),)?;@@ -321,7 +321,7 @@ impl FrontendSearcher {let mut search_query = query.clone();let pipeline: RankingPipeline<ScoredWebsitePointer> = RankingPipeline::reranking_for_query(&mut search_query,- self.cross_encoder.clone(),+ self.cross_encoder.as_ref().map(Arc::clone),self.lambda_model.clone(),self.collector_config.clone(),)?;diff --git a/core/src/searcher/local.rs b/core/src/searcher/local.rsindex fb5181c2..a26b3906 100644--- a/core/src/searcher/local.rs+++ b/core/src/searcher/local.rs@@ -321,23 +321,22 @@ impl LocalSearcher {use std::time::Instant;use crate::{- ranking::models::cross_encoder::{CrossEncoderModel, DummyCrossEncoder},- search_prettifier::Sidebar,+ ranking::models::cross_encoder::CrossEncoderModel, search_prettifier::Sidebar,};let start = Instant::now();let mut search_query = query.clone();let pipeline = match CrossEncoderModel::open("data/cross_encoder") {- Ok(model) => RankingPipeline::reranking_for_query(+ Ok(model) => RankingPipeline::reranking_for_query::<CrossEncoderModel>(&mut search_query,- Arc::new(model),+ Some(Arc::new(model)),None,self.collector_config.clone(),)?,- Err(_) => RankingPipeline::reranking_for_query(+ Err(_) => RankingPipeline::reranking_for_query::<CrossEncoderModel>(&mut search_query,- Arc::new(DummyCrossEncoder {}),+ None,None,self.collector_config.clone(),)?,