From b68cd58a3b9ac1aa4a13955bae4a8c2fc08ce279 Mon Sep 17 00:00:00 2001 From: KCaverly Date: Tue, 11 Jul 2023 19:54:03 -0400 Subject: [PATCH] updated vector store settings to remove batch embeddings size --- assets/settings/default.json | 5 ++--- crates/vector_store/src/vector_store.rs | 6 +++--- crates/vector_store/src/vector_store_settings.rs | 6 ++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/assets/settings/default.json b/assets/settings/default.json index cf8f630dfbd7d0766b2aafa8e99ed3b5be007958..1f8d12a3d9db82a87ca1788fe8369dbfb42b7596 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -293,9 +293,8 @@ }, // Difference settings for vector_store "vector_store": { - "enable": false, - "reindexing_delay_seconds": 600, - "embedding_batch_size": 150 + "enabled": false, + "reindexing_delay_seconds": 600 }, // Different settings for specific languages. "languages": { diff --git a/crates/vector_store/src/vector_store.rs b/crates/vector_store/src/vector_store.rs index 87e70230ee56baa4d7dce9ea95f2c7e47e33fdba..0a197bc40663034d4156cf025c731449cef725c7 100644 --- a/crates/vector_store/src/vector_store.rs +++ b/crates/vector_store/src/vector_store.rs @@ -37,6 +37,7 @@ use util::{ use workspace::{Workspace, WorkspaceCreated}; const VECTOR_STORE_VERSION: usize = 0; +const EMBEDDINGS_BATCH_SIZE: usize = 150; pub fn init( fs: Arc, @@ -70,7 +71,7 @@ pub fn init( ); if *RELEASE_CHANNEL == ReleaseChannel::Stable - || !settings::get::(cx).enable + || !settings::get::(cx).enabled { return; } @@ -353,7 +354,6 @@ impl VectorStore { }); // batch_tx/rx: Batch Files to Send for Embeddings - let batch_size = settings::get::(cx).embedding_batch_size; let (batch_files_tx, batch_files_rx) = channel::unbounded::(); let _batch_files_task = cx.background().spawn(async move { let mut queue_len = 0; @@ -368,7 +368,7 @@ impl VectorStore { } => { queue_len += &document_spans.len(); embeddings_queue.push((worktree_id, parsed_file, document_spans)); - queue_len >= batch_size + queue_len >= EMBEDDINGS_BATCH_SIZE } EmbeddingJob::Flush => true, }; diff --git a/crates/vector_store/src/vector_store_settings.rs b/crates/vector_store/src/vector_store_settings.rs index 0bde07dd65159f9966b3e326d4fea208b563bd03..e1fa7cc05a362829fae1a361097740d04b115b6c 100644 --- a/crates/vector_store/src/vector_store_settings.rs +++ b/crates/vector_store/src/vector_store_settings.rs @@ -5,16 +5,14 @@ use settings::Setting; #[derive(Deserialize, Debug)] pub struct VectorStoreSettings { - pub enable: bool, + pub enabled: bool, pub reindexing_delay_seconds: usize, - pub embedding_batch_size: usize, } #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)] pub struct VectorStoreSettingsContent { - pub enable: Option, + pub enabled: Option, pub reindexing_delay_seconds: Option, - pub embedding_batch_size: Option, } impl Setting for VectorStoreSettings {