web search done right
remove ranking signal from optics and add to api instead this will simplify optic merging and make it easier to allow more than 1 optic to be applied to a search
Mikkel Denkerea1c517da475
diff --git a/crates/core/src/api/explore.rs b/crates/core/src/api/explore.rsindex 979e4516..8076c75e 100644--- a/crates/core/src/api/explore.rs+++ b/crates/core/src/api/explore.rs@@ -66,7 +66,6 @@ pub async fn explore_export_optic(},rules: vec![rule],discard_non_matching: true,- ..Default::default()};Ok(optic.to_string())diff --git a/crates/core/src/api/search.rs b/crates/core/src/api/search.rsindex 07e9ac7c..82db135c 100644--- a/crates/core/src/api/search.rs+++ b/crates/core/src/api/search.rs@@ -14,10 +14,14 @@// You should have received a copy of the GNU Affero General Public License// along with this program. If not, see <https://www.gnu.org/licenses/>.-use crate::config::defaults;+use crate::{+ config::defaults,+ enum_map::EnumMap,+ ranking::{SignalCoefficient, SignalEnum, SignalEnumDiscriminants},+};use http::StatusCode;use optics::{HostRankings, Optic};-use std::sync::Arc;+use std::{collections::HashMap, sync::Arc};use utoipa::ToSchema;use axum::Json;@@ -63,6 +67,8 @@ pub struct ApiSearchQuery {pub host_rankings: Option<HostRankings>,pub safe_search: Option<bool>,+ pub signal_coefficients: Option<HashMap<SignalEnumDiscriminants, f64>>,+#[serde(default = "defaults::SearchQuery::return_ranking_signals")]pub return_ranking_signals: bool,@@ -89,6 +95,15 @@ impl TryFrom<ApiSearchQuery> for SearchQuery {None};+ let signal_coefficients: Option<SignalCoefficient> =+ api.signal_coefficients.map(|coefficients| {+ coefficients+ .into_iter()+ .map(|(signal, coefficient)| (signal.into(), coefficient))+ .collect::<EnumMap<SignalEnum, f64>>()+ .into()+ });+let default = SearchQuery::default();Ok(SearchQuery {@@ -101,6 +116,7 @@ impl TryFrom<ApiSearchQuery> for SearchQuery {return_ranking_signals: api.return_ranking_signals,safe_search: api.safe_search.unwrap_or(default.safe_search),count_results_exact: api.count_results_exact,+ signal_coefficients: signal_coefficients.unwrap_or(default.signal_coefficients),#[cfg(feature = "return_body")]return_body: api.return_body,#[cfg(not(feature = "return_body"))]diff --git a/crates/core/src/enum_map.rs b/crates/core/src/enum_map.rsindex 28998a27..9b64364c 100644--- a/crates/core/src/enum_map.rs+++ b/crates/core/src/enum_map.rs@@ -14,6 +14,17 @@// You should have received a copy of the GNU Affero General Public License// along with this program. If not, see <https://www.gnu.org/licenses/>.+#[macro_export]+macro_rules! enum_map {+ [$($key:expr => $value:expr),+ $(,)?] => {{+ let mut map = $crate::enum_map::EnumMap::new();+ $(+ map.insert($key, $value);+ )++ map+ }};+}+pub trait InsertEnumMapKey: Sized {fn into_usize(self) -> usize;}@@ -170,6 +181,8 @@ impl<K: InsertEnumMapKey + GetEnumMapKey> EnumSet<K> {#[cfg(test)]mod tests {+ use crate::enum_map;+use super::*;#[derive(Debug, PartialEq, Eq, Clone, Copy)]@@ -187,10 +200,11 @@ mod tests {#[test]fn test_enum_map() {- let mut map = EnumMap::new();- map.insert(TestEnum::A, TestEnum::B);- map.insert(TestEnum::B, TestEnum::C);- map.insert(TestEnum::C, TestEnum::A);+ let map = enum_map! {+ TestEnum::A => TestEnum::B,+ TestEnum::B => TestEnum::C,+ TestEnum::C => TestEnum::A,+ };assert_eq!(map.get(TestEnum::A), Some(&TestEnum::B));assert_eq!(map.get(TestEnum::B), Some(&TestEnum::C));diff --git a/crates/core/src/query/mod.rs b/crates/core/src/query/mod.rsindex 4450b2f9..b79baf56 100644--- a/crates/core/src/query/mod.rs+++ b/crates/core/src/query/mod.rs@@ -53,6 +53,7 @@ pub struct Query {optics: Vec<Optic>,top_n: usize,count_results_exact: bool,+ signal_coefficients: SignalCoefficient,}impl Clone for Query {@@ -66,6 +67,7 @@ impl Clone for Query {optics: self.optics.clone(),top_n: self.top_n,count_results_exact: self.count_results_exact,+ signal_coefficients: self.signal_coefficients.clone(),}}}@@ -143,6 +145,7 @@ impl Query {region: query.selected_region,top_n: query.num_results,count_results_exact: query.count_results_exact,+ signal_coefficients: query.signal_coefficients(),})}@@ -174,22 +177,8 @@ impl Query {&self.host_rankings}- pub fn signal_coefficients(&self) -> Option<SignalCoefficient> {- // TODO: we should make sure taht `SearchQuery::signal_coefficients`- // return the same coefficients as the ones we calculate here- if self.optics.is_empty() {- return None;- }-- Some(- self.optics- .iter()- .fold(SignalCoefficient::default(), |mut acc, optic| {- let coeffs = SignalCoefficient::from_optic(optic);- acc.merge_add(coeffs);- acc- }),- )+ pub fn signal_coefficients(&self) -> SignalCoefficient {+ self.signal_coefficients.clone()}}diff --git a/crates/core/src/query/optic.rs b/crates/core/src/query/optic.rsindex e4be7350..1fd60de8 100644--- a/crates/core/src/query/optic.rs+++ b/crates/core/src/query/optic.rs@@ -274,14 +274,11 @@ impl AsTantivyQuery for Matching {#[cfg(test)]mod tests {- use optics::{- ast::{RankingCoeff, RankingTarget},- HostRankings, Optic,- };+ use optics::{HostRankings, Optic};use crate::{bangs::Bangs,- gen_temp_path,+ enum_map, gen_temp_path,index::Index,searcher::{api::{ApiSearcher, Config},@@ -354,13 +351,10 @@ mod tests {let res = searcher.search(&SearchQuery {query: "website".to_string(),- optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("host_centrality".to_string()),- value: 1_000_000.0,- }],- ..Default::default()- }),+ signal_coefficients: enum_map!{+ crate::ranking::SignalEnum::from(crate::ranking::signal::Bm25Title) => 1_000_000.0++ }.into(),..Default::default()}).unwrap()@@ -759,11 +753,11 @@ mod tests {let res = searcher.search(&SearchQuery {query: "website".to_string(),+ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::InboundSimilarity) => 100_000.0+ }.into(),+optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("inbound_similarity".to_string()),- value: 100_000.0,- }],host_rankings: HostRankings {liked: vec!["www.a.com".to_string(), "www.b.com".to_string()],disliked: vec!["www.c.com".to_string()],diff --git a/crates/core/src/ranking/mod.rs b/crates/core/src/ranking/mod.rsindex 506b42fc..adb0d1a6 100644--- a/crates/core/src/ranking/mod.rs+++ b/crates/core/src/ranking/mod.rs@@ -123,11 +123,6 @@ mod tests {use std::path::Path;- use optics::{- ast::{RankingCoeff, RankingTarget},- Optic,- };-use crate::{config::{IndexingDualEncoderConfig, IndexingLocalConfig, WarcSource},entrypoint::indexer::IndexingWorker,@@ -334,13 +329,9 @@ mod tests {.search(&SearchQuery {query: "title".to_string(),return_ranking_signals: true,- optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("update_timestamp".to_string()),- value: 1_000_000.0,- }],- ..Default::default()- }),+ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::UpdateTimestamp) => 100_000.0,+ }.into(),..Default::default()}).expect("Search failed");@@ -556,15 +547,12 @@ mod tests {let res = searcher.search(&SearchQuery {query: "example".to_string(),- optic: Some(- Optic::parse(- r#"- Ranking(Signal("bm25_title"), 20000000);- Ranking(Signal("host_centrality"), 0);- "#,- )- .unwrap(),- ),++ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::Bm25Title) => 20_000_000.0,+ crate::ranking::SignalEnum::from(crate::ranking::signal::HostCentrality) => 0.0,+ }.into(),+..Default::default()}).unwrap();@@ -575,14 +563,11 @@ mod tests {let res = searcher.search(&SearchQuery {query: "example".to_string(),- optic: Some(- Optic::parse(- r#"- Ranking(Signal("host_centrality"), 2000000)- "#,- )- .unwrap(),- ),++ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::HostCentrality) => 2_000_000.0,+ }.into(),+..Default::default()}).unwrap();@@ -648,13 +633,9 @@ mod tests {let result = searcher.search(&SearchQuery {query: "test".to_string(),- optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("fetch_time_ms".to_string()),- value: 100_000.0,- }],- ..Default::default()- }),+ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::FetchTimeMs) => 100_000.0,+ }.into(),..Default::default()}).expect("Search failed");@@ -745,19 +726,12 @@ mod tests {let result = searcher.search(&SearchQuery {query: "test".to_string(),- optic: Some(Optic {- rankings: vec![- RankingCoeff {- target: RankingTarget::Signal("url_slashes".to_string()),- value: 100_000.0,- },- RankingCoeff {- target: RankingTarget::Signal("url_digits".to_string()),- value: 100_000.0,- },- ],- ..Default::default()- }),++ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::UrlSlashes) => 100_000.0,+ crate::ranking::SignalEnum::from(crate::ranking::signal::UrlDigits) => 100_000.0,+ }.into(),+..Default::default()}).expect("Search failed");@@ -859,13 +833,11 @@ mod tests {let result = searcher.search(&SearchQuery {query: "best chocolate cake".to_string(),- optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("title_embedding_similarity".to_string()),- value: 100_000.0,- }],- ..Default::default()- }),++ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::TitleEmbeddingSimilarity) => 100_000.0,+ }.into(),+..Default::default()}).expect("Search failed");@@ -949,13 +921,11 @@ mod tests {let result = searcher.search(&SearchQuery {query: "best chocolate cake".to_string(),- optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("keyword_embedding_similarity".to_string()),- value: 100_000.0,- }],- ..Default::default()- }),++ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::KeywordEmbeddingSimilarity) => 100_000.0,+ }.into(),+..Default::default()}).expect("Search failed");diff --git a/crates/core/src/ranking/optics.rs b/crates/core/src/ranking/optics.rsindex ea56c4a5..78573b79 100644--- a/crates/core/src/ranking/optics.rs+++ b/crates/core/src/ranking/optics.rs@@ -16,10 +16,7 @@#[cfg(test)]mod tests {- use optics::{- ast::{RankingCoeff, RankingTarget},- HostRankings, Optic,- };+ use optics::HostRankings;use crate::{bangs::Bangs,@@ -179,13 +176,11 @@ mod tests {disliked: vec![],blocked: vec![],}),- optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("inbound_similarity".to_string()),- value: 100_000_000.0,- }],- ..Default::default()- }),++ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::InboundSimilarity) => 100_000_000.0,+ }.into(),+..Default::default()}).await@@ -205,13 +200,11 @@ mod tests {disliked: vec!["www.second.com".to_string()],blocked: vec!["first.com".to_string()],}),- optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("inbound_similarity".to_string()),- value: 100_000_000.0,- }],- ..Default::default()- }),++ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::InboundSimilarity) => 100_000_000.0,+ }.into(),+return_ranking_signals: true,..Default::default()})@@ -231,13 +224,11 @@ mod tests {disliked: vec![],blocked: vec!["abc.first.com".to_string()],}),- optic: Some(Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("inbound_similarity".to_string()),- value: 100_000_000.0,- }],- ..Default::default()- }),++ signal_coefficients: crate::enum_map! {+ crate::ranking::SignalEnum::from(crate::ranking::signal::InboundSimilarity) => 100_000_000.0,+ }.into(),+return_ranking_signals: true,..Default::default()})diff --git a/crates/core/src/ranking/signal/computer/mod.rs b/crates/core/src/ranking/signal/computer/mod.rsindex b42fba17..ec054890 100644--- a/crates/core/src/ranking/signal/computer/mod.rs+++ b/crates/core/src/ranking/signal/computer/mod.rs@@ -131,7 +131,7 @@ impl std::fmt::Debug for SignalComputer {impl SignalComputer {pub fn new(query: Option<&Query>) -> Self {- let query_signal_coefficients = query.as_ref().and_then(|q| q.signal_coefficients());+ let query_signal_coefficients = query.as_ref().map(|q| q.signal_coefficients());let fetch_time_ms_cache: Vec<_> = (0..1000).map(|fetch_time| 1.0 / (fetch_time as f64 + 1.0))diff --git a/crates/core/src/ranking/signal/mod.rs b/crates/core/src/ranking/signal/mod.rsindex 370b4eb6..fb4d4340 100644--- a/crates/core/src/ranking/signal/mod.rs+++ b/crates/core/src/ranking/signal/mod.rs@@ -15,8 +15,6 @@// along with this program. If not, see <https://www.gnu.org/licenses/>.use crate::enum_map::EnumMap;-use optics::ast::RankingTarget;-use optics::Optic;use std::str::FromStr;@@ -49,7 +47,7 @@ impl FromStr for SignalEnumDiscriminants {}}-#[derive(Debug, Clone)]+#[derive(Debug, serde::Serialize, serde::Deserialize, bincode::Encode, bincode::Decode, Clone)]pub struct SignalCoefficient {map: EnumMap<SignalEnum, f64>,}@@ -60,6 +58,12 @@ impl Default for SignalCoefficient {}}+impl From<EnumMap<SignalEnum, f64>> for SignalCoefficient {+ fn from(map: EnumMap<SignalEnum, f64>) -> Self {+ Self { map }+ }+}+impl SignalCoefficient {pub fn get(&self, signal: &SignalEnum) -> f64 {self.map@@ -78,16 +82,6 @@ impl SignalCoefficient {Self { map }}- pub fn from_optic(optic: &Optic) -> Self {- SignalCoefficient::new(optic.rankings.iter().filter_map(|coeff| {- match &coeff.target {- RankingTarget::Signal(signal) => SignalEnumDiscriminants::from_str(signal)- .ok()- .map(|signal| (signal.into(), coeff.value)),- }- }))- }-pub fn merge_add(&mut self, coeffs: SignalCoefficient) {for signal in SignalEnum::all() {if let Some(coeff) = coeffs.map.get(signal).copied() {diff --git a/crates/core/src/searcher/mod.rs b/crates/core/src/searcher/mod.rsindex 3a5d546b..d0f34814 100644--- a/crates/core/src/searcher/mod.rs+++ b/crates/core/src/searcher/mod.rs@@ -79,6 +79,8 @@ pub struct SearchQuery {pub count_results_exact: bool,pub return_body: Option<ReturnBody>,pub return_structured_data: bool,++ pub signal_coefficients: SignalCoefficient,}#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, bincode::Encode, bincode::Decode)]@@ -105,6 +107,7 @@ impl Default for SearchQuery {count_results_exact: defaults::SearchQuery::count_results_exact(),return_body: None,return_structured_data: defaults::SearchQuery::return_structured_data(),+ signal_coefficients: Default::default(),}}}@@ -115,13 +118,7 @@ impl SearchQuery {}pub fn signal_coefficients(&self) -> SignalCoefficient {- let mut signal_coefficients = SignalCoefficient::default();-- if let Some(optic) = &self.optic {- signal_coefficients.merge_overwrite(SignalCoefficient::from_optic(optic));- }-- signal_coefficients+ self.signal_coefficients.clone()}pub fn host_rankings(&self) -> HostRankings {diff --git a/crates/optics/src/ast.rs b/crates/optics/src/ast.rsindex 507b4acb..e8c47c31 100644--- a/crates/optics/src/ast.rs+++ b/crates/optics/src/ast.rs@@ -17,7 +17,6 @@use super::Error;use super::Result as ModResult;use lalrpop_util::lalrpop_mod;-use std::fmt::Display;use super::lexer;@@ -26,39 +25,9 @@ lalrpop_mod!(pub parser, "/parser.rs");pub static PARSER: once_cell::sync::Lazy<parser::BlocksParser> =once_cell::sync::Lazy::new(parser::BlocksParser::new);-#[derive(- Debug, PartialEq, Clone, serde::Serialize, serde::Deserialize, bincode::Encode, bincode::Decode,-)]-pub enum RankingTarget {- Signal(String),-}--#[derive(- Debug, PartialEq, Clone, serde::Serialize, serde::Deserialize, bincode::Encode, bincode::Decode,-)]-pub struct RankingCoeff {- pub target: RankingTarget,- pub value: f64,-}--impl Display for RankingCoeff {- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {- write!(f, "Ranking(")?;-- match &self.target {- RankingTarget::Signal(signal) => {- write!(f, "Signal(\"{signal}\")")?;- }- }-- write!(f, ", {})", self.value)- }-}-#[derive(Debug, PartialEq)]pub struct RawOptic {pub rules: Vec<RawRule>,- pub rankings: Vec<RankingCoeff>,pub host_preferences: Vec<RawHostPreference>,pub discard_non_matching: bool,}@@ -66,13 +35,11 @@ pub struct RawOptic {impl From<Vec<RawOpticBlock>> for RawOptic {fn from(blocks: Vec<RawOpticBlock>) -> Self {let mut rules = Vec::new();- let mut rankings = Vec::new();let mut host_preferences = Vec::new();let mut discard_non_matching = false;for block in blocks {match block {- RawOpticBlock::Ranking(ranking) => rankings.push(ranking),RawOpticBlock::Rule(rule) => rules.push(rule),RawOpticBlock::HostPreference(pref) => host_preferences.push(pref),RawOpticBlock::DiscardNonMatching => discard_non_matching = true,@@ -81,7 +48,6 @@ impl From<Vec<RawOpticBlock>> for RawOptic {RawOptic {rules,- rankings,host_preferences,discard_non_matching,}@@ -92,7 +58,6 @@ impl From<Vec<RawOpticBlock>> for RawOptic {pub enum RawOpticBlock {Rule(RawRule),HostPreference(RawHostPreference),- Ranking(RankingCoeff),DiscardNonMatching,}@@ -170,9 +135,6 @@ mod tests {/*this is a block comment*/- Ranking(Signal("host_centrality"), 3);- Ranking(Signal("bm25"), 100);-Rule {Matches {Url("/this/is/a/*/pattern")@@ -206,16 +168,6 @@ mod tests {action: None,},],- rankings: vec![- RankingCoeff {- target: RankingTarget::Signal("host_centrality".to_string()),- value: 3.0,- },- RankingCoeff {- target: RankingTarget::Signal("bm25".to_string()),- value: 100.0,- },- ],host_preferences: vec![],discard_non_matching: false,}@@ -259,7 +211,6 @@ mod tests {action: Some(RawAction::Downrank(4)),},],- rankings: vec![],host_preferences: vec![],discard_non_matching: false,}@@ -304,7 +255,6 @@ mod tests {action: Some(RawAction::Downrank(4)),},],- rankings: vec![],host_preferences: vec![],discard_non_matching: true,}diff --git a/crates/optics/src/lib.rs b/crates/optics/src/lib.rsindex 21a5fd74..3db983ef 100644--- a/crates/optics/src/lib.rs+++ b/crates/optics/src/lib.rs@@ -17,7 +17,6 @@pub mod ast;mod lexer;-use ast::RankingCoeff;use itertools::Itertools;use std::fmt::Display;use thiserror::Error;@@ -101,7 +100,6 @@ impl TryFrom<RawOptic> for Optic {Ok(Self {rules,- rankings: raw.rankings,discard_non_matching: raw.discard_non_matching,host_rankings: HostRankings {liked: liked_hosts,@@ -364,7 +362,6 @@ impl Display for Action {bincode::Decode,)]pub struct Optic {- pub rankings: Vec<RankingCoeff>,pub host_rankings: HostRankings,pub rules: Vec<Rule>,pub discard_non_matching: bool,@@ -386,10 +383,6 @@ impl Display for Optic {write!(f, "{rule}")?;}- for ranking in &self.rankings {- writeln!(f, "{ranking};")?;- }-write!(f, "{}", self.host_rankings)}}@@ -579,8 +572,6 @@ impl HostRankings {#[cfg(test)]mod tests {- use crate::ast::RankingTarget;-use super::*;#[test]fn pattern_part() {@@ -609,10 +600,6 @@ mod tests {#[test]fn export() {let optic = Optic {- rankings: vec![RankingCoeff {- target: RankingTarget::Signal("bm25".to_string()),- value: 1.0,- }],host_rankings: HostRankings {liked: vec!["liked.com".to_string()],disliked: vec!["disliked.com".to_string()],diff --git a/crates/optics/src/parser.lalrpop b/crates/optics/src/parser.lalrpopindex 7ebca451..d34cddba 100644--- a/crates/optics/src/parser.lalrpop+++ b/crates/optics/src/parser.lalrpop@@ -18,7 +18,6 @@ pub Blocks: Vec<RawOpticBlock> = <Sep<";", Block>>;Block: RawOpticBlock = {<Rule> => RawOpticBlock::Rule(<>),- <Ranking> => RawOpticBlock::Ranking(<>),<HostPreference> => RawOpticBlock::HostPreference(<>),"DiscardNonMatching" => RawOpticBlock::DiscardNonMatching,}@@ -69,24 +68,6 @@ InnerAction: RawAction= {"Discard" => RawAction::Discard,}-Ranking: RankingCoeff = {- "Ranking" "(" <target:RankingTarget> "," <l:@L> <value:Number> <r:@R> ")" =>? {- match value.parse() {- Ok(value) => Ok(RankingCoeff {- target,- value- }),- Err(_) => Err(ParseError::User {- error: crate::Error::NumberParse{ token: (l, value.to_string(), r)}- })- }- }-}--RankingTarget: RankingTarget = {- "Signal" "(" <StringLiteral> ")" => RankingTarget::Signal(<>.to_string()),-}-HostPreference: RawHostPreference = {"Like" "(" "Site" "(" <StringLiteral> ")" ")" => RawHostPreference::Like(<>.to_string()),"Dislike" "(" "Site" "(" <StringLiteral> ")" ")" => RawHostPreference::Dislike(<>.to_string())@@ -106,7 +87,6 @@ extern {"DiscardNonMatching" => Token::DiscardNonMatching,"Rule" => Token::Rule,- "Ranking" => Token::Ranking,"Stage" => Token::Stage,"Signal" => Token::Signal,"Field" => Token::Field,diff --git a/crates/optics/testcases/samples b/crates/optics/testcases/samplesindex 7103bd04..fe90e01a 160000--- a/crates/optics/testcases/samples+++ b/crates/optics/testcases/samples@@ -1 +1 @@-Subproject commit 7103bd04096fc8f9729996fbf845feddea6bb7d5+Subproject commit fe90e01a4dae00a110710b40ad8ca334d38d7084