Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

chore: fix compile

Nathan4925e991660a
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_bloc.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_bloc.dart
index 4924a42c0d..602b46f97a 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_bloc.dart
@@ -435,7 +435,7 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
messageType: ChatMessageTypePB.User,
questionStreamPort: Int64(questionStream.nativePort),
answerStreamPort: Int64(answerStream!.nativePort),
- metadata: await metadataPBFromMetadata(metadata),
+ //metadata: await metadataPBFromMetadata(metadata),
);
if (format != null) {
payload.format = format.toPB();
diff --git a/frontend/rust-lib/flowy-ai-pub/src/cloud.rs b/frontend/rust-lib/flowy-ai-pub/src/cloud.rs
index b91021142e..2292e0f332 100644
--- a/frontend/rust-lib/flowy-ai-pub/src/cloud.rs
+++ b/frontend/rust-lib/flowy-ai-pub/src/cloud.rs
@@ -6,8 +6,8 @@ pub use client_api::entity::ai_dto::{
};
pub use client_api::entity::billing_dto::SubscriptionPlan;
pub use client_api::entity::chat_dto::{
- ChatMessage, ChatMessageMetadata, ChatMessageType, ChatRAGData, ChatSettings, ContextLoader,
- MessageCursor, RepeatedChatMessage, UpdateChatParams,
+ ChatMessage, ChatMessageType, ChatRAGData, ChatSettings, ContextLoader, MessageCursor,
+ RepeatedChatMessage, UpdateChatParams,
};
pub use client_api::entity::QuestionStreamValue;
pub use client_api::entity::*;
diff --git a/frontend/rust-lib/flowy-ai/src/chat.rs b/frontend/rust-lib/flowy-ai/src/chat.rs
index ba5ff431e9..3180227ed0 100644
--- a/frontend/rust-lib/flowy-ai/src/chat.rs
+++ b/frontend/rust-lib/flowy-ai/src/chat.rs
@@ -76,11 +76,10 @@ impl Chat {
preferred_ai_model: Option<AIModel>,
) -> Result<ChatMessagePB, FlowyError> {
trace!(
- "[Chat] stream chat message: chat_id={}, message={}, message_type={:?}, metadata={:?}, format={:?}",
+ "[Chat] stream chat message: chat_id={}, message={}, message_type={:?}, format={:?}",
self.chat_id,
params.message,
params.message_type,
- params.metadata,
params.format,
);
@@ -116,14 +115,6 @@ impl Chat {
.send(StreamMessage::MessageId(question.message_id).to_string())
.await;
- if let Err(err) = self
- .chat_service
- .index_message_metadata(&self.chat_id, &params.metadata, &mut question_sink)
- .await
- {
- error!("Failed to index file: {}", err);
- }
-
// Save message to disk
notify_message(&self.chat_id, question.clone())?;
let format = params.format.clone().map(Into::into).unwrap_or_default();
diff --git a/frontend/rust-lib/flowy-ai/src/entities.rs b/frontend/rust-lib/flowy-ai/src/entities.rs
index b62899eca3..5a4aecbbd7 100644
--- a/frontend/rust-lib/flowy-ai/src/entities.rs
+++ b/frontend/rust-lib/flowy-ai/src/entities.rs
@@ -2,9 +2,8 @@ use crate::local_ai::controller::LocalAISetting;
use crate::local_ai::resource::PendingResource;
use af_plugin::core::plugin::RunningState;
use flowy_ai_pub::cloud::{
- AIModel, ChatMessage, ChatMessageMetadata, ChatMessageType, CompletionMessage, LLMModel,
- OutputContent, OutputLayout, RelatedQuestion, RepeatedChatMessage, RepeatedRelatedQuestion,
- ResponseFormat,
+ AIModel, ChatMessage, ChatMessageType, CompletionMessage, LLMModel, OutputContent, OutputLayout,
+ RelatedQuestion, RepeatedChatMessage, RepeatedRelatedQuestion, ResponseFormat,
};
use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
use lib_infra::validator_fn::required_not_empty_str;
@@ -71,9 +70,6 @@ pub struct StreamChatPayloadPB {
#[pb(index = 6, one_of)]
pub format: Option<PredefinedFormatPB>,
-
- #[pb(index = 7)]
- pub metadata: Vec<ChatMessageMetaPB>,
}
#[derive(Default, Debug)]
@@ -84,7 +80,6 @@ pub struct StreamMessageParams {
pub answer_stream_port: i64,
pub question_stream_port: i64,
pub format: Option<PredefinedFormatPB>,
- pub metadata: Vec<ChatMessageMetadata>,
}
#[derive(Default, ProtoBuf, Validate, Clone, Debug)]
diff --git a/frontend/rust-lib/flowy-ai/src/event_handler.rs b/frontend/rust-lib/flowy-ai/src/event_handler.rs
index 6788685102..85f2dc8306 100644
--- a/frontend/rust-lib/flowy-ai/src/event_handler.rs
+++ b/frontend/rust-lib/flowy-ai/src/event_handler.rs
@@ -2,16 +2,13 @@ use crate::ai_manager::{AIManager, GLOBAL_ACTIVE_MODEL_KEY};
use crate::completion::AICompletion;
use crate::entities::*;
use crate::util::ai_available_models_key;
-use flowy_ai_pub::cloud::{
- AIModel, ChatMessageMetadata, ChatMessageType, ChatRAGData, ContextLoader,
-};
+use flowy_ai_pub::cloud::{AIModel, ChatMessageType};
use flowy_error::{ErrorCode, FlowyError, FlowyResult};
use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};
use std::fs;
use std::path::PathBuf;
use std::str::FromStr;
use std::sync::{Arc, Weak};
-use tracing::trace;
use uuid::Uuid;
use validator::Validate;
@@ -37,7 +34,6 @@ pub(crate) async fn stream_chat_message_handler(
answer_stream_port,
question_stream_port,
format,
- metadata,
} = data;
let message_type = match message_type {
@@ -45,32 +41,6 @@ pub(crate) async fn stream_chat_message_handler(
ChatMessageTypePB::User => ChatMessageType::User,
};
- let metadata = metadata
- .into_iter()
- .map(|metadata| {
- let (content_type, content_len) = match metadata.loader_type {
- ContextLoaderTypePB::Txt => (ContextLoader::Text, metadata.data.len()),
- ContextLoaderTypePB::Markdown => (ContextLoader::Markdown, metadata.data.len()),
- ContextLoaderTypePB::PDF => (ContextLoader::PDF, 0),
- ContextLoaderTypePB::UnknownLoaderType => (ContextLoader::Unknown, 0),
- };
-
- ChatMessageMetadata {
- data: ChatRAGData {
- content: metadata.data,
- content_type,
- size: content_len as i64,
- },
- id: metadata.id,
- name: metadata.name.clone(),
- source: metadata.source,
- extra: None,
- }
- })
- .collect::<Vec<_>>();
-
- trace!("Stream chat message with metadata: {:?}", metadata);
-
let chat_id = Uuid::from_str(&chat_id)?;
let params = StreamMessageParams {
chat_id,
@@ -79,7 +49,6 @@ pub(crate) async fn stream_chat_message_handler(
answer_stream_port,
question_stream_port,
format,
- metadata,
};
let ai_manager = upgrade_ai_manager(ai_manager)?;
diff --git a/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs b/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs
index 3c4ccb1f9d..b9dc7a73c1 100644
--- a/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs
+++ b/frontend/rust-lib/flowy-ai/src/local_ai/controller.rs
@@ -6,7 +6,6 @@ use crate::notification::{
};
use af_plugin::manager::PluginManager;
use anyhow::Error;
-use flowy_ai_pub::cloud::{ChatMessageMetadata, ContextLoader};
use flowy_error::{FlowyError, FlowyResult};
use flowy_sqlite::kv::KVStorePreferences;
use futures::Sink;
@@ -21,9 +20,8 @@ use arc_swap::ArcSwapOption;
use futures_util::SinkExt;
use lib_infra::util::get_operating_system;
use serde::{Deserialize, Serialize};
-use serde_json::json;
use std::ops::Deref;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
use std::sync::{Arc, Weak};
use tokio::select;
use tokio_stream::StreamExt;
@@ -383,58 +381,59 @@ impl LocalAIController {
Ok(enabled)
}
- #[instrument(level = "debug", skip_all)]
- pub async fn index_message_metadata(
- &self,
- chat_id: &Uuid,
- metadata_list: &[ChatMessageMetadata],
- index_process_sink: &mut (impl Sink<String> + Unpin),
- ) -> FlowyResult<()> {
- if !self.is_enabled() {
- info!("[AI Plugin] local ai is disabled, skip indexing");
- return Ok(());
- }
-
- for metadata in metadata_list {
- let mut file_metadata = HashMap::new();
- file_metadata.insert("id".to_string(), json!(&metadata.id));
- file_metadata.insert("name".to_string(), json!(&metadata.name));
- file_metadata.insert("source".to_string(), json!(&metadata.source));
-
- let file_path = Path::new(&metadata.data.content);
- if !file_path.exists() {
- return Err(
- FlowyError::record_not_found().with_context(format!("File not found: {:?}", file_path)),
- );
- }
- info!(
- "[AI Plugin] embed file: {:?}, with metadata: {:?}",
- file_path, file_metadata
- );
-
- match &metadata.data.content_type {
- ContextLoader::Unknown => {
- error!(
- "[AI Plugin] unsupported content type: {:?}",
- metadata.data.content_type
- );
- },
- ContextLoader::Text | ContextLoader::Markdown | ContextLoader::PDF => {
- self
- .process_index_file(
- chat_id,
- file_path.to_path_buf(),
- &file_metadata,
- index_process_sink,
- )
- .await?;
- },
- }
- }
-
- Ok(())
- }
-
+ // #[instrument(level = "debug", skip_all)]
+ // pub async fn index_message_metadata(
+ // &self,
+ // chat_id: &Uuid,
+ // metadata_list: &[ChatMessageMetadata],
+ // index_process_sink: &mut (impl Sink<String> + Unpin),
+ // ) -> FlowyResult<()> {
+ // if !self.is_enabled() {
+ // info!("[AI Plugin] local ai is disabled, skip indexing");
+ // return Ok(());
+ // }
+ //
+ // for metadata in metadata_list {
+ // let mut file_metadata = HashMap::new();
+ // file_metadata.insert("id".to_string(), json!(&metadata.id));
+ // file_metadata.insert("name".to_string(), json!(&metadata.name));
+ // file_metadata.insert("source".to_string(), json!(&metadata.source));
+ //
+ // let file_path = Path::new(&metadata.data.content);
+ // if !file_path.exists() {
+ // return Err(
+ // FlowyError::record_not_found().with_context(format!("File not found: {:?}", file_path)),
+ // );
+ // }
+ // info!(
+ // "[AI Plugin] embed file: {:?}, with metadata: {:?}",
+ // file_path, file_metadata
+ // );
+ //
+ // match &metadata.data.content_type {
+ // ContextLoader::Unknown => {
+ // error!(
+ // "[AI Plugin] unsupported content type: {:?}",
+ // metadata.data.content_type
+ // );
+ // },
+ // ContextLoader::Text | ContextLoader::Markdown | ContextLoader::PDF => {
+ // self
+ // .process_index_file(
+ // chat_id,
+ // file_path.to_path_buf(),
+ // &file_metadata,
+ // index_process_sink,
+ // )
+ // .await?;
+ // },
+ // }
+ // }
+ //
+ // Ok(())
+ // }
+
+ #[allow(dead_code)]
async fn process_index_file(
&self,
chat_id: &Uuid,
diff --git a/frontend/rust-lib/flowy-ai/src/middleware/chat_service_mw.rs b/frontend/rust-lib/flowy-ai/src/middleware/chat_service_mw.rs
index ff5c608f22..22a2bec674 100644
--- a/frontend/rust-lib/flowy-ai/src/middleware/chat_service_mw.rs
+++ b/frontend/rust-lib/flowy-ai/src/middleware/chat_service_mw.rs
@@ -9,19 +9,17 @@ use flowy_ai_pub::persistence::select_message_content;
use std::collections::HashMap;
use flowy_ai_pub::cloud::{
- AIModel, AppErrorCode, AppResponseError, ChatCloudService, ChatMessage, ChatMessageMetadata,
- ChatMessageType, ChatSettings, CompleteTextParams, CompletionStream, MessageCursor, ModelList,
- RelatedQuestion, RepeatedChatMessage, RepeatedRelatedQuestion, ResponseFormat, StreamAnswer,
- StreamComplete, UpdateChatParams,
+ AIModel, AppErrorCode, AppResponseError, ChatCloudService, ChatMessage, ChatMessageType,
+ ChatSettings, CompleteTextParams, CompletionStream, MessageCursor, ModelList, RelatedQuestion,
+ RepeatedChatMessage, RepeatedRelatedQuestion, ResponseFormat, StreamAnswer, StreamComplete,
+ UpdateChatParams,
};
use flowy_error::{FlowyError, FlowyResult};
-use futures::{stream, Sink, StreamExt, TryStreamExt};
+use futures::{stream, StreamExt, TryStreamExt};
use lib_infra::async_trait::async_trait;
use crate::local_ai::stream_util::QuestionStream;
-use crate::stream_message::StreamMessage;
use flowy_storage_pub::storage::StorageService;
-use futures_util::SinkExt;
use serde_json::{json, Value};
use std::path::Path;
use std::sync::{Arc, Weak};
@@ -32,6 +30,7 @@ pub struct ChatServiceMiddleware {
cloud_service: Arc<dyn ChatCloudService>,
user_service: Arc<dyn AIUserService>,
local_ai: Arc<LocalAIController>,
+ #[allow(dead_code)]
storage_service: Weak<dyn StorageService>,
}
@@ -50,34 +49,6 @@ impl ChatServiceMiddleware {
}
}
- pub async fn index_message_metadata(
- &self,
- chat_id: &Uuid,
- metadata_list: &[ChatMessageMetadata],
- index_process_sink: &mut (impl Sink<String> + Unpin),
- ) -> Result<(), FlowyError> {
- if metadata_list.is_empty() {
- return Ok(());
- }
- if self.local_ai.is_enabled() {
- let _ = index_process_sink
- .send(StreamMessage::IndexStart.to_string())
- .await;
- let result = self
- .local_ai
- .index_message_metadata(chat_id, metadata_list, index_process_sink)
- .await;
- let _ = index_process_sink
- .send(StreamMessage::IndexEnd.to_string())
- .await;
-
- result?
- } else if let Some(_storage_service) = self.storage_service.upgrade() {
- //
- }
- Ok(())
- }
-
fn get_message_content(&self, message_id: i64) -> FlowyResult<String> {
let uid = self.user_service.user_id()?;
let conn = self.user_service.sqlite_connection(uid)?;
diff --git a/frontend/rust-lib/flowy-ai/src/stream_message.rs b/frontend/rust-lib/flowy-ai/src/stream_message.rs
index 3e76282aa8..3f7b37bd34 100644
--- a/frontend/rust-lib/flowy-ai/src/stream_message.rs
+++ b/frontend/rust-lib/flowy-ai/src/stream_message.rs
@@ -1,5 +1,6 @@
use std::fmt::Display;
+#[allow(dead_code)]
pub enum StreamMessage {
MessageId(i64),
IndexStart,
diff --git a/frontend/rust-lib/flowy-sqlite/src/schema.rs b/frontend/rust-lib/flowy-sqlite/src/schema.rs
index f3caa86e66..91c9aa8162 100644
--- a/frontend/rust-lib/flowy-sqlite/src/schema.rs
+++ b/frontend/rust-lib/flowy-sqlite/src/schema.rs
@@ -128,15 +128,15 @@ diesel::table! {
}
diesel::allow_tables_to_appear_in_same_query!(
- af_collab_metadata,
- chat_local_setting_table,
- chat_message_table,
- chat_table,
- collab_snapshot,
- upload_file_part,
- upload_file_table,
- user_data_migration_records,
- user_table,
- user_workspace_table,
- workspace_members_table,
+ af_collab_metadata,
+ chat_local_setting_table,
+ chat_message_table,
+ chat_table,
+ collab_snapshot,
+ upload_file_part,
+ upload_file_table,
+ user_data_migration_records,
+ user_table,
+ user_workspace_table,
+ workspace_members_table,
);