web search done right
Ability to turn off QA model in config
Mikkel Denker650e4b62011c
diff --git a/configs/frontend.toml b/configs/frontend.tomlindex 7cd0d2c2..676fd6b2 100644--- a/configs/frontend.toml+++ b/configs/frontend.toml@@ -2,6 +2,6 @@ queries_csv_path = "data/queries_us.csv"host = "0.0.0.0:3000"search_servers = [["0.0.0.0:3001"]]crossencoder_model_path = "data/cross_encoder"-qa_model_path = "data/qa_model"+# qa_model_path = "data/qa_model"bangs_path = "data/bangs.json"summarizer_path = "data/summarizer"\ No newline at end of filediff --git a/core/src/api/mod.rs b/core/src/api/mod.rsindex 4b19a26a..b3f84ca6 100644--- a/core/src/api/mod.rs+++ b/core/src/api/mod.rs@@ -83,7 +83,7 @@ pub async fn favicon() -> impl IntoResponse {pub fn router(queries_csv_path: &str,crossencoder_model_path: &str,- qa_model_path: &str,+ qa_model_path: &Option<String>,bangs_path: &str,summarizer_path: &str,shards: Vec<Vec<String>>,@@ -96,7 +96,12 @@ pub fn router(let autosuggest = Autosuggest::load_csv(queries_csv_path)?;let crossencoder = CrossEncoderModel::open(crossencoder_model_path)?;- let qa_model = QaModel::open(qa_model_path)?;++ let qa_model = match qa_model_path {+ Some(path) => Some(QaModel::open(path)?),+ None => None,+ };+let bangs = Bangs::from_path(bangs_path);let searcher = DistributedSearcher::new(shards, crossencoder, qa_model, bangs);diff --git a/core/src/lib.rs b/core/src/lib.rsindex a03716b8..3868797c 100644--- a/core/src/lib.rs+++ b/core/src/lib.rs@@ -162,7 +162,7 @@ pub struct FrontendConfig {pub queries_csv_path: String,pub host: String,pub crossencoder_model_path: String,- pub qa_model_path: String,+ pub qa_model_path: Option<String>,pub bangs_path: String,pub summarizer_path: String,pub search_servers: Vec<Vec<String>>,diff --git a/core/src/searcher/distributed.rs b/core/src/searcher/distributed.rsindex 7e25dd6d..9fa34d26 100644--- a/core/src/searcher/distributed.rs+++ b/core/src/searcher/distributed.rs@@ -235,7 +235,7 @@ pub enum Request {pub struct DistributedSearcher {shards: Vec<Shard>,cross_encoder: Arc<CrossEncoderModel>,- qa_model: Arc<QaModel>,+ qa_model: Option<Arc<QaModel>>,bangs: Bangs,}@@ -273,13 +273,13 @@ impl DistributedSearcher {pub fn new(shards: Vec<Shard>,model: CrossEncoderModel,- qa_model: QaModel,+ qa_model: Option<QaModel>,bangs: Bangs,) -> Self {Self {shards,cross_encoder: Arc::new(model),- qa_model: Arc::new(qa_model),+ qa_model: qa_model.map(Arc::new),bangs,}}@@ -588,26 +588,31 @@ impl DistributedSearcher {}fn answer(&self, query: &str, webpages: &mut Vec<DisplayedWebpage>) -> Option<DisplayedAnswer> {- let contexts: Vec<_> = webpages- .iter()- .take(1)- .map(|webpage| webpage.body.as_str())- .collect();-- match self.qa_model.run(query, &contexts) {- Some(answer) => {- let answer_webpage = webpages.remove(answer.context_idx);- Some(DisplayedAnswer {- title: answer_webpage.title,- url: answer_webpage.url,- pretty_url: answer_webpage.pretty_url,- snippet: generate_answer_snippet(&answer_webpage.body, answer.offset.clone()),- answer: answer_webpage.body[answer.offset].to_string(),- body: answer_webpage.body,- })+ self.qa_model.as_ref().and_then(|qa_model| {+ let contexts: Vec<_> = webpages+ .iter()+ .take(1)+ .map(|webpage| webpage.body.as_str())+ .collect();++ match qa_model.run(query, &contexts) {+ Some(answer) => {+ let answer_webpage = webpages.remove(answer.context_idx);+ Some(DisplayedAnswer {+ title: answer_webpage.title,+ url: answer_webpage.url,+ pretty_url: answer_webpage.pretty_url,+ snippet: generate_answer_snippet(+ &answer_webpage.body,+ answer.offset.clone(),+ ),+ answer: answer_webpage.body[answer.offset].to_string(),+ body: answer_webpage.body,+ })+ }+ None => None,}- None => None,- }+ })}pub(crate) async fn get_webpage(&self, url: &str) -> Result<RetrievedWebpage> {