From 486ee57bf8123116a326d1433bcb1b36ff88ee67 Mon Sep 17 00:00:00 2001 From: sigoden Date: Fri, 10 Jan 2025 17:31:41 +0800 Subject: feat: discontinue `rag_min_score_*` config items (#1081) --- src/config/mod.rs | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'src/config/mod.rs') diff --git a/src/config/mod.rs b/src/config/mod.rs index ca0990a..407d041 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -123,8 +123,6 @@ pub struct Config { pub rag_top_k: usize, pub rag_chunk_size: Option, pub rag_chunk_overlap: Option, - pub rag_min_score_vector_search: f32, - pub rag_min_score_keyword_search: f32, pub rag_template: Option, #[serde(default)] @@ -197,8 +195,6 @@ impl Default for Config { rag_top_k: 5, rag_chunk_size: None, rag_chunk_overlap: None, - rag_min_score_vector_search: 0.0, - rag_min_score_keyword_search: 0.0, rag_template: None, document_loaders: Default::default(), @@ -1413,22 +1409,8 @@ impl Config { abort_signal: AbortSignal, ) -> Result { let (reranker_model, top_k) = rag.get_config(); - let (min_score_vector_search, min_score_keyword_search) = { - let config = config.read(); - ( - config.rag_min_score_vector_search, - config.rag_min_score_keyword_search, - ) - }; let (embeddings, ids) = rag - .search( - text, - top_k, - min_score_vector_search, - min_score_keyword_search, - reranker_model.as_deref(), - abort_signal, - ) + .search(text, top_k, reranker_model.as_deref(), abort_signal) .await?; let text = config.read().rag_template(&embeddings, text); rag.set_last_sources(&ids); @@ -2222,13 +2204,6 @@ impl Config { if let Some(v) = read_env_value::(&get_env_name("rag_chunk_overlap")) { self.rag_chunk_overlap = v; } - if let Some(Some(v)) = read_env_value::(&get_env_name("rag_min_score_vector_search")) { - self.rag_min_score_vector_search = v; - } - if let Some(Some(v)) = read_env_value::(&get_env_name("rag_min_score_keyword_search")) - { - self.rag_min_score_keyword_search = v; - } if let Some(v) = read_env_value::(&get_env_name("rag_template")) { self.rag_template = v; } -- cgit v1.2.3