Skip to content

web search done right

add a 'fetchSidebar' api parameter that defaults to false. this will speedup api searches that does not need sidebar response

Mikkel Denker601037542520
diff --git a/core/src/alice/mod.rs b/core/src/alice/mod.rs
index 9b70462f..1a6608ba 100644
--- a/core/src/alice/mod.rs
+++ b/core/src/alice/mod.rs
@@ -181,6 +181,7 @@ impl Searcher {
flatten_response: false,
safe_search: Some(false),
fetch_discussions: false,
+ fetch_sidebar: false,
count_results: false,
};
tracing::debug!("searching at {:?}: {:#?}", self.url, query);
diff --git a/core/src/api/search.rs b/core/src/api/search.rs
index 1b689308..aa853e9b 100644
--- a/core/src/api/search.rs
+++ b/core/src/api/search.rs
@@ -54,6 +54,9 @@ pub struct ApiSearchQuery {
#[serde(default = "defaults::SearchQuery::fetch_discussions")]
pub fetch_discussions: bool,
+ #[serde(default = "defaults::SearchQuery::fetch_sidebar")]
+ pub fetch_sidebar: bool,
+
#[serde(default = "defaults::SearchQuery::count_results")]
pub count_results: bool,
}
@@ -80,6 +83,7 @@ impl TryFrom<ApiSearchQuery> for SearchQuery {
return_ranking_signals: api.return_ranking_signals,
safe_search: api.safe_search.unwrap_or(default.safe_search),
fetch_discussions: api.fetch_discussions,
+ fetch_sidebar: api.fetch_sidebar,
count_results: api.count_results,
})
}
diff --git a/core/src/config/defaults.rs b/core/src/config/defaults.rs
index 0d66c3a9..a15ef45b 100644
--- a/core/src/config/defaults.rs
+++ b/core/src/config/defaults.rs
@@ -133,6 +133,10 @@ impl SearchQuery {
false
}
+ pub fn fetch_sidebar() -> bool {
+ false
+ }
+
pub fn count_results() -> bool {
false
}
diff --git a/core/src/ranking/pipeline.rs b/core/src/ranking/pipeline.rs
index 7b328780..fbd3830e 100644
--- a/core/src/ranking/pipeline.rs
+++ b/core/src/ranking/pipeline.rs
@@ -138,7 +138,7 @@ impl RankingWebsite {
}
}
-trait Scorer<T: AsRankingWebsite>: Send + Sync {
+trait Scorer<T>: Send + Sync {
fn score(&self, websites: &mut [T]);
fn set_query_info(&mut self, _query: &SearchQuery) {}
}
@@ -287,7 +287,7 @@ impl<T: AsRankingWebsite> Scorer<T> for Initial {
}
}
-struct RankingStage<T: AsRankingWebsite> {
+struct RankingStage<T> {
scorer: Box<dyn Scorer<T>>,
stage_top_n: usize,
derank_similar: bool,
@@ -332,7 +332,7 @@ impl<T: AsRankingWebsite> RankingStage<T> {
}
}
-pub struct RankingPipeline<T: AsRankingWebsite> {
+pub struct RankingPipeline<T> {
stage: RankingStage<T>,
page: usize,
pub top_n: usize,
diff --git a/core/src/searcher/api/mod.rs b/core/src/searcher/api/mod.rs
index 4f922093..168aec9f 100644
--- a/core/src/searcher/api/mod.rs
+++ b/core/src/searcher/api/mod.rs
@@ -371,9 +371,12 @@ where
let discussions = discussions?;
let stackoverflow = stackoverflow?;
- let sidebar = self
- .sidebar_manager
- .sidebar(&initial_results, stackoverflow);
+ let sidebar = if query.fetch_sidebar {
+ self.sidebar_manager
+ .sidebar(&initial_results, stackoverflow)
+ } else {
+ None
+ };
let spell_corrected_query = if widget.is_none() {
self.spell_checker
diff --git a/core/src/searcher/api/sidebar.rs b/core/src/searcher/api/sidebar.rs
index bc138c76..ebc86492 100644
--- a/core/src/searcher/api/sidebar.rs
+++ b/core/src/searcher/api/sidebar.rs
@@ -42,6 +42,10 @@ where
}
pub async fn stackoverflow(&self, query: &SearchQuery) -> Result<Option<DisplayedSidebar>> {
+ if !query.fetch_sidebar {
+ return Ok(None);
+ }
+
let query = SearchQuery {
query: query.query.clone(),
num_results: 1,
diff --git a/core/src/searcher/mod.rs b/core/src/searcher/mod.rs
index 283c0ee6..b9897445 100644
--- a/core/src/searcher/mod.rs
+++ b/core/src/searcher/mod.rs
@@ -70,6 +70,7 @@ pub struct SearchQuery {
pub return_ranking_signals: bool,
pub safe_search: bool,
pub fetch_discussions: bool,
+ pub fetch_sidebar: bool,
pub count_results: bool,
}
@@ -96,6 +97,7 @@ impl Default for SearchQuery {
return_ranking_signals: defaults::SearchQuery::return_ranking_signals(),
safe_search: defaults::SearchQuery::safe_search(),
fetch_discussions: defaults::SearchQuery::fetch_discussions(),
+ fetch_sidebar: defaults::SearchQuery::fetch_sidebar(),
count_results: defaults::SearchQuery::count_results(),
}
}
diff --git a/frontend/src/lib/api/index.ts b/frontend/src/lib/api/index.ts
index 28e23233..f576974a 100644
--- a/frontend/src/lib/api/index.ts
+++ b/frontend/src/lib/api/index.ts
@@ -185,6 +185,7 @@ export const api = {
export type ApiSearchQuery = {
countResults?: boolean;
fetchDiscussions?: boolean;
+ fetchSidebar?: boolean;
flattenResponse?: boolean;
hostRankings?: HostRankings;
numResults?: number;
diff --git a/frontend/src/routes/search/+page.server.ts b/frontend/src/routes/search/+page.server.ts
index c670feef..a2b6426c 100644
--- a/frontend/src/routes/search/+page.server.ts
+++ b/frontend/src/routes/search/+page.server.ts
@@ -32,6 +32,7 @@ export const load = async ({ locals, fetch, url, getClientAddress }) => {
selectedRegion: params.selectedRegion,
hostRankings: params.host_rankings,
fetchDiscussions: true,
+ fetchSidebar: true,
countResults: true,
},
{ fetch, headers: { 'X-Forwarded-For': getClientAddress() } },