chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: attach indexer to collab persister

This commit is contained in:
Bartosz Sypytkowski 2024-10-10 12:22:07 +02:00
parent a7713d9001
commit dfe1b5ad28
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
services/appflowy-collaborate/src/group/group_init.rs
View File

@ -1,8 +1,9 @@
use crate::error::RealtimeError; use crate::error::RealtimeError;
use crate::indexer::Indexer; use crate::indexer::{Indexer, IndexerProvider};
use crate::metrics::CollabRealtimeMetrics; use crate::metrics::CollabRealtimeMetrics;
use crate::state::RedisConnectionManager; use crate::state::RedisConnectionManager;
use anyhow::anyhow; use anyhow::anyhow;
use app_error::AppError;
use arc_swap::{ArcSwap, ArcSwapAny, ArcSwapOption}; use arc_swap::{ArcSwap, ArcSwapAny, ArcSwapOption};
use bytes::Bytes; use bytes::Bytes;
use collab::core::collab::DataSource; use collab::core::collab::DataSource;
@ -27,7 +28,9 @@ use collab_stream::model::{
use collab_stream::stream_group::StreamGroup; use collab_stream::stream_group::StreamGroup;
use dashmap::DashMap; use dashmap::DashMap;
use database::collab::{CollabStorage, GetCollabOrigin}; use database::collab::{CollabStorage, GetCollabOrigin};
use database_entity::dto::{CollabParams, InsertSnapshotParams, QueryCollabParams}; use database_entity::dto::{
AFCollabEmbeddings, CollabParams, InsertSnapshotParams, QueryCollabParams,
};
use futures::{pin_mut, Sink, Stream}; use futures::{pin_mut, Sink, Stream};
use futures_util::{SinkExt, StreamExt}; use futures_util::{SinkExt, StreamExt};
use std::collections::VecDeque; use std::collections::VecDeque;
@ -1028,7 +1031,13 @@ impl CollabPersister {
let encoded_collab = EncodedCollab::new_v1(sv, doc_state_light) let encoded_collab = EncodedCollab::new_v1(sv, doc_state_light)
.encode_to_bytes() .encode_to_bytes()
.map_err(|err| RealtimeError::Internal(err.into()))?; .map_err(|err| RealtimeError::Internal(err.into()))?;
let params = CollabParams::new(&self.object_id, self.collab_type.clone(), encoded_collab); let mut params = CollabParams::new(&self.object_id, self.collab_type.clone(), encoded_collab);
match self.embeddings(collab).await {
Ok(embeddings) => params.embeddings = embeddings,
Err(err) => tracing::warn!("failed to fetch embeddings `{}`: {}", self.object_id, err),
}
let uid = 0; //FIXME: what UID should go there? let uid = 0; //FIXME: what UID should go there?
self self
.storage .storage
@ -1046,12 +1055,23 @@ impl CollabPersister {
.collab_redis_stream .collab_redis_stream
.prune_stream(&stream_key, msg_id) .prune_stream(&stream_key, msg_id)
.await?; .await?;
let _ = lease.release().await; let _ = lease.release().await;
} }
Ok(()) Ok(())
} }
async fn embeddings(&self, collab: &Collab) -> Result<Option<AFCollabEmbeddings>, AppError> {
if let Some(indexer) = self.indexer.clone() {
let params = indexer.embedding_params(&collab)?;
let embeddings = indexer.embeddings(params).await?;
Ok(embeddings)
} else {
Ok(None)
}
}
async fn load_collab_full(&self, keep_history: bool) -> Result<Collab, RealtimeError> { async fn load_collab_full(&self, keep_history: bool) -> Result<Collab, RealtimeError> {
let params = QueryCollabParams::new( let params = QueryCollabParams::new(
self.object_id.clone(), self.object_id.clone(),