Merge branch 'main' into stateless

This commit is contained in:
khorshuheng 2024-12-26 11:55:52 +08:00
commit 824d60920d
3 changed files with 7 additions and 4 deletions

View File

@ -487,14 +487,17 @@ fn process_collab(
metrics: &EmbeddingMetrics, metrics: &EmbeddingMetrics,
) -> Result<Option<(u32, Vec<AFCollabEmbeddedChunk>)>, AppError> { ) -> Result<Option<(u32, Vec<AFCollabEmbeddedChunk>)>, AppError> {
if let Some(indexer) = indexer { if let Some(indexer) = indexer {
metrics.record_embed_count(1);
let chunks = match data { let chunks = match data {
UnindexedData::Text(text) => { UnindexedData::Text(text) => {
indexer.create_embedded_chunks_from_text(object_id.to_string(), text, embedder.model())? indexer.create_embedded_chunks_from_text(object_id.to_string(), text, embedder.model())?
}, },
}; };
if chunks.is_empty() {
return Ok(None);
}
metrics.record_embed_count(1);
let result = indexer.embed(embedder, chunks); let result = indexer.embed(embedder, chunks);
match result { match result {
Ok(Some(embeddings)) => Ok(Some((embeddings.tokens_consumed, embeddings.params))), Ok(Some(embeddings)) => Ok(Some((embeddings.tokens_consumed, embeddings.params))),

View File

@ -129,7 +129,7 @@ pub async fn create_app(listener: TcpListener, config: Config) -> Result<(), Err
let threads = Arc::new( let threads = Arc::new(
ThreadPoolNoAbortBuilder::new() ThreadPoolNoAbortBuilder::new()
.num_threads(20) .num_threads(30)
.thread_name(|index| format!("background-embedding-thread-{index}")) .thread_name(|index| format!("background-embedding-thread-{index}"))
.build() .build()
.unwrap(), .unwrap(),

View File

@ -1464,7 +1464,7 @@ async fn update_collab_handler(
); );
state state
.indexer_scheduler .indexer_scheduler
.index_pending_collab_one(pending, false)?; .index_pending_collab_one(pending, true)?;
} }
}, },
_ => { _ => {